From gerrit-no-reply at lists.osmocom.org Fri Oct 1 01:43:24 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 1 Oct 2021 01:43:24 +0000 Subject: Change in osmo-bsc[master]: Add vty command to manually force MS Uplink Power In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 to look at the new patch set (#3). Change subject: Add vty command to manually force MS Uplink Power ...................................................................... Add vty command to manually force MS Uplink Power Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 --- M src/osmo-bsc/bsc_vty.c M tests/osmo-bsc.vty 2 files changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/53/25653/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 Gerrit-Change-Number: 25653 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 01:48:55 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 1 Oct 2021 01:48:55 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop. In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 to look at the new patch set (#6). Change subject: Implement MS Uplink Power Control Loop. ...................................................................... Implement MS Uplink Power Control Loop. * Adds vty option dyn-bsc for ms-power-control -> mode * Imports power_control.c from osmo-bts project. * Removes unused C/I code from power_control. This patch then calls the power loop on receipt of measurement reports and updates the MS Power Level accordingly. Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e --- M include/osmocom/bsc/debug.h M include/osmocom/bsc/gsm_data.h A include/osmocom/bsc/power_control.h M src/osmo-bsc/Makefile.am M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/osmo_bsc_main.c A src/osmo-bsc/power_control.c M tests/power_ctrl.vty 10 files changed, 328 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/25654/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 6 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 01:58:08 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 1 Oct 2021 01:58:08 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop. In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 to look at the new patch set (#7). Change subject: Implement MS Uplink Power Control Loop. ...................................................................... Implement MS Uplink Power Control Loop. * Adds vty option dyn-bsc for ms-power-control -> mode * Imports power_control.c from osmo-bts project. * Removes unused C/I code from power_control. This patch then calls the power loop on receipt of measurement reports and updates the MS Power Level accordingly. Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e --- M include/osmocom/bsc/debug.h M include/osmocom/bsc/gsm_data.h A include/osmocom/bsc/power_control.h M src/osmo-bsc/Makefile.am M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/osmo_bsc_main.c A src/osmo-bsc/power_control.c M tests/power_ctrl.vty 10 files changed, 329 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/25654/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 04:08:31 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 1 Oct 2021 04:08:31 +0000 Subject: Change in osmo-bsc[master]: Add vty command to manually force MS Uplink Power. In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 to look at the new patch set (#4). Change subject: Add vty command to manually force MS Uplink Power. ...................................................................... Add vty command to manually force MS Uplink Power. Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 --- M src/osmo-bsc/bsc_vty.c M tests/osmo-bsc.vty 2 files changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/53/25653/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 Gerrit-Change-Number: 25653 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 04:09:15 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 1 Oct 2021 04:09:15 +0000 Subject: Change in osmo-bsc[master]: Add vty command to manually force MS Uplink Power In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 to look at the new patch set (#5). Change subject: Add vty command to manually force MS Uplink Power ...................................................................... Add vty command to manually force MS Uplink Power Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 --- M src/osmo-bsc/bsc_vty.c M tests/osmo-bsc.vty 2 files changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/53/25653/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 Gerrit-Change-Number: 25653 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 04:10:33 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 1 Oct 2021 04:10:33 +0000 Subject: Change in osmo-bsc[master]: Add vty command to manually force MS Uplink Power In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 to look at the new patch set (#6). Change subject: Add vty command to manually force MS Uplink Power ...................................................................... Add vty command to manually force MS Uplink Power Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 --- M src/osmo-bsc/bsc_vty.c M tests/osmo-bsc.vty 2 files changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/53/25653/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 Gerrit-Change-Number: 25653 Gerrit-PatchSet: 6 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 05:42:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 1 Oct 2021 05:42:54 +0000 Subject: Change in osmocom-bb[master]: 262-10 is "DB Netz AG" and not "DB Systel" References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/25655 ) Change subject: 262-10 is "DB Netz AG" and not "DB Systel" ...................................................................... 262-10 is "DB Netz AG" and not "DB Systel" Change-Id: Idbce4bade4305fabbedcf15c5bd9253fbb371744 --- M src/host/layer23/src/common/networks.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/55/25655/1 diff --git a/src/host/layer23/src/common/networks.c b/src/host/layer23/src/common/networks.c index b4757e9..0cc0d94 100644 --- a/src/host/layer23/src/common/networks.c +++ b/src/host/layer23/src/common/networks.c @@ -470,7 +470,7 @@ { 0x262, 0x07f, "O2" }, { 0x262, 0x08f, "O2" }, { 0x262, 0x09f, "Vodafone" }, - { 0x262, 0x10f, "DB Systel GSM-R" }, + { 0x262, 0x10f, "DB Netz AG GSM-R" }, { 0x262, 0x11f, "O2" }, { 0x262, 0x12f, "Dolphin Telecom" }, { 0x262, 0x13f, "Mobilcom Multimedia" }, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/25655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idbce4bade4305fabbedcf15c5bd9253fbb371744 Gerrit-Change-Number: 25655 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 06:36:48 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 1 Oct 2021 06:36:48 +0000 Subject: Change in osmocom-bb[master]: 262-10 is "DB Netz AG" and not "DB Systel" In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/25655 ) Change subject: 262-10 is "DB Netz AG" and not "DB Systel" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/25655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idbce4bade4305fabbedcf15c5bd9253fbb371744 Gerrit-Change-Number: 25655 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 01 Oct 2021 06:36:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 08:42:46 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 1 Oct 2021 08:42:46 +0000 Subject: Change in pysim[master]: card_handler: make reader (sl) operations optional. In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25548 ) Change subject: card_handler: make reader (sl) operations optional. ...................................................................... card_handler: make reader (sl) operations optional. The constructor gets an sl object on initalization. The card handler will then carry out the reader operation wait_for_card(). In cases where an mechanically automated card reader is used it may be useful to go without those operations and let the caller carry out the appropriate reader operations. So Lets make the sl object optional for the CardHandlerAuto class. If it is not present, simply do not carry out the pre programmed reader operation. Change-Id: I0f793aec51751b7c7b87d55b66326cce9970274e Related: SYS#5617 --- M pySim/card_handler.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/card_handler.py b/pySim/card_handler.py index ef1b071..385c55e 100644 --- a/pySim/card_handler.py +++ b/pySim/card_handler.py @@ -94,7 +94,8 @@ def get(self, first = False): print("Ready for Programming: Transporting card into the reader-bay...") self.__exec_cmd(self.cmds['get']) - self.sl.connect() + if self.sl: + self.sl.connect() def error(self): print("Programming failed: Transporting card to the error-bin...") -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25548 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0f793aec51751b7c7b87d55b66326cce9970274e Gerrit-Change-Number: 25548 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 09:15:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 1 Oct 2021 09:15:44 +0000 Subject: Change in osmo-bsc[master]: stat: add bts.N.num_trx:total In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25506 ) Change subject: stat: add bts.N.num_trx:total ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I283d38e7a8c032e274a5bd2fa150ec2c9a7157b4 Gerrit-Change-Number: 25506 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: osmith Gerrit-Comment-Date: Fri, 01 Oct 2021 09:15:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 09:23:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 1 Oct 2021 09:23:39 +0000 Subject: Change in osmo-bsc[master]: Add vty command to manually force MS Uplink Power In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25653 ) Change subject: Add vty command to manually force MS Uplink Power ...................................................................... Patch Set 6: (3 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25653/6/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25653/6/src/osmo-bsc/bsc_vty.c at 1888 PS6, Line 1888: "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> ms-power <5-40>\n", are you sure 4-50 is the correct range or ms power levels? https://gerrit.osmocom.org/c/osmo-bsc/+/25653/6/src/osmo-bsc/bsc_vty.c at 1896 PS6, Line 1896: if (!ts) Add vty_out about wrong bts+trx+ts? https://gerrit.osmocom.org/c/osmo-bsc/+/25653/6/src/osmo-bsc/bsc_vty.c at 1908 PS6, Line 1908: lchan->ms_power = ms_pwr_ctl_lvl(ts->trx->bts->band, atoi(argv[4])); What about reusing lchan_update_ms_power_ctrl_level() instead? You could extend that fucntion to return negative on error and return WARNIGN here in that case. I guess since this is a test command it's find yto bypass all the checks and send the value manually. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 Gerrit-Change-Number: 25653 Gerrit-PatchSet: 6 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 01 Oct 2021 09:23:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 09:42:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 1 Oct 2021 09:42:07 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25654 ) Change subject: Implement MS Uplink Power Control Loop. ...................................................................... Patch Set 7: (8 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7//COMMIT_MSG at 10 PS7, Line 10: * Imports power_control.c from osmo-bts project. Please add a commit reference here. https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7//COMMIT_MSG at 11 PS7, Line 11: * Removes unused C/I code from power_control. from osmo-bts's power_control.c https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/include/osmocom/bsc/gsm_data.h at 825 PS7, Line 825: struct gsm_power_ctrl_meas_proc_state rxlev_meas_proc; Put this inside a struct lchan_power_ctrl_state {} similar to what's done in osmo-bts. This way we keep similar code base and it's easier to re-use it later ifw e want to implement bs-power control. We would ideally move uint8_t bs_power_db and uint8_t ms_power; from above inside this struct as "uint8_t current" too. https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c File src/osmo-bsc/power_control.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 170 PS7, Line 170: // int16_t ul_lqual_cb_avg; can be dropped https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 171 PS7, Line 171: uint8_t ms_power_lvl = ms_pwr_ctl_lvl(band, mr->ms_l1.pwr); I'd say this is wrong. mr->ms_l1.pwr as received from the MS contains already a MS Power Level right? not dBm. Or are we converting it to dBm somewhere? IIUC this line should be: uint8_t ms_power_lvl = mr->ms_l1.pwr; https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 183 PS7, Line 183: if (bts->dtxu == GSM48_DTX_SHALL_BE_USED) IIRC this can be obtained from the MR? it depends on the channel. https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 188 PS7, Line 188: /* Shall we skip current block based on configured interval? */ Let's move this further up before the dtxu block. https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 258 PS7, Line 258: lchan->ms_power = new_power_lvl; Here for sure lchan_update_ms_power_ctrl_level() must be called instead. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 01 Oct 2021 09:42:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 09:47:13 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 1 Oct 2021 09:47:13 +0000 Subject: Change in libosmocore[master]: fix rsl_chan_nr_str_{buf, c}(): enlarge the buffer size References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/25656 ) Change subject: fix rsl_chan_nr_str_{buf,c}(): enlarge the buffer size ...................................................................... fix rsl_chan_nr_str_{buf,c}(): enlarge the buffer size 20 bytes is not enough for some VAMOS specific channel number values, so the resulting string representation gets truncated by snprintf(): expected: "VAMOS TCH/H(0) on TS4\0" actual: "VAMOS TCH/H(0) on T\0" Let's enlarge the buffers to 32 bytes. Change-Id: I68d839f4ab742cf56de34e7e22572a1163aec2da --- M src/gsm/rsl.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/56/25656/1 diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c index 0574966..e648d82 100644 --- a/src/gsm/rsl.c +++ b/src/gsm/rsl.c @@ -268,7 +268,7 @@ */ const char *rsl_chan_nr_str(uint8_t chan_nr) { - static __thread char str[20]; + static __thread char str[32]; return rsl_chan_nr_str_buf(str, sizeof(str), chan_nr); } @@ -279,10 +279,10 @@ */ char *rsl_chan_nr_str_c(const void *ctx, uint8_t chan_nr) { - char *str = talloc_size(ctx, 20); + char *str = talloc_size(ctx, 32); if (!str) return NULL; - return rsl_chan_nr_str_buf(str, 20, chan_nr); + return rsl_chan_nr_str_buf(str, 32, chan_nr); } static const struct value_string rsl_err_vals[] = { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I68d839f4ab742cf56de34e7e22572a1163aec2da Gerrit-Change-Number: 25656 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 09:51:20 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 1 Oct 2021 09:51:20 +0000 Subject: Change in pysim[master]: pySim-shell: refactor __main__ section In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25484 to look at the new patch set (#8). Change subject: pySim-shell: refactor __main__ section ...................................................................... pySim-shell: refactor __main__ section The code in __main__ which initalizes the reader and the card and runtime state is not so well structured. Lets put the generation of the card and rs (RuntimeState) object into a separate function. Also do not wait indefinetly for a card. 3 seconds should be enough. If the card or reader did not respond until then, then there will be a problem in any case. Change-Id: Id2a0f2012b84ce61f5c0c14404df559fca4ddfcd Related: SYS#5617 --- M pySim-shell.py 1 file changed, 52 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/84/25484/8 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id2a0f2012b84ce61f5c0c14404df559fca4ddfcd Gerrit-Change-Number: 25484 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-CC: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 09:52:27 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 1 Oct 2021 09:52:27 +0000 Subject: Change in pysim[master]: pySim-shell: refactor __main__ section In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25484 ) Change subject: pySim-shell: refactor __main__ section ...................................................................... Patch Set 8: (2 comments) https://gerrit.osmocom.org/c/pysim/+/25484/7/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/25484/7/pySim-shell.py at 64 PS7, Line 64: ; > ; is not needed at the end of commands in python, same below too bad that python doesn't error about this... https://gerrit.osmocom.org/c/pysim/+/25484/7/pySim-shell.py at 529 PS7, Line 529: if (sl is None) > () around conditions not needed Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id2a0f2012b84ce61f5c0c14404df559fca4ddfcd Gerrit-Change-Number: 25484 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-CC: osmith Gerrit-Comment-Date: Fri, 01 Oct 2021 09:52:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 10:08:03 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 1 Oct 2021 10:08:03 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop. In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25654 ) Change subject: Implement MS Uplink Power Control Loop. ...................................................................... Patch Set 7: (8 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/include/osmocom/bsc/gsm_data.h at 825 PS7, Line 825: struct gsm_power_ctrl_meas_proc_state rxlev_meas_proc; > Put this inside a struct lchan_power_ctrl_state {} similar to what's done in osmo-bts. [?] Ack https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/bsc_vty.c at 1359 PS7, Line 1359: == GSM_PWR_CTRL_MODE_DYN_BSC I would rather do != GSM_PWR_CTRL_MODE_DYN_BTS here. But first would be good to know why are you adding this check here? https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/bts_vty.c File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/bts_vty.c at 3150 PS7, Line 3150: if (params->mode == GSM_PWR_CTRL_MODE_DYN_BSC) { These thresholds also does not matter in 'static' mode. Not sure if we really need this check here... https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c File src/osmo-bsc/power_control.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 161 PS7, Line 161: struct gsm_meas_rep *mr Please make this pointer 'const'. https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 170 PS7, Line 170: // int16_t ul_lqual_cb_avg; > can be dropped Ack https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 177 PS7, Line 177: /* Not doing the power loop here if we are not handling it */ I would move this check to the calling function, but not critical. https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 183 PS7, Line 183: if (bts->dtxu == GSM48_DTX_SHALL_BE_USED) > IIRC this can be obtained from the MR? it depends on the channel. Indeed. I guess 'mr->flags & MEAS_REP_F_UL_DTX'? https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 188 PS7, Line 188: /* Shall we skip current block based on configured interval? */ > Let's move this further up before the dtxu block. Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 01 Oct 2021 10:08:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 12:11:54 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 1 Oct 2021 12:11:54 +0000 Subject: Change in pysim[master]: pySim-shell: verify_adm: turn error messages into exceptions In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25550 ) Change subject: pySim-shell: verify_adm: turn error messages into exceptions ...................................................................... pySim-shell: verify_adm: turn error messages into exceptions When verify_adm is used with scripts, especially bulk provisioning, then an exception is far more visible and allows us to spot problems with ADM verification quicker. Change-Id: I4162b43754efd061b6b9058b7ff8e1fc985e3538 Related: SYS#5617 --- M pySim-shell.py 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/pySim-shell.py b/pySim-shell.py index 06e14f6..6699c6f 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -310,13 +310,12 @@ if pin_adm: self._cmd.poutput("found ADM-PIN '%s' for ICCID '%s'" % (result, self._cmd.iccid)) else: - self._cmd.poutput("cannot find ADM-PIN for ICCID '%s'" % (self._cmd.iccid)) - return + raise ValueError("cannot find ADM-PIN for ICCID '%s'" % (self._cmd.iccid)) if pin_adm: self._cmd.card.verify_adm(h2b(pin_adm)) else: - self._cmd.poutput("error: cannot authenticate, no adm-pin!") + raise ValueError("error: cannot authenticate, no adm-pin!") @with_default_category('ISO7816 Commands') class Iso7816Commands(CommandSet): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25550 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4162b43754efd061b6b9058b7ff8e1fc985e3538 Gerrit-Change-Number: 25550 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 12:25:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 1 Oct 2021 12:25:12 +0000 Subject: Change in libosmocore[master]: fix rsl_chan_nr_str_{buf, c}(): enlarge the buffer size In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25656 ) Change subject: fix rsl_chan_nr_str_{buf,c}(): enlarge the buffer size ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I68d839f4ab742cf56de34e7e22572a1163aec2da Gerrit-Change-Number: 25656 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 01 Oct 2021 12:25:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 13:01:21 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 1 Oct 2021 13:01:21 +0000 Subject: Change in pysim[master]: pySim-shell: refactor __main__ section In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25484 ) Change subject: pySim-shell: refactor __main__ section ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id2a0f2012b84ce61f5c0c14404df559fca4ddfcd Gerrit-Change-Number: 25484 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 01 Oct 2021 13:01:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 16:12:10 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 1 Oct 2021 16:12:10 +0000 Subject: Change in pysim[master]: pySim-shell: allow card insertion at runtime In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25549 ) Change subject: pySim-shell: allow card insertion at runtime ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/c/pysim/+/25549/2/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/25549/2/pySim-shell.py at 96 PS2, Line 96: basic_commands = [] > this variable can be removed Done https://gerrit.osmocom.org/c/pysim/+/25549/2/pySim-shell.py at 106 PS2, Line 106: self.add_settable(cmd2.Settable('numeric_path', bool, 'Print File IDs instead of names', > looks like unrelated moving around of variables, -> extra commit? Done https://gerrit.osmocom.org/c/pysim/+/25549/2/pySim-shell.py at 587 PS2, Line 587: execption > exception Thanks! -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 Gerrit-Change-Number: 25549 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Comment-Date: Fri, 01 Oct 2021 16:12:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 16:12:46 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 1 Oct 2021 16:12:46 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25552 ) Change subject: pySim-shell: add bulk provisioning support ...................................................................... Patch Set 2: (5 comments) https://gerrit.osmocom.org/c/pysim/+/25552/2/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/25552/2/pySim-shell.py at 241 PS2, Line 241: Eearly > Early Done https://gerrit.osmocom.org/c/pysim/+/25552/2/pySim-shell.py at 247 PS2, Line 247: execption > exception Done https://gerrit.osmocom.org/c/pysim/+/25552/2/pySim-shell.py at 306 PS2, Line 306: TODO: > this is implemented below, not a TODO anymore No it is not, it counts the overall failures. The TODO is different. We need to count consecutive failures and reset the counter when we see a good card again. The idea is to make sure that we do not get into a situation where we pass hundredths of cards into the bad-bin when a reader-failure occurs. At the moment we cannot process large amounts of cards anyway, so we do not need this right now, but we also shouldn't forget about it. https://gerrit.osmocom.org/c/pysim/+/25552/2/pySim-shell.py at 352 PS2, Line 352: execption > exception Done https://gerrit.osmocom.org/c/pysim/+/25552/2/pySim-shell.py at 360 PS2, Line 360: execption > exception Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Comment-Date: Fri, 01 Oct 2021 16:12:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 16:13:02 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 1 Oct 2021 16:13:02 +0000 Subject: Change in pysim[master]: pySim-shell: allow card insertion at runtime In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25549 to look at the new patch set (#3). Change subject: pySim-shell: allow card insertion at runtime ...................................................................... pySim-shell: allow card insertion at runtime Currently a card must be present in the reader until the user can enter pySim-shell. Removing and plugging another card is in theory already possible, but then the new card will operate on the old card and runtime state object. It might also be useful to enter pySim-shell before the card is plugged to execute some other commands for preperation before. So lets allow to "equip" pySim-shell with a card and rs object at runtime. Related: SYS#5617 Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 --- M pySim-shell.py M pySim/filesystem.py 2 files changed, 75 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/49/25549/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 Gerrit-Change-Number: 25549 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 16:13:02 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 1 Oct 2021 16:13:02 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25552 to look at the new patch set (#3). Change subject: pySim-shell: add bulk provisioning support ...................................................................... pySim-shell: add bulk provisioning support There are scenarios where multiple cards need to get the same change. Lets add a new command that takes a script as parameter and executes the secript in a loop on multiple cards while prompting the user to change the card before starting the next cycle. Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Related: SYS#5617 --- M pySim-shell.py 1 file changed, 183 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/52/25552/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 16:13:02 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 1 Oct 2021 16:13:02 +0000 Subject: Change in pysim[master]: pySim-prog: fix typo References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25657 ) Change subject: pySim-prog: fix typo ...................................................................... pySim-prog: fix typo Change-Id: I94818e5646ac2beb57052d93b5599f0b877de83b --- M pySim-prog.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/57/25657/1 diff --git a/pySim-prog.py b/pySim-prog.py index a3235b4..334431e 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -760,7 +760,7 @@ raise except: print("") - print("Card programming failed with an execption:") + print("Card programming failed with an exception:") print("---------------------8<---------------------") traceback.print_exc() print("---------------------8<---------------------") -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I94818e5646ac2beb57052d93b5599f0b877de83b Gerrit-Change-Number: 25657 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 16:44:55 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 1 Oct 2021 16:44:55 +0000 Subject: Change in pysim[master]: pySim-prog: fix typo In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25657 ) Change subject: pySim-prog: fix typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I94818e5646ac2beb57052d93b5599f0b877de83b Gerrit-Change-Number: 25657 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Fri, 01 Oct 2021 16:44:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 16:45:02 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 1 Oct 2021 16:45:02 +0000 Subject: Change in pysim[master]: pySim-prog: fix typo In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25657 ) Change subject: pySim-prog: fix typo ...................................................................... pySim-prog: fix typo Change-Id: I94818e5646ac2beb57052d93b5599f0b877de83b --- M pySim-prog.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved diff --git a/pySim-prog.py b/pySim-prog.py index a3235b4..334431e 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -760,7 +760,7 @@ raise except: print("") - print("Card programming failed with an execption:") + print("Card programming failed with an exception:") print("---------------------8<---------------------") traceback.print_exc() print("---------------------8<---------------------") -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I94818e5646ac2beb57052d93b5599f0b877de83b Gerrit-Change-Number: 25657 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 23:10:23 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 1 Oct 2021 23:10:23 +0000 Subject: Change in osmo-bsc[master]: Add vty command to manually force MS Uplink Power In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 to look at the new patch set (#7). Change subject: Add vty command to manually force MS Uplink Power ...................................................................... Add vty command to manually force MS Uplink Power Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 --- M src/osmo-bsc/bsc_vty.c M tests/osmo-bsc.vty 2 files changed, 54 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/53/25653/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 Gerrit-Change-Number: 25653 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 23:11:41 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 1 Oct 2021 23:11:41 +0000 Subject: Change in osmo-bsc[master]: Add vty command to manually force MS Uplink Power In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25653 ) Change subject: Add vty command to manually force MS Uplink Power ...................................................................... Patch Set 7: (3 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25653/6/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25653/6/src/osmo-bsc/bsc_vty.c at 1888 PS6, Line 1888: "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> ms-power <5-40>\n", > are you sure 4-50 is the correct range or ms power levels? Oops, You're right, I principally work in the 850 band which has a minimum of 5 dB, but other bands have 0 dBm. As for the max, what I see in the spec is 39, for UE that supports it, in GSM 900 and GSM 850, but we have 0-40 in ms max power, so I shall use that range here. https://gerrit.osmocom.org/c/osmo-bsc/+/25653/6/src/osmo-bsc/bsc_vty.c at 1896 PS6, Line 1896: if (!ts) > Add vty_out about wrong bts+trx+ts? OK, I was just following many other similar implementations. I think if one is running these bts x trx x commands, one is expected to know what bts and trx exist in the configuration. https://gerrit.osmocom.org/c/osmo-bsc/+/25653/6/src/osmo-bsc/bsc_vty.c at 1908 PS6, Line 1908: lchan->ms_power = ms_pwr_ctl_lvl(ts->trx->bts->band, atoi(argv[4])); > What about reusing lchan_update_ms_power_ctrl_level() instead? You could extend that fucntion to ret [?] Well, it is kind of designed for fuzzing, only to ever be executed by an operator who might expect things to break so yes, I'd say we don't want all those checks here. But lets add it as an option. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 Gerrit-Change-Number: 25653 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 01 Oct 2021 23:11:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 1 23:12:41 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Fri, 1 Oct 2021 23:12:41 +0000 Subject: Change in osmo-bsc[master]: Add vty command to manually force MS Uplink Power In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 to look at the new patch set (#8). Change subject: Add vty command to manually force MS Uplink Power ...................................................................... Add vty command to manually force MS Uplink Power Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 --- M src/osmo-bsc/bsc_vty.c M tests/osmo-bsc.vty 2 files changed, 54 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/53/25653/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 Gerrit-Change-Number: 25653 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 01:35:28 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sat, 2 Oct 2021 01:35:28 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop. In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 to look at the new patch set (#8). Change subject: Implement MS Uplink Power Control Loop. ...................................................................... Implement MS Uplink Power Control Loop. * Adds vty option dyn-bsc for ms-power-control -> mode * Imports power_control.c from osmo-bts project. * Removes unused C/I code from power_control. This patch then calls the power loop on receipt of measurement reports and updates the MS Power Level accordingly. Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e --- M include/osmocom/bsc/debug.h M include/osmocom/bsc/gsm_data.h A include/osmocom/bsc/power_control.h M src/osmo-bsc/Makefile.am M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/osmo_bsc_main.c A src/osmo-bsc/power_control.c M tests/power_ctrl.vty 10 files changed, 334 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/25654/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 01:35:39 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sat, 2 Oct 2021 01:35:39 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25654 ) Change subject: Implement MS Uplink Power Control Loop. ...................................................................... Patch Set 8: (10 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7//COMMIT_MSG at 10 PS7, Line 10: * Imports power_control.c from osmo-bts project. > Please add a commit reference here. OK, Should it be the commit hash of the commit that originally adds power_control.c to osmo-bts? Or the last commit to modify it? (i.e. the version I took?) Or do you mean a URL reference to the file itself? Thnx https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/include/osmocom/bsc/gsm_data.h at 825 PS7, Line 825: struct gsm_power_ctrl_meas_proc_state rxlev_meas_proc; > Ack Are you saying you would you like to see ms_power moved in here to '.current' in a separate patchset? (maybe previous to this one?) I've removed unused fields from the state struct, not sure if you would prefer to leave them there? Or put them back them in a subsequent commit that actually makes use of them? https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/bsc_vty.c at 1359 PS7, Line 1359: == GSM_PWR_CTRL_MODE_DYN_BSC > I would rather do != GSM_PWR_CTRL_MODE_DYN_BTS here. [?] I'm happy to drop it. It's just an advice to the operator that the command won't do anything as it's not in DYN_BTS mode. Let me know what you prefer. https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/bts_vty.c File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/bts_vty.c at 3150 PS7, Line 3150: if (params->mode == GSM_PWR_CTRL_MODE_DYN_BSC) { > These thresholds also does not matter in 'static' mode. Not sure if we really need this check here.. [?] I don't know what to do with "not sure" comments. ? We don't really "NEED" it, no, do we really need the following lines I based it on? I don't mind. I'll follow your lead, if you want me to take it out, please be more explicit. thanks https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c File src/osmo-bsc/power_control.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 161 PS7, Line 161: struct gsm_meas_rep *mr > Please make this pointer 'const'. Done https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 170 PS7, Line 170: // int16_t ul_lqual_cb_avg; > Ack Missed it.. https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 171 PS7, Line 171: uint8_t ms_power_lvl = ms_pwr_ctl_lvl(band, mr->ms_l1.pwr); > I'd say this is wrong. mr->ms_l1. [?] meas_rep.h: struct { int8_t pwr; /* MS power in dBm */ uint8_t ta; /* MS timing advance */ } ms_l1; abis_rsl.c:1319: mr->ms_l1.pwr = ms_pwr_dbm(sign_link->trx->bts->band, val[0] >> 3); Besides, I don't think it would have perfomed correctly if that were wrong ? https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 177 PS7, Line 177: /* Not doing the power loop here if we are not handling it */ > I would move this check to the calling function, but not critical. I did question this. My doubt is whether it less optimal or less clear to access mr->lchan->ts->trx->bts>ms_power_ctrl->mode in the calling function, or do do it here. I don't really understand what happens with CPU/Memory (if anything) when we call this function with those declarations at the top, only to exit. https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 183 PS7, Line 183: if (bts->dtxu == GSM48_DTX_SHALL_BE_USED) > Indeed. [?] Yep, thanks I hadn't actually investigated the full report IE, I see it now. https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/src/osmo-bsc/power_control.c at 258 PS7, Line 258: lchan->ms_power = new_power_lvl; > Here for sure lchan_update_ms_power_ctrl_level() must be called instead. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 02 Oct 2021 01:35:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 01:38:12 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sat, 2 Oct 2021 01:38:12 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop. In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 to look at the new patch set (#9). Change subject: Implement MS Uplink Power Control Loop. ...................................................................... Implement MS Uplink Power Control Loop. * Adds vty option dyn-bsc for ms-power-control -> mode * Imports power_control.c from osmo-bts project [at commit 2f3cd4b697972d8484f9a9d3b7ef634086f65fa5] * Removes unused C/I code from osmo-bts's power_control.c This patch then calls the power loop on receipt of measurement reports and updates the MS Power Level accordingly. Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e --- M include/osmocom/bsc/debug.h M include/osmocom/bsc/gsm_data.h A include/osmocom/bsc/power_control.h M src/osmo-bsc/Makefile.am M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/osmo_bsc_main.c A src/osmo-bsc/power_control.c M tests/power_ctrl.vty 10 files changed, 334 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/25654/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 9 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 02:00:32 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sat, 2 Oct 2021 02:00:32 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop. In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 to look at the new patch set (#10). Change subject: Implement MS Uplink Power Control Loop. ...................................................................... Implement MS Uplink Power Control Loop. * Adds vty option dyn-bsc for ms-power-control -> mode * Imports power_control.c from osmo-bts project [at commit 2f3cd4b697972d8484f9a9d3b7ef634086f65fa5] * Removes unused C/I code from osmo-bts's power_control.c This patch then calls the power loop on receipt of measurement reports and updates the MS Power Level accordingly. Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e --- M include/osmocom/bsc/Makefile.am M include/osmocom/bsc/debug.h M include/osmocom/bsc/gsm_data.h A include/osmocom/bsc/power_control.h M src/osmo-bsc/Makefile.am M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/osmo_bsc_main.c A src/osmo-bsc/power_control.c M tests/power_ctrl.vty 11 files changed, 335 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/25654/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 10 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 03:37:10 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sat, 2 Oct 2021 03:37:10 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25654 ) Change subject: Implement MS Uplink Power Control Loop ...................................................................... Patch Set 11: (1 comment) This change is ready for review. https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7//COMMIT_MSG at 11 PS7, Line 11: * Removes unused C/I code from power_control. > from osmo-bts's power_control. [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 11 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 02 Oct 2021 03:37:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 05:51:43 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 2 Oct 2021 05:51:43 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25654 ) Change subject: Implement MS Uplink Power Control Loop ...................................................................... Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 11 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 02 Oct 2021 05:51:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 08:05:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 2 Oct 2021 08:05:55 +0000 Subject: Change in osmo-bsc[master]: Add vty command to manually force MS Uplink Power In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25653 ) Change subject: Add vty command to manually force MS Uplink Power ...................................................................... Patch Set 8: Code-Review+1 one might consider to use a DEFUN_HIDDEN for these testing/debugging commands. Maybe a good idea to convert the other similar ones in a separate patch, too. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 Gerrit-Change-Number: 25653 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 02 Oct 2021 08:05:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 08:07:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 2 Oct 2021 08:07:05 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25654 ) Change subject: Implement MS Uplink Power Control Loop ...................................................................... Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 11 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 02 Oct 2021 08:07:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 08:07:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 2 Oct 2021 08:07:30 +0000 Subject: Change in osmo-bsc[master]: stat: add bts.N.num_trx:total In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25506 ) Change subject: stat: add bts.N.num_trx:total ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I283d38e7a8c032e274a5bd2fa150ec2c9a7157b4 Gerrit-Change-Number: 25506 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: osmith Gerrit-Comment-Date: Sat, 02 Oct 2021 08:07:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 08:07:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 2 Oct 2021 08:07:48 +0000 Subject: Change in osmo-bsc[master]: stat: add bts.N.num_trx:rsl_connected In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25507 ) Change subject: stat: add bts.N.num_trx:rsl_connected ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I55b55159fe13d937e441d8c2ed915734463e1154 Gerrit-Change-Number: 25507 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sat, 02 Oct 2021 08:07:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 08:08:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 2 Oct 2021 08:08:12 +0000 Subject: Change in libosmocore[master]: fix rsl_chan_nr_str_{buf, c}(): enlarge the buffer size In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25656 ) Change subject: fix rsl_chan_nr_str_{buf,c}(): enlarge the buffer size ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I68d839f4ab742cf56de34e7e22572a1163aec2da Gerrit-Change-Number: 25656 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 02 Oct 2021 08:08:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 08:08:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 2 Oct 2021 08:08:16 +0000 Subject: Change in libosmocore[master]: fix rsl_chan_nr_str_{buf, c}(): enlarge the buffer size In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25656 ) Change subject: fix rsl_chan_nr_str_{buf,c}(): enlarge the buffer size ...................................................................... fix rsl_chan_nr_str_{buf,c}(): enlarge the buffer size 20 bytes is not enough for some VAMOS specific channel number values, so the resulting string representation gets truncated by snprintf(): expected: "VAMOS TCH/H(0) on TS4\0" actual: "VAMOS TCH/H(0) on T\0" Let's enlarge the buffers to 32 bytes. Change-Id: I68d839f4ab742cf56de34e7e22572a1163aec2da --- M src/gsm/rsl.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c index 0574966..e648d82 100644 --- a/src/gsm/rsl.c +++ b/src/gsm/rsl.c @@ -268,7 +268,7 @@ */ const char *rsl_chan_nr_str(uint8_t chan_nr) { - static __thread char str[20]; + static __thread char str[32]; return rsl_chan_nr_str_buf(str, sizeof(str), chan_nr); } @@ -279,10 +279,10 @@ */ char *rsl_chan_nr_str_c(const void *ctx, uint8_t chan_nr) { - char *str = talloc_size(ctx, 20); + char *str = talloc_size(ctx, 32); if (!str) return NULL; - return rsl_chan_nr_str_buf(str, 20, chan_nr); + return rsl_chan_nr_str_buf(str, 32, chan_nr); } static const struct value_string rsl_err_vals[] = { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I68d839f4ab742cf56de34e7e22572a1163aec2da Gerrit-Change-Number: 25656 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 09:20:43 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 2 Oct 2021 09:20:43 +0000 Subject: Change in osmo-bsc[master]: fix comment in lchan_fsm.c: s/modification/activation References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25658 ) Change subject: fix comment in lchan_fsm.c: s/modification/activation ...................................................................... fix comment in lchan_fsm.c: s/modification/activation Change-Id: I1f2eaf636d4edc170e1608ab782f60028e2b1eb8 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/58/25658/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index d06dbac..0faafdb 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -719,8 +719,7 @@ else lchan->activate.tsc_set = lchan->vamos.is_secondary ? 2 : 1; - /* Use the TSC provided in the modification request, if any. Otherwise use the timeslot's configured - * TSC. */ + /* Use the TSC provided in the activation request, if any. Otherwise use the timeslot's configured TSC. */ lchan->activate.tsc = (lchan->activate.info.tsc >= 0) ? lchan->activate.info.tsc : gsm_ts_tsc(lchan->ts); use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1f2eaf636d4edc170e1608ab782f60028e2b1eb8 Gerrit-Change-Number: 25658 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 09:21:17 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 2 Oct 2021 09:21:17 +0000 Subject: Change in osmo-bsc[master]: fix comment in lchan_fsm.c: s/modification/activation In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25658 ) Change subject: fix comment in lchan_fsm.c: s/modification/activation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1f2eaf636d4edc170e1608ab782f60028e2b1eb8 Gerrit-Change-Number: 25658 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: neels Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sat, 02 Oct 2021 09:21:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 11:12:15 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 2 Oct 2021 11:12:15 +0000 Subject: Change in osmo-bsc[master]: fix TSC / TSC Set used for Handover References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25659 ) Change subject: fix TSC / TSC Set used for Handover ...................................................................... fix TSC / TSC Set used for Handover >From the nature of the lchan_activate_info.tsc_set and .tsc, it is easy to forget to set tsc_set,tsc = -1 to use default TSC Set and TSC values. Handover code is one such instance that forgets to set -1. Change the semantics of tsc_set and tsc so that this kind of error can not happen again as easily: use a separate bool to flag whether to use the default config or explicit values. Implicitly fix the lchan_activate_infos "launched" in handover_fsm.c as well as abis_rsl_chan_rqd_queue_poll(). Related: OS#5244 SYS#4895 Related: I1ed6f068c85b01e5a2d7b5f2651498a1521f89af (osmo-ttcn3-hacks) Change-Id: Iae20df4387c3d75752301bd5daeeea7508966393 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c 6 files changed, 68 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/25659/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 03f210f..4c7f348 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -138,6 +138,14 @@ static inline const char *assign_for_name(enum assign_for assign_for) { return get_value_string(assign_for_names, assign_for); } +/* If .use is false, use the default value defined elsewhere. If true, use .val below. + * (A practical benefit of this is that the default initialization sets .use to false, so that even if a .val == 0 is a + * valid value, a struct containing this as member does not need to explicitly set .val = INVALID_VAL_CONSTANT.) */ +struct optional_val { + bool use; + int val; +}; + /* Information retrieved during an Assignment Request from the MSC. This is storage of the Assignment instructions * parsed from the Assignment Request message, to pass on until the gscon and assignment FSMs have decided whether an * Assignment is actually going to be carried out. Should remain unchanged after initial decoding. */ @@ -165,12 +173,12 @@ * target_lchan to it. */ struct gsm_lchan *target_lchan; - /* TSC Set to use, or -1 for automatically determining the TSC Set to use. Valid range is 1 to 4, as described - * in 3GPP TS 45.002. */ - int tsc_set; - /* TSC to use, or -1 for automatically determining the TSC to use. Valid range is 0 to 7, as described in 3GPP - * TS 45.002. */ - int tsc; + /* The TSC Set to use if 'use' is true, otherwise automatically determine the TSC Set value to use. Valid range + * is 1 to 4, as described in 3GPP TS 45.002. */ + struct optional_val tsc_set; + /* The TSC to use if 'use' is true, otherwise automatically determine the TSC value to use. Valid range is 0 to + * 7, as described in 3GPP TS 45.002. */ + struct optional_val tsc; }; /* State of an ongoing Assignment, while the assignment_fsm is still busy. This serves as state separation to keep the @@ -621,12 +629,12 @@ bool ta_known; uint8_t ta; - /* TSC Set to use, or -1 for automatically determining the TSC Set to use. Valid range is 1 to 4, as described - * in 3GPP TS 45.002. */ - int tsc_set; - /* TSC to use, or -1 for automatically determining the TSC to use. Valid range is 0 to 7, as described in 3GPP - * TS 45.002. */ - int tsc; + /* The TSC Set to use if 'use' is true, otherwise automatically determine the TSC Set value to use. Valid range + * is 1 to 4, as described in 3GPP TS 45.002. */ + struct optional_val tsc_set; + /* The TSC to use if 'use' is true, otherwise automatically determine the TSC value to use. Valid range is 0 to + * 7, as described in 3GPP TS 45.002. */ + struct optional_val tsc; bool vamos; @@ -652,12 +660,12 @@ bool requires_voice_stream; uint16_t msc_assigned_cic; - /* TSC Set to use, or -1 for automatically determining the TSC Set to use. Valid range is 1 to 4, as described - * in 3GPP TS 45.002. */ - int tsc_set; - /* TSC to use, or -1 for automatically determining the TSC to use. Valid range is 0 to 7, as described in 3GPP - * TS 45.002. */ - int tsc; + /* The TSC Set to use if 'use' is true, otherwise automatically determine the TSC Set value to use. Valid range + * is 1 to 4, as described in 3GPP TS 45.002. */ + struct optional_val tsc_set; + /* The TSC to use if 'use' is true, otherwise automatically determine the TSC value to use. Valid range is 0 to + * 7, as described in 3GPP TS 45.002. */ + struct optional_val tsc; bool vamos; }; @@ -695,7 +703,9 @@ * occur later, e.g. during release, that we don't send a NACK out of context. */ bool concluded; enum gsm0808_cause gsm0808_error_cause; + /* Actually used TSC Set. */ int tsc_set; + /* Actually used TSC. */ uint8_t tsc; } activate; @@ -709,7 +719,9 @@ struct channel_mode_and_rate ch_mode_rate; struct gsm48_multi_rate_conf mr_conf_filtered; + /* Actually used TSC Set. */ int tsc_set; + /* Actually used TSC. */ uint8_t tsc; bool concluded; } modify; diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index fb8e386..9882252 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2087,8 +2087,6 @@ }, .ta = rqd->ta, .ta_known = true, - .tsc_set = -1, - .tsc = -1, .imm_ass_time = bts->imm_ass_time, }; diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 97eb335..5a54928 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -452,8 +452,14 @@ .n_ch_mode_rate = 1, .ch_mode_rate_list = { lchan->current_ch_mode_rate }, .target_lchan = to_lchan, - .tsc_set = tsc_set, - .tsc = tsc, + .tsc_set = { + .use = (tsc_set >= 0), + .val = tsc_set, + }, + .tsc = { + .use = (tsc >= 0), + .val = tsc, + }, }; if (to_lchan) @@ -822,8 +828,14 @@ .requires_voice_stream = conn->assignment.requires_voice_stream, .msc_assigned_cic = req->msc_assigned_cic, /* keep previous training sequence code */ - .tsc_set = lchan->tsc_set, - .tsc = lchan->tsc, + .tsc_set = { + .use = true, + .val = lchan->tsc_set, + }, + .tsc = { + .use = true, + .val = lchan->tsc, + }, }; lchan_mode_modify(lchan, &modif_info); } diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 5ccd784..572434d 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -849,6 +849,7 @@ return CMD_WARNING; } +/* tsc_set and tsc: -1 to automatically determine which TSC Set / which TSC to use. */ static int trigger_vamos_mode_modify(struct vty *vty, struct gsm_lchan *lchan, bool vamos, int tsc_set, int tsc) { struct lchan_modify_info info = { @@ -856,8 +857,14 @@ .ch_mode_rate = lchan->current_ch_mode_rate, .requires_voice_stream = (lchan->fi_rtp != NULL), .vamos = vamos, - .tsc_set = tsc_set, - .tsc = tsc, + .tsc_set = { + .use = (tsc_set >= 0), + .val = tsc_set, + }, + .tsc = { + .use = (tsc >= 0), + .val = tsc, + }, }; lchan_mode_modify(lchan, &info); @@ -1540,10 +1547,7 @@ /* Activate / Deactivate a single lchan with a specific codec mode */ static int lchan_act_single(struct vty *vty, struct gsm_lchan *lchan, const char *codec_str, int amr_mode, int activate) { - struct lchan_activate_info info = { - .tsc_set = -1, - .tsc = -1, - }; + struct lchan_activate_info info = {0}; uint16_t amr_modes[8] = { GSM0808_SC_CFG_AMR_4_75, GSM0808_SC_CFG_AMR_4_75_5_90_7_40_12_20, GSM0808_SC_CFG_AMR_5_90, GSM0808_SC_CFG_AMR_6_70, GSM0808_SC_CFG_AMR_7_40, GSM0808_SC_CFG_AMR_7_95, GSM0808_SC_CFG_AMR_10_2, @@ -1612,8 +1616,12 @@ if (activate == 2 || lchan->vamos.is_secondary) { info.vamos = true; - info.tsc_set = lchan->vamos.is_secondary ? 1 : 0; - info.tsc = 0; + if (lchan->vamos.is_secondary) { + info.tsc_set.use = true; + info.tsc_set.val = 1; + } + info.tsc.use = true; + info.tsc.val = 0; info.ch_mode_rate.chan_mode = gsm48_chan_mode_to_vamos(info.ch_mode_rate.chan_mode); } diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 0faafdb..7ebdaa5 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -714,13 +714,13 @@ /* If enabling VAMOS mode and no specific TSC Set was selected, make sure to select a sane TSC Set by * default: Set 1 for the primary and Set 2 for the shadow lchan. For non-VAMOS lchans, TSC Set 1. */ - if (lchan->activate.info.tsc_set > 0) - lchan->activate.tsc_set = lchan->activate.info.tsc_set; + if (lchan->activate.info.tsc_set.use) + lchan->activate.tsc_set = lchan->activate.info.tsc_set.val; else lchan->activate.tsc_set = lchan->vamos.is_secondary ? 2 : 1; /* Use the TSC provided in the activation request, if any. Otherwise use the timeslot's configured TSC. */ - lchan->activate.tsc = (lchan->activate.info.tsc >= 0) ? lchan->activate.info.tsc : gsm_ts_tsc(lchan->ts); + lchan->activate.tsc = lchan->activate.info.tsc.use ? lchan->activate.info.tsc.val : gsm_ts_tsc(lchan->ts); use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); @@ -1095,8 +1095,6 @@ .ch_mode_rate = lchan->modify.ch_mode_rate, .requires_voice_stream = true, .msc_assigned_cic = lchan->modify.info.msc_assigned_cic, - .tsc_set = -1, - .tsc = -1, }; if (lchan_activate_set_ch_mode_rate_and_mr_config(lchan)) return; @@ -1250,14 +1248,14 @@ /* If enabling VAMOS mode and no specific TSC Set was selected, make sure to select a sane TSC Set by * default: Set 1 for the primary and Set 2 for the shadow lchan. For non-VAMOS lchans, TSC Set 1. */ - if (lchan->modify.info.tsc_set > 0) - lchan->modify.tsc_set = lchan->modify.info.tsc_set; + if (lchan->modify.info.tsc_set.use) + lchan->modify.tsc_set = lchan->modify.info.tsc_set.val; else lchan->modify.tsc_set = lchan->vamos.is_secondary ? 2 : 1; /* Use the TSC provided in the modification request, if any. Otherwise use the timeslot's configured * TSC. */ - lchan->modify.tsc = (lchan->modify.info.tsc >= 0) ? lchan->modify.info.tsc : gsm_ts_tsc(lchan->ts); + lchan->modify.tsc = lchan->modify.info.tsc.use ? lchan->modify.info.tsc.val : gsm_ts_tsc(lchan->ts); LOG_LCHAN(lchan, LOGL_INFO, "Modification requested: %s voice=%s MGW-ci=%s type=%s tch-mode=%s tsc=%d/%u\n", diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index d786ec6..aab2514 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -940,8 +940,6 @@ .msc_assigned_cic = cic, .use_osmux = use_osmux, .osmux_cid = osmux_cid, - .tsc_set = -1, - .tsc = -1, }; /* Match codec information from the assignment command against the @@ -968,8 +966,6 @@ req = (struct assignment_request){ .assign_for = ASSIGN_FOR_BSSMAP_REQ, .aoip = aoip, - .tsc_set = -1, - .tsc = -1, }; rc = select_sign_chan(&req, &ct); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iae20df4387c3d75752301bd5daeeea7508966393 Gerrit-Change-Number: 25659 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 11:12:36 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 2 Oct 2021 11:12:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add const list of TSC expected per BTS References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25660 ) Change subject: bsc: add const list of TSC expected per BTS ...................................................................... bsc: add const list of TSC expected per BTS Reduce code (comment) dup by having one const definition for default TSCs instead of magic numbers. Will add another use of this in upcoming patch testing correct TSC in handover. Related: SYS#4895 Change-Id: I3733ebbbfd74630e095a08b83023974aad177b34 --- M bsc/BSC_Tests.ttcn 1 file changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/25660/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index a4def7b..9e4ddff 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -75,6 +75,8 @@ import from GSM_RestOctets all; import from TCCConversion_Functions all; +type record of integer integer_list; + const integer NUM_BTS := 3; const integer NUM_BTS_CFG := 4; /* we have 4 BTS in the osmo-bsc.cfg (for inter-BSC HO tests) but use only 3 */ const integer NUM_MSC := 3; @@ -85,6 +87,18 @@ const integer NUM_TCHF_PER_BTS := 4; const integer NUM_SDCCH_PER_BTS := 3; +/* Default Training Sequence Code expected for bts[i]: + * BTS 0 has BSIC 10 (and no explicit timeslot training_sequence_code config), so expecting TSC = (BSIC & 7) = 2. + * BTS 1 has BSIC 11, TSC = (BSIC & 7) = 3. + * BTS 2 has BSIC 12, TSC = (BSIC & 7) = 4. + * BTS 2 has BSIC 12, TSC = (BSIC & 7) = 4. + */ +const integer_list BTS_TSC := { + 2, + 3, + 4, + 4 +} /* per-BTS state which we keep */ type record BTS_State { @@ -699,9 +713,7 @@ } pars.exp_ms_power_level := mp_exp_ms_power_level; pars.mscpool.bssap_idx := bssap_idx; - - /* BTS 0 has BSIC 10 (and no explicit timeslot training_sequence_code config), so expecting TSC = (BSIC & 7) = 2 */ - pars.expect_tsc := 2; + pars.expect_tsc := BTS_TSC[0]; return pars; } @@ -9735,9 +9747,7 @@ var MSC_ConnHdlr vc_conn2; pars2.imsi := pars1.imsi; pars2.media_nr := 2; - /* f_tc_cm_reestablishment_2 uses 'bts 1'. - * BTS 1 has BSIC 11 (and no explicit timeslot training_sequence_code config), so expecting TSC = (BSIC & 7) = 3 */ - pars2.expect_tsc := 3; + pars2.expect_tsc := BTS_TSC[1]; f_init(2, true, guard_timeout := 40.0); f_sleep(1.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3733ebbbfd74630e095a08b83023974aad177b34 Gerrit-Change-Number: 25660 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 11:12:37 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 2 Oct 2021 11:12:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSLEM: add f_chan_act_verify_tsc() References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25661 ) Change subject: RSLEM: add f_chan_act_verify_tsc() ...................................................................... RSLEM: add f_chan_act_verify_tsc() Will need this code again to verify the TSC during handover, so cast this in a separate function. Related: SYS#4895 Change-Id: I7a3f68ed1deba6a4a0a1cc4df7613638225c1640 --- M library/RSL_Emulation.ttcn 1 file changed, 13 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/61/25661/1 diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index 30adfba..effe83b 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -136,6 +136,18 @@ return rx_rsl; } +function f_chan_act_verify_tsc(RSL_Message chan_act, template uint3_t tsc) { + var RSL_IE_Body ie; + if (f_rsl_find_ie(chan_act, RSL_IE_CHAN_IDENT, ie)) { + var uint3_t got_tsc := ie.chan_ident.ch_desc.v.tsc; + if (not match(got_tsc, tsc)) { + setverdict(fail, "RSL CHANnel ACTIVation: unexpected TSC in Channel Description: expected ", + tsc, " got ", got_tsc); + mtc.stop; + } + } +} + /* establish a dedicated channel using 'ra' */ function f_chan_est(OCT1 ra, octetstring est_l3, template RslLinkId link_id, GsmFrameNumber fn := 23, template uint3_t tsc := ?, RSL_DCHAN_PT rsl_pt := RSL, RSLEM_PROC_PT rsl_proc_pt := RSL_PROC) @@ -158,16 +170,7 @@ rsl_pt.send(ts_RSL_EST_IND(g_chan_nr, valueof(link_id), est_l3)); /* Check above CHAN ACTIV */ - var RSL_Message chan_act := f_rslem_get_last_act(rsl_proc_pt, 0, g_chan_nr); - var RSL_IE_Body ie; - if (f_rsl_find_ie(chan_act, RSL_IE_CHAN_IDENT, ie)) { - var uint3_t got_tsc := ie.chan_ident.ch_desc.v.tsc; - if (not match(got_tsc, tsc)) { - setverdict(fail, "RSL CHANnel ACTIVation: unexpected TSC in Channel Description: expected ", - tsc, " got ", got_tsc); - mtc.stop; - } - } + f_chan_act_verify_tsc(f_rslem_get_last_act(rsl_proc_pt, 0, g_chan_nr), tsc); } function f_deact_chan(RSL_Cause cause) runs on RSL_DchanHdlr -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7a3f68ed1deba6a4a0a1cc4df7613638225c1640 Gerrit-Change-Number: 25661 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 11:12:37 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 2 Oct 2021 11:12:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_ho_int: verify TSC in Chan Act References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25662 ) Change subject: bsc: TC_ho_int: verify TSC in Chan Act ...................................................................... bsc: TC_ho_int: verify TSC in Chan Act OS#5244 reports an error in the Training Sequence Code used in the Channel Activation for a handover target channel. Verify the TSC to uncover this bug. Related: SYS#4895, OS#5244 Related: Iae20df4387c3d75752301bd5daeeea7508966393 (osmo-bsc) Change-Id: I1ed6f068c85b01e5a2d7b5f2651498a1521f89af --- M bsc/BSC_Tests.ttcn 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/62/25662/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 9e4ddff..e8bb99c 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -5081,7 +5081,7 @@ handover_done := false, old_chan_nr := - }; - /* issue hand-over command on VTY */ + /* issue hand-over command on VTY, from BTS 0 to BTS 1 */ f_vty_handover(BSCVTY, 0, 0, g_chan_nr, 1); /* temporarily suspend DChan processing on BTS1 to avoid race with RSLEM_register */ f_rslem_suspend(RSL1_PROC); @@ -5103,9 +5103,13 @@ * test expectation */ f_check_mgcp_expectations() + var RSL_Message chan_act := f_rslem_get_last_act(RSL1_PROC, 0, g_chan_nr); + /* Ensure the Channel Activation for the new channel contained the right encryption params. as_handover() set * g_chan_nr to the new lchan that was handed over to. It lives in bts 1, so look it up at RSL1_PROC. */ - f_verify_encr_info(f_rslem_get_last_act(RSL1_PROC, 0, g_chan_nr)); + f_verify_encr_info(chan_act); + + f_chan_act_verify_tsc(chan_act, BTS_TSC[1]); f_sleep(0.5); } @@ -5116,6 +5120,8 @@ f_init(2, true); f_sleep(1.0); + pars.expect_tsc := BTS_TSC[0]; + f_ctrs_bsc_and_bts_init(); vc_conn := f_start_handler(refers(f_tc_ho_int), pars); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1ed6f068c85b01e5a2d7b5f2651498a1521f89af Gerrit-Change-Number: 25662 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 11:57:09 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 2 Oct 2021 11:57:09 +0000 Subject: Change in osmo-bsc[master]: fix comment in lchan_fsm.c: s/modification/activation In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25658 ) Change subject: fix comment in lchan_fsm.c: s/modification/activation ...................................................................... fix comment in lchan_fsm.c: s/modification/activation Change-Id: I1f2eaf636d4edc170e1608ab782f60028e2b1eb8 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index d06dbac..0faafdb 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -719,8 +719,7 @@ else lchan->activate.tsc_set = lchan->vamos.is_secondary ? 2 : 1; - /* Use the TSC provided in the modification request, if any. Otherwise use the timeslot's configured - * TSC. */ + /* Use the TSC provided in the activation request, if any. Otherwise use the timeslot's configured TSC. */ lchan->activate.tsc = (lchan->activate.info.tsc >= 0) ? lchan->activate.info.tsc : gsm_ts_tsc(lchan->ts); use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25658 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1f2eaf636d4edc170e1608ab782f60028e2b1eb8 Gerrit-Change-Number: 25658 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 13:02:21 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 2 Oct 2021 13:02:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_ho_int: verify TSC in HandoverCommand References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663 ) Change subject: bsc: TC_ho_int: verify TSC in HandoverCommand ...................................................................... bsc: TC_ho_int: verify TSC in HandoverCommand For intra-BSC handovers, also verify the correct Training Sequence Code in the RR Handover Command (not only in the Channel Activation as added in previous patch). Related: SYS#4895 OS#5244 Related: Iae20df4387c3d75752301bd5daeeea7508966393 (osmo-bsc) Change-Id: I32e3553581eb17812082f1f2ee96cc978e8db668 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 21 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/25663/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index e8bb99c..04e895a 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -5079,7 +5079,8 @@ var HandoverState hs := { rr_ho_cmpl_seen := false, handover_done := false, - old_chan_nr := - + old_chan_nr := -, + expect_target_tsc := BTS_TSC[1] }; /* issue hand-over command on VTY, from BTS 0 to BTS 1 */ f_vty_handover(BSCVTY, 0, 0, g_chan_nr, 1); @@ -5197,7 +5198,8 @@ var HandoverState hs := { rr_ho_cmpl_seen := false, handover_done := false, - old_chan_nr := - + old_chan_nr := -, + expect_target_tsc := BTS_TSC[1] }; /* issue hand-over command on VTY */ f_vty_handover(BSCVTY, 0, 0, g_chan_nr, 1); @@ -9347,7 +9349,8 @@ var HandoverState hs := { rr_ho_cmpl_seen := false, handover_done := false, - old_chan_nr := - + old_chan_nr := -, + expect_target_tsc := BTS_TSC[1] }; /* issue hand-over command on VTY */ f_vty_handover(BSCVTY, 0, 0, g_chan_nr, 1); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 5f77764..2b1f711 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -1467,7 +1467,8 @@ boolean rr_ho_cmpl_seen, integer mdcx_seen_before_ho, boolean handover_done, - RslChannelNr old_chan_nr + RslChannelNr old_chan_nr, + uint3_t expect_target_tsc optional }; altstep as_handover(inout HandoverState st) runs on MSC_ConnHdlr { @@ -1482,6 +1483,19 @@ new_chan_nr, arfcn); /* FIXME: Determine TRX NR by ARFCN, instead of hard-coded TRX0! */ + /* Verify correct TSC in handoverCommand */ + if (ispresent(st.expect_target_tsc)) { + var uint3_t got_tsc := rr_chan_desc_tsc(l3.msgs.rrm.handoverCommand.channelDescription2); + if (not match(got_tsc, st.expect_target_tsc)) { + setverdict(fail, "RR Handover Command: unexpected TSC in Channel Description: expected ", + st.expect_target_tsc, " got ", got_tsc); + mtc.stop; + } else { + log("handoverCommand: verified TSC = ", got_tsc, " (matches ", + st.expect_target_tsc, ")"); + } + } + /* register our component for this channel number at the RSL Emulation */ f_rslem_register(0, new_chan_nr, RSL1_PROC); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I32e3553581eb17812082f1f2ee96cc978e8db668 Gerrit-Change-Number: 25663 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 13:02:21 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 2 Oct 2021 13:02:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify TSC in RR HO Cmd of TC_ho_neighbor_config_* References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25664 ) Change subject: bsc: verify TSC in RR HO Cmd of TC_ho_neighbor_config_* ...................................................................... bsc: verify TSC in RR HO Cmd of TC_ho_neighbor_config_* Related: SYS#4895 OS#5244 Related: Iae20df4387c3d75752301bd5daeeea7508966393 (osmo-bsc) Change-Id: I09cb07561a57527880b87147495619a3bbbceb3f --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 19 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/25664/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 04e895a..cc387f6 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6267,7 +6267,8 @@ charstring log_descr, charstring handover_vty_cmd, boolean expect_handover, - boolean is_inter_bsc_handover := false) + boolean is_inter_bsc_handover := false, + template uint3_t expect_target_tsc := ?) runs on MSC_ConnHdlr { /* We're going to thwart any and all handover attempts, just be ready to handle (and ignore) handover target @@ -6299,6 +6300,17 @@ log("Handover to new chan ", new_chan_nr, " on ARFCN ", arfcn); log(l3.msgs.rrm.handoverCommand); + /* Verify correct TSC in handoverCommand */ + var uint3_t got_tsc := rr_chan_desc_tsc(l3.msgs.rrm.handoverCommand.channelDescription2); + if (not match(got_tsc, expect_target_tsc)) { + setverdict(fail, "RR Handover Command: unexpected TSC in Channel Description: expected ", + expect_target_tsc, " got ", got_tsc); + mtc.stop; + } else { + log("handoverCommand: verified TSC = ", got_tsc, " (matches ", + expect_target_tsc, ")"); + } + /* Need to register for new lchan on new BTS -- it's either bts 1 or bts 2. It doesn't really * matter on which BTS it really is, we're not going to follow through an entire handover * anyway. */ @@ -6407,7 +6419,7 @@ f_bts_0_cfg(BSCVTY, {"no neighbors"}); f_probe_for_handover("1.a", "HO to bts 1 works, implicitly listed as neighbor (legacy behavior when none are configured)", "handover any to arfcn 871 bsic 11", - true); + true, expect_target_tsc := BTS_TSC[1]); f_probe_for_handover("1.b", "HO to unknown cell does not start", "handover any to arfcn 13 bsic 39", @@ -6419,7 +6431,7 @@ f_probe_for_handover("1.d", "HO to 871-11 still works (verify that this test properly cleans up)", "handover any to arfcn 871 bsic 11", - true); + true, expect_target_tsc := BTS_TSC[1]); } testcase TC_ho_neighbor_config_1() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -6475,7 +6487,7 @@ f_probe_for_handover("2.a", "HO to bts 1 works, explicitly listed as neighbor", "handover any to arfcn 871 bsic 11", - true); + true, expect_target_tsc := BTS_TSC[1]); f_probe_for_handover("2.b", "HO to bts 2 doesn't work, not listed as neighbor", "handover any to arfcn 871 bsic 12", @@ -6528,7 +6540,7 @@ false); f_probe_for_handover("3.b", "HO to bts 2 works, explicitly listed as neighbor; no ambiguity because bts 3 is not listed as neighbor", "handover any to arfcn 871 bsic 12", - true); + true, expect_target_tsc := BTS_TSC[2]); } testcase TC_ho_neighbor_config_3() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -6714,7 +6726,7 @@ f_probe_for_handover("7.a", "HO to 871-12 does HO to bts 2", "handover any to arfcn 871 bsic 12", - true); + true, expect_target_tsc := BTS_TSC[2]); f_probe_for_handover("7.b", "HO to 123-45 triggers inter-BSC HO", "handover any to arfcn 123 bsic 45", true, true); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 2b1f711..cb93bfe 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -955,7 +955,7 @@ } -private function rr_chan_desc_tsc(ChannelDescription2_V cd2) +function rr_chan_desc_tsc(ChannelDescription2_V cd2) return uint3_t { var uint3_t tsc := oct2int(cd2.octet3); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I09cb07561a57527880b87147495619a3bbbceb3f Gerrit-Change-Number: 25664 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 13:02:22 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 2 Oct 2021 13:02:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify TSC in inter-BSC ho (out) RR HO Cmd References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25665 ) Change subject: bsc: verify TSC in inter-BSC ho (out) RR HO Cmd ...................................................................... bsc: verify TSC in inter-BSC ho (out) RR HO Cmd Related: SYS#4895 OS#5244 Related: Iae20df4387c3d75752301bd5daeeea7508966393 (osmo-bsc) Change-Id: Icabcedc59d80e812c3d6ba5d6db5e2bb9b319252 --- M bsc/BSC_Tests.ttcn 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/25665/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cc387f6..d64ccc0 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -5677,6 +5677,7 @@ var RslChannelNr new_chan_nr := valueof(t_RslChanNr0(1, RSL_CHAN_NR_Bm_ACCH)); f_rslem_register(0, new_chan_nr); g_chan_nr := new_chan_nr; + var uint3_t expect_target_tsc := BTS_TSC[0]; f_sleep(1.0); f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); @@ -5696,8 +5697,10 @@ BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap; - /* we're sure that the channel activation is done now, verify the encryption parameters in it */ - f_verify_encr_info(f_rslem_get_last_act(RSL_PROC, 0, g_chan_nr)); + /* we're sure that the channel activation is done now, verify the parameters in it */ + var RSL_Message chan_act := f_rslem_get_last_act(RSL_PROC, 0, g_chan_nr); + f_verify_encr_info(chan_act); + f_chan_act_verify_tsc(chan_act, expect_target_tsc); ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info; log("Received L3 Info in HO Request Ack: ", ho_command_str); @@ -5717,6 +5720,15 @@ } log("Handover Command chan_nr is", actual_new_chan_nr); + var uint3_t got_tsc := rr_chan_desc_tsc(ho_command.msgs.rrm.handoverCommand.channelDescription2); + if (not match(got_tsc, expect_target_tsc)) { + setverdict(fail, "RR Handover Command: unexpected TSC in Channel Description: expected ", + expect_target_tsc, " got ", got_tsc); + mtc.stop; + } else { + log("handoverCommand: verified TSC = ", got_tsc); + } + /* Now the MSC forwards the RR Handover Command to the other BSC, which * tells the MS to handover to the new lchan. Here comes the new MS on * the new lchan with a Handover RACH: */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icabcedc59d80e812c3d6ba5d6db5e2bb9b319252 Gerrit-Change-Number: 25665 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 13:08:28 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 2 Oct 2021 13:08:28 +0000 Subject: Change in osmo-bsc[master]: fix TSC / TSC Set used for Handover In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25659 to look at the new patch set (#2). Change subject: fix TSC / TSC Set used for Handover ...................................................................... fix TSC / TSC Set used for Handover >From the nature of the lchan_activate_info.tsc_set and .tsc, it is easy to forget to set tsc_set,tsc = -1 to use default TSC Set and TSC values. Handover code is one such instance that forgets to set -1. Change the semantics of tsc_set and tsc so that this kind of error can not happen again as easily: use a separate bool to flag whether to use the default config or explicit values. Implicitly fix the lchan_activate_infos "launched" in handover_fsm.c as well as abis_rsl_chan_rqd_queue_poll(). Related: OS#5244 SYS#4895 Related: I1ed6f068c85b01e5a2d7b5f2651498a1521f89af (osmo-ttcn3-hacks) Change-Id: Iae20df4387c3d75752301bd5daeeea7508966393 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c 6 files changed, 68 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/25659/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iae20df4387c3d75752301bd5daeeea7508966393 Gerrit-Change-Number: 25659 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 15:52:58 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Sat, 2 Oct 2021 15:52:58 +0000 Subject: Change in osmo-bsc[master]: add secondary RSL link for VAMOS (shadow TEI) In-Reply-To: References: Message-ID: neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24366 ) Change subject: add secondary RSL link for VAMOS (shadow TEI) ...................................................................... Abandoned superseded -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24366 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic304924b017f4588f749268e99ed1326db4c9f47 Gerrit-Change-Number: 24366 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 20:13:27 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 2 Oct 2021 20:13:27 +0000 Subject: Change in osmo-bsc[master]: fix TSC / TSC Set used for Handover In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25659 ) Change subject: fix TSC / TSC Set used for Handover ...................................................................... Patch Set 2: Code-Review+1 (3 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25659/2/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/25659/2/include/osmocom/bsc/gsm_data.h at 144 PS2, Line 144: struct optional_val { Might be a good idea to generalize this API and have it in libosmocore: #define OSMO_OPTFIELD(ftype, fname) \ struct { \ bool present; \ ftype val; \ } name; so then one could use it with various types: struct foo { OSMO_OPTFIELD(struct bar_t, bar); OSMO_OPTFIELD(struct zoo_t, zoo); OSMO_OPTFIELD(uint32_t, counter); } What do you think? https://gerrit.osmocom.org/c/osmo-bsc/+/25659/2/include/osmocom/bsc/gsm_data.h at 145 PS2, Line 145: use I would call it 'valid' or even 'present'. Not critical though. https://gerrit.osmocom.org/c/osmo-bsc/+/25659/2/include/osmocom/bsc/gsm_data.h at 629 PS2, Line 629: bool ta_known; Idea for a separate change: use 'struct optional_val' here too. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iae20df4387c3d75752301bd5daeeea7508966393 Gerrit-Change-Number: 25659 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 02 Oct 2021 20:13:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 20:15:47 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 2 Oct 2021 20:15:47 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add const list of TSC expected per BTS In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25660 ) Change subject: bsc: add const list of TSC expected per BTS ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3733ebbbfd74630e095a08b83023974aad177b34 Gerrit-Change-Number: 25660 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 02 Oct 2021 20:15:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 20:16:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 2 Oct 2021 20:16:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSLEM: add f_chan_act_verify_tsc() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25661 ) Change subject: RSLEM: add f_chan_act_verify_tsc() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7a3f68ed1deba6a4a0a1cc4df7613638225c1640 Gerrit-Change-Number: 25661 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 02 Oct 2021 20:16:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 20:17:58 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 2 Oct 2021 20:17:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_ho_int: verify TSC in Chan Act In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25662 ) Change subject: bsc: TC_ho_int: verify TSC in Chan Act ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1ed6f068c85b01e5a2d7b5f2651498a1521f89af Gerrit-Change-Number: 25662 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 02 Oct 2021 20:17:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 20:19:43 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 2 Oct 2021 20:19:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_ho_int: verify TSC in HandoverCommand In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663 ) Change subject: bsc: TC_ho_int: verify TSC in HandoverCommand ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I32e3553581eb17812082f1f2ee96cc978e8db668 Gerrit-Change-Number: 25663 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 02 Oct 2021 20:19:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 20:20:33 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 2 Oct 2021 20:20:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify TSC in RR HO Cmd of TC_ho_neighbor_config_* In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25664 ) Change subject: bsc: verify TSC in RR HO Cmd of TC_ho_neighbor_config_* ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I09cb07561a57527880b87147495619a3bbbceb3f Gerrit-Change-Number: 25664 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 02 Oct 2021 20:20:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 20:20:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 2 Oct 2021 20:20:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify TSC in inter-BSC ho (out) RR HO Cmd In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25665 ) Change subject: bsc: verify TSC in inter-BSC ho (out) RR HO Cmd ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icabcedc59d80e812c3d6ba5d6db5e2bb9b319252 Gerrit-Change-Number: 25665 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 02 Oct 2021 20:20:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 2 21:13:15 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 2 Oct 2021 21:13:15 +0000 Subject: Change in libosmocore[master]: utils: remove misleading comments for osmo_hexdump[_nospc]_c() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/25666 ) Change subject: utils: remove misleading comments for osmo_hexdump[_nospc]_c() ...................................................................... utils: remove misleading comments for osmo_hexdump[_nospc]_c() The buffer is allocated dynamically on heap, so there is no such limitation of 4096 bytes / 1365 characters. Change-Id: I960dd6a53123fd4209ef6e61dcd0d22e4005e397 --- M src/utils.c 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/25666/1 diff --git a/src/utils.c b/src/utils.c index 2b21dcc..c180595 100644 --- a/src/utils.c +++ b/src/utils.c @@ -407,9 +407,6 @@ * * This function will print a sequence of bytes as hexadecimal numbers, * adding one space character between each byte (e.g. "1a ef d9") - * - * The maximum size of the output buffer is 4096 bytes, i.e. the maximum - * number of input bytes that can be printed in one call is 1365! */ char *osmo_hexdump_c(const void *ctx, const unsigned char *buf, int len) { @@ -446,9 +443,6 @@ * * This function will print a sequence of bytes as hexadecimal numbers, * without any space character between each byte (e.g. "1aefd9") - * - * The maximum size of the output buffer is 4096 bytes, i.e. the maximum - * number of input bytes that can be printed in one call is 2048! */ char *osmo_hexdump_nospc_c(const void *ctx, const unsigned char *buf, int len) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I960dd6a53123fd4209ef6e61dcd0d22e4005e397 Gerrit-Change-Number: 25666 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 3 03:06:25 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sun, 3 Oct 2021 03:06:25 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25654 ) Change subject: Implement MS Uplink Power Control Loop ...................................................................... Patch Set 11: Thanks for CR, Maybe @pespin wants to comment again? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 11 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 03 Oct 2021 03:06:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 3 09:24:00 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 3 Oct 2021 09:24:00 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: support setting artificial delay for TRXC References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/25667 ) Change subject: trx_toolkit: support setting artificial delay for TRXC ...................................................................... trx_toolkit: support setting artificial delay for TRXC Change-Id: Idb1ef445bc14a6312f08a83ecacc3a938b0e1d70 Related: OS#5245 --- M src/target/trx_toolkit/ctrl_if.py M src/target/trx_toolkit/fake_trx.py 2 files changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/67/25667/1 diff --git a/src/target/trx_toolkit/ctrl_if.py b/src/target/trx_toolkit/ctrl_if.py index 4f44080..aaf1111 100644 --- a/src/target/trx_toolkit/ctrl_if.py +++ b/src/target/trx_toolkit/ctrl_if.py @@ -23,6 +23,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import logging as log +import time from udp_link import UDPLink @@ -31,6 +32,9 @@ UDPLink.__init__(self, *udp_link_args) log.debug("Init TRXC interface (%s)" % self.desc_link()) + # Do not delay RSP messages by default + self.rsp_delay_ms = 0 + def handle_rx(self): # Read data from socket data, remote = self.sock.recvfrom(128) @@ -86,6 +90,9 @@ # Add the response signature, and join back to string response = "RSP " + " ".join(request) + "\0" + # If configured, delay sending the RSP message + if self.rsp_delay_ms > 0: + time.sleep(self.rsp_delay_ms / 1000.0) # Now we have something like "RSP TXTUNE 0 941600" self.sendto(response, remote) diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index d519a9a..93ae64e 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -374,6 +374,15 @@ self.burst_drop_period = period return 0 + # Artificial delay for the TRXC interface + # Syntax: CMD FAKE_TRXC_DELAY + elif self.ctrl_if.verify_cmd(request, "FAKE_TRXC_DELAY", 1): + log.debug("(%s) Recv FAKE_TRXC_DELAY cmd", self) + + self.ctrl_if.rsp_delay_ms = int(request[1]) + log.info("(%s) Artificial TRXC delay set to %d", + self, self.ctrl_if.rsp_delay_ms) + # Unhandled command return None -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/25667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idb1ef445bc14a6312f08a83ecacc3a938b0e1d70 Gerrit-Change-Number: 25667 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 3 09:24:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 3 Oct 2021 09:24:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: f_TRXC_transceive(): accept 'template (value)' parameter References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25668 ) Change subject: f_TRXC_transceive(): accept 'template (value)' parameter ...................................................................... f_TRXC_transceive(): accept 'template (value)' parameter Change-Id: I98012607f3e9da71234333aac77d59936cd3ee20 Related: OS#5245 --- M bts/BTS_Tests.ttcn M library/TRXC_CodecPort.ttcn 2 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/25668/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 616ca34..44d9de4 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -584,10 +584,10 @@ f_init_trxc(BTS_TRXC, id, g_bts_trxc_conn_id); /* Start with a default moderate timing offset equalling TA=2, and RSSI=-60 */ - ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(2*256))); - ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_RSSI(-60))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_TIMING(2*256)); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_RSSI(-60)); /* OsmoBTS may have different AB / NB threshold (see MIN_QUAL_NORM, MIN_QUAL_RACH) */ - ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_CI(60))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_CI(60)); } /* Wait some extra time to make sure the BTS emits a stable carrier. @@ -708,12 +708,12 @@ private function f_trxc_fake_rssi(TRXC_RSSI rssi) runs on ConnHdlr { var TrxcMessage ret; - ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_RSSI(rssi))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_RSSI(rssi)); } private function f_trxc_fake_toffs256(int16_t toffs256) runs on ConnHdlr { var TrxcMessage ret; - ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_TIMING(toffs256)); } /* first function started in ConnHdlr component */ @@ -1729,7 +1729,7 @@ private function f_rach_toffs(int16_t toffs256, boolean expect_pass) runs on test_CT { var TrxcMessage ret; /* tell fake_trx to use a given timing offset for all bursts */ - ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_TIMING(toffs256)); f_sleep(0.5); /* Transmit RACH request + wait for confirmation */ @@ -5391,8 +5391,7 @@ for (var int16_t i := -256; i <= 1280; i := i + 128) { var TrxcMessage ret; - ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, - valueof(ts_TRXC_FAKE_CI(i))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_CI(i)); /* FIXME: OsmoBTS may have different threshold (see MIN_QUAL_NORM) */ f_TC_pcu_data_ind_lqual_cb(i, thresh := 0); diff --git a/library/TRXC_CodecPort.ttcn b/library/TRXC_CodecPort.ttcn index 09b2977..bb2193f 100644 --- a/library/TRXC_CodecPort.ttcn +++ b/library/TRXC_CodecPort.ttcn @@ -59,7 +59,8 @@ msg := msg } -function f_TRXC_transceive(TRXC_CODEC_PT pt, ConnectionId conn_id, TrxcMessage tx, +function f_TRXC_transceive(TRXC_CODEC_PT pt, ConnectionId conn_id, + template (value) TrxcMessage tx, template TrxcMessage tr := ?) return TrxcMessage { var TRXC_RecvFrom rf; timer T := 3.0; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I98012607f3e9da71234333aac77d59936cd3ee20 Gerrit-Change-Number: 25668 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 3 09:24:36 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 3 Oct 2021 09:24:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/TRXC_Types: add definitions for FAKE_TRXC_DELAY References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25669 ) Change subject: library/TRXC_Types: add definitions for FAKE_TRXC_DELAY ...................................................................... library/TRXC_Types: add definitions for FAKE_TRXC_DELAY Change-Id: Ic5034f244374d4368d4fcb9a382c984cc730c408 Related: OS#5245 --- M library/TRXC_Types.ttcn 1 file changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/25669/1 diff --git a/library/TRXC_Types.ttcn b/library/TRXC_Types.ttcn index b67243b..aaa58ee 100644 --- a/library/TRXC_Types.ttcn +++ b/library/TRXC_Types.ttcn @@ -19,9 +19,9 @@ type charstring TrxcVerb ("POWERON", "POWEROFF", "CLOCK", "RXTUNE", "TXTUNE", "SETSLOT", "SETTSC", "SETBSIC", "SETPOWER", "SETMAXDLY", "SETMAXDLYNB", "SETSLOT", "HANDOVER", "NOHANDOVER", - "MEASURE", "FAKE_RSSI", "FAKE_TOA", "FAKE_CI" ) with { + "MEASURE", "FAKE_RSSI", "FAKE_TOA", "FAKE_CI", "FAKE_TRXC_DELAY") with { variant "TEXT_CODING(,convert=upper_case, - '((POWERON)|(POWEROFF)|(CLOCK)|(RXTUNE)|(TXTUNE)|(SETSLOT)|(SETTSC)|(SETBSIC)|(SETPOWER)|(SETMAXDLY)|(SETMAXDLYNB)|(HANDOVER)|(NOHANDOVER)|(MEASURE)|(FAKE_RSSI)|(FAKE_TOA)|(FAKE_CI))' + '((POWERON)|(POWEROFF)|(CLOCK)|(RXTUNE)|(TXTUNE)|(SETSLOT)|(SETTSC)|(SETBSIC)|(SETPOWER)|(SETMAXDLY)|(SETMAXDLYNB)|(HANDOVER)|(NOHANDOVER)|(MEASURE)|(FAKE_RSSI)|(FAKE_TOA)|(FAKE_CI)|(FAKE_TRXC_DELAY))' ,case_insensitive)" } @@ -93,5 +93,12 @@ } } +template (value) TrxcMessage ts_TRXC_FAKE_TRXC_DELAY(integer delay_ms := 0) := { + cmd := { + verb := "FAKE_TRXC_DELAY", + params := { int2str(delay_ms) } + } +} + } with { encode "TEXT" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic5034f244374d4368d4fcb9a382c984cc730c408 Gerrit-Change-Number: 25669 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 3 09:24:36 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 3 Oct 2021 09:24:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS: reproduce a race condition described in OS#5245 References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25670 ) Change subject: BTS: reproduce a race condition described in OS#5245 ...................................................................... BTS: reproduce a race condition described in OS#5245 Change-Id: I3b602ac9dbe0ab3e80eb30de573c9b48a79872d8 Depends: Idb1ef445bc14a6312f08a83ecacc3a938b0e1d70 Related: OS#5245 --- M bts/BTS_Tests.ttcn 1 file changed, 68 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/70/25670/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 44d9de4..6753eec 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -6281,6 +6281,72 @@ vc_conn.done; } +/* Reproduce a race condition described in OS#5245 */ +private function f_rsl_chan_act_deact(charstring id) runs on ConnHdlr { + f_rsl_chan_act(g_pars.chan_mode); + f_sleep(1.0); + f_rsl_chan_deact(); + setverdict(pass); +} +testcase TC_dyn_osmo_pdch_tchh_race_act() runs on test_CT { + var ConnHdlrPars pars[2]; + var ConnHdlr vc_conn[2]; + var TrxcMessage rsp; + + f_init(); + + /* Configure an artificial delay of 200 ms for TRXC RSP messages */ + rsp := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, + ts_TRXC_FAKE_TRXC_DELAY(200)); + + /* Activate all sub-channels of TCH/H on TS4 immediately in hope that the second + * CHANnel ACTIVation message will be handled before the PHY responds to 'SETSLOT' */ + for (var integer i := 0; i < sizeof(pars); i := i + 1) { + /* TS4 is an Osmocom style dynamic timeslot, we want it to be TCH/H */ + pars[i] := valueof(t_Pars(t_RslChanNr_Lm(4, i), ts_RSL_ChanMode_SIGN)); + vc_conn[i] := f_start_handler(refers(f_rsl_chan_act_deact), + pars[i], l1ctl := false); + } + + /* Wait for all components to finish */ + for (var integer i := 0; i < sizeof(pars); i := i + 1) { + vc_conn[i].done; + } + + /* Disable the artificial delay for TRXC RSP messages */ + rsp := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, + ts_TRXC_FAKE_TRXC_DELAY(0)); +} +testcase TC_dyn_osmo_pdch_sdcch8_race_act() runs on test_CT { + var ConnHdlrPars pars[8]; + var ConnHdlr vc_conn[8]; + var TrxcMessage rsp; + + f_init(); + + /* Configure an artificial delay of 200 ms for TRXC RSP messages */ + rsp := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, + ts_TRXC_FAKE_TRXC_DELAY(200)); + + /* Activate all sub-channels of SDCCH/8 on TS4 immediately in hope that subsequent + * CHANnel ACTIVation messages will be handled before the PHY responds to 'SETSLOT' */ + for (var integer i := 0; i < sizeof(pars); i := i + 1) { + /* TS4 is an Osmocom style dynamic timeslot, we want it to be SDCCH/8 */ + pars[i] := valueof(t_Pars(t_RslChanNr_SDCCH8(4, i), ts_RSL_ChanMode_SIGN)); + vc_conn[i] := f_start_handler(refers(f_rsl_chan_act_deact), + pars[i], l1ctl := false); + } + + /* Wait for all components to finish */ + for (var integer i := 0; i < sizeof(pars); i := i + 1) { + vc_conn[i].done; + } + + /* Disable the artificial delay for TRXC RSP messages */ + rsp := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, + ts_TRXC_FAKE_TRXC_DELAY(0)); +} + /*********************************************************************** * IPA Style Dynamic Timeslot Support ***********************************************************************/ @@ -7915,6 +7981,8 @@ execute( TC_dyn_osmo_pdch_tchf_act() ); execute( TC_dyn_osmo_pdch_tchh_act() ); execute( TC_dyn_osmo_pdch_sdcch8_act() ); + execute( TC_dyn_osmo_pdch_tchh_race_act() ); + execute( TC_dyn_osmo_pdch_sdcch8_race_act() ); execute( TC_dyn_ipa_pdch_tchf_act() ); execute( TC_dyn_ipa_pdch_tchf_act_pdch_act_nack() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3b602ac9dbe0ab3e80eb30de573c9b48a79872d8 Gerrit-Change-Number: 25670 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 3 09:27:48 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 3 Oct 2021 09:27:48 +0000 Subject: Change in osmo-bts[master]: abis: fix memory leak in abis_oml_sendmsg() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25671 ) Change subject: abis: fix memory leak in abis_oml_sendmsg() ...................................................................... abis: fix memory leak in abis_oml_sendmsg() Change-Id: Ifc46b94b4540705f7d9b4678a7398158f3aaf7c5 Fixes: Iecd3c7cb96f5fff3b4c7e04c74e031df0f7a6987 --- M src/common/abis.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/71/25671/1 diff --git a/src/common/abis.c b/src/common/abis.c index f1fb10c..c0cd18c 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -324,6 +324,7 @@ if (!bts->oml_link) { LOGP(DABIS, LOGL_INFO, "Drop Tx OML msg, OML link is down\n"); + msgb_free(msg); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifc46b94b4540705f7d9b4678a7398158f3aaf7c5 Gerrit-Change-Number: 25671 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 3 09:27:48 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 3 Oct 2021 09:27:48 +0000 Subject: Change in osmo-bts[master]: abis: reduce logging verbosity in abis_oml_sendmsg() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25672 ) Change subject: abis: reduce logging verbosity in abis_oml_sendmsg() ...................................................................... abis: reduce logging verbosity in abis_oml_sendmsg() Change-Id: I7fc4796161b0e46dbb4cb76e6e145c7dc4a17b1e --- M src/common/abis.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/72/25672/1 diff --git a/src/common/abis.c b/src/common/abis.c index c0cd18c..6ee0fec 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -323,7 +323,7 @@ struct gsm_bts *bts = msg->trx->bts; if (!bts->oml_link) { - LOGP(DABIS, LOGL_INFO, "Drop Tx OML msg, OML link is down\n"); + LOGP(DABIS, LOGL_DEBUG, "Drop Tx OML msg, OML link is down\n"); msgb_free(msg); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7fc4796161b0e46dbb4cb76e6e145c7dc4a17b1e Gerrit-Change-Number: 25672 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 3 09:27:49 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 3 Oct 2021 09:27:49 +0000 Subject: Change in osmo-bts[master]: rsl: remove redundant logging in rsl_rx_chan_activ() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25673 ) Change subject: rsl: remove redundant logging in rsl_rx_chan_activ() ...................................................................... rsl: remove redundant logging in rsl_rx_chan_activ() The first check in this function ensures that the state is NONE. Therefore it does not make sense to print it below.. Change-Id: I62ea4117dd5e1eebb8774809134e5cb73774945c --- M src/common/rsl.c 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/73/25673/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index d50983d..507a7cf 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1651,9 +1651,6 @@ } } - LOGPLCHAN(lchan, DRSL, LOGL_DEBUG, "rx Channel Activation in state: %s.\n", - gsm_lchans_name(lchan->state)); - /* Initialize MS Power Control defaults */ lchan->ms_power_ctrl = (struct lchan_power_ctrl_state) { .max = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0), -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I62ea4117dd5e1eebb8774809134e5cb73774945c Gerrit-Change-Number: 25673 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 3 09:27:49 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 3 Oct 2021 09:27:49 +0000 Subject: Change in osmo-bts[master]: rsl: prevent race condition during timeslot re-configuration References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25674 ) Change subject: rsl: prevent race condition during timeslot re-configuration ...................................................................... rsl: prevent race condition during timeslot re-configuration Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Fixes: OS#5245 --- M include/osmo-bts/gsm_data.h M src/common/rsl.c 2 files changed, 22 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/74/25674/1 diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index fe2862d..e77dc02 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -407,6 +407,8 @@ int s; /* Kind of the release/activation. E.g. RSL or PCU */ enum lchan_rel_act_kind rel_act_kind; + /* RSL CHANnel ACTIVation message */ + struct msgb *rsl_chan_activ; /* RTP header Marker bit to indicate beginning of speech after pause */ bool rtp_tx_marker; @@ -468,7 +470,6 @@ struct { enum gsm_phys_chan_config pchan_is; enum gsm_phys_chan_config pchan_want; - struct msgb *pending_chan_activ; } dyn; unsigned int flags; diff --git a/src/common/rsl.c b/src/common/rsl.c index 507a7cf..e88785c 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1521,7 +1521,7 @@ * Store the CHAN_ACTIV msg, connect the L1 timeslot in the proper type and * then invoke rsl_rx_chan_activ() with msg. */ -static int dyn_ts_l1_reconnect(struct gsm_bts_trx_ts *ts, struct msgb *msg) +static int dyn_ts_l1_reconnect(struct gsm_bts_trx_ts *ts) { DEBUGP(DRSL, "%s dyn_ts_l1_reconnect\n", gsm_ts_and_pchan_name(ts)); @@ -1542,9 +1542,6 @@ return -EINVAL; } - /* We will feed this back to rsl_rx_chan_activ() later */ - ts->dyn.pending_chan_activ = msg; - /* Disconnect, continue connecting from cb_ts_disconnected(). */ DEBUGP(DRSL, "%s Disconnect\n", gsm_ts_and_pchan_name(ts)); return bts_model_ts_disconnect(ts); @@ -1643,9 +1640,12 @@ * mode than this activation needs it to be. * Re-connect, then come back to rsl_rx_chan_activ(). */ - rc = dyn_ts_l1_reconnect(ts, msg); + rc = dyn_ts_l1_reconnect(ts); if (rc) return rsl_tx_chan_act_nack(lchan, RSL_ERR_NORMAL_UNSPEC); + /* will be fed back to rsl_rx_chan_activ() later */ + OSMO_ASSERT(lchan->rsl_chan_activ == NULL); + lchan->rsl_chan_activ = msg; /* indicate that the msgb should not be freed. */ return 1; } @@ -3231,8 +3231,7 @@ static void osmo_dyn_ts_connected(struct gsm_bts_trx_ts *ts, int rc) { - struct msgb *msg = ts->dyn.pending_chan_activ; - ts->dyn.pending_chan_activ = NULL; + unsigned int ln; if (rc) { LOGP(DRSL, LOGL_NOTICE, "%s PDCH ACT OSMO operation failed (%d) in bts model\n", @@ -3241,20 +3240,23 @@ return; } - if (!msg) { - LOGP(DRSL, LOGL_ERROR, - "%s TS re-connected, but no chan activ msg pending\n", - gsm_ts_and_pchan_name(ts)); - return; - } - ts->dyn.pchan_is = ts->dyn.pchan_want; DEBUGP(DRSL, "%s Connected\n", gsm_ts_and_pchan_name(ts)); - /* continue where we left off before re-connecting the TS. */ - rc = rsl_rx_chan_activ(msg); - if (rc != 1) - msgb_free(msg); + /* Handle postponed RSL CHANnel ACTIVation messages (if any) */ + for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) { + struct gsm_lchan *lchan = &ts->lchan[ln]; + + if (lchan->rsl_chan_activ == NULL) + continue; + + struct msgb *msg = lchan->rsl_chan_activ; + lchan->rsl_chan_activ = NULL; + + /* Continue where we left off before re-connecting the TS */ + if (rsl_rx_chan_activ(msg) != 1) + msgb_free(msg); + } } void cb_ts_connected(struct gsm_bts_trx_ts *ts, int rc) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Gerrit-Change-Number: 25674 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 3 18:51:47 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sun, 3 Oct 2021 18:51:47 +0000 Subject: Change in libosmocore[master]: utils: remove misleading comments for osmo_hexdump[_nospc]_c() In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25666 ) Change subject: utils: remove misleading comments for osmo_hexdump[_nospc]_c() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/25666/1/src/utils.c File src/utils.c: https://gerrit.osmocom.org/c/libosmocore/+/25666/1/src/utils.c at a410 PS1, Line 410: * I trust you, but I really don't know. Thanks for the CR invite. ? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I960dd6a53123fd4209ef6e61dcd0d22e4005e397 Gerrit-Change-Number: 25666 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Comment-Date: Sun, 03 Oct 2021 18:51:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 3 18:52:15 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sun, 3 Oct 2021 18:52:15 +0000 Subject: Change in osmo-bsc[master]: Add vty command to manually force MS Uplink Power In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25653 ) Change subject: Add vty command to manually force MS Uplink Power ...................................................................... Patch Set 8: > Patch Set 8: Code-Review+1 > > one might consider to use a DEFUN_HIDDEN for these testing/debugging commands. Maybe a good idea to convert the other similar ones in a separate patch, too. Ack. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 Gerrit-Change-Number: 25653 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 03 Oct 2021 18:52:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 3 18:52:54 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Sun, 3 Oct 2021 18:52:54 +0000 Subject: Change in osmo-mgw[master]: Log messages about RTP timestamps at level INFO In-Reply-To: References: Message-ID: keith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/24130 ) Change subject: Log messages about RTP timestamps at level INFO ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/24130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id76dc6345e1b1875240c87c609b5224ea9a6643f Gerrit-Change-Number: 24130 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 3 20:02:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 3 Oct 2021 20:02:54 +0000 Subject: Change in osmo-bts[master]: bts-trx: Keep the process ongoing trying to reconnect on Abis link down In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25647 ) Change subject: bts-trx: Keep the process ongoing trying to reconnect on Abis link down ...................................................................... Patch Set 2: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I28cb36a43b44865caa409b3255c05963acc74848 Gerrit-Change-Number: 25647 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 03 Oct 2021 20:02:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 3 20:02:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sun, 3 Oct 2021 20:02:57 +0000 Subject: Change in osmo-bts[master]: bts-trx: Keep the process ongoing trying to reconnect on Abis link down In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25647 ) Change subject: bts-trx: Keep the process ongoing trying to reconnect on Abis link down ...................................................................... bts-trx: Keep the process ongoing trying to reconnect on Abis link down Change-Id: I28cb36a43b44865caa409b3255c05963acc74848 --- M src/osmo-bts-trx/l1_if.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index f3d8743..9faae88 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -195,10 +195,11 @@ osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_DISABLE, NULL); } -/* on RSL failure, deactivate transceiver */ void bts_model_abis_close(struct gsm_bts *bts) { - bts_shutdown(bts, "Abis close"); + /* Go into shutdown state deactivating transceivers until Abis link + * becomes up again */ + bts_shutdown_ext(bts, "Abis close", false); } int bts_model_adjst_ms_pwr(struct gsm_lchan *lchan) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25647 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I28cb36a43b44865caa409b3255c05963acc74848 Gerrit-Change-Number: 25647 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 01:08:21 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 4 Oct 2021 01:08:21 +0000 Subject: Change in osmo-sip-connector[master]: Implement basic Support for Global Call Reference. References: Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 ) Change subject: Implement basic Support for Global Call Reference. ...................................................................... Implement basic Support for Global Call Reference. * Add GCR to mncc struct and therefore bump mncc version. * Add the GCR as a SIP Header and retrieve and such header from incoming sip calls, passing the GCR on to MNCC Depends: osmo-msc I705c860e51637b4537cad65a330ecbaaca96dd5b Change-Id: Id40d7e0fed9356f801b3627c118150055e7232b1 --- M src/call.h M src/mncc.c M src/mncc_protocol.h M src/sip.c 4 files changed, 31 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/75/25675/1 diff --git a/src/call.h b/src/call.h index d1732f9..8360711 100644 --- a/src/call.h +++ b/src/call.h @@ -31,6 +31,7 @@ const char *source; const char *dest; + struct osmo_gcr_parsed gcr; }; enum { diff --git a/src/mncc.c b/src/mncc.c index 9d75950..fc99400 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -543,6 +543,7 @@ leg->conn = conn; leg->state = MNCC_CC_INITIAL; leg->dir = MNCC_DIR_MO; + leg->base.call->gcr = data->gcr; memcpy(&leg->called, called, sizeof(leg->called)); memcpy(&leg->calling, &data->calling, sizeof(leg->calling)); memcpy(&leg->imsi, data->imsi, sizeof(leg->imsi)); @@ -898,6 +899,7 @@ mncc.fields |= MNCC_F_CALLING; mncc.calling.plan = GSM48_NPI_ISDN_E164; + mncc.gcr = call->gcr; if (call->source && call->source[0] == '+') { mncc.calling.type = GSM48_TON_INTERNATIONAL; diff --git a/src/mncc_protocol.h b/src/mncc_protocol.h index 5d35191..11969ee 100644 --- a/src/mncc_protocol.h +++ b/src/mncc_protocol.h @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -159,6 +160,7 @@ unsigned char lchan_type; unsigned char lchan_mode; + struct osmo_gcr_parsed gcr; /* A buffer to contain SDP ('\0' terminated) */ char sdp[1024]; @@ -170,7 +172,7 @@ unsigned char data[0]; }; -#define MNCC_SOCK_VERSION 7 +#define MNCC_SOCK_VERSION 8 struct gsm_mncc_hello { uint32_t msg_type; uint32_t version; diff --git a/src/sip.c b/src/sip.c index f0bc4c3..2455ddf 100644 --- a/src/sip.c +++ b/src/sip.c @@ -113,9 +113,22 @@ struct sip_call_leg *leg; const char *from = NULL, *to = NULL; char ip_addr[INET6_ADDRSTRLEN]; + char gcr_hex[sizeof(call->gcr)*2] = {0}; + uint8_t gcr_back[28] = {0}; + LOGP(DSIP, LOGL_INFO, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh); + sip_unknown_t *unknown_header = sip->sip_unknown; + while (unknown_header != NULL) { + if (!strcmp("X-Global-Call-Ref", unknown_header->un_name)) { + memcpy(gcr_hex, unknown_header->un_value, sizeof(gcr_hex)); + osmo_hexparse(gcr_hex, gcr_back, sizeof(gcr_back)); + break; + } + unknown_header = unknown_header->un_next; + } + if (!sdp_screen_sdp(sip)) { LOGP(DSIP, LOGL_ERROR, "No supported codec.\n"); nua_respond(nh, SIP_406_NOT_ACCEPTABLE, TAG_END()); @@ -131,6 +144,8 @@ return; } + osmo_dec_gcr(&call->gcr, gcr_back, sizeof(gcr_back)); + if (sip->sip_to) to = sip->sip_to->a_url->url_user; if (sip->sip_from) @@ -594,6 +609,13 @@ const char *calling_num, const char *called_num) { struct call_leg *other = leg->base.call->initial; + char gcr_hex[sizeof(leg->base.call->gcr)*2] = { NULL }; + + struct msgb *msg = msgb_alloc(128, "gcr-header"); + uint8_t len = osmo_enc_gcr(msg, &leg->base.call->gcr); + osmo_strlcpy(gcr_hex, osmo_hexdump_nospc(msg->data, len*2+2), len*2+2); + msgb_free(msg); + char *from = talloc_asprintf(leg, "sip:%s@%s:%d", calling_num, @@ -605,6 +627,8 @@ agent->app->sip.remote_port); char *sdp = sdp_create_file(leg, other, sdp_sendrecv); + char *x_gcr = talloc_asprintf(leg, "X-Global-Call-Ref: %s", gcr_hex); + leg->state = SIP_CC_INITIAL; leg->dir = SIP_DIR_MT; nua_invite(leg->nua_handle, @@ -612,6 +636,7 @@ SIPTAG_TO_STR(to), NUTAG_MEDIA_ENABLE(0), SIPTAG_CONTENT_TYPE_STR("application/sdp"), + SIPTAG_HEADER_STR(x_gcr), SIPTAG_PAYLOAD_STR(sdp), TAG_END()); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Id40d7e0fed9356f801b3627c118150055e7232b1 Gerrit-Change-Number: 25675 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Mon Oct 4 03:15:49 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:15:49 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a71f8e202a_1962b29e81005f869137a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 57s] [302/461] installing gcc-10-10.3.0-11 [ 58s] [303/461] installing docbook5-xml-5.0-3 [ 59s] Processing triggers for sgml-base (1.30) ... [ 59s] [304/461] installing tzdata-2021c-1 [ 59s] Current default time zone: 'Etc/UTC' [ 59s] Local time is now: Mon Oct 4 03:15:31 UTC 2021. [ 59s] Universal Time is now: Mon Oct 4 03:15:31 UTC 2021. [ 59s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 59s] [305/461] installing docutils-common-0.16+dfsg-4 [ 59s] Processing triggers for sgml-base (1.30) ... [ 59s] Processing triggers for shared-mime-info (2.0-1) ... [ 60s] [306/461] installing gcc-4:10.2.1-1 [ 60s] [307/461] installing libssl1.1-1.1.1l-1 [ 60s] Processing triggers for libc-bin (2.32-4) ... [ 60s] [308/461] installing dictionaries-common-1.28.10 [ 61s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 61s] dmihd: No hunspell dir passed or available [ 61s] dpkg: error processing package dictionaries-common (--install): [ 61s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 61s] Errors were encountered while processing: [ 61s] dictionaries-common [ 61s] exit ... [ 61s] ### VM INTERACTION START ### [ 64s] [ 49.435500] sysrq: Power Off [ 64s] [ 49.444924] reboot: Power down [ 64s] ### VM INTERACTION END ### [ 64s] [ 64s] sheep84 failed "build osmo-gsm-manuals-dev_1.1.0.dsc" at Mon Oct 4 03:15:37 UTC 2021. [ 64s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:16:06 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:16:06 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a71f9655a1_1962b29e81005f86914fd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 54s] [302/461] installing gcc-10-10.3.0-11 [ 56s] [303/461] installing docbook5-xml-5.0-3 [ 56s] Processing triggers for sgml-base (1.30) ... [ 56s] [304/461] installing tzdata-2021c-1 [ 56s] Current default time zone: 'Etc/UTC' [ 56s] Local time is now: Mon Oct 4 03:15:51 UTC 2021. [ 56s] Universal Time is now: Mon Oct 4 03:15:51 UTC 2021. [ 56s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 56s] [305/461] installing docutils-common-0.16+dfsg-4 [ 57s] Processing triggers for sgml-base (1.30) ... [ 57s] Processing triggers for shared-mime-info (2.0-1) ... [ 58s] [306/461] installing gcc-4:10.2.1-1 [ 58s] [307/461] installing libssl1.1-1.1.1l-1 [ 58s] Processing triggers for libc-bin (2.32-4) ... [ 58s] [308/461] installing dictionaries-common-1.28.10 [ 58s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 58s] dmihd: No hunspell dir passed or available [ 58s] dpkg: error processing package dictionaries-common (--install): [ 58s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 58s] Errors were encountered while processing: [ 58s] dictionaries-common [ 58s] exit ... [ 58s] ### VM INTERACTION START ### [ 61s] [ 48.138235] sysrq: Power Off [ 61s] [ 48.142739] reboot: Power down [ 62s] ### VM INTERACTION END ### [ 62s] [ 62s] sheep85 failed "build osmo-gsm-manuals-dev_1.1.0.16.581e.202110040026.dsc" at Mon Oct 4 03:15:58 UTC 2021. [ 62s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:22:37 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:22:37 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a739a8e5d4_1962b29e81005f8692032@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 46s] [384/644] installing gcc-10-10.3.0-11 [ 47s] [385/644] installing docbook5-xml-5.0-3 [ 47s] Processing triggers for sgml-base (1.30) ... [ 47s] [386/644] installing tzdata-2021c-1 [ 47s] Current default time zone: 'Etc/UTC' [ 47s] Local time is now: Mon Oct 4 03:22:29 UTC 2021. [ 47s] Universal Time is now: Mon Oct 4 03:22:29 UTC 2021. [ 47s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 47s] [387/644] installing docutils-common-0.16+dfsg-4 [ 47s] Processing triggers for sgml-base (1.30) ... [ 47s] Processing triggers for shared-mime-info (2.0-1) ... [ 48s] [388/644] installing gcc-4:10.2.1-1 [ 48s] [389/644] installing libssl1.1-1.1.1l-1 [ 48s] Processing triggers for libc-bin (2.32-4) ... [ 48s] [390/644] installing dictionaries-common-1.28.10 [ 48s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 49s] dmihd: No hunspell dir passed or available [ 49s] dpkg: error processing package dictionaries-common (--install): [ 49s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 49s] Errors were encountered while processing: [ 49s] dictionaries-common [ 49s] exit ... [ 49s] ### VM INTERACTION START ### [ 52s] [ 40.631545] sysrq: Power Off [ 52s] [ 40.635203] reboot: Power down [ 52s] ### VM INTERACTION END ### [ 52s] [ 52s] goat07 failed "build osmo-trx_1.3.1.dsc" at Mon Oct 4 03:22:34 UTC 2021. [ 52s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:22:37 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:22:37 +0000 Subject: Build failure of network:osmocom:latest/osmo-e1d in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a739a51c49_1962b29e81005f869193c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-e1d/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-e1d failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-e1d Last lines of build log: [ 40s] [318/481] installing gcc-10-10.3.0-11 [ 41s] [319/481] installing docbook5-xml-5.0-3 [ 41s] Processing triggers for sgml-base (1.30) ... [ 41s] [320/481] installing tzdata-2021c-1 [ 41s] Current default time zone: 'Etc/UTC' [ 41s] Local time is now: Mon Oct 4 03:22:21 UTC 2021. [ 41s] Universal Time is now: Mon Oct 4 03:22:21 UTC 2021. [ 41s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 41s] [321/481] installing docutils-common-0.16+dfsg-4 [ 41s] Processing triggers for sgml-base (1.30) ... [ 41s] Processing triggers for shared-mime-info (2.0-1) ... [ 42s] [322/481] installing gcc-4:10.2.1-1 [ 42s] [323/481] installing libssl1.1-1.1.1l-1 [ 42s] Processing triggers for libc-bin (2.32-4) ... [ 42s] [324/481] installing dictionaries-common-1.28.10 [ 42s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 42s] dmihd: No hunspell dir passed or available [ 42s] dpkg: error processing package dictionaries-common (--install): [ 42s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 42s] Errors were encountered while processing: [ 42s] dictionaries-common [ 42s] exit ... [ 42s] ### VM INTERACTION START ### [ 46s] [ 35.142365] sysrq: Power Off [ 46s] [ 35.146322] reboot: Power down [ 46s] ### VM INTERACTION END ### [ 46s] [ 46s] goat05 failed "build osmo-e1d_0.2.1.dsc" at Mon Oct 4 03:22:27 UTC 2021. [ 46s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:23:11 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:23:11 +0000 Subject: Build failure of network:osmocom:latest/osmo-ggsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a73b984242_1962b29e81005f8692359@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-ggsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-ggsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-ggsn Last lines of build log: [ 71s] [321/486] installing gcc-10-10.3.0-11 [ 72s] [322/486] installing docbook5-xml-5.0-3 [ 73s] Processing triggers for sgml-base (1.30) ... [ 73s] [323/486] installing tzdata-2021c-1 [ 73s] Current default time zone: 'Etc/UTC' [ 73s] Local time is now: Mon Oct 4 03:22:59 UTC 2021. [ 73s] Universal Time is now: Mon Oct 4 03:22:59 UTC 2021. [ 73s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 73s] [324/486] installing docutils-common-0.16+dfsg-4 [ 73s] Processing triggers for sgml-base (1.30) ... [ 73s] Processing triggers for shared-mime-info (2.0-1) ... [ 75s] [325/486] installing gcc-4:10.2.1-1 [ 75s] [326/486] installing libssl1.1-1.1.1l-1 [ 75s] Processing triggers for libc-bin (2.32-4) ... [ 75s] [327/486] installing dictionaries-common-1.28.10 [ 75s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 76s] dmihd: No hunspell dir passed or available [ 76s] dpkg: error processing package dictionaries-common (--install): [ 76s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 76s] Errors were encountered while processing: [ 76s] dictionaries-common [ 76s] exit ... [ 76s] ### VM INTERACTION START ### [ 79s] [ 60.955029] sysrq: Power Off [ 79s] [ 60.967509] reboot: Power down [ 79s] ### VM INTERACTION END ### [ 79s] [ 79s] lamb18 failed "build osmo-ggsn_1.7.1.dsc" at Mon Oct 4 03:23:06 UTC 2021. [ 79s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:23:11 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:23:11 +0000 Subject: Build failure of network:osmocom:latest/osmo-gbproxy in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a73b944c86_1962b29e81005f86922f5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gbproxy/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-gbproxy failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gbproxy Last lines of build log: [ 68s] [317/480] installing gcc-10-10.3.0-11 [ 70s] [318/480] installing docbook5-xml-5.0-3 [ 70s] Processing triggers for sgml-base (1.30) ... [ 70s] [319/480] installing tzdata-2021c-1 [ 71s] Current default time zone: 'Etc/UTC' [ 71s] Local time is now: Mon Oct 4 03:22:56 UTC 2021. [ 71s] Universal Time is now: Mon Oct 4 03:22:56 UTC 2021. [ 71s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 71s] [320/480] installing docutils-common-0.16+dfsg-4 [ 71s] Processing triggers for sgml-base (1.30) ... [ 71s] Processing triggers for shared-mime-info (2.0-1) ... [ 73s] [321/480] installing gcc-4:10.2.1-1 [ 73s] [322/480] installing libssl1.1-1.1.1l-1 [ 73s] Processing triggers for libc-bin (2.32-4) ... [ 73s] [323/480] installing dictionaries-common-1.28.10 [ 73s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 73s] dmihd: No hunspell dir passed or available [ 73s] dpkg: error processing package dictionaries-common (--install): [ 73s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 73s] Errors were encountered while processing: [ 73s] dictionaries-common [ 73s] exit ... [ 73s] ### VM INTERACTION START ### [ 76s] [ 59.501776] sysrq: Power Off [ 76s] [ 59.509068] reboot: Power down [ 77s] ### VM INTERACTION END ### [ 77s] [ 77s] lamb09 failed "build osmo-gbproxy_0.1.2.dsc" at Mon Oct 4 03:23:03 UTC 2021. [ 77s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:23:11 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:23:11 +0000 Subject: Build failure of network:osmocom:latest/osmo-sip-connector in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a73b9d2c4d_1962b29e81005f8692550@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sip-connector/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sip-connector failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sip-connector Last lines of build log: [ 70s] [327/505] installing gcc-10-10.3.0-11 [ 72s] [328/505] installing docbook5-xml-5.0-3 [ 72s] Processing triggers for sgml-base (1.30) ... [ 72s] [329/505] installing tzdata-2021c-1 [ 73s] Current default time zone: 'Etc/UTC' [ 73s] Local time is now: Mon Oct 4 03:23:00 UTC 2021. [ 73s] Universal Time is now: Mon Oct 4 03:23:00 UTC 2021. [ 73s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 73s] [330/505] installing docutils-common-0.16+dfsg-4 [ 73s] Processing triggers for sgml-base (1.30) ... [ 73s] Processing triggers for shared-mime-info (2.0-1) ... [ 74s] [331/505] installing gcc-4:10.2.1-1 [ 74s] [332/505] installing libssl1.1-1.1.1l-1 [ 75s] Processing triggers for libc-bin (2.32-4) ... [ 75s] [333/505] installing dictionaries-common-1.28.10 [ 75s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 75s] dmihd: No hunspell dir passed or available [ 75s] dpkg: error processing package dictionaries-common (--install): [ 75s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 75s] Errors were encountered while processing: [ 75s] dictionaries-common [ 75s] exit ... [ 75s] ### VM INTERACTION START ### [ 78s] [ 60.085818] sysrq: Power Off [ 78s] [ 60.092962] reboot: Power down [ 78s] ### VM INTERACTION END ### [ 78s] [ 78s] lamb54 failed "build osmo-sip-connector_1.5.1.dsc" at Mon Oct 4 03:23:06 UTC 2021. [ 78s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:23:11 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:23:11 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcu in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a73b9a81a1_1962b29e81005f8692417@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcu/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-pcu failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-pcu Last lines of build log: [ 70s] [317/480] installing gcc-10-10.3.0-11 [ 71s] [318/480] installing docbook5-xml-5.0-3 [ 72s] Processing triggers for sgml-base (1.30) ... [ 72s] [319/480] installing tzdata-2021c-1 [ 72s] Current default time zone: 'Etc/UTC' [ 72s] Local time is now: Mon Oct 4 03:22:59 UTC 2021. [ 72s] Universal Time is now: Mon Oct 4 03:22:59 UTC 2021. [ 72s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 72s] [320/480] installing docutils-common-0.16+dfsg-4 [ 72s] Processing triggers for sgml-base (1.30) ... [ 72s] Processing triggers for shared-mime-info (2.0-1) ... [ 74s] [321/480] installing gcc-4:10.2.1-1 [ 74s] [322/480] installing libssl1.1-1.1.1l-1 [ 74s] Processing triggers for libc-bin (2.32-4) ... [ 74s] [323/480] installing dictionaries-common-1.28.10 [ 74s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 75s] dmihd: No hunspell dir passed or available [ 75s] dpkg: error processing package dictionaries-common (--install): [ 75s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 75s] Errors were encountered while processing: [ 75s] dictionaries-common [ 75s] exit ... [ 75s] ### VM INTERACTION START ### [ 78s] [ 60.271872] sysrq: Power Off [ 78s] [ 60.279724] reboot: Power down [ 78s] ### VM INTERACTION END ### [ 78s] [ 78s] lamb62 failed "build osmo-pcu_0.9.1.dsc" at Mon Oct 4 03:23:06 UTC 2021. [ 78s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:23:28 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:23:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a73ba3f314_1962b29e81005f869266f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 56s] [321/486] installing gcc-10-10.3.0-11 [ 58s] [322/486] installing docbook5-xml-5.0-3 [ 58s] Processing triggers for sgml-base (1.30) ... [ 58s] [323/486] installing tzdata-2021c-1 [ 58s] Current default time zone: 'Etc/UTC' [ 58s] Local time is now: Mon Oct 4 03:23:04 UTC 2021. [ 58s] Universal Time is now: Mon Oct 4 03:23:04 UTC 2021. [ 58s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 58s] [324/486] installing docutils-common-0.16+dfsg-4 [ 58s] Processing triggers for sgml-base (1.30) ... [ 58s] Processing triggers for shared-mime-info (2.0-1) ... [ 60s] [325/486] installing gcc-4:10.2.1-1 [ 60s] [326/486] installing libssl1.1-1.1.1l-1 [ 60s] Processing triggers for libc-bin (2.32-4) ... [ 60s] [327/486] installing dictionaries-common-1.28.10 [ 60s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 60s] dmihd: No hunspell dir passed or available [ 60s] dpkg: error processing package dictionaries-common (--install): [ 60s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 60s] Errors were encountered while processing: [ 60s] dictionaries-common [ 60s] exit ... [ 60s] ### VM INTERACTION START ### [ 63s] [ 48.426091] sysrq: Power Off [ 63s] [ 48.428866] reboot: Power down [ 64s] ### VM INTERACTION END ### [ 64s] [ 64s] wildcard2 failed "build osmo-ggsn_1.7.1.18.6ee5.202110040026.dsc" at Mon Oct 4 03:23:11 UTC 2021. [ 64s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:23:28 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:23:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a73ba6f0a8_1962b29e81005f86927be@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 59s] [317/480] installing gcc-10-10.3.0-11 [ 61s] [318/480] installing docbook5-xml-5.0-3 [ 61s] Processing triggers for sgml-base (1.30) ... [ 61s] [319/480] installing tzdata-2021c-1 [ 62s] Current default time zone: 'Etc/UTC' [ 62s] Local time is now: Mon Oct 4 03:23:09 UTC 2021. [ 62s] Universal Time is now: Mon Oct 4 03:23:09 UTC 2021. [ 62s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 62s] [320/480] installing docutils-common-0.16+dfsg-4 [ 62s] Processing triggers for sgml-base (1.30) ... [ 62s] Processing triggers for shared-mime-info (2.0-1) ... [ 63s] [321/480] installing gcc-4:10.2.1-1 [ 64s] [322/480] installing libssl1.1-1.1.1l-1 [ 64s] Processing triggers for libc-bin (2.32-4) ... [ 64s] [323/480] installing dictionaries-common-1.28.10 [ 64s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 64s] dmihd: No hunspell dir passed or available [ 64s] dpkg: error processing package dictionaries-common (--install): [ 64s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 64s] Errors were encountered while processing: [ 64s] dictionaries-common [ 64s] exit ... [ 64s] ### VM INTERACTION START ### [ 67s] [ 51.265135] sysrq: Power Off [ 67s] [ 51.268683] reboot: Power down [ 67s] ### VM INTERACTION END ### [ 67s] [ 67s] old-atreju2 failed "build osmo-pcu_0.9.0.194.cee6.202110040026.dsc" at Mon Oct 4 03:23:15 UTC 2021. [ 67s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:23:28 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:23:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a73ba90759_1962b29e81005f86928c5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 58s] [327/505] installing gcc-10-10.3.0-11 [ 59s] [328/505] installing docbook5-xml-5.0-3 [ 60s] Processing triggers for sgml-base (1.30) ... [ 60s] [329/505] installing tzdata-2021c-1 [ 60s] Current default time zone: 'Etc/UTC' [ 60s] Local time is now: Mon Oct 4 03:23:10 UTC 2021. [ 60s] Universal Time is now: Mon Oct 4 03:23:10 UTC 2021. [ 60s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 60s] [330/505] installing docutils-common-0.16+dfsg-4 [ 60s] Processing triggers for sgml-base (1.30) ... [ 60s] Processing triggers for shared-mime-info (2.0-1) ... [ 61s] [331/505] installing gcc-4:10.2.1-1 [ 61s] [332/505] installing libssl1.1-1.1.1l-1 [ 61s] Processing triggers for libc-bin (2.32-4) ... [ 61s] [333/505] installing dictionaries-common-1.28.10 [ 62s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 62s] dmihd: No hunspell dir passed or available [ 62s] dpkg: error processing package dictionaries-common (--install): [ 62s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 62s] Errors were encountered while processing: [ 62s] dictionaries-common [ 62s] exit ... [ 62s] ### VM INTERACTION START ### [ 65s] [ 51.498794] sysrq: Power Off [ 65s] [ 51.507092] reboot: Power down [ 65s] ### VM INTERACTION END ### [ 65s] [ 65s] sheep82 failed "build osmo-sip-connector_1.5.0.4.1c76.202110040026.dsc" at Mon Oct 4 03:23:16 UTC 2021. [ 65s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:23:28 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:23:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a73babe798_1962b29e81005f86929f3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 62s] [384/644] installing gcc-10-10.3.0-11 [ 64s] [385/644] installing docbook5-xml-5.0-3 [ 64s] Processing triggers for sgml-base (1.30) ... [ 64s] [386/644] installing tzdata-2021c-1 [ 64s] Current default time zone: 'Etc/UTC' [ 64s] Local time is now: Mon Oct 4 03:23:11 UTC 2021. [ 64s] Universal Time is now: Mon Oct 4 03:23:11 UTC 2021. [ 64s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 64s] [387/644] installing docutils-common-0.16+dfsg-4 [ 65s] Processing triggers for sgml-base (1.30) ... [ 65s] Processing triggers for shared-mime-info (2.0-1) ... [ 65s] [388/644] installing gcc-4:10.2.1-1 [ 66s] [389/644] installing libssl1.1-1.1.1l-1 [ 66s] Processing triggers for libc-bin (2.32-4) ... [ 66s] [390/644] installing dictionaries-common-1.28.10 [ 66s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 66s] dmihd: No hunspell dir passed or available [ 66s] dpkg: error processing package dictionaries-common (--install): [ 66s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 66s] Errors were encountered while processing: [ 66s] dictionaries-common [ 66s] exit ... [ 66s] ### VM INTERACTION START ### [ 69s] [ 53.628408] sysrq: Power Off [ 69s] [ 53.632907] reboot: Power down [ 69s] ### VM INTERACTION END ### [ 69s] [ 69s] sheep86 failed "build osmo-trx_1.3.1.24.bb2cb.202110040026.dsc" at Mon Oct 4 03:23:17 UTC 2021. [ 69s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:23:45 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:23:45 +0000 Subject: Build failure of network:osmocom:nightly/osmo-e1d in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a73d438a1_1962b29e81005f86930d5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-e1d/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-e1d failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-e1d Last lines of build log: [ 70s] [318/481] installing gcc-10-10.3.0-11 [ 71s] [319/481] installing docbook5-xml-5.0-3 [ 72s] Processing triggers for sgml-base (1.30) ... [ 72s] [320/481] installing tzdata-2021c-1 [ 72s] Current default time zone: 'Etc/UTC' [ 72s] Local time is now: Mon Oct 4 03:23:22 UTC 2021. [ 72s] Universal Time is now: Mon Oct 4 03:23:22 UTC 2021. [ 72s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 72s] [321/481] installing docutils-common-0.16+dfsg-4 [ 73s] Processing triggers for sgml-base (1.30) ... [ 73s] Processing triggers for shared-mime-info (2.0-1) ... [ 74s] [322/481] installing gcc-4:10.2.1-1 [ 74s] [323/481] installing libssl1.1-1.1.1l-1 [ 74s] Processing triggers for libc-bin (2.32-4) ... [ 74s] [324/481] installing dictionaries-common-1.28.10 [ 74s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 75s] dmihd: No hunspell dir passed or available [ 75s] dpkg: error processing package dictionaries-common (--install): [ 75s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 75s] Errors were encountered while processing: [ 75s] dictionaries-common [ 75s] exit ... [ 75s] ### VM INTERACTION START ### [ 78s] [ 59.915134] sysrq: Power Off [ 78s] [ 59.922325] reboot: Power down [ 78s] ### VM INTERACTION END ### [ 78s] [ 78s] lamb57 failed "build osmo-e1d_0.2.1.4.74fa.202110040026.dsc" at Mon Oct 4 03:23:29 UTC 2021. [ 78s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:23:45 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:23:45 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gbproxy in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a73d436446_1962b29e81005f869319e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gbproxy/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-gbproxy failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gbproxy Last lines of build log: [ 71s] [317/480] installing gcc-10-10.3.0-11 [ 73s] [318/480] installing docbook5-xml-5.0-3 [ 73s] Processing triggers for sgml-base (1.30) ... [ 74s] [319/480] installing tzdata-2021c-1 [ 74s] Current default time zone: 'Etc/UTC' [ 74s] Local time is now: Mon Oct 4 03:23:25 UTC 2021. [ 74s] Universal Time is now: Mon Oct 4 03:23:25 UTC 2021. [ 74s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 74s] [320/480] installing docutils-common-0.16+dfsg-4 [ 74s] Processing triggers for sgml-base (1.30) ... [ 74s] Processing triggers for shared-mime-info (2.0-1) ... [ 75s] [321/480] installing gcc-4:10.2.1-1 [ 76s] [322/480] installing libssl1.1-1.1.1l-1 [ 76s] Processing triggers for libc-bin (2.32-4) ... [ 76s] [323/480] installing dictionaries-common-1.28.10 [ 76s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 76s] dmihd: No hunspell dir passed or available [ 76s] dpkg: error processing package dictionaries-common (--install): [ 76s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 76s] Errors were encountered while processing: [ 76s] dictionaries-common [ 76s] exit ... [ 76s] ### VM INTERACTION START ### [ 79s] [ 61.273784] sysrq: Power Off [ 79s] [ 61.281484] reboot: Power down [ 80s] ### VM INTERACTION END ### [ 80s] [ 80s] lamb62 failed "build osmo-gbproxy_0.1.0.39.cbfc.202110040026.dsc" at Mon Oct 4 03:23:32 UTC 2021. [ 80s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:24:19 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:24:19 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a73f2b9505_1962b29e81005f8693284@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 40s] [325/491] installing gcc-10-10.3.0-11 [ 41s] [326/491] installing docbook5-xml-5.0-3 [ 42s] Processing triggers for sgml-base (1.30) ... [ 42s] [327/491] installing tzdata-2021c-1 [ 42s] Current default time zone: 'Etc/UTC' [ 42s] Local time is now: Mon Oct 4 03:24:12 UTC 2021. [ 42s] Universal Time is now: Mon Oct 4 03:24:12 UTC 2021. [ 42s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 42s] [328/491] installing docutils-common-0.16+dfsg-4 [ 42s] Processing triggers for sgml-base (1.30) ... [ 42s] Processing triggers for shared-mime-info (2.0-1) ... [ 43s] [329/491] installing gcc-4:10.2.1-1 [ 43s] [330/491] installing libssl1.1-1.1.1l-1 [ 43s] Processing triggers for libc-bin (2.32-4) ... [ 43s] [331/491] installing dictionaries-common-1.28.10 [ 43s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 43s] dmihd: No hunspell dir passed or available [ 43s] dpkg: error processing package dictionaries-common (--install): [ 43s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 43s] Errors were encountered while processing: [ 43s] dictionaries-common [ 43s] exit ... [ 43s] ### VM INTERACTION START ### [ 46s] [ 36.191463] sysrq: Power Off [ 46s] [ 36.195901] reboot: Power down [ 46s] ### VM INTERACTION END ### [ 46s] [ 46s] goat13 failed "build osmo-bts_1.3.3.dsc" at Mon Oct 4 03:24:17 UTC 2021. [ 46s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:24:36 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:24:36 +0000 Subject: Build failure of network:osmocom:nightly/osmo-cbc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a74119dbb_1962b29e81005f8693356@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-cbc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-cbc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-cbc Last lines of build log: [ 41s] [336/506] installing gcc-10-10.3.0-11 [ 43s] [337/506] installing docbook5-xml-5.0-3 [ 43s] Processing triggers for sgml-base (1.30) ... [ 43s] [338/506] installing tzdata-2021c-1 [ 43s] Current default time zone: 'Etc/UTC' [ 43s] Local time is now: Mon Oct 4 03:24:20 UTC 2021. [ 43s] Universal Time is now: Mon Oct 4 03:24:20 UTC 2021. [ 43s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 43s] [339/506] installing docutils-common-0.16+dfsg-4 [ 43s] Processing triggers for sgml-base (1.30) ... [ 43s] Processing triggers for shared-mime-info (2.0-1) ... [ 44s] [340/506] installing gcc-4:10.2.1-1 [ 44s] [341/506] installing libssl1.1-1.1.1l-1 [ 44s] Processing triggers for libc-bin (2.32-4) ... [ 44s] [342/506] installing dictionaries-common-1.28.10 [ 44s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 44s] dmihd: No hunspell dir passed or available [ 44s] dpkg: error processing package dictionaries-common (--install): [ 44s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 44s] Errors were encountered while processing: [ 44s] dictionaries-common [ 44s] exit ... [ 44s] ### VM INTERACTION START ### [ 47s] [ 36.461221] sysrq: Power Off [ 47s] [ 36.465052] reboot: Power down [ 47s] ### VM INTERACTION END ### [ 47s] [ 48s] goat05 failed "build osmo-cbc_0.2.2.202110040026.dsc" at Mon Oct 4 03:24:26 UTC 2021. [ 48s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:25:10 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:25:10 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a742f7977b_1962b29e81005f8693495@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 75s] [346/516] installing gcc-10-10.3.0-11 [ 77s] [347/516] installing docbook5-xml-5.0-3 [ 78s] Processing triggers for sgml-base (1.30) ... [ 78s] [348/516] installing tzdata-2021c-1 [ 78s] Current default time zone: 'Etc/UTC' [ 78s] Local time is now: Mon Oct 4 03:24:50 UTC 2021. [ 78s] Universal Time is now: Mon Oct 4 03:24:50 UTC 2021. [ 78s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 78s] [349/516] installing docutils-common-0.16+dfsg-4 [ 78s] Processing triggers for sgml-base (1.30) ... [ 78s] Processing triggers for shared-mime-info (2.0-1) ... [ 79s] [350/516] installing gcc-4:10.2.1-1 [ 80s] [351/516] installing libssl1.1-1.1.1l-1 [ 80s] Processing triggers for libc-bin (2.32-4) ... [ 80s] [352/516] installing dictionaries-common-1.28.10 [ 80s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 80s] dmihd: No hunspell dir passed or available [ 80s] dpkg: error processing package dictionaries-common (--install): [ 80s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 80s] Errors were encountered while processing: [ 80s] dictionaries-common [ 80s] exit ... [ 80s] ### VM INTERACTION START ### [ 83s] [ 58.372175] sysrq: Power Off [ 83s] [ 58.376217] reboot: Power down [ 84s] ### VM INTERACTION END ### [ 84s] [ 84s] cloud127 failed "build osmo-remsim_0.2.4.dsc" at Mon Oct 4 03:24:57 UTC 2021. [ 84s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:25:10 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:25:10 +0000 Subject: Build failure of network:osmocom:nightly/osmo-uecups in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a742fac349_1962b29e81005f86935f2@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-uecups/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-uecups failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-uecups Last lines of build log: [ 69s] [325/490] installing gcc-10-10.3.0-11 [ 71s] [326/490] installing docbook5-xml-5.0-3 [ 71s] Processing triggers for sgml-base (1.30) ... [ 71s] [327/490] installing tzdata-2021c-1 [ 72s] Current default time zone: 'Etc/UTC' [ 72s] Local time is now: Mon Oct 4 03:24:55 UTC 2021. [ 72s] Universal Time is now: Mon Oct 4 03:24:55 UTC 2021. [ 72s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 72s] [328/490] installing docutils-common-0.16+dfsg-4 [ 72s] Processing triggers for sgml-base (1.30) ... [ 72s] Processing triggers for shared-mime-info (2.0-1) ... [ 74s] [329/490] installing gcc-4:10.2.1-1 [ 74s] [330/490] installing libssl1.1-1.1.1l-1 [ 74s] Processing triggers for libc-bin (2.32-4) ... [ 74s] [331/490] installing dictionaries-common-1.28.10 [ 74s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 74s] dmihd: No hunspell dir passed or available [ 74s] dpkg: error processing package dictionaries-common (--install): [ 74s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 74s] Errors were encountered while processing: [ 74s] dictionaries-common [ 75s] exit ... [ 75s] ### VM INTERACTION START ### [ 78s] [ 61.512961] sysrq: Power Off [ 78s] [ 61.520708] reboot: Power down [ 78s] ### VM INTERACTION END ### [ 78s] [ 78s] lamb03 failed "build osmo-uecups_0.1.3.1.8362.202110040026.dsc" at Mon Oct 4 03:25:02 UTC 2021. [ 78s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:25:27 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:25:27 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a742fd6c25_1962b29e81005f8693664@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 75s] [326/493] installing gcc-10-10.3.0-11 [ 77s] [327/493] installing docbook5-xml-5.0-3 [ 78s] Processing triggers for sgml-base (1.30) ... [ 78s] [328/493] installing tzdata-2021c-1 [ 78s] Current default time zone: 'Etc/UTC' [ 78s] Local time is now: Mon Oct 4 03:25:11 UTC 2021. [ 78s] Universal Time is now: Mon Oct 4 03:25:11 UTC 2021. [ 78s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 78s] [329/493] installing docutils-common-0.16+dfsg-4 [ 78s] Processing triggers for sgml-base (1.30) ... [ 78s] Processing triggers for shared-mime-info (2.0-1) ... [ 80s] [330/493] installing gcc-4:10.2.1-1 [ 80s] [331/493] installing libssl1.1-1.1.1l-1 [ 80s] Processing triggers for libc-bin (2.32-4) ... [ 80s] [332/493] installing dictionaries-common-1.28.10 [ 80s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 81s] dmihd: No hunspell dir passed or available [ 81s] dpkg: error processing package dictionaries-common (--install): [ 81s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 81s] Errors were encountered while processing: [ 81s] dictionaries-common [ 81s] exit ... [ 81s] ### VM INTERACTION START ### [ 84s] [ 66.894388] sysrq: Power Off [ 84s] [ 66.902083] reboot: Power down [ 84s] ### VM INTERACTION END ### [ 84s] [ 84s] lamb69 failed "build libosmo-sccp_1.4.0.29.7698.202110040026.dsc" at Mon Oct 4 03:25:18 UTC 2021. [ 84s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:25:27 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:25:27 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a74301336c_1962b29e81005f86937b5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 44s] [336/506] installing gcc-10-10.3.0-11 [ 46s] [337/506] installing docbook5-xml-5.0-3 [ 46s] Processing triggers for sgml-base (1.30) ... [ 46s] [338/506] installing tzdata-2021c-1 [ 46s] Current default time zone: 'Etc/UTC' [ 46s] Local time is now: Mon Oct 4 03:25:14 UTC 2021. [ 46s] Universal Time is now: Mon Oct 4 03:25:14 UTC 2021. [ 46s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 46s] [339/506] installing docutils-common-0.16+dfsg-4 [ 46s] Processing triggers for sgml-base (1.30) ... [ 46s] Processing triggers for shared-mime-info (2.0-1) ... [ 47s] [340/506] installing gcc-4:10.2.1-1 [ 47s] [341/506] installing libssl1.1-1.1.1l-1 [ 47s] Processing triggers for libc-bin (2.32-4) ... [ 47s] [342/506] installing dictionaries-common-1.28.10 [ 47s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 48s] dmihd: No hunspell dir passed or available [ 48s] dpkg: error processing package dictionaries-common (--install): [ 48s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 48s] Errors were encountered while processing: [ 48s] dictionaries-common [ 48s] exit ... [ 48s] ### VM INTERACTION START ### [ 51s] [ 38.873938] sysrq: Power Off [ 51s] [ 38.877494] reboot: Power down [ 51s] ### VM INTERACTION END ### [ 51s] [ 51s] hci-cnode1-m0 failed "build osmo-cbc_0.2.2.dsc" at Mon Oct 4 03:25:20 UTC 2021. [ 51s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:26:02 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:26:02 +0000 Subject: Build failure of network:osmocom:latest/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a744eb5d85_1962b29e81005f86939f1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-hlr Last lines of build log: [ 72s] [325/492] installing gcc-10-10.3.0-11 [ 74s] [326/492] installing docbook5-xml-5.0-3 [ 74s] Processing triggers for sgml-base (1.30) ... [ 74s] [327/492] installing tzdata-2021c-1 [ 75s] Current default time zone: 'Etc/UTC' [ 75s] Local time is now: Mon Oct 4 03:25:45 UTC 2021. [ 75s] Universal Time is now: Mon Oct 4 03:25:45 UTC 2021. [ 75s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 75s] [328/492] installing docutils-common-0.16+dfsg-4 [ 75s] Processing triggers for sgml-base (1.30) ... [ 75s] Processing triggers for shared-mime-info (2.0-1) ... [ 76s] [329/492] installing gcc-4:10.2.1-1 [ 76s] [330/492] installing libssl1.1-1.1.1l-1 [ 77s] Processing triggers for libc-bin (2.32-4) ... [ 77s] [331/492] installing dictionaries-common-1.28.10 [ 77s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 77s] dmihd: No hunspell dir passed or available [ 77s] dpkg: error processing package dictionaries-common (--install): [ 77s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 77s] Errors were encountered while processing: [ 77s] dictionaries-common [ 77s] exit ... [ 77s] ### VM INTERACTION START ### [ 80s] [ 62.573841] sysrq: Power Off [ 80s] [ 62.582357] reboot: Power down [ 80s] ### VM INTERACTION END ### [ 80s] [ 80s] lamb62 failed "build osmo-hlr_1.3.1.dsc" at Mon Oct 4 03:25:52 UTC 2021. [ 80s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:26:02 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:26:02 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a744f17c1b_1962b29e81005f869415c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 77s] [326/493] installing gcc-10-10.3.0-11 [ 78s] [327/493] installing docbook5-xml-5.0-3 [ 79s] Processing triggers for sgml-base (1.30) ... [ 79s] [328/493] installing tzdata-2021c-1 [ 79s] Current default time zone: 'Etc/UTC' [ 79s] Local time is now: Mon Oct 4 03:25:50 UTC 2021. [ 79s] Universal Time is now: Mon Oct 4 03:25:50 UTC 2021. [ 79s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 79s] [329/493] installing docutils-common-0.16+dfsg-4 [ 79s] Processing triggers for sgml-base (1.30) ... [ 79s] Processing triggers for shared-mime-info (2.0-1) ... [ 81s] [330/493] installing gcc-4:10.2.1-1 [ 81s] [331/493] installing libssl1.1-1.1.1l-1 [ 81s] Processing triggers for libc-bin (2.32-4) ... [ 81s] [332/493] installing dictionaries-common-1.28.10 [ 81s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 82s] dmihd: No hunspell dir passed or available [ 82s] dpkg: error processing package dictionaries-common (--install): [ 82s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 82s] Errors were encountered while processing: [ 82s] dictionaries-common [ 82s] exit ... [ 82s] ### VM INTERACTION START ### [ 85s] [ 67.785471] sysrq: Power Off [ 85s] [ 67.800408] reboot: Power down [ 85s] ### VM INTERACTION END ### [ 85s] [ 85s] lamb25 failed "build libosmo-sccp_1.4.0.dsc" at Mon Oct 4 03:25:57 UTC 2021. [ 85s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:26:02 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:26:02 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a744edd4f1_1962b29e81005f8694026@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 69s] [325/490] installing gcc-10-10.3.0-11 [ 71s] [326/490] installing docbook5-xml-5.0-3 [ 71s] Processing triggers for sgml-base (1.30) ... [ 71s] [327/490] installing tzdata-2021c-1 [ 72s] Current default time zone: 'Etc/UTC' [ 72s] Local time is now: Mon Oct 4 03:25:45 UTC 2021. [ 72s] Universal Time is now: Mon Oct 4 03:25:45 UTC 2021. [ 72s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 72s] [328/490] installing docutils-common-0.16+dfsg-4 [ 72s] Processing triggers for sgml-base (1.30) ... [ 72s] Processing triggers for shared-mime-info (2.0-1) ... [ 73s] [329/490] installing gcc-4:10.2.1-1 [ 73s] [330/490] installing libssl1.1-1.1.1l-1 [ 74s] Processing triggers for libc-bin (2.32-4) ... [ 74s] [331/490] installing dictionaries-common-1.28.10 [ 74s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 74s] dmihd: No hunspell dir passed or available [ 74s] dpkg: error processing package dictionaries-common (--install): [ 74s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 74s] Errors were encountered while processing: [ 74s] dictionaries-common [ 74s] exit ... [ 74s] ### VM INTERACTION START ### [ 77s] [ 60.789962] sysrq: Power Off [ 77s] [ 60.797847] reboot: Power down [ 77s] ### VM INTERACTION END ### [ 77s] [ 77s] lamb23 failed "build osmo-mgw_1.8.1.dsc" at Mon Oct 4 03:25:52 UTC 2021. [ 77s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:26:18 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:26:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a746da881d_1962b29e81005f86943f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 74s] [325/492] installing gcc-10-10.3.0-11 [ 76s] [326/492] installing docbook5-xml-5.0-3 [ 76s] Processing triggers for sgml-base (1.30) ... [ 76s] [327/492] installing tzdata-2021c-1 [ 77s] Current default time zone: 'Etc/UTC' [ 77s] Local time is now: Mon Oct 4 03:26:09 UTC 2021. [ 77s] Universal Time is now: Mon Oct 4 03:26:09 UTC 2021. [ 77s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 77s] [328/492] installing docutils-common-0.16+dfsg-4 [ 77s] Processing triggers for sgml-base (1.30) ... [ 77s] Processing triggers for shared-mime-info (2.0-1) ... [ 78s] [329/492] installing gcc-4:10.2.1-1 [ 78s] [330/492] installing libssl1.1-1.1.1l-1 [ 78s] Processing triggers for libc-bin (2.32-4) ... [ 78s] [331/492] installing dictionaries-common-1.28.10 [ 78s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 79s] dmihd: No hunspell dir passed or available [ 79s] dpkg: error processing package dictionaries-common (--install): [ 79s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 79s] Errors were encountered while processing: [ 79s] dictionaries-common [ 79s] exit ... [ 79s] ### VM INTERACTION START ### [ 82s] [ 57.159248] sysrq: Power Off [ 82s] [ 57.164081] reboot: Power down [ 82s] ### VM INTERACTION END ### [ 82s] [ 82s] cloud106 failed "build osmo-hlr_1.3.0.7.bfee.202110040026.dsc" at Mon Oct 4 03:26:16 UTC 2021. [ 82s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:26:35 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:26:35 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a746dd8027_1962b29e81005f8694420@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 86s] [325/490] installing gcc-10-10.3.0-11 [ 88s] [326/490] installing docbook5-xml-5.0-3 [ 88s] Processing triggers for sgml-base (1.30) ... [ 88s] [327/490] installing tzdata-2021c-1 [ 89s] Current default time zone: 'Etc/UTC' [ 89s] Local time is now: Mon Oct 4 03:26:24 UTC 2021. [ 89s] Universal Time is now: Mon Oct 4 03:26:24 UTC 2021. [ 89s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 89s] [328/490] installing docutils-common-0.16+dfsg-4 [ 89s] Processing triggers for sgml-base (1.30) ... [ 89s] Processing triggers for shared-mime-info (2.0-1) ... [ 90s] [329/490] installing gcc-4:10.2.1-1 [ 90s] [330/490] installing libssl1.1-1.1.1l-1 [ 91s] Processing triggers for libc-bin (2.32-4) ... [ 91s] [331/490] installing dictionaries-common-1.28.10 [ 91s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 91s] dmihd: No hunspell dir passed or available [ 91s] dpkg: error processing package dictionaries-common (--install): [ 91s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 91s] Errors were encountered while processing: [ 91s] dictionaries-common [ 91s] exit ... [ 91s] ### VM INTERACTION START ### [ 94s] [ 56.060926] sysrq: Power Off [ 94s] [ 56.064812] reboot: Power down [ 94s] ### VM INTERACTION END ### [ 94s] [ 94s] cloud101 failed "build osmo-mgw_1.8.1.84.a0b69.202110040026.dsc" at Mon Oct 4 03:26:30 UTC 2021. [ 94s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:26:35 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:26:35 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a746e56ca_1962b29e81005f86945fb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 71s] [325/491] installing gcc-10-10.3.0-11 [ 73s] [326/491] installing docbook5-xml-5.0-3 [ 74s] Processing triggers for sgml-base (1.30) ... [ 74s] [327/491] installing tzdata-2021c-1 [ 74s] Current default time zone: 'Etc/UTC' [ 74s] Local time is now: Mon Oct 4 03:26:10 UTC 2021. [ 74s] Universal Time is now: Mon Oct 4 03:26:10 UTC 2021. [ 74s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 74s] [328/491] installing docutils-common-0.16+dfsg-4 [ 74s] Processing triggers for sgml-base (1.30) ... [ 74s] Processing triggers for shared-mime-info (2.0-1) ... [ 75s] [329/491] installing gcc-4:10.2.1-1 [ 76s] [330/491] installing libssl1.1-1.1.1l-1 [ 76s] Processing triggers for libc-bin (2.32-4) ... [ 76s] [331/491] installing dictionaries-common-1.28.10 [ 76s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 76s] dmihd: No hunspell dir passed or available [ 76s] dpkg: error processing package dictionaries-common (--install): [ 76s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 76s] Errors were encountered while processing: [ 76s] dictionaries-common [ 76s] exit ... [ 76s] ### VM INTERACTION START ### [ 79s] [ 55.574189] sysrq: Power Off [ 79s] [ 55.581591] reboot: Power down [ 80s] ### VM INTERACTION END ### [ 80s] [ 80s] cloud109 failed "build osmo-bts_1.3.0.256.66f5.202110040026.dsc" at Mon Oct 4 03:26:18 UTC 2021. [ 80s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:26:52 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:26:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-smlc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a748c40479_1962b29e81005f8694613@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-smlc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-smlc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-smlc Last lines of build log: [ 70s] [320/487] installing gcc-10-10.3.0-11 [ 72s] [321/487] installing docbook5-xml-5.0-3 [ 72s] Processing triggers for sgml-base (1.30) ... [ 72s] [322/487] installing tzdata-2021c-1 [ 73s] Current default time zone: 'Etc/UTC' [ 73s] Local time is now: Mon Oct 4 03:26:38 UTC 2021. [ 73s] Universal Time is now: Mon Oct 4 03:26:38 UTC 2021. [ 73s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 73s] [323/487] installing docutils-common-0.16+dfsg-4 [ 73s] Processing triggers for sgml-base (1.30) ... [ 73s] Processing triggers for shared-mime-info (2.0-1) ... [ 74s] [324/487] installing gcc-4:10.2.1-1 [ 74s] [325/487] installing libssl1.1-1.1.1l-1 [ 74s] Processing triggers for libc-bin (2.32-4) ... [ 74s] [326/487] installing dictionaries-common-1.28.10 [ 74s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 75s] dmihd: No hunspell dir passed or available [ 75s] dpkg: error processing package dictionaries-common (--install): [ 75s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 75s] Errors were encountered while processing: [ 75s] dictionaries-common [ 75s] exit ... [ 75s] ### VM INTERACTION START ### [ 78s] [ 55.593162] sysrq: Power Off [ 78s] [ 55.596946] reboot: Power down [ 78s] ### VM INTERACTION END ### [ 78s] [ 78s] cloud127 failed "build osmo-smlc_0.2.0.1.44a2.202110040026.dsc" at Mon Oct 4 03:26:44 UTC 2021. [ 78s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:27:09 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:27:09 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a74aa941d0_1962b29e81005f869485d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 39s] [321/490] installing gcc-10-10.3.0-11 [ 40s] [322/490] installing docbook5-xml-5.0-3 [ 41s] Processing triggers for sgml-base (1.30) ... [ 41s] [323/490] installing tzdata-2021c-1 [ 41s] Current default time zone: 'Etc/UTC' [ 41s] Local time is now: Mon Oct 4 03:26:47 UTC 2021. [ 41s] Universal Time is now: Mon Oct 4 03:26:47 UTC 2021. [ 41s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 41s] [324/490] installing docutils-common-0.16+dfsg-4 [ 41s] Processing triggers for sgml-base (1.30) ... [ 41s] Processing triggers for shared-mime-info (2.0-1) ... [ 42s] [325/490] installing gcc-4:10.2.1-1 [ 42s] [326/490] installing libssl1.1-1.1.1l-1 [ 42s] Processing triggers for libc-bin (2.32-4) ... [ 42s] [327/490] installing dictionaries-common-1.28.10 [ 42s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 42s] dmihd: No hunspell dir passed or available [ 42s] dpkg: error processing package dictionaries-common (--install): [ 42s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 42s] Errors were encountered while processing: [ 42s] dictionaries-common [ 42s] exit ... [ 42s] ### VM INTERACTION START ### [ 45s] [ 34.907544] sysrq: Power Off [ 45s] [ 34.911333] reboot: Power down [ 45s] ### VM INTERACTION END ### [ 45s] [ 45s] goat15 failed "build osmo-iuh_1.0.0.dsc" at Mon Oct 4 03:26:52 UTC 2021. [ 45s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:27:09 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:27:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a74aaeb87c_1962b29e81005f8695074@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 73s] [346/518] installing gcc-10-10.3.0-11 [ 74s] [347/518] installing docbook5-xml-5.0-3 [ 75s] Processing triggers for sgml-base (1.30) ... [ 75s] [348/518] installing tzdata-2021c-1 [ 75s] Current default time zone: 'Etc/UTC' [ 75s] Local time is now: Mon Oct 4 03:26:47 UTC 2021. [ 75s] Universal Time is now: Mon Oct 4 03:26:47 UTC 2021. [ 75s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 75s] [349/518] installing docutils-common-0.16+dfsg-4 [ 76s] Processing triggers for sgml-base (1.30) ... [ 76s] Processing triggers for shared-mime-info (2.0-1) ... [ 77s] [350/518] installing gcc-4:10.2.1-1 [ 77s] [351/518] installing libssl1.1-1.1.1l-1 [ 77s] Processing triggers for libc-bin (2.32-4) ... [ 77s] [352/518] installing dictionaries-common-1.28.10 [ 77s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 78s] dmihd: No hunspell dir passed or available [ 78s] dpkg: error processing package dictionaries-common (--install): [ 78s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 78s] Errors were encountered while processing: [ 78s] dictionaries-common [ 78s] exit ... [ 78s] ### VM INTERACTION START ### [ 81s] [ 64.066598] sysrq: Power Off [ 81s] [ 64.074314] reboot: Power down [ 81s] ### VM INTERACTION END ### [ 81s] [ 81s] lamb05 failed "build osmo-remsim_0.2.2.113.eb9f.202110040026.dsc" at Mon Oct 4 03:26:53 UTC 2021. [ 81s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:27:09 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:27:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a74ab252de_1962b29e81005f869511d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 70s] [321/490] installing gcc-10-10.3.0-11 [ 72s] [322/490] installing docbook5-xml-5.0-3 [ 72s] Processing triggers for sgml-base (1.30) ... [ 72s] [323/490] installing tzdata-2021c-1 [ 73s] Current default time zone: 'Etc/UTC' [ 73s] Local time is now: Mon Oct 4 03:26:50 UTC 2021. [ 73s] Universal Time is now: Mon Oct 4 03:26:50 UTC 2021. [ 73s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 73s] [324/490] installing docutils-common-0.16+dfsg-4 [ 73s] Processing triggers for sgml-base (1.30) ... [ 73s] Processing triggers for shared-mime-info (2.0-1) ... [ 74s] [325/490] installing gcc-4:10.2.1-1 [ 74s] [326/490] installing libssl1.1-1.1.1l-1 [ 75s] Processing triggers for libc-bin (2.32-4) ... [ 75s] [327/490] installing dictionaries-common-1.28.10 [ 75s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 75s] dmihd: No hunspell dir passed or available [ 75s] dpkg: error processing package dictionaries-common (--install): [ 75s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 75s] Errors were encountered while processing: [ 75s] dictionaries-common [ 75s] exit ... [ 75s] ### VM INTERACTION START ### [ 78s] [ 61.634633] sysrq: Power Off [ 78s] [ 61.642748] reboot: Power down [ 79s] ### VM INTERACTION END ### [ 79s] [ 79s] lamb69 failed "build osmo-iuh_0.7.0.4.1f6c.202110040026.dsc" at Mon Oct 4 03:26:58 UTC 2021. [ 79s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:27:09 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:27:09 +0000 Subject: Build failure of network:osmocom:latest/osmo-smlc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a74aabe522_1962b29e81005f8694911@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-smlc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-smlc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-smlc Last lines of build log: [ 40s] [320/487] installing gcc-10-10.3.0-11 [ 42s] [321/487] installing docbook5-xml-5.0-3 [ 42s] Processing triggers for sgml-base (1.30) ... [ 42s] [322/487] installing tzdata-2021c-1 [ 42s] Current default time zone: 'Etc/UTC' [ 42s] Local time is now: Mon Oct 4 03:26:47 UTC 2021. [ 42s] Universal Time is now: Mon Oct 4 03:26:47 UTC 2021. [ 42s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 42s] [323/487] installing docutils-common-0.16+dfsg-4 [ 42s] Processing triggers for sgml-base (1.30) ... [ 42s] Processing triggers for shared-mime-info (2.0-1) ... [ 43s] [324/487] installing gcc-4:10.2.1-1 [ 43s] [325/487] installing libssl1.1-1.1.1l-1 [ 43s] Processing triggers for libc-bin (2.32-4) ... [ 43s] [326/487] installing dictionaries-common-1.28.10 [ 43s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 43s] dmihd: No hunspell dir passed or available [ 43s] dpkg: error processing package dictionaries-common (--install): [ 43s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 43s] Errors were encountered while processing: [ 43s] dictionaries-common [ 43s] exit ... [ 43s] ### VM INTERACTION START ### [ 46s] [ 35.838610] sysrq: Power Off [ 46s] [ 35.842899] reboot: Power down [ 47s] ### VM INTERACTION END ### [ 47s] [ 47s] goat03 failed "build osmo-smlc_0.2.0.dsc" at Mon Oct 4 03:26:53 UTC 2021. [ 47s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:27:43 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:27:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a74c49eadc_1962b29e81005f8695281@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 71s] [329/498] installing docbook5-xml-5.0-3 [ 72s] Processing triggers for sgml-base (1.30) ... [ 72s] [330/498] installing tzdata-2021c-1 [ 72s] Current default time zone: 'Etc/UTC' [ 72s] Local time is now: Mon Oct 4 03:27:25 UTC 2021. [ 72s] Universal Time is now: Mon Oct 4 03:27:25 UTC 2021. [ 72s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 72s] [331/498] installing docutils-common-0.16+dfsg-4 [ 73s] Processing triggers for sgml-base (1.30) ... [ 73s] Processing triggers for shared-mime-info (2.0-1) ... [ 74s] [332/498] installing gcc-4:10.2.1-1 [ 74s] [333/498] installing libosmo-mgcp-client-dev-1.8.1 [ 74s] [334/498] installing libssl1.1-1.1.1l-1 [ 74s] Processing triggers for libc-bin (2.32-4) ... [ 74s] [335/498] installing dictionaries-common-1.28.10 [ 75s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 75s] dmihd: No hunspell dir passed or available [ 75s] dpkg: error processing package dictionaries-common (--install): [ 75s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 75s] Errors were encountered while processing: [ 75s] dictionaries-common [ 75s] exit ... [ 75s] ### VM INTERACTION START ### [ 78s] [ 61.635978] sysrq: Power Off [ 78s] [ 61.643907] reboot: Power down [ 78s] ### VM INTERACTION END ### [ 78s] [ 78s] lamb53 failed "build osmo-bsc_1.7.0.dsc" at Mon Oct 4 03:27:32 UTC 2021. [ 78s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:28:00 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:28:00 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a74c4d3ccc_1962b29e81005f869531b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 42s] [335/507] installing docbook5-xml-5.0-3 [ 42s] Processing triggers for sgml-base (1.30) ... [ 42s] [336/507] installing tzdata-2021c-1 [ 43s] Current default time zone: 'Etc/UTC' [ 43s] Local time is now: Mon Oct 4 03:27:41 UTC 2021. [ 43s] Universal Time is now: Mon Oct 4 03:27:41 UTC 2021. [ 43s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 43s] [337/507] installing docutils-common-0.16+dfsg-4 [ 43s] Processing triggers for sgml-base (1.30) ... [ 43s] Processing triggers for shared-mime-info (2.0-1) ... [ 44s] [338/507] installing gcc-4:10.2.1-1 [ 44s] [339/507] installing libosmo-mgcp-client-dev-1.8.1 [ 44s] [340/507] installing libssl1.1-1.1.1l-1 [ 44s] Processing triggers for libc-bin (2.32-4) ... [ 44s] [341/507] installing dictionaries-common-1.28.10 [ 44s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 44s] dmihd: No hunspell dir passed or available [ 44s] dpkg: error processing package dictionaries-common (--install): [ 44s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 44s] Errors were encountered while processing: [ 44s] dictionaries-common [ 44s] exit ... [ 44s] ### VM INTERACTION START ### [ 47s] [ 36.574335] sysrq: Power Off [ 47s] [ 36.578152] reboot: Power down [ 47s] ### VM INTERACTION END ### [ 47s] [ 47s] goat03 failed "build osmo-msc_1.7.1.dsc" at Mon Oct 4 03:27:46 UTC 2021. [ 47s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:28:17 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:28:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a74e336565_1962b29e81005f869541@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 76s] [328/497] installing docbook5-xml-5.0-3 [ 77s] Processing triggers for sgml-base (1.30) ... [ 77s] [329/497] installing tzdata-2021c-1 [ 77s] Current default time zone: 'Etc/UTC' [ 77s] Local time is now: Mon Oct 4 03:27:58 UTC 2021. [ 77s] Universal Time is now: Mon Oct 4 03:27:58 UTC 2021. [ 77s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 77s] [330/497] installing docutils-common-0.16+dfsg-4 [ 77s] Processing triggers for sgml-base (1.30) ... [ 77s] Processing triggers for shared-mime-info (2.0-1) ... [ 79s] [331/497] installing gcc-4:10.2.1-1 [ 79s] [332/497] installing libosmo-mgcp-client-dev-1.8.1.84.a0b69.202110040026 [ 79s] [333/497] installing libssl1.1-1.1.1l-1 [ 79s] Processing triggers for libc-bin (2.32-4) ... [ 79s] [334/497] installing dictionaries-common-1.28.10 [ 79s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 80s] dmihd: No hunspell dir passed or available [ 80s] dpkg: error processing package dictionaries-common (--install): [ 80s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 80s] Errors were encountered while processing: [ 80s] dictionaries-common [ 80s] exit ... [ 80s] ### VM INTERACTION START ### [ 83s] [ 56.977350] sysrq: Power Off [ 83s] [ 56.982154] reboot: Power down [ 83s] ### VM INTERACTION END ### [ 83s] [ 83s] cloud101 failed "build osmo-bsc_1.7.0.270.eb67.202110040026.dsc" at Mon Oct 4 03:28:05 UTC 2021. [ 83s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:28:34 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:28:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a74e37ea74_1962b29e81005f869553b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 60s] [332/503] installing gcc-10-10.3.0-11 [ 62s] [333/503] installing docbook5-xml-5.0-3 [ 62s] Processing triggers for sgml-base (1.30) ... [ 62s] [334/503] installing tzdata-2021c-1 [ 62s] Current default time zone: 'Etc/UTC' [ 62s] Local time is now: Mon Oct 4 03:28:10 UTC 2021. [ 62s] Universal Time is now: Mon Oct 4 03:28:10 UTC 2021. [ 62s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 62s] [335/503] installing docutils-common-0.16+dfsg-4 [ 63s] Processing triggers for sgml-base (1.30) ... [ 63s] Processing triggers for shared-mime-info (2.0-1) ... [ 64s] [336/503] installing gcc-4:10.2.1-1 [ 64s] [337/503] installing libssl1.1-1.1.1l-1 [ 64s] Processing triggers for libc-bin (2.32-4) ... [ 64s] [338/503] installing dictionaries-common-1.28.10 [ 64s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 64s] dmihd: No hunspell dir passed or available [ 64s] dpkg: error processing package dictionaries-common (--install): [ 64s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 64s] Errors were encountered while processing: [ 64s] dictionaries-common [ 64s] exit ... [ 64s] ### VM INTERACTION START ### [ 68s] [ 51.158185] sysrq: Power Off [ 68s] [ 51.161168] reboot: Power down [ 68s] ### VM INTERACTION END ### [ 68s] [ 68s] old-atreju3 failed "build osmo-sgsn_1.7.0.25.c0e14.202110040026.dsc" at Mon Oct 4 03:28:17 UTC 2021. [ 68s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:28:34 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:28:34 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a74e3acd92_1962b29e81005f86956d1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 69s] [332/503] installing gcc-10-10.3.0-11 [ 71s] [333/503] installing docbook5-xml-5.0-3 [ 71s] Processing triggers for sgml-base (1.30) ... [ 71s] [334/503] installing tzdata-2021c-1 [ 72s] Current default time zone: 'Etc/UTC' [ 72s] Local time is now: Mon Oct 4 03:28:14 UTC 2021. [ 72s] Universal Time is now: Mon Oct 4 03:28:14 UTC 2021. [ 72s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 72s] [335/503] installing docutils-common-0.16+dfsg-4 [ 72s] Processing triggers for sgml-base (1.30) ... [ 72s] Processing triggers for shared-mime-info (2.0-1) ... [ 73s] [336/503] installing gcc-4:10.2.1-1 [ 74s] [337/503] installing libssl1.1-1.1.1l-1 [ 74s] Processing triggers for libc-bin (2.32-4) ... [ 74s] [338/503] installing dictionaries-common-1.28.10 [ 74s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 74s] dmihd: No hunspell dir passed or available [ 74s] dpkg: error processing package dictionaries-common (--install): [ 74s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 74s] Errors were encountered while processing: [ 74s] dictionaries-common [ 74s] exit ... [ 74s] ### VM INTERACTION START ### [ 77s] [ 60.749279] sysrq: Power Off [ 77s] [ 60.756076] reboot: Power down [ 78s] ### VM INTERACTION END ### [ 78s] [ 78s] lamb05 failed "build osmo-sgsn_1.7.1.dsc" at Mon Oct 4 03:28:22 UTC 2021. [ 78s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 4 03:28:34 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 04 Oct 2021 03:28:34 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <615a74e3dcf56_1962b29e81005f869577e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 72s] [335/507] installing docbook5-xml-5.0-3 [ 72s] Processing triggers for sgml-base (1.30) ... [ 72s] [336/507] installing tzdata-2021c-1 [ 73s] Current default time zone: 'Etc/UTC' [ 73s] Local time is now: Mon Oct 4 03:28:23 UTC 2021. [ 73s] Universal Time is now: Mon Oct 4 03:28:23 UTC 2021. [ 73s] Run 'dpkg-reconfigure tzdata' if you wish to change it. [ 73s] [337/507] installing docutils-common-0.16+dfsg-4 [ 73s] Processing triggers for sgml-base (1.30) ... [ 73s] Processing triggers for shared-mime-info (2.0-1) ... [ 74s] [338/507] installing gcc-4:10.2.1-1 [ 74s] [339/507] installing libosmo-mgcp-client-dev-1.8.1.84.a0b69.202110040026 [ 74s] [340/507] installing libssl1.1-1.1.1l-1 [ 74s] Processing triggers for libc-bin (2.32-4) ... [ 74s] [341/507] installing dictionaries-common-1.28.10 [ 74s] Adding 'diversion of /usr/share/dict/words to /usr/share/dict/words.pre-dictionaries-common by dictionaries-common' [ 75s] dmihd: No hunspell dir passed or available [ 75s] dpkg: error processing package dictionaries-common (--install): [ 75s] installed dictionaries-common package post-installation script subprocess returned error exit status 2 [ 75s] Errors were encountered while processing: [ 75s] dictionaries-common [ 75s] exit ... [ 75s] ### VM INTERACTION START ### [ 78s] [ 60.591161] sysrq: Power Off [ 78s] [ 60.597183] reboot: Power down [ 78s] ### VM INTERACTION END ### [ 78s] [ 78s] lamb55 failed "build osmo-msc_1.7.0.29.3081.202110040026.dsc" at Mon Oct 4 03:28:30 UTC 2021. [ 78s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Oct 4 07:54:29 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 4 Oct 2021 07:54:29 +0000 Subject: Change in pysim[master]: pySim-shell: allow card insertion at runtime In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25549 ) Change subject: pySim-shell: allow card insertion at runtime ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 Gerrit-Change-Number: 25549 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 04 Oct 2021 07:54:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 08:01:28 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 4 Oct 2021 08:01:28 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25552 ) Change subject: pySim-shell: add bulk provisioning support ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/pysim/+/25552/2/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/25552/2/pySim-shell.py at 306 PS2, Line 306: TODO: > No it is not, it counts the overall failures. The TODO is different. [?] Ack -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 04 Oct 2021 08:01:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 08:41:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 08:41:54 +0000 Subject: Change in osmo-bsc[master]: fix TSC / TSC Set used for Handover In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25659 ) Change subject: fix TSC / TSC Set used for Handover ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25659/2/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/25659/2/include/osmocom/bsc/gsm_data.h at 144 PS2, Line 144: struct optional_val { > Might be a good idea to generalize this API and have it in libosmocore: [?] I personally don't think it really make sense to have this kind of stuff in libosmocore. https://gerrit.osmocom.org/c/osmo-bsc/+/25659/2/include/osmocom/bsc/gsm_data.h at 145 PS2, Line 145: use > I would call it 'valid' or even 'present'. Not critical though. agree, "valid" sounds like a better name here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iae20df4387c3d75752301bd5daeeea7508966393 Gerrit-Change-Number: 25659 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 08:41:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 08:43:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 08:43:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add const list of TSC expected per BTS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25660 ) Change subject: bsc: add const list of TSC expected per BTS ...................................................................... Patch Set 1: Code-Review+1 Ideally these should be specified as a module parameter. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3733ebbbfd74630e095a08b83023974aad177b34 Gerrit-Change-Number: 25660 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 08:43:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 08:46:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 08:46:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_ho_int: verify TSC in HandoverCommand In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663 ) Change subject: bsc: TC_ho_int: verify TSC in HandoverCommand ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663/1/bsc/BSC_Tests.ttcn at 5082 PS1, Line 5082: old_chan_nr := -, what does "-" mean? :O -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I32e3553581eb17812082f1f2ee96cc978e8db668 Gerrit-Change-Number: 25663 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 08:46:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 08:47:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 08:47:34 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify TSC in RR HO Cmd of TC_ho_neighbor_config_* In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25664 ) Change subject: bsc: verify TSC in RR HO Cmd of TC_ho_neighbor_config_* ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I09cb07561a57527880b87147495619a3bbbceb3f Gerrit-Change-Number: 25664 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 08:47:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 08:51:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 08:51:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify TSC in inter-BSC ho (out) RR HO Cmd In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25665 ) Change subject: bsc: verify TSC in inter-BSC ho (out) RR HO Cmd ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icabcedc59d80e812c3d6ba5d6db5e2bb9b319252 Gerrit-Change-Number: 25665 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 08:51:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 08:51:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 08:51:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify TSC in inter-BSC ho (out) RR HO Cmd In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25665 ) Change subject: bsc: verify TSC in inter-BSC ho (out) RR HO Cmd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icabcedc59d80e812c3d6ba5d6db5e2bb9b319252 Gerrit-Change-Number: 25665 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 08:51:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 08:57:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 08:57:13 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25654 ) Change subject: Implement MS Uplink Power Control Loop ...................................................................... Patch Set 11: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25654/11/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/11/src/osmo-bsc/abis_rsl.c at 1343 PS11, Line 1343: lchan_ms_pwr_ctrl(msg->lchan, mr); nitpick: may be more useful for debugging running the ms power loop AFTER we print the meas report (see print_meas_rep() below). So I'd maybe swap lchan_ms_pwr_ctrl and print_meas_rep here, not sure if that makes sense to you too. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 11 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 08:57:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 08:59:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 08:59:29 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25654 ) Change subject: Implement MS Uplink Power Control Loop ...................................................................... Patch Set 11: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7//COMMIT_MSG at 10 PS7, Line 10: * Imports power_control.c from osmo-bts project. > OK, Should it be the commit hash of the commit that originally adds power_control. [?] hash commit refernece is enough, like you did in newer version of the patch, thanks. https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/7/include/osmocom/bsc/gsm_data.h at 825 PS7, Line 825: struct gsm_power_ctrl_meas_proc_state rxlev_meas_proc; > Are you saying you would you like to see ms_power moved in here to '.current' in a separate patchset? (maybe previous to this one?) Yes, exactly. Not necessarily previous to this one, you can do that afterwards if you want (not mandatory but appreciated, thanks). -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 11 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 08:59:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Comment-In-Reply-To: keith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 09:02:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 09:02:15 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: support setting artificial delay for TRXC In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/25667 ) Change subject: trx_toolkit: support setting artificial delay for TRXC ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmocom-bb/+/25667/1/src/target/trx_toolkit/ctrl_if.py File src/target/trx_toolkit/ctrl_if.py: https://gerrit.osmocom.org/c/osmocom-bb/+/25667/1/src/target/trx_toolkit/ctrl_if.py at 95 PS1, Line 95: time.sleep(self.rsp_delay_ms / 1000.0) just to be sure, is this will block the thread, so this is always used when trxdata is still not ongoing? or is it handled by another thread? I guess everything is fine and you already gave it a try, but just to be sure. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/25667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idb1ef445bc14a6312f08a83ecacc3a938b0e1d70 Gerrit-Change-Number: 25667 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 09:02:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 09:02:45 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 09:02:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: f_TRXC_transceive(): accept 'template (value)' parameter In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25668 ) Change subject: f_TRXC_transceive(): accept 'template (value)' parameter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I98012607f3e9da71234333aac77d59936cd3ee20 Gerrit-Change-Number: 25668 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 09:02:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 09:03:02 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 09:03:02 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/TRXC_Types: add definitions for FAKE_TRXC_DELAY In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25669 ) Change subject: library/TRXC_Types: add definitions for FAKE_TRXC_DELAY ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic5034f244374d4368d4fcb9a382c984cc730c408 Gerrit-Change-Number: 25669 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 09:03:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 09:03:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 09:03:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS: reproduce a race condition described in OS#5245 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25670 ) Change subject: BTS: reproduce a race condition described in OS#5245 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3b602ac9dbe0ab3e80eb30de573c9b48a79872d8 Gerrit-Change-Number: 25670 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 09:03:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 09:04:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 09:04:07 +0000 Subject: Change in osmo-bts[master]: abis: fix memory leak in abis_oml_sendmsg() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25671 ) Change subject: abis: fix memory leak in abis_oml_sendmsg() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifc46b94b4540705f7d9b4678a7398158f3aaf7c5 Gerrit-Change-Number: 25671 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 09:04:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 09:05:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 09:05:08 +0000 Subject: Change in osmo-bts[master]: abis: reduce logging verbosity in abis_oml_sendmsg() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25672 ) Change subject: abis: reduce logging verbosity in abis_oml_sendmsg() ...................................................................... Patch Set 1: I'd like to keep this one as INFO, it is actually helpful because it may provide info on stuff which may be disabled when the abis conn goes down :) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7fc4796161b0e46dbb4cb76e6e145c7dc4a17b1e Gerrit-Change-Number: 25672 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 09:05:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 09:05:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 09:05:36 +0000 Subject: Change in osmo-bts[master]: rsl: remove redundant logging in rsl_rx_chan_activ() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25673 ) Change subject: rsl: remove redundant logging in rsl_rx_chan_activ() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I62ea4117dd5e1eebb8774809134e5cb73774945c Gerrit-Change-Number: 25673 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 09:05:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 09:13:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 09:13:35 +0000 Subject: Change in osmo-bts[master]: rsl: prevent race condition during timeslot re-configuration In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25674 ) Change subject: rsl: prevent race condition during timeslot re-configuration ...................................................................... Patch Set 1: I'd welcome some description on why is the field moved from TS to lchan structure. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Gerrit-Change-Number: 25674 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 09:13:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 09:14:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 09:14:54 +0000 Subject: Change in libosmocore[master]: utils: remove misleading comments for osmo_hexdump[_nospc]_c() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25666 ) Change subject: utils: remove misleading comments for osmo_hexdump[_nospc]_c() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I960dd6a53123fd4209ef6e61dcd0d22e4005e397 Gerrit-Change-Number: 25666 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 09:14:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 09:17:32 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 4 Oct 2021 09:17:32 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: Check for conn->lchan References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25676 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... assignment_fsm: Check for conn->lchan When the SDCCH gets released while the TCH still beeing activated, then the ChanActivACK that is received after the TCH is activated will trigger a segmentation fault in the assignment_fsm. The reason for this is that conn->lchan, which holds the SDCCH at that point in time, is now NULL. To prevent osmo-bsc from crashing, the FSM should check for the presence of conn->lchan first. If it does not exist, the FSM should terminate. (Assignment failed) Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Related: SYS#5627 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/76/25676/1 diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 97eb335..1df62cc 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -678,6 +678,12 @@ int rc; struct gsm_subscriber_connection *conn = assignment_fi_conn(fi); + if (!conn->lchan) { + assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE, + "Unable to send RR Assignment Command: conn without lchan"); + return; + } + rc = gsm48_send_rr_ass_cmd(conn->lchan, conn->assignment.new_lchan, conn->lchan->ms_power); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25676 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 09:17:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 09:17:43 +0000 Subject: Change in osmo-bsc[master]: Add vty command to manually force MS Uplink Power In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25653 ) Change subject: Add vty command to manually force MS Uplink Power ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 Gerrit-Change-Number: 25653 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 09:17:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 09:30:24 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 09:30:24 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: Check for conn->lchan In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25676 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25676/1/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25676/1/src/osmo-bsc/assignment_fsm.c at 681 PS1, Line 681: if (!conn->lchan) { I'd welcome a comment here explaining something similar to what you wrote in the commit description. It is not obvious at all why conn->lchan may be NULL here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25676 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 09:30:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 09:38:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 09:38:46 +0000 Subject: Change in osmo-ggsn[master]: Introduce program gtp-echo-responder In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 ) Change subject: Introduce program gtp-echo-responder ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibdd6d8f6920571db0c60cf8b3b25d541b15ad3f1 Gerrit-Change-Number: 25652 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 09:39:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 09:39:27 +0000 Subject: Change in osmo-ggsn[master]: Introduce program gtp-echo-responder In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 ) Change subject: Introduce program gtp-echo-responder ...................................................................... Patch Set 6: linter failures reamining don't apply here, since osmo_strlcpy() can't be used here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibdd6d8f6920571db0c60cf8b3b25d541b15ad3f1 Gerrit-Change-Number: 25652 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 04 Oct 2021 09:39:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 09:42:48 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 4 Oct 2021 09:42:48 +0000 Subject: Change in osmo-bts[master]: abis: fix memory leak in abis_oml_sendmsg() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25671 ) Change subject: abis: fix memory leak in abis_oml_sendmsg() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifc46b94b4540705f7d9b4678a7398158f3aaf7c5 Gerrit-Change-Number: 25671 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 09:42:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:21:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 10:21:20 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Drop unneeded reset of fields References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25677 ) Change subject: trx_provision_fsm: Drop unneeded reset of fields ...................................................................... trx_provision_fsm: Drop unneeded reset of fields Since recently, reset of all fields is already properly done in trx_provision_reset(). Change-Id: I3e6bc8205704e425644507dd1f1b299dea4cd851 --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/77/25677/1 diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 52736ad..b219040 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -594,11 +594,6 @@ trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); plink->u.osmotrx.poweronoff_sent = true; } - l1h->config.rxgain_sent = false; - l1h->config.maxdly_sent = false; - l1h->config.maxdlynb_sent = false; - for (tn = 0; tn < TRX_NR_TS; tn++) - l1h->config.setslot_sent[tn] = false; } else if (!pinst->phy_link->u.osmotrx.poweronoff_sent) { bts_model_trx_close_cb(pinst->trx, 0); } /* else: poweroff in progress, cb will be called upon TRXC RSP */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3e6bc8205704e425644507dd1f1b299dea4cd851 Gerrit-Change-Number: 25677 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:34:28 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 4 Oct 2021 10:34:28 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: Check for conn->lchan In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25676 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25676/1/src/osmo-bsc/assignment_fsm.c File src/osmo-bsc/assignment_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25676/1/src/osmo-bsc/assignment_fsm.c at 681 PS1, Line 681: if (!conn->lchan) { > I'd welcome a comment here explaining something similar to what you wrote in the commit description. [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25676 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 10:34:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:34:43 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 4 Oct 2021 10:34:43 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: Check for conn->lchan In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25676 to look at the new patch set (#2). Change subject: assignment_fsm: Check for conn->lchan ...................................................................... assignment_fsm: Check for conn->lchan When the SDCCH gets released while the TCH still beeing activated, then the ChanActivACK that is received after the TCH is activated will trigger a segmentation fault in the assignment_fsm. The reason for this is that conn->lchan, which holds the SDCCH at that point in time, is now NULL. To prevent osmo-bsc from crashing, the FSM should check for the presence of conn->lchan first. If it does not exist, the FSM should terminate. (Assignment failed) Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Related: SYS#5627 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/76/25676/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25676 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:35:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 10:35:13 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: Check for conn->lchan In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25676 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25676 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 10:35:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:37:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 10:37:55 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Drop unneeded reset of fields In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25677 to look at the new patch set (#2). Change subject: trx_provision_fsm: Drop unneeded reset of fields ...................................................................... trx_provision_fsm: Drop unneeded reset of fields Since recently, reset of all fields is already properly done in trx_provision_reset(). Change-Id: I3e6bc8205704e425644507dd1f1b299dea4cd851 --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/77/25677/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3e6bc8205704e425644507dd1f1b299dea4cd851 Gerrit-Change-Number: 25677 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:37:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 10:37:55 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Drop impossible paths References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25678 ) Change subject: trx_provision_fsm: Drop impossible paths ...................................................................... trx_provision_fsm: Drop impossible paths config.enabled is always true in that state. Hence, those paths can be securely dropped since only add confusion. Change-Id: Icf00c52e61ddedd8e32eb37223cea5686005e6a3 --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 2 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/78/25678/1 diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 758789d..4ea6758 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -588,15 +588,10 @@ switch (event) { case TRX_PROV_EV_CLOSE: /* power off transceiver, if not already */ - if (l1h->config.enabled) { - if (pinst->num == 0 && plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { + if (pinst->num == 0 && plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); plink->u.osmotrx.poweronoff_sent = true; - } - } else if (!pinst->phy_link->u.osmotrx.poweronoff_sent) { - bts_model_trx_close_cb(pinst->trx, 0); - } /* else: poweroff in progress, cb will be called upon TRXC RSP */ - + } trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF); break; case TRX_PROV_EV_CFG_TS: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icf00c52e61ddedd8e32eb37223cea5686005e6a3 Gerrit-Change-Number: 25678 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:41:45 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 10:41:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add const list of TSC expected per BTS In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25660 ) Change subject: bsc: add const list of TSC expected per BTS ...................................................................... Patch Set 1: > Patch Set 1: Code-Review+1 > > Ideally these should be specified as a module parameter. hm that's right; the reason i put those there is because of the NUM_BTS and NUM_MSC, i guess those should also have been module params. i think i'll just merge this now, we can move to module param once a change from .cfg file is actually needed. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3733ebbbfd74630e095a08b83023974aad177b34 Gerrit-Change-Number: 25660 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 10:41:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:41:49 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 10:41:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add const list of TSC expected per BTS In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25660 ) Change subject: bsc: add const list of TSC expected per BTS ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3733ebbbfd74630e095a08b83023974aad177b34 Gerrit-Change-Number: 25660 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 10:41:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:43:00 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 10:43:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_ho_int: verify TSC in HandoverCommand In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663 ) Change subject: bsc: TC_ho_int: verify TSC in HandoverCommand ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663/1/bsc/BSC_Tests.ttcn at 5082 PS1, Line 5082: old_chan_nr := -, > what does "-" mean? :O i think that's "not present" or something?? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I32e3553581eb17812082f1f2ee96cc978e8db668 Gerrit-Change-Number: 25663 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 10:43:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:43:08 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 10:43:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add const list of TSC expected per BTS In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25660 ) Change subject: bsc: add const list of TSC expected per BTS ...................................................................... bsc: add const list of TSC expected per BTS Reduce code (comment) dup by having one const definition for default TSCs instead of magic numbers. Will add another use of this in upcoming patch testing correct TSC in handover. Related: SYS#4895 Change-Id: I3733ebbbfd74630e095a08b83023974aad177b34 --- M bsc/BSC_Tests.ttcn 1 file changed, 16 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index a4def7b..9e4ddff 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -75,6 +75,8 @@ import from GSM_RestOctets all; import from TCCConversion_Functions all; +type record of integer integer_list; + const integer NUM_BTS := 3; const integer NUM_BTS_CFG := 4; /* we have 4 BTS in the osmo-bsc.cfg (for inter-BSC HO tests) but use only 3 */ const integer NUM_MSC := 3; @@ -85,6 +87,18 @@ const integer NUM_TCHF_PER_BTS := 4; const integer NUM_SDCCH_PER_BTS := 3; +/* Default Training Sequence Code expected for bts[i]: + * BTS 0 has BSIC 10 (and no explicit timeslot training_sequence_code config), so expecting TSC = (BSIC & 7) = 2. + * BTS 1 has BSIC 11, TSC = (BSIC & 7) = 3. + * BTS 2 has BSIC 12, TSC = (BSIC & 7) = 4. + * BTS 2 has BSIC 12, TSC = (BSIC & 7) = 4. + */ +const integer_list BTS_TSC := { + 2, + 3, + 4, + 4 +} /* per-BTS state which we keep */ type record BTS_State { @@ -699,9 +713,7 @@ } pars.exp_ms_power_level := mp_exp_ms_power_level; pars.mscpool.bssap_idx := bssap_idx; - - /* BTS 0 has BSIC 10 (and no explicit timeslot training_sequence_code config), so expecting TSC = (BSIC & 7) = 2 */ - pars.expect_tsc := 2; + pars.expect_tsc := BTS_TSC[0]; return pars; } @@ -9735,9 +9747,7 @@ var MSC_ConnHdlr vc_conn2; pars2.imsi := pars1.imsi; pars2.media_nr := 2; - /* f_tc_cm_reestablishment_2 uses 'bts 1'. - * BTS 1 has BSIC 11 (and no explicit timeslot training_sequence_code config), so expecting TSC = (BSIC & 7) = 3 */ - pars2.expect_tsc := 3; + pars2.expect_tsc := BTS_TSC[1]; f_init(2, true, guard_timeout := 40.0); f_sleep(1.0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3733ebbbfd74630e095a08b83023974aad177b34 Gerrit-Change-Number: 25660 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:43:08 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 10:43:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: RSLEM: add f_chan_act_verify_tsc() In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25661 ) Change subject: RSLEM: add f_chan_act_verify_tsc() ...................................................................... RSLEM: add f_chan_act_verify_tsc() Will need this code again to verify the TSC during handover, so cast this in a separate function. Related: SYS#4895 Change-Id: I7a3f68ed1deba6a4a0a1cc4df7613638225c1640 --- M library/RSL_Emulation.ttcn 1 file changed, 13 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index 30adfba..effe83b 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -136,6 +136,18 @@ return rx_rsl; } +function f_chan_act_verify_tsc(RSL_Message chan_act, template uint3_t tsc) { + var RSL_IE_Body ie; + if (f_rsl_find_ie(chan_act, RSL_IE_CHAN_IDENT, ie)) { + var uint3_t got_tsc := ie.chan_ident.ch_desc.v.tsc; + if (not match(got_tsc, tsc)) { + setverdict(fail, "RSL CHANnel ACTIVation: unexpected TSC in Channel Description: expected ", + tsc, " got ", got_tsc); + mtc.stop; + } + } +} + /* establish a dedicated channel using 'ra' */ function f_chan_est(OCT1 ra, octetstring est_l3, template RslLinkId link_id, GsmFrameNumber fn := 23, template uint3_t tsc := ?, RSL_DCHAN_PT rsl_pt := RSL, RSLEM_PROC_PT rsl_proc_pt := RSL_PROC) @@ -158,16 +170,7 @@ rsl_pt.send(ts_RSL_EST_IND(g_chan_nr, valueof(link_id), est_l3)); /* Check above CHAN ACTIV */ - var RSL_Message chan_act := f_rslem_get_last_act(rsl_proc_pt, 0, g_chan_nr); - var RSL_IE_Body ie; - if (f_rsl_find_ie(chan_act, RSL_IE_CHAN_IDENT, ie)) { - var uint3_t got_tsc := ie.chan_ident.ch_desc.v.tsc; - if (not match(got_tsc, tsc)) { - setverdict(fail, "RSL CHANnel ACTIVation: unexpected TSC in Channel Description: expected ", - tsc, " got ", got_tsc); - mtc.stop; - } - } + f_chan_act_verify_tsc(f_rslem_get_last_act(rsl_proc_pt, 0, g_chan_nr), tsc); } function f_deact_chan(RSL_Cause cause) runs on RSL_DchanHdlr -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25661 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7a3f68ed1deba6a4a0a1cc4df7613638225c1640 Gerrit-Change-Number: 25661 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:43:09 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 10:43:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_ho_int: verify TSC in Chan Act In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25662 ) Change subject: bsc: TC_ho_int: verify TSC in Chan Act ...................................................................... bsc: TC_ho_int: verify TSC in Chan Act OS#5244 reports an error in the Training Sequence Code used in the Channel Activation for a handover target channel. Verify the TSC to uncover this bug. Related: SYS#4895, OS#5244 Related: Iae20df4387c3d75752301bd5daeeea7508966393 (osmo-bsc) Change-Id: I1ed6f068c85b01e5a2d7b5f2651498a1521f89af --- M bsc/BSC_Tests.ttcn 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 9e4ddff..e8bb99c 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -5081,7 +5081,7 @@ handover_done := false, old_chan_nr := - }; - /* issue hand-over command on VTY */ + /* issue hand-over command on VTY, from BTS 0 to BTS 1 */ f_vty_handover(BSCVTY, 0, 0, g_chan_nr, 1); /* temporarily suspend DChan processing on BTS1 to avoid race with RSLEM_register */ f_rslem_suspend(RSL1_PROC); @@ -5103,9 +5103,13 @@ * test expectation */ f_check_mgcp_expectations() + var RSL_Message chan_act := f_rslem_get_last_act(RSL1_PROC, 0, g_chan_nr); + /* Ensure the Channel Activation for the new channel contained the right encryption params. as_handover() set * g_chan_nr to the new lchan that was handed over to. It lives in bts 1, so look it up at RSL1_PROC. */ - f_verify_encr_info(f_rslem_get_last_act(RSL1_PROC, 0, g_chan_nr)); + f_verify_encr_info(chan_act); + + f_chan_act_verify_tsc(chan_act, BTS_TSC[1]); f_sleep(0.5); } @@ -5116,6 +5120,8 @@ f_init(2, true); f_sleep(1.0); + pars.expect_tsc := BTS_TSC[0]; + f_ctrs_bsc_and_bts_init(); vc_conn := f_start_handler(refers(f_tc_ho_int), pars); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25662 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1ed6f068c85b01e5a2d7b5f2651498a1521f89af Gerrit-Change-Number: 25662 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:43:10 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 10:43:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: TC_ho_int: verify TSC in HandoverCommand In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663 ) Change subject: bsc: TC_ho_int: verify TSC in HandoverCommand ...................................................................... bsc: TC_ho_int: verify TSC in HandoverCommand For intra-BSC handovers, also verify the correct Training Sequence Code in the RR Handover Command (not only in the Channel Activation as added in previous patch). Related: SYS#4895 OS#5244 Related: Iae20df4387c3d75752301bd5daeeea7508966393 (osmo-bsc) Change-Id: I32e3553581eb17812082f1f2ee96cc978e8db668 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 21 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index e8bb99c..04e895a 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -5079,7 +5079,8 @@ var HandoverState hs := { rr_ho_cmpl_seen := false, handover_done := false, - old_chan_nr := - + old_chan_nr := -, + expect_target_tsc := BTS_TSC[1] }; /* issue hand-over command on VTY, from BTS 0 to BTS 1 */ f_vty_handover(BSCVTY, 0, 0, g_chan_nr, 1); @@ -5197,7 +5198,8 @@ var HandoverState hs := { rr_ho_cmpl_seen := false, handover_done := false, - old_chan_nr := - + old_chan_nr := -, + expect_target_tsc := BTS_TSC[1] }; /* issue hand-over command on VTY */ f_vty_handover(BSCVTY, 0, 0, g_chan_nr, 1); @@ -9347,7 +9349,8 @@ var HandoverState hs := { rr_ho_cmpl_seen := false, handover_done := false, - old_chan_nr := - + old_chan_nr := -, + expect_target_tsc := BTS_TSC[1] }; /* issue hand-over command on VTY */ f_vty_handover(BSCVTY, 0, 0, g_chan_nr, 1); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 5f77764..2b1f711 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -1467,7 +1467,8 @@ boolean rr_ho_cmpl_seen, integer mdcx_seen_before_ho, boolean handover_done, - RslChannelNr old_chan_nr + RslChannelNr old_chan_nr, + uint3_t expect_target_tsc optional }; altstep as_handover(inout HandoverState st) runs on MSC_ConnHdlr { @@ -1482,6 +1483,19 @@ new_chan_nr, arfcn); /* FIXME: Determine TRX NR by ARFCN, instead of hard-coded TRX0! */ + /* Verify correct TSC in handoverCommand */ + if (ispresent(st.expect_target_tsc)) { + var uint3_t got_tsc := rr_chan_desc_tsc(l3.msgs.rrm.handoverCommand.channelDescription2); + if (not match(got_tsc, st.expect_target_tsc)) { + setverdict(fail, "RR Handover Command: unexpected TSC in Channel Description: expected ", + st.expect_target_tsc, " got ", got_tsc); + mtc.stop; + } else { + log("handoverCommand: verified TSC = ", got_tsc, " (matches ", + st.expect_target_tsc, ")"); + } + } + /* register our component for this channel number at the RSL Emulation */ f_rslem_register(0, new_chan_nr, RSL1_PROC); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25663 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I32e3553581eb17812082f1f2ee96cc978e8db668 Gerrit-Change-Number: 25663 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:43:10 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 10:43:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify TSC in RR HO Cmd of TC_ho_neighbor_config_* In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25664 ) Change subject: bsc: verify TSC in RR HO Cmd of TC_ho_neighbor_config_* ...................................................................... bsc: verify TSC in RR HO Cmd of TC_ho_neighbor_config_* Related: SYS#4895 OS#5244 Related: Iae20df4387c3d75752301bd5daeeea7508966393 (osmo-bsc) Change-Id: I09cb07561a57527880b87147495619a3bbbceb3f --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 19 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 04e895a..cc387f6 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6267,7 +6267,8 @@ charstring log_descr, charstring handover_vty_cmd, boolean expect_handover, - boolean is_inter_bsc_handover := false) + boolean is_inter_bsc_handover := false, + template uint3_t expect_target_tsc := ?) runs on MSC_ConnHdlr { /* We're going to thwart any and all handover attempts, just be ready to handle (and ignore) handover target @@ -6299,6 +6300,17 @@ log("Handover to new chan ", new_chan_nr, " on ARFCN ", arfcn); log(l3.msgs.rrm.handoverCommand); + /* Verify correct TSC in handoverCommand */ + var uint3_t got_tsc := rr_chan_desc_tsc(l3.msgs.rrm.handoverCommand.channelDescription2); + if (not match(got_tsc, expect_target_tsc)) { + setverdict(fail, "RR Handover Command: unexpected TSC in Channel Description: expected ", + expect_target_tsc, " got ", got_tsc); + mtc.stop; + } else { + log("handoverCommand: verified TSC = ", got_tsc, " (matches ", + expect_target_tsc, ")"); + } + /* Need to register for new lchan on new BTS -- it's either bts 1 or bts 2. It doesn't really * matter on which BTS it really is, we're not going to follow through an entire handover * anyway. */ @@ -6407,7 +6419,7 @@ f_bts_0_cfg(BSCVTY, {"no neighbors"}); f_probe_for_handover("1.a", "HO to bts 1 works, implicitly listed as neighbor (legacy behavior when none are configured)", "handover any to arfcn 871 bsic 11", - true); + true, expect_target_tsc := BTS_TSC[1]); f_probe_for_handover("1.b", "HO to unknown cell does not start", "handover any to arfcn 13 bsic 39", @@ -6419,7 +6431,7 @@ f_probe_for_handover("1.d", "HO to 871-11 still works (verify that this test properly cleans up)", "handover any to arfcn 871 bsic 11", - true); + true, expect_target_tsc := BTS_TSC[1]); } testcase TC_ho_neighbor_config_1() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -6475,7 +6487,7 @@ f_probe_for_handover("2.a", "HO to bts 1 works, explicitly listed as neighbor", "handover any to arfcn 871 bsic 11", - true); + true, expect_target_tsc := BTS_TSC[1]); f_probe_for_handover("2.b", "HO to bts 2 doesn't work, not listed as neighbor", "handover any to arfcn 871 bsic 12", @@ -6528,7 +6540,7 @@ false); f_probe_for_handover("3.b", "HO to bts 2 works, explicitly listed as neighbor; no ambiguity because bts 3 is not listed as neighbor", "handover any to arfcn 871 bsic 12", - true); + true, expect_target_tsc := BTS_TSC[2]); } testcase TC_ho_neighbor_config_3() runs on test_CT { var MSC_ConnHdlr vc_conn; @@ -6714,7 +6726,7 @@ f_probe_for_handover("7.a", "HO to 871-12 does HO to bts 2", "handover any to arfcn 871 bsic 12", - true); + true, expect_target_tsc := BTS_TSC[2]); f_probe_for_handover("7.b", "HO to 123-45 triggers inter-BSC HO", "handover any to arfcn 123 bsic 45", true, true); diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 2b1f711..cb93bfe 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -955,7 +955,7 @@ } -private function rr_chan_desc_tsc(ChannelDescription2_V cd2) +function rr_chan_desc_tsc(ChannelDescription2_V cd2) return uint3_t { var uint3_t tsc := oct2int(cd2.octet3); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25664 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I09cb07561a57527880b87147495619a3bbbceb3f Gerrit-Change-Number: 25664 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:43:11 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 10:43:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: verify TSC in inter-BSC ho (out) RR HO Cmd In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25665 ) Change subject: bsc: verify TSC in inter-BSC ho (out) RR HO Cmd ...................................................................... bsc: verify TSC in inter-BSC ho (out) RR HO Cmd Related: SYS#4895 OS#5244 Related: Iae20df4387c3d75752301bd5daeeea7508966393 (osmo-bsc) Change-Id: Icabcedc59d80e812c3d6ba5d6db5e2bb9b319252 --- M bsc/BSC_Tests.ttcn 1 file changed, 14 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cc387f6..d64ccc0 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -5677,6 +5677,7 @@ var RslChannelNr new_chan_nr := valueof(t_RslChanNr0(1, RSL_CHAN_NR_Bm_ACCH)); f_rslem_register(0, new_chan_nr); g_chan_nr := new_chan_nr; + var uint3_t expect_target_tsc := BTS_TSC[0]; f_sleep(1.0); f_create_mgcp_expect(ExpectCriteria:{omit,omit,omit}); @@ -5696,8 +5697,10 @@ BSSAP.receive(tr_BSSMAP_HandoverRequestAcknowledge(?)) -> value rx_bssap; - /* we're sure that the channel activation is done now, verify the encryption parameters in it */ - f_verify_encr_info(f_rslem_get_last_act(RSL_PROC, 0, g_chan_nr)); + /* we're sure that the channel activation is done now, verify the parameters in it */ + var RSL_Message chan_act := f_rslem_get_last_act(RSL_PROC, 0, g_chan_nr); + f_verify_encr_info(chan_act); + f_chan_act_verify_tsc(chan_act, expect_target_tsc); ho_command_str := rx_bssap.pdu.bssmap.handoverRequestAck.layer3Information.layer3info; log("Received L3 Info in HO Request Ack: ", ho_command_str); @@ -5717,6 +5720,15 @@ } log("Handover Command chan_nr is", actual_new_chan_nr); + var uint3_t got_tsc := rr_chan_desc_tsc(ho_command.msgs.rrm.handoverCommand.channelDescription2); + if (not match(got_tsc, expect_target_tsc)) { + setverdict(fail, "RR Handover Command: unexpected TSC in Channel Description: expected ", + expect_target_tsc, " got ", got_tsc); + mtc.stop; + } else { + log("handoverCommand: verified TSC = ", got_tsc); + } + /* Now the MSC forwards the RR Handover Command to the other BSC, which * tells the MS to handover to the new lchan. Here comes the new MS on * the new lchan with a Handover RACH: */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25665 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Icabcedc59d80e812c3d6ba5d6db5e2bb9b319252 Gerrit-Change-Number: 25665 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:46:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 10:46:07 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: poweronff_sent flag: track POWERON and POWEROFF se... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25679 ) Change subject: trx_provision_fsm: poweronff_sent flag: track POWERON and POWEROFF separately ...................................................................... trx_provision_fsm: poweronff_sent flag: track POWERON and POWEROFF separately It helps better understanding the code, and will allow handling situations where for instance a POWERON in in transit while the BTS is instructed to shutdown, hence a POWEROFF needs to be sent. Change-Id: Iaf62217ceab7420afa4140cba61e1c2f983c61b4 --- M include/osmo-bts/phy_link.h M src/osmo-bts-trx/trx_provision_fsm.c 2 files changed, 11 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/79/25679/1 diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index ac38c28..862ed48 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -50,7 +50,8 @@ bool use_legacy_setbsic; uint8_t trxd_pdu_ver_max; /* Maximum TRXD PDU version to negotiate */ bool powered; /* last POWERON (true) or POWEROFF (false) confirmed */ - bool poweronoff_sent; /* is there a POWERON/POWEROFF in transit? (one or the other based on ->powered) */ + bool poweron_sent; /* is there a POWERON in transit? */ + bool poweroff_sent; /* is there a POWEROFF in transit? */ } osmotrx; struct { char *mcast_dev; /* Network device for multicast */ diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 4ea6758..3d7eebf 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -50,12 +50,14 @@ struct phy_link *plink = pinst->phy_link; plink->u.osmotrx.powered = poweronoff; - plink->u.osmotrx.poweronoff_sent = false; - if (poweronoff) + if (poweronoff) { + plink->u.osmotrx.poweron_sent = false; osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWERON_CNF, (void*)(intptr_t)rc); - else + } else { + plink->u.osmotrx.poweroff_sent = false; osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWEROFF_CNF, (void*)(intptr_t)rc); + } } @@ -520,7 +522,7 @@ struct phy_instance *pinst = l1h->phy_inst; trx_if_cmd_poweron(l1h, l1if_poweronoff_cb); - pinst->phy_link->u.osmotrx.poweronoff_sent = true; + pinst->phy_link->u.osmotrx.poweron_sent = true; } static void st_open_wait_power_cnf(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -588,9 +590,9 @@ switch (event) { case TRX_PROV_EV_CLOSE: /* power off transceiver, if not already */ - if (pinst->num == 0 && plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { - trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); - plink->u.osmotrx.poweronoff_sent = true; + if (pinst->num == 0 && plink->u.osmotrx.powered && !plink->u.osmotrx.poweroff_sent) { + trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); + plink->u.osmotrx.poweroff_sent = true; } trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaf62217ceab7420afa4140cba61e1c2f983c61b4 Gerrit-Change-Number: 25679 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:50:56 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 10:50:56 +0000 Subject: Change in osmo-bsc[master]: fix TSC / TSC Set used for Handover In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25659 ) Change subject: fix TSC / TSC Set used for Handover ...................................................................... Patch Set 2: (2 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25659/2/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/25659/2/include/osmocom/bsc/gsm_data.h at 144 PS2, Line 144: struct optional_val { > I personally don't think it really make sense to have this kind of stuff in libosmocore. IMHO such a define would be bloat, and it'd be more stuff ctags doesn't find. https://gerrit.osmocom.org/c/osmo-bsc/+/25659/2/include/osmocom/bsc/gsm_data.h at 145 PS2, Line 145: use > agree, "valid" sounds like a better name here. for the use i have in mind, it's not interesting whether the value is valid or not, the interesting bit is whether the code should use the value or not. val == 0 would be a valid value, but if the flag is false, then osmo-bsc should rather use a different, default value. So I don't agree with "valid". "present" would be a better match. We also use "present" in BSSMAP message structs for optional IEs. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iae20df4387c3d75752301bd5daeeea7508966393 Gerrit-Change-Number: 25659 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 10:50:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:52:51 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 4 Oct 2021 10:52:51 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Drop impossible paths In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25678 ) Change subject: trx_provision_fsm: Drop impossible paths ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icf00c52e61ddedd8e32eb37223cea5686005e6a3 Gerrit-Change-Number: 25678 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 04 Oct 2021 10:52:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:53:55 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 10:53:55 +0000 Subject: Change in osmo-bsc[master]: fix TSC / TSC Set used for Handover In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25659 to look at the new patch set (#3). Change subject: fix TSC / TSC Set used for Handover ...................................................................... fix TSC / TSC Set used for Handover >From the nature of the lchan_activate_info.tsc_set and .tsc, it is easy to forget to set tsc_set,tsc = -1 to use default TSC Set and TSC values. Handover code is one such instance that forgets to set -1. Change the semantics of tsc_set and tsc so that this kind of error can not happen again as easily: use a separate bool to flag whether to use the default config or explicit values. Implicitly fix the lchan_activate_infos "launched" in handover_fsm.c as well as abis_rsl_chan_rqd_queue_poll(). Related: OS#5244 SYS#4895 Related: I1ed6f068c85b01e5a2d7b5f2651498a1521f89af (osmo-ttcn3-hacks) Change-Id: Iae20df4387c3d75752301bd5daeeea7508966393 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c 6 files changed, 68 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/25659/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iae20df4387c3d75752301bd5daeeea7508966393 Gerrit-Change-Number: 25659 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:55:30 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 10:55:30 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: Check for conn->lchan In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25676 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25676 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 10:55:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:55:39 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 10:55:39 +0000 Subject: Change in osmo-bsc[master]: assignment_fsm: Check for conn->lchan In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25676 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... assignment_fsm: Check for conn->lchan When the SDCCH gets released while the TCH still beeing activated, then the ChanActivACK that is received after the TCH is activated will trigger a segmentation fault in the assignment_fsm. The reason for this is that conn->lchan, which holds the SDCCH at that point in time, is now NULL. To prevent osmo-bsc from crashing, the FSM should check for the presence of conn->lchan first. If it does not exist, the FSM should terminate. (Assignment failed) Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Related: SYS#5627 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 97eb335..07e7239 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -678,6 +678,15 @@ int rc; struct gsm_subscriber_connection *conn = assignment_fi_conn(fi); + /* There may be situations where the SDCCH gets released while the TCH is still being activated. We will then + * receive ChanActivAck message from the BTS when the TCH is ready. Since the SDCCH is already released by + * then conn->lchan will be NULL in this case. */ + if (!conn->lchan) { + assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE, + "Unable to send RR Assignment Command: conn without lchan"); + return; + } + rc = gsm48_send_rr_ass_cmd(conn->lchan, conn->assignment.new_lchan, conn->lchan->ms_power); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25676 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25676 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:59:05 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 4 Oct 2021 10:59:05 +0000 Subject: Change in osmo-ggsn[master]: Introduce program gtp-echo-responder In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 ) Change subject: Introduce program gtp-echo-responder ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibdd6d8f6920571db0c60cf8b3b25d541b15ad3f1 Gerrit-Change-Number: 25652 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 04 Oct 2021 10:59:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 10:59:25 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 10:59:25 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Fix shutdown while POWERON in transit References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25680 ) Change subject: trx_provision_fsm: Fix shutdown while POWERON in transit ...................................................................... trx_provision_fsm: Fix shutdown while POWERON in transit EV_CLOSE in state OPEN_WAIT_POWERON_CNF was not permitted, hence TRX0 was finally moved and kept to state OPEN_POWERON while other TRX were moved OPEN_POWERON->OPEN_WAIT_POWER_CNF: """ 20211004090637640 DL1C <0006> trx_provision_fsm.c:86 TRX_PROV(phy0-0)[0x55fddfb1fda0]{OPEN_POWEROFF}: Received Event TRX_PROV_EV_NOMTXPOWER_CNF 20211004090637640 DL1C <0006> trx_provision_fsm.c:498 TRX_PROV(phy0-0)[0x55fddfb1fda0]{OPEN_POWEROFF}: state_chg to OPEN_WAIT_POWERON_CNF 20211004090637640 DTRX <000b> trx_if.c:256 phy0.0: Enqueuing TRX control command 'CMD POWERON' ... 20211004090637641 DABIS <000d> abis.c:397 E1L(0) Signalling link down ... 20211004090637642 DOML <0001> bts_shutdown_fsm.c:74 BTS_SHUTDOWN(bts0)[0x55fddfb0b4e0]{NONE}: state_chg to WAIT_TRX_CLOSED ... 20211004090637642 DL1C <0006> l1_if.c:191 TRX_PROV(phy0-3)[0x55fddfb238b0]{OPEN_POWERON}: Received Event TRX_PROV_EV_CLOSE 20211004090637642 DL1C <0006> trx_provision_fsm.c:606 TRX_PROV(phy0-3)[0x55fddfb238b0]{OPEN_POWERON}: state_chg to OPEN_WAIT_POWEROFF_CNF 20211004090637642 DOML <0001> l1_if.c:194 NM_RCARRIER_OP(bts0-trx3)[0x55fddfb2ab20]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DOML <0001> l1_if.c:195 NM_BBTRANSC_OP(bts0-trx3)[0x55fddfb2ae00]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DL1C <0006> l1_if.c:191 TRX_PROV(phy0-2)[0x55fddfb22500]{OPEN_POWERON}: Received Event TRX_PROV_EV_CLOSE 20211004090637642 DL1C <0006> trx_provision_fsm.c:606 TRX_PROV(phy0-2)[0x55fddfb22500]{OPEN_POWERON}: state_chg to OPEN_WAIT_POWEROFF_CNF 20211004090637642 DOML <0001> l1_if.c:194 NM_RCARRIER_OP(bts0-trx2)[0x55fddfb27410]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DOML <0001> l1_if.c:195 NM_BBTRANSC_OP(bts0-trx2)[0x55fddfb27660]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DL1C <0006> l1_if.c:191 TRX_PROV(phy0-1)[0x55fddfb21150]{OPEN_POWERON}: Received Event TRX_PROV_EV_CLOSE 20211004090637642 DL1C <0006> trx_provision_fsm.c:606 TRX_PROV(phy0-1)[0x55fddfb21150]{OPEN_POWERON}: state_chg to OPEN_WAIT_POWEROFF_CNF 20211004090637642 DOML <0001> l1_if.c:194 NM_RCARRIER_OP(bts0-trx1)[0x55fddfb23b50]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DOML <0001> l1_if.c:195 NM_BBTRANSC_OP(bts0-trx1)[0x55fddfb23e60]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DL1C <0006> l1_if.c:191 TRX_PROV(phy0-0)[0x55fddfb1fda0]{OPEN_WAIT_POWERON_CNF}: Received Event TRX_PROV_EV_CLOSE 20211004090637642 DL1C <0006> l1_if.c:191 TRX_PROV(phy0-0)[0x55fddfb1fda0]{OPEN_WAIT_POWERON_CNF}: Event TRX_PROV_EV_CLOSE not permitted 20211004090637642 DOML <0001> l1_if.c:194 NM_RCARRIER_OP(bts0-trx0)[0x55fddfb0bb70]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DOML <0001> l1_if.c:195 NM_BBTRANSC_OP(bts0-trx0)[0x55fddfb0be50]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DTRX <000b> trx_if.c:672 phy0.0: Response message: 'RSP POWERON 0' 20211004090637642 DL1C <0006> trx_provision_fsm.c:56 TRX_PROV(phy0-0)[0x55fddfb1fda0]{OPEN_WAIT_POWERON_CNF}: Received Event TRX_PROV_EV_POWERON_CNF """ This left the BTS in an unexpected broken state and TTCN3 tests after this race condition failed. Change-Id: Ic4831201a5be1bc9aff757a9a061c637d98582de --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/80/25680/1 diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 3d7eebf..273b491 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -547,6 +547,14 @@ case TRX_PROV_EV_CFG_TS: update_ts_data(l1h, (struct trx_prov_ev_cfg_ts_data*)data); break; + case TRX_PROV_EV_CLOSE: + /* power off transceiver, if not already */ + if (pinst->num == 0 && !plink->u.osmotrx.poweroff_sent) { + trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); + plink->u.osmotrx.poweroff_sent = true; + } + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF); + break; default: OSMO_ASSERT(0); } @@ -658,10 +666,12 @@ }, [TRX_PROV_ST_OPEN_WAIT_POWERON_CNF] = { .in_event_mask = + X(TRX_PROV_EV_CLOSE) | X(TRX_PROV_EV_POWERON_CNF) | X(TRX_PROV_EV_CFG_TS), .out_state_mask = - X(TRX_PROV_ST_OPEN_POWERON), + X(TRX_PROV_ST_OPEN_POWERON) | + X(TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF), .name = "OPEN_WAIT_POWERON_CNF", .onenter = st_open_wait_power_cnf_on_enter, .action = st_open_wait_power_cnf, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic4831201a5be1bc9aff757a9a061c637d98582de Gerrit-Change-Number: 25680 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:01:02 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 11:01:02 +0000 Subject: Change in osmo-bsc[master]: fix TSC / TSC Set used for Handover In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25659 ) Change subject: fix TSC / TSC Set used for Handover ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25659/2/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/25659/2/include/osmocom/bsc/gsm_data.h at 629 PS2, Line 629: bool ta_known; > Idea for a separate change: use 'struct optional_val' here too. would make sense, but maybe not worth the effort. (the main reason i added struct optional_val for tsc was that i can do foo.tsc = bar.tsc; to copy both value and flag at the same time. Well, and have less comments.) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iae20df4387c3d75752301bd5daeeea7508966393 Gerrit-Change-Number: 25659 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 11:01:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:01:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 11:01:42 +0000 Subject: Change in osmo-bsc[master]: fix TSC / TSC Set used for Handover In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25659 ) Change subject: fix TSC / TSC Set used for Handover ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iae20df4387c3d75752301bd5daeeea7508966393 Gerrit-Change-Number: 25659 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 11:01:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:04:01 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 4 Oct 2021 11:04:01 +0000 Subject: Change in osmocom-bb[master]: 262-10 is "DB Netz AG" and not "DB Systel" In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/25655 ) Change subject: 262-10 is "DB Netz AG" and not "DB Systel" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/25655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idbce4bade4305fabbedcf15c5bd9253fbb371744 Gerrit-Change-Number: 25655 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 04 Oct 2021 11:04:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:04:12 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 11:04:12 +0000 Subject: Change in osmo-bsc[master]: fix TSC / TSC Set used for Handover In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25659 ) Change subject: fix TSC / TSC Set used for Handover ...................................................................... Patch Set 3: Code-Review+2 combine votes -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iae20df4387c3d75752301bd5daeeea7508966393 Gerrit-Change-Number: 25659 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 11:04:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:04:21 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 11:04:21 +0000 Subject: Change in osmo-bsc[master]: fix TSC / TSC Set used for Handover In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25659 ) Change subject: fix TSC / TSC Set used for Handover ...................................................................... fix TSC / TSC Set used for Handover >From the nature of the lchan_activate_info.tsc_set and .tsc, it is easy to forget to set tsc_set,tsc = -1 to use default TSC Set and TSC values. Handover code is one such instance that forgets to set -1. Change the semantics of tsc_set and tsc so that this kind of error can not happen again as easily: use a separate bool to flag whether to use the default config or explicit values. Implicitly fix the lchan_activate_infos "launched" in handover_fsm.c as well as abis_rsl_chan_rqd_queue_poll(). Related: OS#5244 SYS#4895 Related: I1ed6f068c85b01e5a2d7b5f2651498a1521f89af (osmo-ttcn3-hacks) Change-Id: Iae20df4387c3d75752301bd5daeeea7508966393 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c 6 files changed, 68 insertions(+), 44 deletions(-) Approvals: neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 03f210f..21828d4 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -138,6 +138,14 @@ static inline const char *assign_for_name(enum assign_for assign_for) { return get_value_string(assign_for_names, assign_for); } +/* If .present is false, use the default value defined elsewhere. If true, use .val below. + * (A practical benefit of this is that the default initialization sets .present to false, so that even if a .val == 0 + * is a valid value, a struct containing this as member does not need to explicitly set .val = INVALID_VAL_CONSTANT.) */ +struct optional_val { + bool present; + int val; +}; + /* Information retrieved during an Assignment Request from the MSC. This is storage of the Assignment instructions * parsed from the Assignment Request message, to pass on until the gscon and assignment FSMs have decided whether an * Assignment is actually going to be carried out. Should remain unchanged after initial decoding. */ @@ -165,12 +173,12 @@ * target_lchan to it. */ struct gsm_lchan *target_lchan; - /* TSC Set to use, or -1 for automatically determining the TSC Set to use. Valid range is 1 to 4, as described - * in 3GPP TS 45.002. */ - int tsc_set; - /* TSC to use, or -1 for automatically determining the TSC to use. Valid range is 0 to 7, as described in 3GPP - * TS 45.002. */ - int tsc; + /* The TSC Set to use if 'use' is true, otherwise automatically determine the TSC Set value to use. Valid range + * is 1 to 4, as described in 3GPP TS 45.002. */ + struct optional_val tsc_set; + /* The TSC to use if 'use' is true, otherwise automatically determine the TSC value to use. Valid range is 0 to + * 7, as described in 3GPP TS 45.002. */ + struct optional_val tsc; }; /* State of an ongoing Assignment, while the assignment_fsm is still busy. This serves as state separation to keep the @@ -621,12 +629,12 @@ bool ta_known; uint8_t ta; - /* TSC Set to use, or -1 for automatically determining the TSC Set to use. Valid range is 1 to 4, as described - * in 3GPP TS 45.002. */ - int tsc_set; - /* TSC to use, or -1 for automatically determining the TSC to use. Valid range is 0 to 7, as described in 3GPP - * TS 45.002. */ - int tsc; + /* The TSC Set to use if 'use' is true, otherwise automatically determine the TSC Set value to use. Valid range + * is 1 to 4, as described in 3GPP TS 45.002. */ + struct optional_val tsc_set; + /* The TSC to use if 'use' is true, otherwise automatically determine the TSC value to use. Valid range is 0 to + * 7, as described in 3GPP TS 45.002. */ + struct optional_val tsc; bool vamos; @@ -652,12 +660,12 @@ bool requires_voice_stream; uint16_t msc_assigned_cic; - /* TSC Set to use, or -1 for automatically determining the TSC Set to use. Valid range is 1 to 4, as described - * in 3GPP TS 45.002. */ - int tsc_set; - /* TSC to use, or -1 for automatically determining the TSC to use. Valid range is 0 to 7, as described in 3GPP - * TS 45.002. */ - int tsc; + /* The TSC Set to use if 'use' is true, otherwise automatically determine the TSC Set value to use. Valid range + * is 1 to 4, as described in 3GPP TS 45.002. */ + struct optional_val tsc_set; + /* The TSC to use if 'use' is true, otherwise automatically determine the TSC value to use. Valid range is 0 to + * 7, as described in 3GPP TS 45.002. */ + struct optional_val tsc; bool vamos; }; @@ -695,7 +703,9 @@ * occur later, e.g. during release, that we don't send a NACK out of context. */ bool concluded; enum gsm0808_cause gsm0808_error_cause; + /* Actually used TSC Set. */ int tsc_set; + /* Actually used TSC. */ uint8_t tsc; } activate; @@ -709,7 +719,9 @@ struct channel_mode_and_rate ch_mode_rate; struct gsm48_multi_rate_conf mr_conf_filtered; + /* Actually used TSC Set. */ int tsc_set; + /* Actually used TSC. */ uint8_t tsc; bool concluded; } modify; diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index fb8e386..9882252 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2087,8 +2087,6 @@ }, .ta = rqd->ta, .ta_known = true, - .tsc_set = -1, - .tsc = -1, .imm_ass_time = bts->imm_ass_time, }; diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 07e7239..a1b423f 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -452,8 +452,14 @@ .n_ch_mode_rate = 1, .ch_mode_rate_list = { lchan->current_ch_mode_rate }, .target_lchan = to_lchan, - .tsc_set = tsc_set, - .tsc = tsc, + .tsc_set = { + .present = (tsc_set >= 0), + .val = tsc_set, + }, + .tsc = { + .present = (tsc >= 0), + .val = tsc, + }, }; if (to_lchan) @@ -831,8 +837,14 @@ .requires_voice_stream = conn->assignment.requires_voice_stream, .msc_assigned_cic = req->msc_assigned_cic, /* keep previous training sequence code */ - .tsc_set = lchan->tsc_set, - .tsc = lchan->tsc, + .tsc_set = { + .present = (lchan->tsc_set >= 0), + .val = lchan->tsc_set, + }, + .tsc = { + .present = (lchan->tsc >= 0), + .val = lchan->tsc, + }, }; lchan_mode_modify(lchan, &modif_info); } diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 5ccd784..bd61555 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -849,6 +849,7 @@ return CMD_WARNING; } +/* tsc_set and tsc: -1 to automatically determine which TSC Set / which TSC to use. */ static int trigger_vamos_mode_modify(struct vty *vty, struct gsm_lchan *lchan, bool vamos, int tsc_set, int tsc) { struct lchan_modify_info info = { @@ -856,8 +857,14 @@ .ch_mode_rate = lchan->current_ch_mode_rate, .requires_voice_stream = (lchan->fi_rtp != NULL), .vamos = vamos, - .tsc_set = tsc_set, - .tsc = tsc, + .tsc_set = { + .present = (tsc_set >= 0), + .val = tsc_set, + }, + .tsc = { + .present = (tsc >= 0), + .val = tsc, + }, }; lchan_mode_modify(lchan, &info); @@ -1540,10 +1547,7 @@ /* Activate / Deactivate a single lchan with a specific codec mode */ static int lchan_act_single(struct vty *vty, struct gsm_lchan *lchan, const char *codec_str, int amr_mode, int activate) { - struct lchan_activate_info info = { - .tsc_set = -1, - .tsc = -1, - }; + struct lchan_activate_info info = {0}; uint16_t amr_modes[8] = { GSM0808_SC_CFG_AMR_4_75, GSM0808_SC_CFG_AMR_4_75_5_90_7_40_12_20, GSM0808_SC_CFG_AMR_5_90, GSM0808_SC_CFG_AMR_6_70, GSM0808_SC_CFG_AMR_7_40, GSM0808_SC_CFG_AMR_7_95, GSM0808_SC_CFG_AMR_10_2, @@ -1612,8 +1616,12 @@ if (activate == 2 || lchan->vamos.is_secondary) { info.vamos = true; - info.tsc_set = lchan->vamos.is_secondary ? 1 : 0; - info.tsc = 0; + if (lchan->vamos.is_secondary) { + info.tsc_set.present = true; + info.tsc_set.val = 1; + } + info.tsc.present = true; + info.tsc.val = 0; info.ch_mode_rate.chan_mode = gsm48_chan_mode_to_vamos(info.ch_mode_rate.chan_mode); } diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 0faafdb..2f62487 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -714,13 +714,13 @@ /* If enabling VAMOS mode and no specific TSC Set was selected, make sure to select a sane TSC Set by * default: Set 1 for the primary and Set 2 for the shadow lchan. For non-VAMOS lchans, TSC Set 1. */ - if (lchan->activate.info.tsc_set > 0) - lchan->activate.tsc_set = lchan->activate.info.tsc_set; + if (lchan->activate.info.tsc_set.present) + lchan->activate.tsc_set = lchan->activate.info.tsc_set.val; else lchan->activate.tsc_set = lchan->vamos.is_secondary ? 2 : 1; /* Use the TSC provided in the activation request, if any. Otherwise use the timeslot's configured TSC. */ - lchan->activate.tsc = (lchan->activate.info.tsc >= 0) ? lchan->activate.info.tsc : gsm_ts_tsc(lchan->ts); + lchan->activate.tsc = lchan->activate.info.tsc.present ? lchan->activate.info.tsc.val : gsm_ts_tsc(lchan->ts); use_mgwep_ci = lchan_use_mgw_endpoint_ci_bts(lchan); @@ -1095,8 +1095,6 @@ .ch_mode_rate = lchan->modify.ch_mode_rate, .requires_voice_stream = true, .msc_assigned_cic = lchan->modify.info.msc_assigned_cic, - .tsc_set = -1, - .tsc = -1, }; if (lchan_activate_set_ch_mode_rate_and_mr_config(lchan)) return; @@ -1250,14 +1248,14 @@ /* If enabling VAMOS mode and no specific TSC Set was selected, make sure to select a sane TSC Set by * default: Set 1 for the primary and Set 2 for the shadow lchan. For non-VAMOS lchans, TSC Set 1. */ - if (lchan->modify.info.tsc_set > 0) - lchan->modify.tsc_set = lchan->modify.info.tsc_set; + if (lchan->modify.info.tsc_set.present) + lchan->modify.tsc_set = lchan->modify.info.tsc_set.val; else lchan->modify.tsc_set = lchan->vamos.is_secondary ? 2 : 1; /* Use the TSC provided in the modification request, if any. Otherwise use the timeslot's configured * TSC. */ - lchan->modify.tsc = (lchan->modify.info.tsc >= 0) ? lchan->modify.info.tsc : gsm_ts_tsc(lchan->ts); + lchan->modify.tsc = lchan->modify.info.tsc.present ? lchan->modify.info.tsc.val : gsm_ts_tsc(lchan->ts); LOG_LCHAN(lchan, LOGL_INFO, "Modification requested: %s voice=%s MGW-ci=%s type=%s tch-mode=%s tsc=%d/%u\n", diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index d786ec6..aab2514 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -940,8 +940,6 @@ .msc_assigned_cic = cic, .use_osmux = use_osmux, .osmux_cid = osmux_cid, - .tsc_set = -1, - .tsc = -1, }; /* Match codec information from the assignment command against the @@ -968,8 +966,6 @@ req = (struct assignment_request){ .assign_for = ASSIGN_FOR_BSSMAP_REQ, .aoip = aoip, - .tsc_set = -1, - .tsc = -1, }; rc = select_sign_chan(&req, &ct); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25659 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iae20df4387c3d75752301bd5daeeea7508966393 Gerrit-Change-Number: 25659 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:04:49 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 4 Oct 2021 11:04:49 +0000 Subject: Change in osmo-bts[master]: abis: fix memory leak in abis_oml_sendmsg() In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25671 ) Change subject: abis: fix memory leak in abis_oml_sendmsg() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifc46b94b4540705f7d9b4678a7398158f3aaf7c5 Gerrit-Change-Number: 25671 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 11:04:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:09:06 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 4 Oct 2021 11:09:06 +0000 Subject: Change in libosmocore[master]: revisit some calls of strtol(), stroul(), strtoull() In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25347 ) Change subject: revisit some calls of strtol(), stroul(), strtoull() ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ebb06e751c28f7d1cdf328de29cd227a2449391 Gerrit-Change-Number: 25347 Gerrit-PatchSet: 9 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 11:09:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:12:02 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 4 Oct 2021 11:12:02 +0000 Subject: Change in pysim[master]: test please ignore In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/25485 ) Change subject: test please ignore ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25485 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0f04f115bbe1406817ee45be07ba1df1fab53242 Gerrit-Change-Number: 25485 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:15:26 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 11:15:26 +0000 Subject: Change in osmo-bts[master]: abis: reduce logging verbosity in abis_oml_sendmsg() In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25672 ) Change subject: abis: reduce logging verbosity in abis_oml_sendmsg() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25672 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7fc4796161b0e46dbb4cb76e6e145c7dc4a17b1e Gerrit-Change-Number: 25672 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 11:15:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:19:13 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 11:19:13 +0000 Subject: Change in osmo-bts[master]: rsl: prevent race condition during timeslot re-configuration In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25674 ) Change subject: rsl: prevent race condition during timeslot re-configuration ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25674/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/25674/1//COMMIT_MSG at 7 PS1, Line 7: rsl: prevent race condition during timeslot re-configuration please at least briefly explain the nature of the race condition. it takes too long to figure out what you're doing here from reading "endless prose" in OS#5245 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Gerrit-Change-Number: 25674 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Mon, 04 Oct 2021 11:19:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:22:47 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 11:22:47 +0000 Subject: Change in osmo-bts[master]: rsl: prevent race condition during timeslot re-configuration In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25674 ) Change subject: rsl: prevent race condition during timeslot re-configuration ...................................................................... Patch Set 1: ...and nice catch! : ) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Gerrit-Change-Number: 25674 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Mon, 04 Oct 2021 11:22:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:24:54 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 11:24:54 +0000 Subject: Change in libosmocore[master]: revisit some calls of strtol(), stroul(), strtoull() In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25347 ) Change subject: revisit some calls of strtol(), stroul(), strtoull() ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ebb06e751c28f7d1cdf328de29cd227a2449391 Gerrit-Change-Number: 25347 Gerrit-PatchSet: 9 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 11:24:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:24:59 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 11:24:59 +0000 Subject: Change in libosmocore[master]: revisit some calls of strtol(), stroul(), strtoull() In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25347 ) Change subject: revisit some calls of strtol(), stroul(), strtoull() ...................................................................... revisit some calls of strtol(), stroul(), strtoull() Replace some with atoi(), where the VTY has already validated correct range of the argument. Replace others with the new osmo_str_to_int() or osmo_str_to_int64() functions, possibly covering more detection of invalid number strings. Leave those strtol() callers that depend on endptr to provide the next string token. Related: SYS#5542 Change-Id: I0ebb06e751c28f7d1cdf328de29cd227a2449391 --- M src/ctrl/control_if.c M src/gsm/gsm23003.c M src/gsm/gsm23236.c M src/vty/command.c M src/vty/cpu_sched_vty.c M src/vty/tdef_vty.c M utils/osmo-aka-verify.c 7 files changed, 31 insertions(+), 73 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved dexter: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index 5fda28f..bea8496 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -84,20 +84,16 @@ * \returns 1 on success; 0 in case of error */ int ctrl_parse_get_num(vector vline, int i, long *num) { - char *token, *tmp; + char *token; + int64_t val; if (i >= vector_active(vline)) return 0; token = vector_slot(vline, i); - errno = 0; - if (token[0] == '\0') + if (osmo_str_to_int64(&val, token, 10, LONG_MIN, LONG_MAX)) return 0; - - *num = strtol(token, &tmp, 10); - if (tmp[0] != '\0' || errno != 0) - return 0; - + *num = (long)val; return 1; } diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c index c2b3de8..f3c0123 100644 --- a/src/gsm/gsm23003.c +++ b/src/gsm/gsm23003.c @@ -487,22 +487,23 @@ */ int osmo_mnc_from_str(const char *mnc_str, uint16_t *mnc, bool *mnc_3_digits) { - long int _mnc = 0; + int _mnc = 0; bool _mnc_3_digits = false; - char *endptr; int rc = 0; if (!mnc_str || !isdigit((unsigned char)mnc_str[0]) || strlen(mnc_str) > 3) return -EINVAL; - errno = 0; - _mnc = strtol(mnc_str, &endptr, 10); - if (errno) - rc = -errno; - else if (*endptr) + rc = osmo_str_to_int(&_mnc, mnc_str, 10, 0, 999); + /* Heed the API definition to return -EINVAL in case of surplus chars */ + if (rc == -E2BIG) return -EINVAL; - if (_mnc < 0 || _mnc > 999) - return -ERANGE; + /* Heed the API definition to always return negative errno */ + if (rc > 0) + return -rc; + if (rc < 0) + return rc; + _mnc_3_digits = strlen(mnc_str) > 2; if (mnc) diff --git a/src/gsm/gsm23236.c b/src/gsm/gsm23236.c index 01d0eb3..d4a14a5 100644 --- a/src/gsm/gsm23236.c +++ b/src/gsm/gsm23236.c @@ -436,27 +436,13 @@ */ static int osmo_nri_parse(int16_t *dst, const char *str) { - char *endp; - int64_t val; + int val; int base = 10; - - if (osmo_str_startswith(str, "0x")) { - str += 2; + if (osmo_str_startswith(str, "0x")) base = 16; - } - - if (!str || !str[0]) + if (osmo_str_to_int(&val, str, base, 0, INT16_MAX)) return -1; - - errno = 0; - val = strtoull(str, &endp, base); - if (errno || *endp != '\0') - return -1; - - if (val < 0 || val > INT16_MAX) - return -1; - - *dst = val; + *dst = (int16_t)val; return 0; } diff --git a/src/vty/command.c b/src/vty/command.c index e5e7d15..2a8942d 100644 --- a/src/vty/command.c +++ b/src/vty/command.c @@ -1349,7 +1349,6 @@ int colons = 0, nums = 0, double_colon = 0; int mask; const char *sp = NULL; - char *endptr = NULL; if (str == NULL) return PARTLY_MATCH; @@ -1447,11 +1446,7 @@ if (state < STATE_MASK) return PARTLY_MATCH; - mask = strtol(str, &endptr, 10); - if (*endptr != '\0') - return NO_MATCH; - - if (mask < 0 || mask > 128) + if (osmo_str_to_int(&mask, str, 10, 0, 128)) return NO_MATCH; /* I don't know why mask < 13 makes command match partly. @@ -3794,16 +3789,7 @@ "Set number of lines on a screen\n" "Number of lines on screen (0 for no pausing)\n") { - int lines; - char *endptr = NULL; - - lines = strtol(argv[0], &endptr, 10); - if (lines < 0 || lines > 512 || *endptr != '\0') { - vty_out(vty, "length is malformed%s", VTY_NEWLINE); - return CMD_WARNING; - } - vty->lines = lines; - + vty->lines = atoi(argv[0]); return CMD_SUCCESS; } @@ -3822,16 +3808,7 @@ "System wide terminal length configuration\n" "Number of lines of VTY (0 means no line control)\n") { - int lines; - char *endptr = NULL; - - lines = strtol(argv[0], &endptr, 10); - if (lines < 0 || lines > 512 || *endptr != '\0') { - vty_out(vty, "length is malformed%s", VTY_NEWLINE); - return CMD_WARNING; - } - host.lines = lines; - + host.lines = atoi(argv[0]); return CMD_SUCCESS; } diff --git a/src/vty/cpu_sched_vty.c b/src/vty/cpu_sched_vty.c index 4ccc627..0b4b249 100644 --- a/src/vty/cpu_sched_vty.c +++ b/src/vty/cpu_sched_vty.c @@ -276,7 +276,6 @@ static enum sched_vty_thread_id procname2pid(pid_t *res_pid, const char *str, bool applynow) { size_t i, len; - char *end; bool is_pid = true; if (strcmp(str, "all") == 0) { @@ -297,12 +296,12 @@ } } if (is_pid) { - errno = 0; - *res_pid = strtoul(str, &end, 0); - if ((errno == ERANGE && *res_pid == ULONG_MAX) || (errno && !*res_pid) || - str == end) { + int64_t val; + if (osmo_str_to_int64(&val, str, 0, 0, INT64_MAX)) return SCHED_VTY_THREAD_UNKNOWN; - } + *res_pid = (pid_t)val; + if (*res_pid != val) + return SCHED_VTY_THREAD_UNKNOWN; if (!applynow || proc_tid_exists(*res_pid)) return SCHED_VTY_THREAD_ID; else diff --git a/src/vty/tdef_vty.c b/src/vty/tdef_vty.c index 0556d8c..09459f1 100644 --- a/src/vty/tdef_vty.c +++ b/src/vty/tdef_vty.c @@ -50,10 +50,9 @@ */ struct osmo_tdef *osmo_tdef_vty_parse_T_arg(struct vty *vty, struct osmo_tdef *tdefs, const char *T_str) { - long l; + int l; int T; struct osmo_tdef *t; - char *endptr; const char *T_nr_str; int sign = 1; @@ -77,9 +76,7 @@ return NULL; } - errno = 0; - l = strtol(T_nr_str, &endptr, 10); - if (errno || *endptr || l > INT_MAX || l < 0) { + if (osmo_str_to_int(&l, T_nr_str, 10, 0, INT_MAX)) { vty_out(vty, "%% Invalid T timer argument (should be 'T1234' or 'X1234'): '%s'%s", T_str, VTY_NEWLINE); return NULL; } diff --git a/utils/osmo-aka-verify.c b/utils/osmo-aka-verify.c index 086add5..bbc65ef 100644 --- a/utils/osmo-aka-verify.c +++ b/utils/osmo-aka-verify.c @@ -123,6 +123,7 @@ bool opc_is_set = false; bool amf_is_set = false; bool opc_is_op = false; + int64_t val64; while (1) { int c; @@ -169,7 +170,8 @@ amf_is_set = true; break; case 's': - g_sqn = strtoull(optarg, 0, 10); + rc = osmo_str_to_int64(&val64, optarg, 10, 0, INT64_MAX); + g_sqn = (unsigned long long)val64; sqn_is_set = true; break; case 'r': -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25347 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ebb06e751c28f7d1cdf328de29cd227a2449391 Gerrit-Change-Number: 25347 Gerrit-PatchSet: 10 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:29:17 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 11:29:17 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Fix shutdown while POWERON in transit In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25680 ) Change subject: trx_provision_fsm: Fix shutdown while POWERON in transit ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25680/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/25680/1//COMMIT_MSG at 43 PS1, Line 43: this race condition failed. "race condition"? just a missing event handler, right? Long commit log message for such an easily explained bug =) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic4831201a5be1bc9aff757a9a061c637d98582de Gerrit-Change-Number: 25680 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 04 Oct 2021 11:29:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:31:20 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 11:31:20 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: poweronff_sent flag: track POWERON and POWEROFF se... In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25679 ) Change subject: trx_provision_fsm: poweronff_sent flag: track POWERON and POWEROFF separately ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25679/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/25679/1//COMMIT_MSG at 7 PS1, Line 7: trx_provision_fsm: poweronff_sent flag: track POWERON and POWEROFF separately "onoff"? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaf62217ceab7420afa4140cba61e1c2f983c61b4 Gerrit-Change-Number: 25679 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 04 Oct 2021 11:31:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:32:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 11:32:07 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Fix shutdown while POWERON in transit In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25680 ) Change subject: trx_provision_fsm: Fix shutdown while POWERON in transit ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25680/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/25680/1//COMMIT_MSG at 43 PS1, Line 43: this race condition failed. > "race condition"? just a missing event handler, right? [?] I'm happy you see it as an easily explained bug, it took me a while to find out and provide a proper fix :P -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic4831201a5be1bc9aff757a9a061c637d98582de Gerrit-Change-Number: 25680 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 04 Oct 2021 11:32:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:32:29 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 11:32:29 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Drop impossible paths In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25678 ) Change subject: trx_provision_fsm: Drop impossible paths ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icf00c52e61ddedd8e32eb37223cea5686005e6a3 Gerrit-Change-Number: 25678 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 04 Oct 2021 11:32:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:36:16 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 11:36:16 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Drop unneeded reset of fields In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25677 ) Change subject: trx_provision_fsm: Drop unneeded reset of fields ...................................................................... Patch Set 2: trx_provision_reset() is only invoked from st_open_poweroff_on_enter(). It is not clear to me how the fields are always reset. - the part that invokes a poweroff is only one branch of this function. - the poweroff may fail for some reason, so that st_open_poweroff_on_enter() isn't called? are you sure about this? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3e6bc8205704e425644507dd1f1b299dea4cd851 Gerrit-Change-Number: 25677 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-Comment-Date: Mon, 04 Oct 2021 11:36:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:47:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 11:47:56 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Drop unneeded reset of fields In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25677 ) Change subject: trx_provision_fsm: Drop unneeded reset of fields ...................................................................... Patch Set 2: > Patch Set 2: > > trx_provision_reset() is only invoked from st_open_poweroff_on_enter(). > It is not clear to me how the fields are always reset. > > - the part that invokes a poweroff is only one branch of this function. > - the poweroff may fail for some reason, so that st_open_poweroff_on_enter() isn't called? > > are you sure about this? Yes it fine since from TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF one can only move to CLOSED and the back to OPEN_POWEROFF. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3e6bc8205704e425644507dd1f1b299dea4cd851 Gerrit-Change-Number: 25677 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-Comment-Date: Mon, 04 Oct 2021 11:47:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:48:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 11:48:27 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: poweronoff_sent flag: track POWERON and POWEROFF s... In-Reply-To: References: Message-ID: Hello Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25679 to look at the new patch set (#2). Change subject: trx_provision_fsm: poweronoff_sent flag: track POWERON and POWEROFF separately ...................................................................... trx_provision_fsm: poweronoff_sent flag: track POWERON and POWEROFF separately It helps better understanding the code, and will allow handling situations where for instance a POWERON in in transit while the BTS is instructed to shutdown, hence a POWEROFF needs to be sent. Change-Id: Iaf62217ceab7420afa4140cba61e1c2f983c61b4 --- M include/osmo-bts/phy_link.h M src/osmo-bts-trx/trx_provision_fsm.c 2 files changed, 11 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/79/25679/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaf62217ceab7420afa4140cba61e1c2f983c61b4 Gerrit-Change-Number: 25679 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:48:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 11:48:27 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Fix shutdown while POWERON in transit In-Reply-To: References: Message-ID: Hello Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25680 to look at the new patch set (#2). Change subject: trx_provision_fsm: Fix shutdown while POWERON in transit ...................................................................... trx_provision_fsm: Fix shutdown while POWERON in transit EV_CLOSE in state OPEN_WAIT_POWERON_CNF was not permitted, hence TRX0 was finally moved and kept to state OPEN_POWERON while other TRX were moved OPEN_POWERON->OPEN_WAIT_POWER_CNF: """ 20211004090637640 DL1C <0006> trx_provision_fsm.c:86 TRX_PROV(phy0-0)[0x55fddfb1fda0]{OPEN_POWEROFF}: Received Event TRX_PROV_EV_NOMTXPOWER_CNF 20211004090637640 DL1C <0006> trx_provision_fsm.c:498 TRX_PROV(phy0-0)[0x55fddfb1fda0]{OPEN_POWEROFF}: state_chg to OPEN_WAIT_POWERON_CNF 20211004090637640 DTRX <000b> trx_if.c:256 phy0.0: Enqueuing TRX control command 'CMD POWERON' ... 20211004090637641 DABIS <000d> abis.c:397 E1L(0) Signalling link down ... 20211004090637642 DOML <0001> bts_shutdown_fsm.c:74 BTS_SHUTDOWN(bts0)[0x55fddfb0b4e0]{NONE}: state_chg to WAIT_TRX_CLOSED ... 20211004090637642 DL1C <0006> l1_if.c:191 TRX_PROV(phy0-3)[0x55fddfb238b0]{OPEN_POWERON}: Received Event TRX_PROV_EV_CLOSE 20211004090637642 DL1C <0006> trx_provision_fsm.c:606 TRX_PROV(phy0-3)[0x55fddfb238b0]{OPEN_POWERON}: state_chg to OPEN_WAIT_POWEROFF_CNF 20211004090637642 DOML <0001> l1_if.c:194 NM_RCARRIER_OP(bts0-trx3)[0x55fddfb2ab20]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DOML <0001> l1_if.c:195 NM_BBTRANSC_OP(bts0-trx3)[0x55fddfb2ae00]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DL1C <0006> l1_if.c:191 TRX_PROV(phy0-2)[0x55fddfb22500]{OPEN_POWERON}: Received Event TRX_PROV_EV_CLOSE 20211004090637642 DL1C <0006> trx_provision_fsm.c:606 TRX_PROV(phy0-2)[0x55fddfb22500]{OPEN_POWERON}: state_chg to OPEN_WAIT_POWEROFF_CNF 20211004090637642 DOML <0001> l1_if.c:194 NM_RCARRIER_OP(bts0-trx2)[0x55fddfb27410]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DOML <0001> l1_if.c:195 NM_BBTRANSC_OP(bts0-trx2)[0x55fddfb27660]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DL1C <0006> l1_if.c:191 TRX_PROV(phy0-1)[0x55fddfb21150]{OPEN_POWERON}: Received Event TRX_PROV_EV_CLOSE 20211004090637642 DL1C <0006> trx_provision_fsm.c:606 TRX_PROV(phy0-1)[0x55fddfb21150]{OPEN_POWERON}: state_chg to OPEN_WAIT_POWEROFF_CNF 20211004090637642 DOML <0001> l1_if.c:194 NM_RCARRIER_OP(bts0-trx1)[0x55fddfb23b50]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DOML <0001> l1_if.c:195 NM_BBTRANSC_OP(bts0-trx1)[0x55fddfb23e60]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DL1C <0006> l1_if.c:191 TRX_PROV(phy0-0)[0x55fddfb1fda0]{OPEN_WAIT_POWERON_CNF}: Received Event TRX_PROV_EV_CLOSE 20211004090637642 DL1C <0006> l1_if.c:191 TRX_PROV(phy0-0)[0x55fddfb1fda0]{OPEN_WAIT_POWERON_CNF}: Event TRX_PROV_EV_CLOSE not permitted 20211004090637642 DOML <0001> l1_if.c:194 NM_RCARRIER_OP(bts0-trx0)[0x55fddfb0bb70]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DOML <0001> l1_if.c:195 NM_BBTRANSC_OP(bts0-trx0)[0x55fddfb0be50]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DTRX <000b> trx_if.c:672 phy0.0: Response message: 'RSP POWERON 0' 20211004090637642 DL1C <0006> trx_provision_fsm.c:56 TRX_PROV(phy0-0)[0x55fddfb1fda0]{OPEN_WAIT_POWERON_CNF}: Received Event TRX_PROV_EV_POWERON_CNF """ This left the BTS in an unexpected broken state and TTCN3 tests after this race condition failed. Change-Id: Ic4831201a5be1bc9aff757a9a061c637d98582de --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/80/25680/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic4831201a5be1bc9aff757a9a061c637d98582de Gerrit-Change-Number: 25680 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 11:53:29 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 4 Oct 2021 11:53:29 +0000 Subject: Change in osmo-ggsn[master]: Introduce program gtp-echo-responder In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 ) Change subject: Introduce program gtp-echo-responder ...................................................................... Patch Set 6: (8 comments) https://gerrit.osmocom.org/c/osmo-ggsn/+/25652/6/utils/gtp_echo_responder.c File utils/gtp_echo_responder.c: https://gerrit.osmocom.org/c/osmo-ggsn/+/25652/6/utils/gtp_echo_responder.c at 109 PS6, Line 109: " -l --listen-addr Listend address for GTPCv1 and GTPCv2\n" "Listen" (typo). ... or maybe "Address to listen on for ..." https://gerrit.osmocom.org/c/osmo-ggsn/+/25652/6/utils/gtp_echo_responder.c at 128 PS6, Line 128: arg == end) { if arg should not contain trailing characters after the bitmask, you should also add '|| *end', i.e. if the endptr has more characters after conversion https://gerrit.osmocom.org/c/osmo-ggsn/+/25652/6/utils/gtp_echo_responder.c at 151 PS6, Line 151: d '-d' seems nonexistent https://gerrit.osmocom.org/c/osmo-ggsn/+/25652/6/utils/gtp_echo_responder.c at 169 PS6, Line 169: g_st->cfg.recovery_ctr = (uint8_t)atoi(optarg); break (or "/* fall thru */") https://gerrit.osmocom.org/c/osmo-ggsn/+/25652/6/utils/gtp_echo_responder.c at 190 PS6, Line 190: (usually we'd not have a blank line here) https://gerrit.osmocom.org/c/osmo-ggsn/+/25652/6/utils/gtp_echo_responder.c at 225 PS6, Line 225: strcpy(_rem_addr_str, "unknwown"); typo "unknwown" x 3 https://gerrit.osmocom.org/c/osmo-ggsn/+/25652/6/utils/gtp_echo_responder.c at 248 PS6, Line 248: fprintf(stderr, "sendto() short write: %u vs exp %u\n", rc, buf_len); size_t should be indicated as %zu, the compiler should complain about this ... not sure about ssize_t, %zd?? https://gerrit.osmocom.org/c/osmo-ggsn/+/25652/6/utils/gtp_echo_responder.c at 281 PS6, Line 281: /* TS 29.274 sec 8.5 Recovery (Restart Counter) */ (we usually add "3GPP" before "TS") -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibdd6d8f6920571db0c60cf8b3b25d541b15ad3f1 Gerrit-Change-Number: 25652 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-Comment-Date: Mon, 04 Oct 2021 11:53:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 12:07:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 12:07:05 +0000 Subject: Change in osmo-ggsn[master]: Introduce program gtp-echo-responder In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 to look at the new patch set (#7). Change subject: Introduce program gtp-echo-responder ...................................................................... Introduce program gtp-echo-responder This is a small standalone program (under MIT license, hence cannot make use of libosmocore) whose only purpose is to answer GTPC (v1 and v2) Echo Request messages with Echo Reply ones, with information provided from the command line. A small python script companion is provided to easily test the program. Related: SYS#5598 Change-Id: Ibdd6d8f6920571db0c60cf8b3b25d541b15ad3f1 --- M Makefile.am M configure.ac M contrib/osmo-ggsn.spec.in M debian/control M debian/copyright A debian/gtp-echo-responder.install A utils/Makefile.am A utils/gtp_echo_responder.c A utils/gtp_echo_responder_test.py 9 files changed, 619 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/52/25652/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibdd6d8f6920571db0c60cf8b3b25d541b15ad3f1 Gerrit-Change-Number: 25652 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 12:08:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 12:08:57 +0000 Subject: Change in osmo-ggsn[master]: Introduce program gtp-echo-responder In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 ) Change subject: Introduce program gtp-echo-responder ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibdd6d8f6920571db0c60cf8b3b25d541b15ad3f1 Gerrit-Change-Number: 25652 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-CC: neels Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 12:37:23 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 4 Oct 2021 12:37:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: f_TRXC_transceive(): accept 'template (value)' parameter In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25668 ) Change subject: f_TRXC_transceive(): accept 'template (value)' parameter ...................................................................... f_TRXC_transceive(): accept 'template (value)' parameter Change-Id: I98012607f3e9da71234333aac77d59936cd3ee20 Related: OS#5245 --- M bts/BTS_Tests.ttcn M library/TRXC_CodecPort.ttcn 2 files changed, 9 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 616ca34..44d9de4 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -584,10 +584,10 @@ f_init_trxc(BTS_TRXC, id, g_bts_trxc_conn_id); /* Start with a default moderate timing offset equalling TA=2, and RSSI=-60 */ - ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(2*256))); - ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_RSSI(-60))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_TIMING(2*256)); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_RSSI(-60)); /* OsmoBTS may have different AB / NB threshold (see MIN_QUAL_NORM, MIN_QUAL_RACH) */ - ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_CI(60))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_CI(60)); } /* Wait some extra time to make sure the BTS emits a stable carrier. @@ -708,12 +708,12 @@ private function f_trxc_fake_rssi(TRXC_RSSI rssi) runs on ConnHdlr { var TrxcMessage ret; - ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_RSSI(rssi))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_RSSI(rssi)); } private function f_trxc_fake_toffs256(int16_t toffs256) runs on ConnHdlr { var TrxcMessage ret; - ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_TIMING(toffs256)); } /* first function started in ConnHdlr component */ @@ -1729,7 +1729,7 @@ private function f_rach_toffs(int16_t toffs256, boolean expect_pass) runs on test_CT { var TrxcMessage ret; /* tell fake_trx to use a given timing offset for all bursts */ - ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(toffs256))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_TIMING(toffs256)); f_sleep(0.5); /* Transmit RACH request + wait for confirmation */ @@ -5391,8 +5391,7 @@ for (var int16_t i := -256; i <= 1280; i := i + 128) { var TrxcMessage ret; - ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, - valueof(ts_TRXC_FAKE_CI(i))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_CI(i)); /* FIXME: OsmoBTS may have different threshold (see MIN_QUAL_NORM) */ f_TC_pcu_data_ind_lqual_cb(i, thresh := 0); diff --git a/library/TRXC_CodecPort.ttcn b/library/TRXC_CodecPort.ttcn index 09b2977..bb2193f 100644 --- a/library/TRXC_CodecPort.ttcn +++ b/library/TRXC_CodecPort.ttcn @@ -59,7 +59,8 @@ msg := msg } -function f_TRXC_transceive(TRXC_CODEC_PT pt, ConnectionId conn_id, TrxcMessage tx, +function f_TRXC_transceive(TRXC_CODEC_PT pt, ConnectionId conn_id, + template (value) TrxcMessage tx, template TrxcMessage tr := ?) return TrxcMessage { var TRXC_RecvFrom rf; timer T := 3.0; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I98012607f3e9da71234333aac77d59936cd3ee20 Gerrit-Change-Number: 25668 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 12:37:23 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 4 Oct 2021 12:37:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/TRXC_Types: add definitions for FAKE_TRXC_DELAY In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25669 ) Change subject: library/TRXC_Types: add definitions for FAKE_TRXC_DELAY ...................................................................... library/TRXC_Types: add definitions for FAKE_TRXC_DELAY Change-Id: Ic5034f244374d4368d4fcb9a382c984cc730c408 Related: OS#5245 --- M library/TRXC_Types.ttcn 1 file changed, 9 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/TRXC_Types.ttcn b/library/TRXC_Types.ttcn index b67243b..aaa58ee 100644 --- a/library/TRXC_Types.ttcn +++ b/library/TRXC_Types.ttcn @@ -19,9 +19,9 @@ type charstring TrxcVerb ("POWERON", "POWEROFF", "CLOCK", "RXTUNE", "TXTUNE", "SETSLOT", "SETTSC", "SETBSIC", "SETPOWER", "SETMAXDLY", "SETMAXDLYNB", "SETSLOT", "HANDOVER", "NOHANDOVER", - "MEASURE", "FAKE_RSSI", "FAKE_TOA", "FAKE_CI" ) with { + "MEASURE", "FAKE_RSSI", "FAKE_TOA", "FAKE_CI", "FAKE_TRXC_DELAY") with { variant "TEXT_CODING(,convert=upper_case, - '((POWERON)|(POWEROFF)|(CLOCK)|(RXTUNE)|(TXTUNE)|(SETSLOT)|(SETTSC)|(SETBSIC)|(SETPOWER)|(SETMAXDLY)|(SETMAXDLYNB)|(HANDOVER)|(NOHANDOVER)|(MEASURE)|(FAKE_RSSI)|(FAKE_TOA)|(FAKE_CI))' + '((POWERON)|(POWEROFF)|(CLOCK)|(RXTUNE)|(TXTUNE)|(SETSLOT)|(SETTSC)|(SETBSIC)|(SETPOWER)|(SETMAXDLY)|(SETMAXDLYNB)|(HANDOVER)|(NOHANDOVER)|(MEASURE)|(FAKE_RSSI)|(FAKE_TOA)|(FAKE_CI)|(FAKE_TRXC_DELAY))' ,case_insensitive)" } @@ -93,5 +93,12 @@ } } +template (value) TrxcMessage ts_TRXC_FAKE_TRXC_DELAY(integer delay_ms := 0) := { + cmd := { + verb := "FAKE_TRXC_DELAY", + params := { int2str(delay_ms) } + } +} + } with { encode "TEXT" } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic5034f244374d4368d4fcb9a382c984cc730c408 Gerrit-Change-Number: 25669 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 12:37:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 4 Oct 2021 12:37:24 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS: reproduce a race condition described in OS#5245 In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25670 ) Change subject: BTS: reproduce a race condition described in OS#5245 ...................................................................... BTS: reproduce a race condition described in OS#5245 Change-Id: I3b602ac9dbe0ab3e80eb30de573c9b48a79872d8 Depends: Idb1ef445bc14a6312f08a83ecacc3a938b0e1d70 Related: OS#5245 --- M bts/BTS_Tests.ttcn 1 file changed, 68 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 44d9de4..6753eec 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -6281,6 +6281,72 @@ vc_conn.done; } +/* Reproduce a race condition described in OS#5245 */ +private function f_rsl_chan_act_deact(charstring id) runs on ConnHdlr { + f_rsl_chan_act(g_pars.chan_mode); + f_sleep(1.0); + f_rsl_chan_deact(); + setverdict(pass); +} +testcase TC_dyn_osmo_pdch_tchh_race_act() runs on test_CT { + var ConnHdlrPars pars[2]; + var ConnHdlr vc_conn[2]; + var TrxcMessage rsp; + + f_init(); + + /* Configure an artificial delay of 200 ms for TRXC RSP messages */ + rsp := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, + ts_TRXC_FAKE_TRXC_DELAY(200)); + + /* Activate all sub-channels of TCH/H on TS4 immediately in hope that the second + * CHANnel ACTIVation message will be handled before the PHY responds to 'SETSLOT' */ + for (var integer i := 0; i < sizeof(pars); i := i + 1) { + /* TS4 is an Osmocom style dynamic timeslot, we want it to be TCH/H */ + pars[i] := valueof(t_Pars(t_RslChanNr_Lm(4, i), ts_RSL_ChanMode_SIGN)); + vc_conn[i] := f_start_handler(refers(f_rsl_chan_act_deact), + pars[i], l1ctl := false); + } + + /* Wait for all components to finish */ + for (var integer i := 0; i < sizeof(pars); i := i + 1) { + vc_conn[i].done; + } + + /* Disable the artificial delay for TRXC RSP messages */ + rsp := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, + ts_TRXC_FAKE_TRXC_DELAY(0)); +} +testcase TC_dyn_osmo_pdch_sdcch8_race_act() runs on test_CT { + var ConnHdlrPars pars[8]; + var ConnHdlr vc_conn[8]; + var TrxcMessage rsp; + + f_init(); + + /* Configure an artificial delay of 200 ms for TRXC RSP messages */ + rsp := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, + ts_TRXC_FAKE_TRXC_DELAY(200)); + + /* Activate all sub-channels of SDCCH/8 on TS4 immediately in hope that subsequent + * CHANnel ACTIVation messages will be handled before the PHY responds to 'SETSLOT' */ + for (var integer i := 0; i < sizeof(pars); i := i + 1) { + /* TS4 is an Osmocom style dynamic timeslot, we want it to be SDCCH/8 */ + pars[i] := valueof(t_Pars(t_RslChanNr_SDCCH8(4, i), ts_RSL_ChanMode_SIGN)); + vc_conn[i] := f_start_handler(refers(f_rsl_chan_act_deact), + pars[i], l1ctl := false); + } + + /* Wait for all components to finish */ + for (var integer i := 0; i < sizeof(pars); i := i + 1) { + vc_conn[i].done; + } + + /* Disable the artificial delay for TRXC RSP messages */ + rsp := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, + ts_TRXC_FAKE_TRXC_DELAY(0)); +} + /*********************************************************************** * IPA Style Dynamic Timeslot Support ***********************************************************************/ @@ -7915,6 +7981,8 @@ execute( TC_dyn_osmo_pdch_tchf_act() ); execute( TC_dyn_osmo_pdch_tchh_act() ); execute( TC_dyn_osmo_pdch_sdcch8_act() ); + execute( TC_dyn_osmo_pdch_tchh_race_act() ); + execute( TC_dyn_osmo_pdch_sdcch8_race_act() ); execute( TC_dyn_ipa_pdch_tchf_act() ); execute( TC_dyn_ipa_pdch_tchf_act_pdch_act_nack() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25670 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3b602ac9dbe0ab3e80eb30de573c9b48a79872d8 Gerrit-Change-Number: 25670 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 12:37:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 4 Oct 2021 12:37:51 +0000 Subject: Change in libosmocore[master]: utils: remove misleading comments for osmo_hexdump[_nospc]_c() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25666 ) Change subject: utils: remove misleading comments for osmo_hexdump[_nospc]_c() ...................................................................... utils: remove misleading comments for osmo_hexdump[_nospc]_c() The buffer is allocated dynamically on heap, so there is no such limitation of 4096 bytes / 1365 characters. Change-Id: I960dd6a53123fd4209ef6e61dcd0d22e4005e397 --- M src/utils.c 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: keith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/utils.c b/src/utils.c index 2b21dcc..c180595 100644 --- a/src/utils.c +++ b/src/utils.c @@ -407,9 +407,6 @@ * * This function will print a sequence of bytes as hexadecimal numbers, * adding one space character between each byte (e.g. "1a ef d9") - * - * The maximum size of the output buffer is 4096 bytes, i.e. the maximum - * number of input bytes that can be printed in one call is 1365! */ char *osmo_hexdump_c(const void *ctx, const unsigned char *buf, int len) { @@ -446,9 +443,6 @@ * * This function will print a sequence of bytes as hexadecimal numbers, * without any space character between each byte (e.g. "1aefd9") - * - * The maximum size of the output buffer is 4096 bytes, i.e. the maximum - * number of input bytes that can be printed in one call is 2048! */ char *osmo_hexdump_nospc_c(const void *ctx, const unsigned char *buf, int len) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25666 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I960dd6a53123fd4209ef6e61dcd0d22e4005e397 Gerrit-Change-Number: 25666 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 12:43:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 4 Oct 2021 12:43:57 +0000 Subject: Change in osmo-bts[master]: abis: fix memory leak in abis_oml_sendmsg() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25671 ) Change subject: abis: fix memory leak in abis_oml_sendmsg() ...................................................................... Patch Set 1: FYI: I discovered this memleak by printing full talloc report on shutdown. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifc46b94b4540705f7d9b4678a7398158f3aaf7c5 Gerrit-Change-Number: 25671 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 12:43:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 12:44:05 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 4 Oct 2021 12:44:05 +0000 Subject: Change in osmo-bts[master]: abis: fix memory leak in abis_oml_sendmsg() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25671 ) Change subject: abis: fix memory leak in abis_oml_sendmsg() ...................................................................... abis: fix memory leak in abis_oml_sendmsg() Change-Id: Ifc46b94b4540705f7d9b4678a7398158f3aaf7c5 Fixes: Iecd3c7cb96f5fff3b4c7e04c74e031df0f7a6987 --- M src/common/abis.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/abis.c b/src/common/abis.c index f1fb10c..c0cd18c 100644 --- a/src/common/abis.c +++ b/src/common/abis.c @@ -324,6 +324,7 @@ if (!bts->oml_link) { LOGP(DABIS, LOGL_INFO, "Drop Tx OML msg, OML link is down\n"); + msgb_free(msg); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifc46b94b4540705f7d9b4678a7398158f3aaf7c5 Gerrit-Change-Number: 25671 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 12:46:30 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 4 Oct 2021 12:46:30 +0000 Subject: Change in osmo-bts[master]: rsl: prevent race condition during timeslot re-configuration In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25674 ) Change subject: rsl: prevent race condition during timeslot re-configuration ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25674/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/25674/1//COMMIT_MSG at 7 PS1, Line 7: rsl: prevent race condition during timeslot re-configuration > please at least briefly explain the nature of the race condition. [?] Hehe :) I will update the commit message soon. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Gerrit-Change-Number: 25674 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Mon, 04 Oct 2021 12:46:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 13:01:50 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 4 Oct 2021 13:01:50 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Drop unneeded reset of fields In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25677 ) Change subject: trx_provision_fsm: Drop unneeded reset of fields ...................................................................... Patch Set 2: Code-Review+1 You know your FSMs better, so I trust you :) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3e6bc8205704e425644507dd1f1b299dea4cd851 Gerrit-Change-Number: 25677 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-CC: neels Gerrit-Comment-Date: Mon, 04 Oct 2021 13:01:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 13:47:03 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 4 Oct 2021 13:47:03 +0000 Subject: Change in simtrace2[master]: contrib/jenkins.sh: lower trace to make bl fit In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25606 ) Change subject: contrib/jenkins.sh: lower trace to make bl fit ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/simtrace2/+/25606/2/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/c/simtrace2/+/25606/2/contrib/jenkins.sh at 48 PS2, Line 48: fi > good idea. No, apps cannot get too big, this only affects the bootloader, and is a fix for gcc versions that keep producing bigger binaries every year. trace for the bl is useless anyway. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7d2947c84097035bed00ad489a175d614b4c388e Gerrit-Change-Number: 25606 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 04 Oct 2021 13:47:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 13:48:39 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 4 Oct 2021 13:48:39 +0000 Subject: Change in osmo-bts[master]: osmo-trx: fix maxdly In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25619 ) Change subject: osmo-trx: fix maxdly ...................................................................... Patch Set 1: I've mixed up my ticket and other issues here, this was originally part of an attempt to increase the max delay beyond the usual TA range, and then got tangled up with other issues and turned into a ticket. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Gerrit-Change-Number: 25619 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 04 Oct 2021 13:48:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 13:48:41 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 4 Oct 2021 13:48:41 +0000 Subject: Change in osmo-bts[master]: osmo-trx: fix maxdly In-Reply-To: References: Message-ID: Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25619 ) Change subject: osmo-trx: fix maxdly ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Gerrit-Change-Number: 25619 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 13:51:24 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 4 Oct 2021 13:51:24 +0000 Subject: Change in osmo-ccid-firmware[master]: sychronize atmel start config with the headers In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25612 ) Change subject: sychronize atmel start config with the headers ...................................................................... Patch Set 2: Yes, it doesn't change anything, the whole config was just a inconsistent mess that got mostly overriden due to the dynamic baud rate calculation anyway, and capitalization differences. -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ib21847f6726920e3f97600a347f2a16f957a5e8e Gerrit-Change-Number: 25612 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 04 Oct 2021 13:51:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:02:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 4 Oct 2021 14:02:56 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: poweronoff_sent flag: track POWERON and POWEROFF s... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25679 ) Change subject: trx_provision_fsm: poweronoff_sent flag: track POWERON and POWEROFF separately ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaf62217ceab7420afa4140cba61e1c2f983c61b4 Gerrit-Change-Number: 25679 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 04 Oct 2021 14:02:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:04:25 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 4 Oct 2021 14:04:25 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Fix shutdown while POWERON in transit In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25680 ) Change subject: trx_provision_fsm: Fix shutdown while POWERON in transit ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic4831201a5be1bc9aff757a9a061c637d98582de Gerrit-Change-Number: 25680 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Mon, 04 Oct 2021 14:04:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:05:39 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 4 Oct 2021 14:05:39 +0000 Subject: Change in libosmocore[master]: gsmtap: allow 127.0.0.x local listeners In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25622 ) Change subject: gsmtap: allow 127.0.0.x local listeners ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/25622/1/src/socket.c File src/socket.c: https://gerrit.osmocom.org/c/libosmocore/+/25622/1/src/socket.c at 1141 PS1, Line 1141: uint32_t address = ((struct sockaddr_in *)a)->sin_addr.s_addr; /* already BE */ > what about ipv6? no, see the check above https://gerrit.osmocom.org/c/libosmocore/+/25622/1/src/socket.c at 1160 PS1, Line 1160: if (sockaddr_is_local_routed(addr)) > IIRC the 127.0.0. [?] the function itself does all the work including the check, as it should. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1043dfd8075f14481011f43db45c943e9320413c Gerrit-Change-Number: 25622 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 04 Oct 2021 14:05:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:07:00 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 4 Oct 2021 14:07:00 +0000 Subject: Change in libosmocore[master]: gsmtap: allow 127.0.0.x local listeners In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/25622 to look at the new patch set (#2). Change subject: gsmtap: allow 127.0.0.x local listeners ...................................................................... gsmtap: allow 127.0.0.x local listeners Even if not bound to a IF they just exist and work as expected, and make distinguishing traffic for local setups easy. Change-Id: I1043dfd8075f14481011f43db45c943e9320413c --- M src/socket.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/22/25622/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1043dfd8075f14481011f43db45c943e9320413c Gerrit-Change-Number: 25622 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:08:40 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 4 Oct 2021 14:08:40 +0000 Subject: Change in osmo-bts[master]: rsl: remove redundant logging in rsl_rx_chan_activ() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25673 ) Change subject: rsl: remove redundant logging in rsl_rx_chan_activ() ...................................................................... rsl: remove redundant logging in rsl_rx_chan_activ() The first check in this function ensures that the state is NONE. Therefore it does not make sense to print it below.. Change-Id: I62ea4117dd5e1eebb8774809134e5cb73774945c --- M src/common/rsl.c 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index d50983d..507a7cf 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1651,9 +1651,6 @@ } } - LOGPLCHAN(lchan, DRSL, LOGL_DEBUG, "rx Channel Activation in state: %s.\n", - gsm_lchans_name(lchan->state)); - /* Initialize MS Power Control defaults */ lchan->ms_power_ctrl = (struct lchan_power_ctrl_state) { .max = ms_pwr_ctl_lvl(lchan->ts->trx->bts->band, 0), -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I62ea4117dd5e1eebb8774809134e5cb73774945c Gerrit-Change-Number: 25673 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:14:02 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 4 Oct 2021 14:14:02 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: support setting artificial delay for TRXC In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/25667 ) Change subject: trx_toolkit: support setting artificial delay for TRXC ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmocom-bb/+/25667/1/src/target/trx_toolkit/ctrl_if.py File src/target/trx_toolkit/ctrl_if.py: https://gerrit.osmocom.org/c/osmocom-bb/+/25667/1/src/target/trx_toolkit/ctrl_if.py at 95 PS1, Line 95: time.sleep(self.rsp_delay_ms / 1000.0) > just to be sure, is this will block the thread, so this is always used when trxdata is still not ong [?] Everything is handled in a single thread, except the clock generator. So yes, if we sleep() here, then everything gets blocked including TRXD. However, I don't expect this feature to be used for anything else than reproducing weird race conditions... Not critical IMO. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/25667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idb1ef445bc14a6312f08a83ecacc3a938b0e1d70 Gerrit-Change-Number: 25667 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 14:14:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:25:39 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 4 Oct 2021 14:25:39 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Drop unneeded reset of fields In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25677 ) Change subject: trx_provision_fsm: Drop unneeded reset of fields ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3e6bc8205704e425644507dd1f1b299dea4cd851 Gerrit-Change-Number: 25677 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 04 Oct 2021 14:25:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:29:31 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 4 Oct 2021 14:29:31 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: poweronoff_sent flag: track POWERON and POWEROFF s... In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25679 ) Change subject: trx_provision_fsm: poweronoff_sent flag: track POWERON and POWEROFF separately ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaf62217ceab7420afa4140cba61e1c2f983c61b4 Gerrit-Change-Number: 25679 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 04 Oct 2021 14:29:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:33:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 14:33:03 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Drop unneeded reset of fields In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25677 ) Change subject: trx_provision_fsm: Drop unneeded reset of fields ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3e6bc8205704e425644507dd1f1b299dea4cd851 Gerrit-Change-Number: 25677 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 14:33:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:33:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 14:33:06 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: poweronoff_sent flag: track POWERON and POWEROFF s... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25679 ) Change subject: trx_provision_fsm: poweronoff_sent flag: track POWERON and POWEROFF separately ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaf62217ceab7420afa4140cba61e1c2f983c61b4 Gerrit-Change-Number: 25679 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 14:33:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:33:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 14:33:10 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Drop unneeded reset of fields In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25677 ) Change subject: trx_provision_fsm: Drop unneeded reset of fields ...................................................................... trx_provision_fsm: Drop unneeded reset of fields Since recently, reset of all fields is already properly done in trx_provision_reset(). Change-Id: I3e6bc8205704e425644507dd1f1b299dea4cd851 --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 52736ad..758789d 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -584,7 +584,6 @@ struct phy_instance *pinst = l1h->phy_inst; struct phy_link *plink = pinst->phy_link; struct trx_prov_ev_cfg_ts_data* ts_data; - uint8_t tn; switch (event) { case TRX_PROV_EV_CLOSE: @@ -594,11 +593,6 @@ trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); plink->u.osmotrx.poweronoff_sent = true; } - l1h->config.rxgain_sent = false; - l1h->config.maxdly_sent = false; - l1h->config.maxdlynb_sent = false; - for (tn = 0; tn < TRX_NR_TS; tn++) - l1h->config.setslot_sent[tn] = false; } else if (!pinst->phy_link->u.osmotrx.poweronoff_sent) { bts_model_trx_close_cb(pinst->trx, 0); } /* else: poweroff in progress, cb will be called upon TRXC RSP */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3e6bc8205704e425644507dd1f1b299dea4cd851 Gerrit-Change-Number: 25677 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:33:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 14:33:12 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Drop impossible paths In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25678 ) Change subject: trx_provision_fsm: Drop impossible paths ...................................................................... trx_provision_fsm: Drop impossible paths config.enabled is always true in that state. Hence, those paths can be securely dropped since only add confusion. Change-Id: Icf00c52e61ddedd8e32eb37223cea5686005e6a3 --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 2 insertions(+), 7 deletions(-) Approvals: neels: Looks good to me, approved dexter: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 758789d..4ea6758 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -588,15 +588,10 @@ switch (event) { case TRX_PROV_EV_CLOSE: /* power off transceiver, if not already */ - if (l1h->config.enabled) { - if (pinst->num == 0 && plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { + if (pinst->num == 0 && plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); plink->u.osmotrx.poweronoff_sent = true; - } - } else if (!pinst->phy_link->u.osmotrx.poweronoff_sent) { - bts_model_trx_close_cb(pinst->trx, 0); - } /* else: poweroff in progress, cb will be called upon TRXC RSP */ - + } trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF); break; case TRX_PROV_EV_CFG_TS: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icf00c52e61ddedd8e32eb37223cea5686005e6a3 Gerrit-Change-Number: 25678 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:33:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 14:33:12 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: poweronoff_sent flag: track POWERON and POWEROFF s... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25679 ) Change subject: trx_provision_fsm: poweronoff_sent flag: track POWERON and POWEROFF separately ...................................................................... trx_provision_fsm: poweronoff_sent flag: track POWERON and POWEROFF separately It helps better understanding the code, and will allow handling situations where for instance a POWERON in in transit while the BTS is instructed to shutdown, hence a POWEROFF needs to be sent. Change-Id: Iaf62217ceab7420afa4140cba61e1c2f983c61b4 --- M include/osmo-bts/phy_link.h M src/osmo-bts-trx/trx_provision_fsm.c 2 files changed, 11 insertions(+), 8 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index ac38c28..862ed48 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -50,7 +50,8 @@ bool use_legacy_setbsic; uint8_t trxd_pdu_ver_max; /* Maximum TRXD PDU version to negotiate */ bool powered; /* last POWERON (true) or POWEROFF (false) confirmed */ - bool poweronoff_sent; /* is there a POWERON/POWEROFF in transit? (one or the other based on ->powered) */ + bool poweron_sent; /* is there a POWERON in transit? */ + bool poweroff_sent; /* is there a POWEROFF in transit? */ } osmotrx; struct { char *mcast_dev; /* Network device for multicast */ diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 4ea6758..3d7eebf 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -50,12 +50,14 @@ struct phy_link *plink = pinst->phy_link; plink->u.osmotrx.powered = poweronoff; - plink->u.osmotrx.poweronoff_sent = false; - if (poweronoff) + if (poweronoff) { + plink->u.osmotrx.poweron_sent = false; osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWERON_CNF, (void*)(intptr_t)rc); - else + } else { + plink->u.osmotrx.poweroff_sent = false; osmo_fsm_inst_dispatch(l1h->provision_fi, TRX_PROV_EV_POWEROFF_CNF, (void*)(intptr_t)rc); + } } @@ -520,7 +522,7 @@ struct phy_instance *pinst = l1h->phy_inst; trx_if_cmd_poweron(l1h, l1if_poweronoff_cb); - pinst->phy_link->u.osmotrx.poweronoff_sent = true; + pinst->phy_link->u.osmotrx.poweron_sent = true; } static void st_open_wait_power_cnf(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -588,9 +590,9 @@ switch (event) { case TRX_PROV_EV_CLOSE: /* power off transceiver, if not already */ - if (pinst->num == 0 && plink->u.osmotrx.powered && !plink->u.osmotrx.poweronoff_sent) { - trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); - plink->u.osmotrx.poweronoff_sent = true; + if (pinst->num == 0 && plink->u.osmotrx.powered && !plink->u.osmotrx.poweroff_sent) { + trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); + plink->u.osmotrx.poweroff_sent = true; } trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaf62217ceab7420afa4140cba61e1c2f983c61b4 Gerrit-Change-Number: 25679 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:33:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 14:33:12 +0000 Subject: Change in osmo-bts[master]: trx_provision_fsm: Fix shutdown while POWERON in transit In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25680 ) Change subject: trx_provision_fsm: Fix shutdown while POWERON in transit ...................................................................... trx_provision_fsm: Fix shutdown while POWERON in transit EV_CLOSE in state OPEN_WAIT_POWERON_CNF was not permitted, hence TRX0 was finally moved and kept to state OPEN_POWERON while other TRX were moved OPEN_POWERON->OPEN_WAIT_POWER_CNF: """ 20211004090637640 DL1C <0006> trx_provision_fsm.c:86 TRX_PROV(phy0-0)[0x55fddfb1fda0]{OPEN_POWEROFF}: Received Event TRX_PROV_EV_NOMTXPOWER_CNF 20211004090637640 DL1C <0006> trx_provision_fsm.c:498 TRX_PROV(phy0-0)[0x55fddfb1fda0]{OPEN_POWEROFF}: state_chg to OPEN_WAIT_POWERON_CNF 20211004090637640 DTRX <000b> trx_if.c:256 phy0.0: Enqueuing TRX control command 'CMD POWERON' ... 20211004090637641 DABIS <000d> abis.c:397 E1L(0) Signalling link down ... 20211004090637642 DOML <0001> bts_shutdown_fsm.c:74 BTS_SHUTDOWN(bts0)[0x55fddfb0b4e0]{NONE}: state_chg to WAIT_TRX_CLOSED ... 20211004090637642 DL1C <0006> l1_if.c:191 TRX_PROV(phy0-3)[0x55fddfb238b0]{OPEN_POWERON}: Received Event TRX_PROV_EV_CLOSE 20211004090637642 DL1C <0006> trx_provision_fsm.c:606 TRX_PROV(phy0-3)[0x55fddfb238b0]{OPEN_POWERON}: state_chg to OPEN_WAIT_POWEROFF_CNF 20211004090637642 DOML <0001> l1_if.c:194 NM_RCARRIER_OP(bts0-trx3)[0x55fddfb2ab20]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DOML <0001> l1_if.c:195 NM_BBTRANSC_OP(bts0-trx3)[0x55fddfb2ae00]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DL1C <0006> l1_if.c:191 TRX_PROV(phy0-2)[0x55fddfb22500]{OPEN_POWERON}: Received Event TRX_PROV_EV_CLOSE 20211004090637642 DL1C <0006> trx_provision_fsm.c:606 TRX_PROV(phy0-2)[0x55fddfb22500]{OPEN_POWERON}: state_chg to OPEN_WAIT_POWEROFF_CNF 20211004090637642 DOML <0001> l1_if.c:194 NM_RCARRIER_OP(bts0-trx2)[0x55fddfb27410]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DOML <0001> l1_if.c:195 NM_BBTRANSC_OP(bts0-trx2)[0x55fddfb27660]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DL1C <0006> l1_if.c:191 TRX_PROV(phy0-1)[0x55fddfb21150]{OPEN_POWERON}: Received Event TRX_PROV_EV_CLOSE 20211004090637642 DL1C <0006> trx_provision_fsm.c:606 TRX_PROV(phy0-1)[0x55fddfb21150]{OPEN_POWERON}: state_chg to OPEN_WAIT_POWEROFF_CNF 20211004090637642 DOML <0001> l1_if.c:194 NM_RCARRIER_OP(bts0-trx1)[0x55fddfb23b50]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DOML <0001> l1_if.c:195 NM_BBTRANSC_OP(bts0-trx1)[0x55fddfb23e60]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DL1C <0006> l1_if.c:191 TRX_PROV(phy0-0)[0x55fddfb1fda0]{OPEN_WAIT_POWERON_CNF}: Received Event TRX_PROV_EV_CLOSE 20211004090637642 DL1C <0006> l1_if.c:191 TRX_PROV(phy0-0)[0x55fddfb1fda0]{OPEN_WAIT_POWERON_CNF}: Event TRX_PROV_EV_CLOSE not permitted 20211004090637642 DOML <0001> l1_if.c:194 NM_RCARRIER_OP(bts0-trx0)[0x55fddfb0bb70]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DOML <0001> l1_if.c:195 NM_BBTRANSC_OP(bts0-trx0)[0x55fddfb0be50]{DISABLED_OFFLINE}: Received Event DISABLE 20211004090637642 DTRX <000b> trx_if.c:672 phy0.0: Response message: 'RSP POWERON 0' 20211004090637642 DL1C <0006> trx_provision_fsm.c:56 TRX_PROV(phy0-0)[0x55fddfb1fda0]{OPEN_WAIT_POWERON_CNF}: Received Event TRX_PROV_EV_POWERON_CNF """ This left the BTS in an unexpected broken state and TTCN3 tests after this race condition failed. Change-Id: Ic4831201a5be1bc9aff757a9a061c637d98582de --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: neels: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 3d7eebf..273b491 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -547,6 +547,14 @@ case TRX_PROV_EV_CFG_TS: update_ts_data(l1h, (struct trx_prov_ev_cfg_ts_data*)data); break; + case TRX_PROV_EV_CLOSE: + /* power off transceiver, if not already */ + if (pinst->num == 0 && !plink->u.osmotrx.poweroff_sent) { + trx_if_cmd_poweroff(l1h, l1if_poweronoff_cb); + plink->u.osmotrx.poweroff_sent = true; + } + trx_prov_fsm_state_chg(fi, TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF); + break; default: OSMO_ASSERT(0); } @@ -658,10 +666,12 @@ }, [TRX_PROV_ST_OPEN_WAIT_POWERON_CNF] = { .in_event_mask = + X(TRX_PROV_EV_CLOSE) | X(TRX_PROV_EV_POWERON_CNF) | X(TRX_PROV_EV_CFG_TS), .out_state_mask = - X(TRX_PROV_ST_OPEN_POWERON), + X(TRX_PROV_ST_OPEN_POWERON) | + X(TRX_PROV_ST_OPEN_WAIT_POWEROFF_CNF), .name = "OPEN_WAIT_POWERON_CNF", .onenter = st_open_wait_power_cnf_on_enter, .action = st_open_wait_power_cnf, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic4831201a5be1bc9aff757a9a061c637d98582de Gerrit-Change-Number: 25680 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:36:18 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 4 Oct 2021 14:36:18 +0000 Subject: Change in simtrace2[master]: contrib/jenkins.sh: lower trace to make bl fit In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25606 ) Change subject: contrib/jenkins.sh: lower trace to make bl fit ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/simtrace2/+/25606/2/contrib/jenkins.sh File contrib/jenkins.sh: https://gerrit.osmocom.org/c/simtrace2/+/25606/2/contrib/jenkins.sh at 48 PS2, Line 48: fi > No, apps cannot get too big, this only affects the bootloader, and is a fix for gcc versions that ke [?] Makes sense, but nevertheless I suggest to have the logic for TRACE_LEVEL only in firmware/Makefile, and not duplicated in contrib/jenkins.sh. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7d2947c84097035bed00ad489a175d614b4c388e Gerrit-Change-Number: 25606 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 04 Oct 2021 14:36:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: Hoernchen Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:38:34 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 4 Oct 2021 14:38:34 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: support setting artificial delay for TRXC In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/25667 ) Change subject: trx_toolkit: support setting artificial delay for TRXC ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/25667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idb1ef445bc14a6312f08a83ecacc3a938b0e1d70 Gerrit-Change-Number: 25667 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 14:38:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:39:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 14:39:48 +0000 Subject: Change in osmo-bsc[master]: MS Power Control Loop: Use P_CON_INTERVAL=2 by default References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25681 ) Change subject: MS Power Control Loop: Use P_CON_INTERVAL=2 by default ...................................................................... MS Power Control Loop: Use P_CON_INTERVAL=2 by default Increase the reaction time at the expense of more stable loop with less temporary oscillations. See updated user manual documentation in this commit for a larger description. Related: SYS#5371 Change-Id: I46be244a5e01a74086e3a977ec3ea139742a0074 --- M doc/manuals/chapters/power_control.adoc M src/osmo-bsc/gsm_data.c 2 files changed, 51 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/25681/1 diff --git a/doc/manuals/chapters/power_control.adoc b/doc/manuals/chapters/power_control.adoc index 51a38cb..5563f19 100644 --- a/doc/manuals/chapters/power_control.adoc +++ b/doc/manuals/chapters/power_control.adoc @@ -168,6 +168,23 @@ <0-31> P_CON_INTERVAL, in units of 2 SACCH periods (0.96 seconds) ---- +3GPP TS 45.008 briefly mentions this parameter in table A.1 (`P_Con_INTERVAL`). + +A small time graph is depicted below for better understanding of the meaning of +values for this parameter, since it is not obvious at all. + +.Example: Suspension interval accomplished by several values of P_CON_INTERVAL +---- +|<-->| - one SACCH multi-frame period +| | +|----|----|----|----|----|----|----|----|----> SACCH multi-frames +a) * * * * * * * * * P_CON_INTERVAL=0 (0.48 s) +b) * * * * * P_CON_INTERVAL=1 (0.96 s) +c) * * * P_CON_INTERVAL=2 (1.92 s, default) +d) * * P_CON_INTERVAL=3 (2.88 s) +e) * * P_CON_INTERVAL=4 (3.84 s) +---- + The value to use for this parameter is closely related to that of VTY option `step-size inc <2-6> red <2-4>`, which configures the maximum step (in dB) at which the MS Power can be requested to changed when the MS Power Control Loop is @@ -181,31 +198,42 @@ By default, increment `step-size` is set to 4 dB and the decrement `step-size` is set to 2 dB, hence the MS requiring `4 * 60 = 240` milliseconds. That's less than 1 measurement period (480 ms), hence only the first measurement period -needs to be skipped. Therefore, the suspension interval is set to 1 for both -MS/BS power control loops, and so the power control decision is taken every 960 -ms (every second SACCH block period). +needs to be skipped. Therefore, a suspension interval of 1 for both +MS/BS power control loops can be used, and so the power control decision is +taken every 960 ms (every second SACCH block period). + +However, OsmoBSC currently uses a default value of `ctrl-interval 2` +(`P_CON_INTERVAL=2`, 1.92s, 3/4 received SACCH blocks are skipped), because +that's the minimum amount of frames required for one loop step to run +completely, that is: BTS fetching measurements and transmitting the new MS Power +Level, then the MS retrieving the MS Power Level, transmitting with that exact +MS Power level during the entire period and then finally submitting the +Measurement result containing that same MS Power Level. Using a value of +`P_CON_INTERVAL=1` also provides good results, but in that case the loop tends +to produce more temporary power oscillations due to the loop acting on periods +where an older (earlier requested) MS Power level is still in use (and +announced) by the MS. + +.Example: Timeline showing propagation of a new MS Power Level (P_CON_INTERVAL=2) +---- +|<------------->| - one SACCH multi-frame period +| 1 | 2 | 3 | 4 | ---> SACCH multi-frames +|SA0|SA1|SA2|SA3|SA0|SA1|SA2|SA3|SA0|SA1|SA2|SA3|SA0|SA1|SA2|SA3| ---> SACCH bursts +|<1>|...|...|<2>|<3>|...|...|<4>|<5>|...|...|<6>|<7>|...|...|<8>| +---- +<1> BTS sends new requested MS Power Level in header of SACCH +<2> MS receives SACCH block (new MS Power Level) +<3> MS starts ramping towards new MS Power Level (hence potentially variable power used over the period) +<4> MS should already be in desired MS Power Level (for step increments of less-or-equal than 8 dB) +<5> MS starts transmitting at desired MS Power level constantly (ramping is over) +<6> MS builds Measurement Results to be sent on next SACCH period +<7> MS sends the Measurement Results of the previous multiframe to the BTS +<8> BTS receives the Measurement Results from MS on SACCH, starts next loop iteration + Setting `ctrl-interval` to 0 increases the interval to 480 ms, so basically no SACCH block is skipped and MS Power Control loop is triggered upon receival of -every UL SACCH block. Value 2 corresponds to the interval of 1920 ms, so 3/4 -received SACCH blocks are skipped. - -3GPP TS 45.008 briefly mentions this parameter in table A.1 (`P_Con_INTERVAL`). - -A small time graph is depicted below for better understanding of the meaning of -values for this parameter, since it is not obvious at all. - -.Example: Suspension interval accomplished by several values of P_CON_INTERVAL ----- -|<-->| - one SACCH multi-frame period -| | -|----|----|----|----|----|----|----|----|----> SACCH multi-frames -a) * * * * * * * * * P_CON_INTERVAL=0 (0.48 s) -b) * * * * * P_CON_INTERVAL=1 (0.96 s, default) -c) * * * P_CON_INTERVAL=2 (1.92 s) -d) * * P_CON_INTERVAL=3 (2.88 s) -e) * * P_CON_INTERVAL=4 (3.84 s) ----- +every UL SACCH block. ==== Power change step size diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index c8108e8..a9fdfe3 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1142,7 +1142,7 @@ .inc_step_size_db = 4, /* 2, 4, or 6 dB */ .red_step_size_db = 2, /* 2 or 4 dB */ - .ctrl_interval = 1, /* Trigger loop every second SACCH block. TS 45.008 sec 4.7.1 */ + .ctrl_interval = 2, /* Trigger loop every fourth SACCH block (1.92s). TS 45.008 sec 4.7.1 */ /* RxLev measurement parameters */ .rxlev_meas = { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I46be244a5e01a74086e3a977ec3ea139742a0074 Gerrit-Change-Number: 25681 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:44:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 14:44:23 +0000 Subject: Change in osmo-bsc[master]: MS Power Control Loop: Use P_CON_INTERVAL=2 by default In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25681 to look at the new patch set (#2). Change subject: MS Power Control Loop: Use P_CON_INTERVAL=2 by default ...................................................................... MS Power Control Loop: Use P_CON_INTERVAL=2 by default Increase the reaction time at the expense of more stable loop with less temporary oscillations. See updated user manual documentation in this commit for a larger description. Related: SYS#5371 Change-Id: I46be244a5e01a74086e3a977ec3ea139742a0074 --- M doc/manuals/chapters/power_control.adoc M src/osmo-bsc/bts.c 2 files changed, 52 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/25681/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I46be244a5e01a74086e3a977ec3ea139742a0074 Gerrit-Change-Number: 25681 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:55:25 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 4 Oct 2021 14:55:25 +0000 Subject: Change in osmo-bsc[master]: MS Power Control Loop: Use P_CON_INTERVAL=2 by default In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25681 ) Change subject: MS Power Control Loop: Use P_CON_INTERVAL=2 by default ...................................................................... Patch Set 2: (2 comments) LGTM besides two cosmetics and tests need to be adjusted: > FAIL: ./power_ctrl.vty https://gerrit.osmocom.org/c/osmo-bsc/+/25681/2/doc/manuals/chapters/power_control.adoc File doc/manuals/chapters/power_control.adoc: https://gerrit.osmocom.org/c/osmo-bsc/+/25681/2/doc/manuals/chapters/power_control.adoc at 211 PS2, Line 211: Measurement measurement https://gerrit.osmocom.org/c/osmo-bsc/+/25681/2/src/osmo-bsc/bts.c File src/osmo-bsc/bts.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25681/2/src/osmo-bsc/bts.c at 356 PS2, Line 356: : ":" is probably a left over? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I46be244a5e01a74086e3a977ec3ea139742a0074 Gerrit-Change-Number: 25681 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 04 Oct 2021 14:55:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 14:56:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 14:56:21 +0000 Subject: Change in osmo-bsc[master]: MS Power Control Loop: Use P_CON_INTERVAL=2 by default In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25681 ) Change subject: MS Power Control Loop: Use P_CON_INTERVAL=2 by default ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25681/2/src/osmo-bsc/bts.c File src/osmo-bsc/bts.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25681/2/src/osmo-bsc/bts.c at 356 PS2, Line 356: : > ":" is probably a left over? It's not, I'm just indicating the comment relates to the line below. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I46be244a5e01a74086e3a977ec3ea139742a0074 Gerrit-Change-Number: 25681 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 04 Oct 2021 14:56:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 15:03:08 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 4 Oct 2021 15:03:08 +0000 Subject: Change in osmo-bsc[master]: MS Power Control Loop: Use P_CON_INTERVAL=2 by default In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25681 ) Change subject: MS Power Control Loop: Use P_CON_INTERVAL=2 by default ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25681/2/src/osmo-bsc/bts.c File src/osmo-bsc/bts.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25681/2/src/osmo-bsc/bts.c at 356 PS2, Line 356: : > It's not, I'm just indicating the comment relates to the line below. Hmm, do we even have comments related to the lines above? ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I46be244a5e01a74086e3a977ec3ea139742a0074 Gerrit-Change-Number: 25681 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 04 Oct 2021 15:03:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 15:05:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 15:05:06 +0000 Subject: Change in libosmocore[master]: gsmtap: allow 127.0.0.x local listeners In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25622 ) Change subject: gsmtap: allow 127.0.0.x local listeners ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1043dfd8075f14481011f43db45c943e9320413c Gerrit-Change-Number: 25622 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 04 Oct 2021 15:05:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 15:07:49 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 4 Oct 2021 15:07:49 +0000 Subject: Change in simtrace2[master]: contrib/jenkins.sh: lower trace to make bl fit In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/25606 to look at the new patch set (#3). Change subject: contrib/jenkins.sh: lower trace to make bl fit ...................................................................... contrib/jenkins.sh: lower trace to make bl fit We keep running out of rom space, so reduce tracing to nothing for alle dfu targets, and let's hope newer gcc versions stop producing more code... Change-Id: I7d2947c84097035bed00ad489a175d614b4c388e --- M contrib/jenkins.sh M firmware/Makefile 2 files changed, 2 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/06/25606/3 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7d2947c84097035bed00ad489a175d614b4c388e Gerrit-Change-Number: 25606 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 15:12:35 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 4 Oct 2021 15:12:35 +0000 Subject: Change in simtrace2[master]: contrib/jenkins.sh: lower trace to make bl fit In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25606 ) Change subject: contrib/jenkins.sh: lower trace to make bl fit ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7d2947c84097035bed00ad489a175d614b4c388e Gerrit-Change-Number: 25606 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 04 Oct 2021 15:12:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 15:16:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 15:16:36 +0000 Subject: Change in osmo-bsc[master]: MS Power Control Loop: Use P_CON_INTERVAL=2 by default In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25681 to look at the new patch set (#3). Change subject: MS Power Control Loop: Use P_CON_INTERVAL=2 by default ...................................................................... MS Power Control Loop: Use P_CON_INTERVAL=2 by default Increase the reaction time at the expense of more stable loop with less temporary oscillations. See updated user manual documentation in this commit for a larger description. Related: SYS#5371 Change-Id: I46be244a5e01a74086e3a977ec3ea139742a0074 --- M doc/manuals/chapters/power_control.adoc M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/gsm_data.c M tests/power_ctrl.vty 6 files changed, 69 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/25681/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I46be244a5e01a74086e3a977ec3ea139742a0074 Gerrit-Change-Number: 25681 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 15:18:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 15:18:05 +0000 Subject: Change in osmo-bsc[master]: MS Power Control Loop: Use P_CON_INTERVAL=2 by default In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25681 to look at the new patch set (#4). Change subject: MS Power Control Loop: Use P_CON_INTERVAL=2 by default ...................................................................... MS Power Control Loop: Use P_CON_INTERVAL=2 by default Increase the reaction time at the expense of more stable loop with less temporary oscillations. See updated user manual documentation in this commit for a larger description. Related: SYS#5371 Change-Id: I46be244a5e01a74086e3a977ec3ea139742a0074 --- M doc/manuals/chapters/power_control.adoc M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/gsm_data.c M tests/power_ctrl.vty 6 files changed, 69 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/25681/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I46be244a5e01a74086e3a977ec3ea139742a0074 Gerrit-Change-Number: 25681 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 15:23:05 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 4 Oct 2021 15:23:05 +0000 Subject: Change in osmo-bsc[master]: MS Power Control Loop: Use P_CON_INTERVAL=2 by default In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25681 ) Change subject: MS Power Control Loop: Use P_CON_INTERVAL=2 by default ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I46be244a5e01a74086e3a977ec3ea139742a0074 Gerrit-Change-Number: 25681 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 04 Oct 2021 15:23:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 15:29:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 4 Oct 2021 15:29:59 +0000 Subject: Change in osmo-bts[master]: MS Power Control Loop: Use P_CON_INTERVAL=2 by default References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25682 ) Change subject: MS Power Control Loop: Use P_CON_INTERVAL=2 by default ...................................................................... MS Power Control Loop: Use P_CON_INTERVAL=2 by default Have a more stable loop with less temporary oscillations at the expense of increased reaction time. 4 SACCH blocks (P_CON_INTERVAL=2) is the minimum interval to get stable measurements for the last requested MS Power level. With P_CON_INTERVAL=1, are also made during a period with stable power being use to transmit, but the MS Power level used (and announced in MR) is not the last one requested by the BTS, but the one requested in the previous loop iteration. This can make the MS and BTS bounce 2 values forth and back, and create some temporary oscillation. See osmo-bsc User manual section "Power Control" for more information. Related: SYS#5371 Change-Id: I91c505447f68714239a4f033d4f06e91893df201 --- M include/osmo-bts/gsm_data.h M src/common/bts.c M src/common/gsm_data.c M src/common/rsl.c 4 files changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/82/25682/1 diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index fe2862d..c24b8f9 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -223,6 +223,7 @@ /* Default MS/BS Power Control parameters */ extern const struct gsm_power_ctrl_params power_ctrl_params_def; +void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, bool is_bs_pwr); /* Measurement pre-processing state */ struct gsm_power_ctrl_meas_proc_state { diff --git a/src/common/bts.c b/src/common/bts.c index 191c331..b226df2 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -340,8 +340,8 @@ bts->rtp_priority = -1; /* Default (fall-back) MS/BS Power control parameters */ - bts->bs_dpc_params = power_ctrl_params_def; - bts->ms_dpc_params = power_ctrl_params_def; + power_ctrl_params_def_reset(&bts->bs_dpc_params, true); + power_ctrl_params_def_reset(&bts->ms_dpc_params, false); /* configurable via OML */ bts->load.ccch.load_ind_period = 112; diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index 1525328..89a740d 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -680,3 +680,11 @@ .h_reqt = 6, /* TODO: investigate a reasonable default value */ }, }; + +void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, bool is_bs_pwr) +{ + *params = power_ctrl_params_def; + if (!is_bs_pwr) + /* Trigger loop every fourth SACCH block (1.92s). TS 45.008 sec 4.7.1: */ + params->ctrl_interval = 2; +} diff --git a/src/common/rsl.c b/src/common/rsl.c index 507a7cf..0109564 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1111,7 +1111,8 @@ /* TLV (O) BS Power Parameters IE */ if ((ie = TLVP_GET(&tp, RSL_IE_BS_POWER_PARAM)) != NULL) { /* Allocate a new chunk and initialize with default values */ - params = talloc_memdup(trx, &power_ctrl_params_def, sizeof(*params)); + params = talloc(trx, struct gsm_power_ctrl_params); + power_ctrl_params_def_reset(params, true); if (ie->len && parse_power_ctrl_params(params, ie->val, ie->len) == 0) { /* Initially it points to the global defaults */ @@ -1128,7 +1129,8 @@ /* TLV (O) MS Power Parameters IE */ if ((ie = TLVP_GET(&tp, RSL_IE_MS_POWER_PARAM)) != NULL) { /* Allocate a new chunk and initialize with default values */ - params = talloc_memdup(trx, &power_ctrl_params_def, sizeof(*params)); + params = talloc(trx, struct gsm_power_ctrl_params); + power_ctrl_params_def_reset(params, false); if (ie->len && parse_power_ctrl_params(params, ie->val, ie->len) == 0) { /* Initially it points to the global defaults */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I91c505447f68714239a4f033d4f06e91893df201 Gerrit-Change-Number: 25682 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 15:42:45 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 4 Oct 2021 15:42:45 +0000 Subject: Change in osmo-sip-connector[master]: Implement basic Support for Global Call Reference. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 ) Change subject: Implement basic Support for Global Call Reference. ...................................................................... Patch Set 2: (3 comments) This change is ready for review. https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675/2/src/sip.c File src/sip.c: https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675/2/src/sip.c at 116 PS2, Line 116: char gcr_hex[sizeof(call->gcr)*2] = {0}; > Not sure this kind of initializer for arrays is actually setting all values to 0, but only the first [?] Hi Pau, Thanks for taking a look at this! I'm aware it's full of issues. Not only in terms of coding, but also strategy. It's WIP. But yes, how to do all this initialization and also getting the correct size for the osmohexdump dest buffer is something I have problems with. https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675/2/src/sip.c at 125 PS2, Line 125: memcpy(gcr_hex, unknown_header->un_value, sizeof(gcr_hex)); > do you really need this gcr_hex intermediate variable and hence this memcpy? I guess you can simply [?] Ack https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675/2/src/sip.c at 612 PS2, Line 612: char gcr_hex[sizeof(leg->base.call->gcr)*2] = { NULL }; > See my comment regarding memset. Furthermore, NULL char makes no sense as a char. [?] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Id40d7e0fed9356f801b3627c118150055e7232b1 Gerrit-Change-Number: 25675 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 15:42:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 16:05:08 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 4 Oct 2021 16:05:08 +0000 Subject: Change in simtrace2[master]: contrib/jenkins.sh: lower trace to make bl fit In-Reply-To: References: Message-ID: Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25606 ) Change subject: contrib/jenkins.sh: lower trace to make bl fit ...................................................................... contrib/jenkins.sh: lower trace to make bl fit We keep running out of rom space, so reduce tracing to nothing for alle dfu targets, and let's hope newer gcc versions stop producing more code... Change-Id: I7d2947c84097035bed00ad489a175d614b4c388e --- M contrib/jenkins.sh M firmware/Makefile 2 files changed, 2 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 5f68cf1..ac0e419 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -40,12 +40,7 @@ app=`echo $build | cut -d "/" -f 2` echo echo "=============== $board / $app START ==============" - # reduce the trace level so the bl fits - if [ $board = "ngff_cardem" ] && [ $app = "dfu" ]; then - make BOARD="$board" APP="$app" TRACE_LEVEL=2 - else - make BOARD="$board" APP="$app" - fi + make BOARD="$board" APP="$app" echo "=============== $board / $app RES:$? ==============" done diff --git a/firmware/Makefile b/firmware/Makefile index 2a14025..50ca63f 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -50,6 +50,7 @@ # Defines which are the available memory targets for the SAM3S-EK board. ifeq ($(APP), dfu) MEMORIES ?= flash dfu +TRACE_LEVEL ?= 0 else MEMORIES ?= dfu endif -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I7d2947c84097035bed00ad489a175d614b4c388e Gerrit-Change-Number: 25606 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 16:05:56 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 4 Oct 2021 16:05:56 +0000 Subject: Change in simtrace2[master]: Revert "firmware: data sections" References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/25683 ) Change subject: Revert "firmware: data sections" ...................................................................... Revert "firmware: data sections" This reverts commit e6a76c7bf40d93c20dd5117806c39e3f8b0e6ad7. Might or might not cause weird issues depending on gcc and binutils versions, let's see if this helps. Change-Id: I2f593fd5e0f1494aae6b9fcfb2160a6c9168f5b8 --- M firmware/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/83/25683/1 diff --git a/firmware/Makefile b/firmware/Makefile index 50ca63f..0364166 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -175,7 +175,7 @@ #CFLAGS += -Wa,-a,-ad CFLAGS += -D__ARM -fno-builtin CFLAGS += --param max-inline-insns-single=500 -mcpu=cortex-m3 -mthumb # -mfix-cortex-m3-ldrd -CFLAGS += -fdata-sections -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DALLOW_PEER_ERASE=$(ALLOW_PEER_ERASE) +CFLAGS += -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DALLOW_PEER_ERASE=$(ALLOW_PEER_ERASE) CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" CFLAGS += -DBOARD=\"$(BOARD)\" -DBOARD_$(BOARD) CFLAGS += -DAPPLICATION=\"$(APP)\" -DAPPLICATION_$(APP) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2f593fd5e0f1494aae6b9fcfb2160a6c9168f5b8 Gerrit-Change-Number: 25683 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 16:07:59 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 4 Oct 2021 16:07:59 +0000 Subject: Change in simtrace2[master]: Revert "firmware: data sections" In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25683 ) Change subject: Revert "firmware: data sections" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2f593fd5e0f1494aae6b9fcfb2160a6c9168f5b8 Gerrit-Change-Number: 25683 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 04 Oct 2021 16:07:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 16:08:01 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Mon, 4 Oct 2021 16:08:01 +0000 Subject: Change in simtrace2[master]: Revert "firmware: data sections" In-Reply-To: References: Message-ID: Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25683 ) Change subject: Revert "firmware: data sections" ...................................................................... Revert "firmware: data sections" This reverts commit e6a76c7bf40d93c20dd5117806c39e3f8b0e6ad7. Might or might not cause weird issues depending on gcc and binutils versions, let's see if this helps. Change-Id: I2f593fd5e0f1494aae6b9fcfb2160a6c9168f5b8 --- M firmware/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified Hoernchen: Looks good to me, approved diff --git a/firmware/Makefile b/firmware/Makefile index 50ca63f..0364166 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -175,7 +175,7 @@ #CFLAGS += -Wa,-a,-ad CFLAGS += -D__ARM -fno-builtin CFLAGS += --param max-inline-insns-single=500 -mcpu=cortex-m3 -mthumb # -mfix-cortex-m3-ldrd -CFLAGS += -fdata-sections -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DALLOW_PEER_ERASE=$(ALLOW_PEER_ERASE) +CFLAGS += -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DALLOW_PEER_ERASE=$(ALLOW_PEER_ERASE) CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" CFLAGS += -DBOARD=\"$(BOARD)\" -DBOARD_$(BOARD) CFLAGS += -DAPPLICATION=\"$(APP)\" -DAPPLICATION_$(APP) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25683 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2f593fd5e0f1494aae6b9fcfb2160a6c9168f5b8 Gerrit-Change-Number: 25683 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 18:25:32 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 4 Oct 2021 18:25:32 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: support setting artificial delay for TRXC In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/25667 ) Change subject: trx_toolkit: support setting artificial delay for TRXC ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/25667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idb1ef445bc14a6312f08a83ecacc3a938b0e1d70 Gerrit-Change-Number: 25667 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 18:25:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 18:25:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 4 Oct 2021 18:25:35 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit: support setting artificial delay for TRXC In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/25667 ) Change subject: trx_toolkit: support setting artificial delay for TRXC ...................................................................... trx_toolkit: support setting artificial delay for TRXC Change-Id: Idb1ef445bc14a6312f08a83ecacc3a938b0e1d70 Related: OS#5245 --- M src/target/trx_toolkit/ctrl_if.py M src/target/trx_toolkit/fake_trx.py 2 files changed, 16 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/target/trx_toolkit/ctrl_if.py b/src/target/trx_toolkit/ctrl_if.py index 4f44080..aaf1111 100644 --- a/src/target/trx_toolkit/ctrl_if.py +++ b/src/target/trx_toolkit/ctrl_if.py @@ -23,6 +23,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import logging as log +import time from udp_link import UDPLink @@ -31,6 +32,9 @@ UDPLink.__init__(self, *udp_link_args) log.debug("Init TRXC interface (%s)" % self.desc_link()) + # Do not delay RSP messages by default + self.rsp_delay_ms = 0 + def handle_rx(self): # Read data from socket data, remote = self.sock.recvfrom(128) @@ -86,6 +90,9 @@ # Add the response signature, and join back to string response = "RSP " + " ".join(request) + "\0" + # If configured, delay sending the RSP message + if self.rsp_delay_ms > 0: + time.sleep(self.rsp_delay_ms / 1000.0) # Now we have something like "RSP TXTUNE 0 941600" self.sendto(response, remote) diff --git a/src/target/trx_toolkit/fake_trx.py b/src/target/trx_toolkit/fake_trx.py index d519a9a..93ae64e 100755 --- a/src/target/trx_toolkit/fake_trx.py +++ b/src/target/trx_toolkit/fake_trx.py @@ -374,6 +374,15 @@ self.burst_drop_period = period return 0 + # Artificial delay for the TRXC interface + # Syntax: CMD FAKE_TRXC_DELAY + elif self.ctrl_if.verify_cmd(request, "FAKE_TRXC_DELAY", 1): + log.debug("(%s) Recv FAKE_TRXC_DELAY cmd", self) + + self.ctrl_if.rsp_delay_ms = int(request[1]) + log.info("(%s) Artificial TRXC delay set to %d", + self, self.ctrl_if.rsp_delay_ms) + # Unhandled command return None -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/25667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idb1ef445bc14a6312f08a83ecacc3a938b0e1d70 Gerrit-Change-Number: 25667 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 19:39:52 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 4 Oct 2021 19:39:52 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25654 ) Change subject: Implement MS Uplink Power Control Loop ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 11 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 19:39:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 19:41:39 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 4 Oct 2021 19:41:39 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25654 ) Change subject: Implement MS Uplink Power Control Loop ...................................................................... Patch Set 11: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25654/11/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25654/11/src/osmo-bsc/abis_rsl.c at 1343 PS11, Line 1343: lchan_ms_pwr_ctrl(msg->lchan, mr); > nitpick: may be more useful for debugging running the ms power loop AFTER we print the meas report ( [?] ah ok, was about to submit, but I will do this later today. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 11 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 04 Oct 2021 19:41:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 4 19:49:55 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 4 Oct 2021 19:49:55 +0000 Subject: Change in osmo-bsc[master]: Add vty command to manually force MS Uplink Power In-Reply-To: References: Message-ID: keith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25653 ) Change subject: Add vty command to manually force MS Uplink Power ...................................................................... Add vty command to manually force MS Uplink Power Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 --- M src/osmo-bsc/bsc_vty.c M tests/osmo-bsc.vty 2 files changed, 54 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index bd61555..879ae3f 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1892,6 +1892,57 @@ return CMD_SUCCESS; } +DEFUN(lchan_set_mspower, lchan_set_mspower_cmd, + "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> ms-power <0-40> [verify]\n", + BTS_NR_TRX_TS_SS_STR2 + "Manually force MS Uplink Power Level in dBm on the lchan (for testing)\n" + "Set transmit power of the MS in dBm\n" + "Check requested level against BAND and UE Power Class.\n") +{ + struct gsm_bts *bts; + struct gsm_bts_trx *trx; + struct gsm_bts_trx_ts *ts; + struct gsm_lchan *lchan; + int bts_nr = atoi(argv[0]); + int trx_nr = atoi(argv[1]); + int ss_nr = atoi(argv[3]); + bool verify = (argc > 5); + + bts = gsm_bts_num(gsmnet_from_vty(vty), bts_nr); + if (!bts) { + vty_out(vty, "%% No such BTS (%d)%s", bts_nr, VTY_NEWLINE); + return CMD_WARNING; + } + + trx = gsm_bts_trx_num(bts, trx_nr); + if (!trx) { + vty_out(vty, "%% No such TRX (%d)%s", trx_nr, VTY_NEWLINE); + return CMD_WARNING; + } + + ts = vty_get_ts(vty, argv[0], argv[1], argv[2]); + if (!ts) { + vty_out(vty, "%% No such TS (%d)%s", atoi(argv[2]), VTY_NEWLINE); + return CMD_WARNING; + } + if (ss_nr >= ts->max_primary_lchans) { + vty_out(vty, "%% Invalid sub-slot number for this timeslot type%s", VTY_NEWLINE); + return CMD_WARNING; + } + + lchan = &ts->lchan[ss_nr]; + if (!lchan->fi) + return CMD_WARNING; + + if (verify) { + lchan_update_ms_power_ctrl_level(lchan, atoi(argv[4])); + return CMD_SUCCESS; + } + lchan->ms_power = ms_pwr_ctl_lvl(ts->trx->bts->band, atoi(argv[4])); + rsl_chan_ms_power_ctrl(lchan); + return CMD_SUCCESS; +} + DEFUN(vamos_modify_lchan, vamos_modify_lchan_cmd, "bts <0-255> trx <0-255> timeslot <0-7> sub-slot <0-7> modify (vamos|non-vamos) " TSC_ARGS_OPT, BTS_NR_TRX_TS_SS_STR2 @@ -3410,6 +3461,7 @@ install_element(ENABLE_NODE, &lchan_mdcx_cmd); install_element(ENABLE_NODE, &lchan_set_borken_cmd); install_element(ENABLE_NODE, &lchan_reassign_cmd); + install_element(ENABLE_NODE, &lchan_set_mspower_cmd); install_element(ENABLE_NODE, &handover_subscr_conn_cmd); install_element(ENABLE_NODE, &assignment_subscr_conn_cmd); diff --git a/tests/osmo-bsc.vty b/tests/osmo-bsc.vty index 4027502..ace21df 100644 --- a/tests/osmo-bsc.vty +++ b/tests/osmo-bsc.vty @@ -12,6 +12,7 @@ modify Manually send Channel Mode Modify (for debugging) mdcx Modify RTP Connection reassign-to Trigger Assignment to an unused lchan on the same cell + ms-power Manually force MS Uplink Power Level in dBm on the lchan (for testing) handover Manually trigger handover (for debugging) assignment Manually trigger assignment (for debugging) @@ -79,6 +80,7 @@ modify Manually send Channel Mode Modify (for debugging) mdcx Modify RTP Connection reassign-to Trigger Assignment to an unused lchan on the same cell + ms-power Manually force MS Uplink Power Level in dBm on the lchan (for testing) handover Manually trigger handover (for debugging) assignment Manually trigger assignment (for debugging) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie2642299ea696358db5822571f1f722b5e8f76b9 Gerrit-Change-Number: 25653 Gerrit-PatchSet: 9 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 04:21:00 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 5 Oct 2021 04:21:00 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 to look at the new patch set (#12). Change subject: Implement MS Uplink Power Control Loop ...................................................................... Implement MS Uplink Power Control Loop * Adds vty option dyn-bsc for ms-power-control -> mode * Imports power_control.c from osmo-bts project [at commit 2f3cd4b697972d8484f9a9d3b7ef634086f65fa5] * Removes unused C/I code from osmo-bts's power_control.c This patch then calls the power loop on receipt of measurement reports and updates the MS Power Level accordingly. Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e --- M include/osmocom/bsc/Makefile.am M include/osmocom/bsc/debug.h M include/osmocom/bsc/gsm_data.h A include/osmocom/bsc/power_control.h M src/osmo-bsc/Makefile.am M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/osmo_bsc_main.c A src/osmo-bsc/power_control.c M tests/power_ctrl.vty 11 files changed, 333 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/25654/12 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 12 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 04:32:15 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 5 Oct 2021 04:32:15 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25654 ) Change subject: Implement MS Uplink Power Control Loop ...................................................................... Patch Set 12: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 12 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 05 Oct 2021 04:32:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 04:32:33 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 5 Oct 2021 04:32:33 +0000 Subject: Change in osmo-bsc[master]: Implement MS Uplink Power Control Loop In-Reply-To: References: Message-ID: keith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25654 ) Change subject: Implement MS Uplink Power Control Loop ...................................................................... Implement MS Uplink Power Control Loop * Adds vty option dyn-bsc for ms-power-control -> mode * Imports power_control.c from osmo-bts project [at commit 2f3cd4b697972d8484f9a9d3b7ef634086f65fa5] * Removes unused C/I code from osmo-bts's power_control.c This patch then calls the power loop on receipt of measurement reports and updates the MS Power Level accordingly. Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e --- M include/osmocom/bsc/Makefile.am M include/osmocom/bsc/debug.h M include/osmocom/bsc/gsm_data.h A include/osmocom/bsc/power_control.h M src/osmo-bsc/Makefile.am M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/osmo_bsc_main.c A src/osmo-bsc/power_control.c M tests/power_ctrl.vty 11 files changed, 333 insertions(+), 5 deletions(-) Approvals: keith: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index 3accc74..3bccf44 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -62,4 +62,5 @@ penalty_timers.h \ osmo_bsc_lcls.h \ smscb.h \ + power_control.h \ $(NULL) diff --git a/include/osmocom/bsc/debug.h b/include/osmocom/bsc/debug.h index 4ad61b4..a3cad68 100644 --- a/include/osmocom/bsc/debug.h +++ b/include/osmocom/bsc/debug.h @@ -29,6 +29,7 @@ DCBS, DLCS, DRESET, + DLOOP, Debug_LastEntry, }; diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 21828d4..36d364c 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -673,6 +673,27 @@ #define INTERF_DBM_UNKNOWN 0 #define INTERF_BAND_UNKNOWN 0xff +/* Measurement pre-processing state */ +struct gsm_power_ctrl_meas_proc_state { + /* Number of measurements processed */ + unsigned int meas_num; + /* Algorithm specific data */ + union { + struct { + /* Scaled up 100 times average value */ + int Avg100; + } ewma; + }; +}; + +struct lchan_power_ctrl_state { + /* Measurement pre-processing state (for dynamic mode) */ + struct gsm_power_ctrl_meas_proc_state rxlev_meas_proc; + struct gsm_power_ctrl_meas_proc_state rxqual_meas_proc; + /* Number of SACCH blocks to skip (for dynamic mode) */ + int skip_block_num; +}; + struct gsm_lchan { /* The TS that we're part of */ struct gsm_bts_trx_ts *ts; @@ -820,6 +841,8 @@ /* Actual reported interference band index, or INTERF_BAND_UNKNOWN if this lchan was not included in the most * recent Resource Indication. */ uint8_t interf_band; + /* MS power control state */ + struct lchan_power_ctrl_state ms_power_ctrl; }; /* One Timeslot in a TRX */ @@ -1342,6 +1365,9 @@ GSM_PWR_CTRL_MODE_STATIC, /* Send MS/BS Power [Parameters] IEs (dynamic mode) */ GSM_PWR_CTRL_MODE_DYN_BTS, + /* Do not send MS/BS Power IEs and use BSC Power Loop */ + GSM_PWR_CTRL_MODE_DYN_BSC, + }; /* MS/BS Power Control Parameters */ diff --git a/include/osmocom/bsc/power_control.h b/include/osmocom/bsc/power_control.h new file mode 100644 index 0000000..82cbcb0 --- /dev/null +++ b/include/osmocom/bsc/power_control.h @@ -0,0 +1,7 @@ +#pragma once + +#include +#include +#include + +int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan, const struct gsm_meas_rep *mr); diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index 8991697..19af569 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -106,6 +106,7 @@ smscb.c \ cbch_scheduler.c \ cbsp_link.c \ + power_control.c \ $(NULL) libbsc_la_LIBADD = \ diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 9882252..a7b267d 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -55,6 +55,7 @@ #include #include #include +#include static void send_lchan_signal(int sig_no, struct gsm_lchan *lchan, struct gsm_meas_rep *resp) @@ -1341,6 +1342,8 @@ print_meas_rep(msg->lchan, mr); + lchan_ms_pwr_ctrl(msg->lchan, mr); + send_lchan_signal(S_LCHAN_MEAS_REP, msg->lchan, mr); return 0; diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 879ae3f..c1a6e44 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -1363,6 +1363,12 @@ return CMD_WARNING; } + if (bts->ms_power_ctrl.mode != GSM_PWR_CTRL_MODE_DYN_BTS) { + vty_out(vty, "%% Not Sending default MS/BS Power control parameters " + "because BTS%d is not using dyn-bts mode%s", bts_nr, VTY_NEWLINE); + return CMD_WARNING; + } + if (bts->model->power_ctrl_send_def_params == NULL) { vty_out(vty, "%% Sending default MS/BS Power control parameters " "for BTS%d is not implemented%s", bts_nr, VTY_NEWLINE); diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index fb11520..460e14a 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -2915,10 +2915,11 @@ DEFUN_USRATTR(cfg_power_ctrl_mode, cfg_power_ctrl_mode_cmd, X(BSC_VTY_ATTR_NEW_LCHAN), - "mode (static|dyn-bts) [reset]", + "mode (static|dyn-bts|dyn-bsc) [reset]", "Power control mode\n" "Instruct the MS/BTS to use a static power level\n" "Power control to be performed dynamically by the BTS itself\n" + "Power control to be performed dynamically at this BSC\n" "Reset to default parameters for the given mode\n") { struct gsm_power_ctrl_params *params = vty->index; @@ -2935,6 +2936,13 @@ params->mode = GSM_PWR_CTRL_MODE_STATIC; else if (strcmp(argv[0], "dyn-bts") == 0) params->mode = GSM_PWR_CTRL_MODE_DYN_BTS; + else if (strcmp(argv[0], "dyn-bsc") == 0) { + if (params->dir == GSM_PWR_CTRL_DIR_DL) { + vty_out(vty, "%% mode dyn-bsc not supported for Downlink.%s", VTY_NEWLINE); + return CMD_WARNING; + } + params->mode = GSM_PWR_CTRL_MODE_DYN_BSC; + } return CMD_SUCCESS; } @@ -3139,6 +3147,11 @@ int upper = atoi(argv[2]); struct gsm_power_ctrl_meas_params *meas_params; + if (params->mode == GSM_PWR_CTRL_MODE_DYN_BSC) { + vty_out(vty, "%% C/I based power loop not possible in dyn-bsc mode!%s", VTY_NEWLINE); + return CMD_WARNING; + } + if (params->dir != GSM_PWR_CTRL_DIR_UL) { vty_out(vty, "%% C/I based power loop only possible in Uplink!%s", VTY_NEWLINE); return CMD_WARNING; @@ -3962,8 +3975,10 @@ cfg_out(" bs-power static %u%s", cp->bs_power_val_db, VTY_NEWLINE); break; case GSM_PWR_CTRL_MODE_DYN_BTS: + case GSM_PWR_CTRL_MODE_DYN_BSC: cfg_out("%s%s", node_name, VTY_NEWLINE); - cfg_out(" mode dyn-bts%s", VTY_NEWLINE); + cfg_out(" mode %s%s", + cp->mode == GSM_PWR_CTRL_MODE_DYN_BTS ? "dyn-bts" : "dyn-bsc", VTY_NEWLINE); if (cp->dir == GSM_PWR_CTRL_DIR_DL) cfg_out(" bs-power dyn-max %u%s", cp->bs_power_max_db, VTY_NEWLINE); @@ -3975,7 +3990,8 @@ /* Measurement processing / averaging parameters */ config_write_power_ctrl_meas(vty, indent + 1, &cp->rxlev_meas, "rxlev", ""); config_write_power_ctrl_meas(vty, indent + 1, &cp->rxqual_meas, "rxqual", ""); - if (cp->dir == GSM_PWR_CTRL_DIR_UL && is_osmobts(bts)) { + if (cp->dir == GSM_PWR_CTRL_DIR_UL && is_osmobts(bts) + && cp->mode == GSM_PWR_CTRL_MODE_DYN_BTS) { config_write_power_ctrl_meas(vty, indent + 1, &cp->ci_fr_meas, "ci", " fr-efr"); config_write_power_ctrl_meas(vty, indent + 1, &cp->ci_hr_meas, "ci", " hr"); config_write_power_ctrl_meas(vty, indent + 1, &cp->ci_amr_fr_meas, "ci", " amr-fr"); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 395a60e..0ed0033 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -855,6 +855,12 @@ .description = "RESET/ACK on A and Lb interfaces", .enabled = 1, .loglevel = LOGL_NOTICE, }, + [DLOOP] = { + .name = "DLOOP", + .description = "Control loops", + .color = "\033[0;34m", + .enabled = 1, .loglevel = LOGL_NOTICE, + }, }; static int filter_fn(const struct log_context *ctx, struct log_target *tar) diff --git a/src/osmo-bsc/power_control.c b/src/osmo-bsc/power_control.c new file mode 100644 index 0000000..6fe4455 --- /dev/null +++ b/src/osmo-bsc/power_control.c @@ -0,0 +1,261 @@ +/* MS Power Control Loop L1 */ + +/* (C) 2014 by Holger Hans Peter Freyther + * (C) 2020-2021 by sysmocom - s.m.f.c. GmbH + * Author: Vadim Yanitskiy + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +/* We don't want to deal with floating point, so we scale up */ +#define EWMA_SCALE_FACTOR 100 +/* EWMA_SCALE_FACTOR/2 = +50: Round to nearest value when downscaling, otherwise floor() is applied. */ +#define EWMA_ROUND_FACTOR (EWMA_SCALE_FACTOR / 2) + +/* Base Low-Pass Single-Pole IIR Filter (EWMA) formula: + * + * Avg[n] = a * Val[n] + (1 - a) * Avg[n - 1] + * + * where parameter 'a' determines how much weight of the latest measurement value + * 'Val[n]' carries vs the weight of the accumulated average 'Avg[n - 1]'. The + * value of 'a' is usually a float in range 0 .. 1, so: + * + * - value 0.5 gives equal weight to both 'Val[n]' and 'Avg[n - 1]'; + * - value 1.0 means no filtering at all (pass through); + * - value 0.0 makes no sense. + * + * Further optimization: + * + * Avg[n] = a * Val[n] + Avg[n - 1] - a * Avg[n - 1] + * ^^^^^^ ^^^^^^^^^^ + * + * a) this can be implemented in C using '+=' operator: + * + * Avg += a * Val - a * Avg + * Avg += a * (Val - Avg) + * + * b) everything is scaled up by 100 to avoid floating point stuff: + * + * Avg100 += A * (Val - Avg) + * + * where 'Avg100' is 'Avg * 100' and 'A' is 'a * 100'. + * + * For more details, see: + * + * https://en.wikipedia.org/wiki/Moving_average + * https://en.wikipedia.org/wiki/Low-pass_filter#Simple_infinite_impulse_response_filter + * https://tomroelandts.com/articles/low-pass-single-pole-iir-filter + */ +static int do_pf_ewma(const struct gsm_power_ctrl_meas_params *mp, + struct gsm_power_ctrl_meas_proc_state *mps, + const int Val) +{ + const uint8_t A = mp->ewma.alpha; + int *Avg100 = &mps->ewma.Avg100; + + /* We don't have 'Avg[n - 1]' if this is the first run */ + if (mps->meas_num++ == 0) { + *Avg100 = Val * EWMA_SCALE_FACTOR; + return Val; + } + + *Avg100 += A * (Val - (*Avg100 + EWMA_ROUND_FACTOR) / EWMA_SCALE_FACTOR); + return (*Avg100 + EWMA_ROUND_FACTOR) / EWMA_SCALE_FACTOR; +} + +/* Calculate target RxLev value from lower/upper thresholds */ +#define CALC_TARGET(mp) \ + ((mp).lower_thresh + (mp).upper_thresh) / 2 + +static int do_avg_algo(const struct gsm_power_ctrl_meas_params *mp, + struct gsm_power_ctrl_meas_proc_state *mps, + const int val) +{ + int val_avg; + switch (mp->algo) { + case GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA: + val_avg = do_pf_ewma(mp, mps, val); + break; + /* TODO: implement other pre-processing methods */ + case GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE: + default: + /* No filtering (pass through) */ + val_avg = val; + } + return val_avg; +} +/* Calculate a 'delta' value (for the given MS/BS power control parameters) + * to be applied to the current Tx power level to approach the target level. */ +static int calc_delta_rxlev(const struct gsm_power_ctrl_params *params, const uint8_t rxlev) +{ + int delta; + + /* Check if RxLev is within the threshold window */ + if (rxlev >= params->rxlev_meas.lower_thresh && + rxlev <= params->rxlev_meas.upper_thresh) + return 0; + + /* How many dBs measured power should be increased (+) or decreased (-) + * to reach expected power. */ + delta = CALC_TARGET(params->rxlev_meas) - rxlev; + + /* Don't ever change more than PWR_{LOWER,RAISE}_MAX_DBM during one loop + * iteration, i.e. reduce the speed at which the MS transmit power can + * change. A higher value means a lower level (and vice versa) */ + if (delta > params->inc_step_size_db) + delta = params->inc_step_size_db; + else if (delta < -params->red_step_size_db) + delta = -params->red_step_size_db; + + return delta; +} + +/* Shall we skip current block based on configured interval? */ +static bool ctrl_interval_skip_block(const struct gsm_power_ctrl_params *params, + struct lchan_power_ctrl_state *state) +{ + /* Power control interval: how many blocks do we skip? */ + if (state->skip_block_num-- > 0) + return true; + + /* Can we be sure if ONE Report is always going to correspond + * to ONE SACCH block at the BTS? - If not this is as approximation + * but it should not hurt. */ + + /* Reset the number of SACCH blocks to be skipped: + * ctrl_interval=0 => 0 blocks to skip, + * ctrl_interval=1 => 1 blocks to skip, + * ctrl_interval=2 => 3 blocks to skip, + * so basically ctrl_interval * 2 - 1. */ + state->skip_block_num = params->ctrl_interval * 2 - 1; + return false; +} + +int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan, const struct gsm_meas_rep *mr) +{ + struct lchan_power_ctrl_state *state = &lchan->ms_power_ctrl; + struct gsm_bts_trx *trx = lchan->ts->trx; + struct gsm_bts *bts = trx->bts; + enum gsm_band band = bts->band; + const struct gsm_power_ctrl_params *params = &bts->ms_power_ctrl; + int8_t new_power_lvl; /* TS 05.05 power level */ + int8_t ms_dbm, new_dbm, current_dbm, bsc_max_dbm; + uint8_t rxlev_avg; + uint8_t ms_power_lvl = ms_pwr_ctl_lvl(band, mr->ms_l1.pwr); + int8_t ul_rssi_dbm; + bool ignore; + + if (params == NULL) + return 0; + /* Not doing the power loop here if we are not handling it */ + if (params->mode != GSM_PWR_CTRL_MODE_DYN_BSC) + return 0; + + /* Shall we skip current block based on configured interval? */ + if (ctrl_interval_skip_block(params, state)) + return 0; + + /* If DTx is active on Uplink, + * use the '-SUB', otherwise '-FULL': */ + if (mr->flags & MEAS_REP_F_UL_DTX) + ul_rssi_dbm = rxlev2dbm(mr->ul.sub.rx_lev); + else + ul_rssi_dbm = rxlev2dbm(mr->ul.full.rx_lev); + + ms_dbm = ms_pwr_dbm(band, ms_power_lvl); + if (ms_dbm < 0) { + LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE, + "Failed to calculate dBm for power ctl level %" PRIu8 " on band %s\n", + ms_power_lvl, gsm_band_name(band)); + return 0; + } + + bsc_max_dbm = bts->ms_max_power; + rxlev_avg = do_avg_algo(¶ms->rxlev_meas, &state->rxlev_meas_proc, dbm2rxlev(ul_rssi_dbm)); + new_dbm = ms_dbm + calc_delta_rxlev(params, rxlev_avg); + + /* Make sure new_dbm is never negative. ms_pwr_ctl_lvl() can later on + cope with any unsigned dbm value, regardless of band minimal value. */ + if (new_dbm < 0) + new_dbm = 0; + /* Don't ask for smaller ms power level than the one set by ms max power for this BTS */ + if (new_dbm > bsc_max_dbm) + new_dbm = bsc_max_dbm; + + new_power_lvl = ms_pwr_ctl_lvl(band, new_dbm); + if (new_power_lvl < 0) { + LOGPLCHAN(lchan, DLOOP, LOGL_NOTICE, + "Failed to retrieve power level for %" PRId8 " dBm on band %d\n", + new_dbm, band); + return 0; + } + + current_dbm = ms_pwr_dbm(band, lchan->ms_power); + + /* In this Power Control Loop, we infer a new good MS Power Level based + * on the previous MS Power Level announced by the MS (not the previous + * one we requested!) together with the related computed measurements. + * Hence, and since we allow for several good MS Power Levels falling into our + * thresholds, we could finally converge into an oscillation loop where + * the MS bounces between 2 different correct MS Power levels all the + * time, due to the fact that we "accept" and "request back" whatever + * good MS Power Level we received from the MS, but at that time the MS + * will be transmitting using the previous MS Power Level we + * requested, which we will later "accept" and "request back" on next loop + * iteration. As a result MS effectively bounces between those 2 MS + * Power Levels. + * In order to fix this permanent oscillation, if current MS_PWR used/announced + * by MS is good ("ms_dbm == new_dbm", hence within thresholds and no change + * required) but has higher Tx power than the one we last requested, we ignore + * it and keep requesting for one with lower Tx power. This way we converge to + * the lowest good Tx power avoiding oscillating over values within thresholds. + */ + ignore = (ms_dbm == new_dbm && ms_dbm > current_dbm); + + if (lchan->ms_power == new_power_lvl || ignore) { + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping MS power at control level %d (%d dBm): " + "ms-pwr-lvl[curr %" PRIu8 ", max %" PRIu8 "], RSSI[curr %d, avg %d, thresh %d..%d] dBm\n", + new_power_lvl, ms_dbm, ms_power_lvl, bsc_max_dbm, ul_rssi_dbm, rxlev2dbm(rxlev_avg), + rxlev2dbm(params->rxlev_meas.lower_thresh), rxlev2dbm(params->rxlev_meas.upper_thresh)); + return 0; + } + + LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "%s MS power control level %d (%d dBm) => %d (%d dBm): " + "ms-pwr-lvl[curr %" PRIu8 ", max %" PRIu8 "], RSSI[curr %d, avg %d, thresh %d..%d] dBm\n", + (new_dbm > current_dbm) ? "Raising" : "Lowering", + lchan->ms_power, current_dbm, new_power_lvl, new_dbm, ms_power_lvl, + bsc_max_dbm, ul_rssi_dbm, rxlev2dbm(rxlev_avg), + rxlev2dbm(params->rxlev_meas.lower_thresh), rxlev2dbm(params->rxlev_meas.upper_thresh)); + + lchan_update_ms_power_ctrl_level(lchan, new_dbm); + + return 1; + +} diff --git a/tests/power_ctrl.vty b/tests/power_ctrl.vty index 491adca..9747ec2 100644 --- a/tests/power_ctrl.vty +++ b/tests/power_ctrl.vty @@ -28,7 +28,7 @@ OsmoBSC(config-net-bts)# bs-power-control OsmoBSC(config-bs-power-ctrl)# list with-flags ... - . l. mode (static|dyn-bts) [reset] + . l. mode (static|dyn-bts|dyn-bsc) [reset] . l. bs-power (static|dyn-max) <0-30> . lv ctrl-interval <0-31> . lv step-size inc <2-6> red <2-4> @@ -109,7 +109,7 @@ OsmoBSC(config-net-bts)# ms-power-control OsmoBSC(config-ms-power-ctrl)# list with-flags ... - . l. mode (static|dyn-bts) [reset] + . l. mode (static|dyn-bts|dyn-bsc) [reset] . l. bs-power (static|dyn-max) <0-30> . lv ctrl-interval <0-31> . lv step-size inc <2-6> red <2-4> -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibc307e758697eb5ca3fb86622f35709d6077db9e Gerrit-Change-Number: 25654 Gerrit-PatchSet: 13 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 06:29:37 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 5 Oct 2021 06:29:37 +0000 Subject: Change in osmo-bsc[master]: tsc fixup: tweak condition for coverity References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25684 ) Change subject: tsc fixup: tweak condition for coverity ...................................................................... tsc fixup: tweak condition for coverity Related: CID#240352 SYS#4895 Change-Id: Idbc6b47df0aeca9b6d870386b037dd6fb7c96c82 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/84/25684/1 diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index a1b423f..1449bdb 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -836,13 +836,14 @@ .ch_mode_rate = conn->assignment.selected_ch_mode_rate, .requires_voice_stream = conn->assignment.requires_voice_stream, .msc_assigned_cic = req->msc_assigned_cic, - /* keep previous training sequence code */ + /* keep previous training sequence code. TSC is always present, TSC Set may or may not be an explicit + * value. */ .tsc_set = { .present = (lchan->tsc_set >= 0), .val = lchan->tsc_set, }, .tsc = { - .present = (lchan->tsc >= 0), + .present = true, .val = lchan->tsc, }, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idbc6b47df0aeca9b6d870386b037dd6fb7c96c82 Gerrit-Change-Number: 25684 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 06:29:53 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 5 Oct 2021 06:29:53 +0000 Subject: Change in osmo-bsc[master]: drop obsolete comment References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25685 ) Change subject: drop obsolete comment ...................................................................... drop obsolete comment Change-Id: I7cc79e368512483ff4e1e56b49ad2b950f627c2f --- M include/osmocom/bsc/gsm_data.h 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/85/25685/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 36d364c..99d1d18 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1153,12 +1153,6 @@ }; struct gsm_network { - /* TODO MSCSPLIT the gsm_network struct is basically a kitchen sink for - * global settings and variables, "madly" mixing BSC and MSC stuff. Split - * this in e.g. struct osmo_bsc and struct osmo_msc, with the things - * these have in common, like country and network code, put in yet - * separate structs and placed as members in osmo_bsc and osmo_msc. */ - struct osmo_plmn_id plmn; /* bit-mask of permitted encryption algorithms. LSB=A5/0, MSB=A5/7 */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7cc79e368512483ff4e1e56b49ad2b950f627c2f Gerrit-Change-Number: 25685 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 06:31:05 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 5 Oct 2021 06:31:05 +0000 Subject: Change in osmo-bsc[master]: drop obsolete comment In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25685 ) Change subject: drop obsolete comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7cc79e368512483ff4e1e56b49ad2b950f627c2f Gerrit-Change-Number: 25685 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: neels Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 05 Oct 2021 06:31:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 06:31:14 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 5 Oct 2021 06:31:14 +0000 Subject: Change in osmo-bsc[master]: tsc fixup: tweak condition for coverity In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25684 ) Change subject: tsc fixup: tweak condition for coverity ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idbc6b47df0aeca9b6d870386b037dd6fb7c96c82 Gerrit-Change-Number: 25684 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: neels Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 05 Oct 2021 06:31:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 06:44:07 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 5 Oct 2021 06:44:07 +0000 Subject: Change in osmo-bsc[master]: tsc fixup: tweak condition for coverity In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25684 ) Change subject: tsc fixup: tweak condition for coverity ...................................................................... tsc fixup: tweak condition for coverity Related: CID#240352 SYS#4895 Change-Id: Idbc6b47df0aeca9b6d870386b037dd6fb7c96c82 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index a1b423f..1449bdb 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -836,13 +836,14 @@ .ch_mode_rate = conn->assignment.selected_ch_mode_rate, .requires_voice_stream = conn->assignment.requires_voice_stream, .msc_assigned_cic = req->msc_assigned_cic, - /* keep previous training sequence code */ + /* keep previous training sequence code. TSC is always present, TSC Set may or may not be an explicit + * value. */ .tsc_set = { .present = (lchan->tsc_set >= 0), .val = lchan->tsc_set, }, .tsc = { - .present = (lchan->tsc >= 0), + .present = true, .val = lchan->tsc, }, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idbc6b47df0aeca9b6d870386b037dd6fb7c96c82 Gerrit-Change-Number: 25684 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 06:44:07 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 5 Oct 2021 06:44:07 +0000 Subject: Change in osmo-bsc[master]: drop obsolete comment In-Reply-To: References: Message-ID: neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25685 ) Change subject: drop obsolete comment ...................................................................... drop obsolete comment Change-Id: I7cc79e368512483ff4e1e56b49ad2b950f627c2f --- M include/osmocom/bsc/gsm_data.h 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 36d364c..99d1d18 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1153,12 +1153,6 @@ }; struct gsm_network { - /* TODO MSCSPLIT the gsm_network struct is basically a kitchen sink for - * global settings and variables, "madly" mixing BSC and MSC stuff. Split - * this in e.g. struct osmo_bsc and struct osmo_msc, with the things - * these have in common, like country and network code, put in yet - * separate structs and placed as members in osmo_bsc and osmo_msc. */ - struct osmo_plmn_id plmn; /* bit-mask of permitted encryption algorithms. LSB=A5/0, MSB=A5/7 */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7cc79e368512483ff4e1e56b49ad2b950f627c2f Gerrit-Change-Number: 25685 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 08:35:39 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 5 Oct 2021 08:35:39 +0000 Subject: Change in osmo-bsc[master]: stat: add bts.N.num_trx:rsl_connected In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25507 ) Change subject: stat: add bts.N.num_trx:rsl_connected ...................................................................... Patch Set 5: Code-Review+1 > Patch Set 3: > > @osmith, maybe another thing that the linter shouldn't care about? > anyone having an opinion to the contrary? => https://gerrit.osmocom.org/c/osmo-bsc/+/25506/5#message-c585e993a4ac62be07d41bcd86999e282903b215 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I55b55159fe13d937e441d8c2ed915734463e1154 Gerrit-Change-Number: 25507 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 05 Oct 2021 08:35:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 08:38:00 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 5 Oct 2021 08:38:00 +0000 Subject: Change in osmo-msc[master]: Make UTRAN encryption algorithms configurable In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22766 ) Change subject: Make UTRAN encryption algorithms configurable ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I91f9e50f9c1439aa19528f887b83ae9de628fcfd Gerrit-Change-Number: 22766 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 05 Oct 2021 08:38:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 08:42:47 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 5 Oct 2021 08:42:47 +0000 Subject: Change in osmo-bsc[master]: stat: add bts.N.num_trx:rsl_connected In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25507 ) Change subject: stat: add bts.N.num_trx:rsl_connected ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I55b55159fe13d937e441d8c2ed915734463e1154 Gerrit-Change-Number: 25507 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 05 Oct 2021 08:42:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 08:47:12 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 5 Oct 2021 08:47:12 +0000 Subject: Change in osmo-bts[master]: MS Power Control Loop: Use P_CON_INTERVAL=2 by default In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25682 ) Change subject: MS Power Control Loop: Use P_CON_INTERVAL=2 by default ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I91c505447f68714239a4f033d4f06e91893df201 Gerrit-Change-Number: 25682 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 05 Oct 2021 08:47:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 08:49:37 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 5 Oct 2021 08:49:37 +0000 Subject: Change in libosmocore[master]: gsmtap: allow 127.0.0.x local listeners In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25622 ) Change subject: gsmtap: allow 127.0.0.x local listeners ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1043dfd8075f14481011f43db45c943e9320413c Gerrit-Change-Number: 25622 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 05 Oct 2021 08:49:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 09:10:23 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 5 Oct 2021 09:10:23 +0000 Subject: Change in osmo-bts[master]: rsl: prevent race condition during timeslot re-configuration In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25674 ) Change subject: rsl: prevent race condition during timeslot re-configuration ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25674/2/src/common/rsl.c File src/common/rsl.c: https://gerrit.osmocom.org/c/osmo-bts/+/25674/2/src/common/rsl.c at 3258 PS2, Line 3258: msgb_free(msg); Its a bit difficult to track the ownership of the msg. Maybe a comment might help to understand why we may lchan->rsl_chan_activ = NULL all while at the same time we have a condition around msgb_free(msg). I guess this is because when rsl_rx_chan_activ(msg) is returning 1, the cycle just started over and rsl_rx_chan_activ(msg) populates lchan->rsl_chan_activ again. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Gerrit-Change-Number: 25674 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Tue, 05 Oct 2021 09:10:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 09:13:23 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 5 Oct 2021 09:13:23 +0000 Subject: Change in osmo-bts[master]: rsl: prevent race condition during timeslot re-configuration In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25674 ) Change subject: rsl: prevent race condition during timeslot re-configuration ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25674/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/25674/2//COMMIT_MSG at 8 PS2, Line 8: It also might help to explain why this is fixing a race condition. My guess is that since now you are handling the msg on lchan level rather then on ts level it can not be overwritten by the msg that is related to a different lchan on the same ts. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Gerrit-Change-Number: 25674 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Tue, 05 Oct 2021 09:13:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 11:41:44 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 5 Oct 2021 11:41:44 +0000 Subject: Change in osmocom-bb[master]: logging: use meaningful default loglevels In-Reply-To: References: Message-ID: Hello laforge, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 to look at the new patch set (#2). Change subject: logging: use meaningful default loglevels ...................................................................... logging: use meaningful default loglevels Some logging categories use LOGL_INFO or even LOGL_DEBUG. Lets set those to LOGL_NOTICE to have a less crowded default log output. Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Related: OS#2577 --- M src/host/layer23/src/common/logging.c M src/host/virt_phy/src/logging.c 2 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/92/16892/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 11:58:37 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 5 Oct 2021 11:58:37 +0000 Subject: Change in pysim[master]: cards: FairwavesSIM: force SIM APDUs during programming In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/24139 to look at the new patch set (#3). Change subject: cards: FairwavesSIM: force SIM APDUs during programming ...................................................................... cards: FairwavesSIM: force SIM APDUs during programming The FairwavesSIM programming fails when the card is accessed with USIM APDUs. To keep it working temporarly switch to SIM APDUs during programming. Change-Id: I8f02625d2b620ecdf4b2afc27a8750119b707152 --- M pySim/cards.py 1 file changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/39/24139/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/24139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8f02625d2b620ecdf4b2afc27a8750119b707152 Gerrit-Change-Number: 24139 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 11:58:56 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 5 Oct 2021 11:58:56 +0000 Subject: Change in pysim[master]: cards: FairwavesSIM: force SIM APDUs during programming In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/24139 ) Change subject: cards: FairwavesSIM: force SIM APDUs during programming ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/pysim/+/24139/2/pySim/cards.py File pySim/cards.py: https://gerrit.osmocom.org/c/pysim/+/24139/2/pySim/cards.py at 1142 PS2, Line 1142: > Now you introducing this unrelated ws... Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/24139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8f02625d2b620ecdf4b2afc27a8750119b707152 Gerrit-Change-Number: 24139 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 05 Oct 2021 11:58:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 12:00:24 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 12:00:24 +0000 Subject: Change in osmocom-bb[master]: logging: use meaningful default loglevels In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16892 ) Change subject: logging: use meaningful default loglevels ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 05 Oct 2021 12:00:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 12:06:22 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 5 Oct 2021 12:06:22 +0000 Subject: Change in pysim[master]: cards: FairwavesSIM: force SIM APDUs during programming In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/24139 ) Change subject: cards: FairwavesSIM: force SIM APDUs during programming ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/24139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8f02625d2b620ecdf4b2afc27a8750119b707152 Gerrit-Change-Number: 24139 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 05 Oct 2021 12:06:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 12:07:02 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 5 Oct 2021 12:07:02 +0000 Subject: Change in pysim[master]: cards: FairwavesSIM: force SIM APDUs during programming In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/24139 ) Change subject: cards: FairwavesSIM: force SIM APDUs during programming ...................................................................... Patch Set 3: (was ready to submit, only fixed a merge conflict - no actual changes made) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/24139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8f02625d2b620ecdf4b2afc27a8750119b707152 Gerrit-Change-Number: 24139 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 05 Oct 2021 12:07:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 12:07:09 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 5 Oct 2021 12:07:09 +0000 Subject: Change in pysim[master]: cards: FairwavesSIM: force SIM APDUs during programming In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/24139 ) Change subject: cards: FairwavesSIM: force SIM APDUs during programming ...................................................................... cards: FairwavesSIM: force SIM APDUs during programming The FairwavesSIM programming fails when the card is accessed with USIM APDUs. To keep it working temporarly switch to SIM APDUs during programming. Change-Id: I8f02625d2b620ecdf4b2afc27a8750119b707152 --- M pySim/cards.py 1 file changed, 18 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved diff --git a/pySim/cards.py b/pySim/cards.py index c38b185..5e2e9fe 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -1123,8 +1123,25 @@ data, sw = self._scc.update_binary(self._EF['OP/OPC'], content) return sw - def program(self, p): + # For some reason the card programming only works when the card + # is handled as a classic SIM, even though it is an USIM, so we + # reconfigure the class byte and the select control field on + # the fly. When the programming is done the original values are + # restored. + cla_byte_orig = self._scc.cla_byte + sel_ctrl_orig = self._scc.sel_ctrl + self._scc.cla_byte = "a0" + self._scc.sel_ctrl = "0000" + + try: + self._program(p) + finally: + # restore original cla byte and sel ctrl + self._scc.cla_byte = cla_byte_orig + self._scc.sel_ctrl = sel_ctrl_orig + + def _program(self, p): # authenticate as ADM1 if not p['pin_adm']: raise ValueError("Please provide a PIN-ADM as there is no default one") -- To view, visit https://gerrit.osmocom.org/c/pysim/+/24139 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I8f02625d2b620ecdf4b2afc27a8750119b707152 Gerrit-Change-Number: 24139 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 12:11:53 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 5 Oct 2021 12:11:53 +0000 Subject: Change in pysim[master]: WIP In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/24136 ) Change subject: WIP ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/pysim/+/24136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id6527254a7305516f2d00876815e46a3c71a81b6 Gerrit-Change-Number: 24136 Gerrit-PatchSet: 7 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Falkenber9 Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 12:54:29 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 5 Oct 2021 12:54:29 +0000 Subject: Change in pysim[master]: cards: remove unused function card_autodetect() References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25686 ) Change subject: cards: remove unused function card_autodetect() ...................................................................... cards: remove unused function card_autodetect() The function card_autodetect() is not used, lets remove it. Change-Id: Ic188e1fffb4a40e89ad276941d20f94cf35e1538 --- M pySim/cards.py 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/86/25686/1 diff --git a/pySim/cards.py b/pySim/cards.py index 5e2e9fe..2f96ee1 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -1559,14 +1559,6 @@ SysmoSIMgr1, SysmoSIMgr2, SysmoUSIMgr1, SysmoUSIMSJS1, FairwavesSIM, OpenCellsSim, WavemobileSim, SysmoISIMSJA2 ] -def card_autodetect(scc): - for kls in _cards_classes: - card = kls.autodetect(scc) - if card is not None: - card.reset() - return card - return None - def card_detect(ctype, scc): # Detect type if needed card = None -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic188e1fffb4a40e89ad276941d20f94cf35e1538 Gerrit-Change-Number: 25686 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 13:59:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 13:59:08 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: Fix extra empty line References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25687 ) Change subject: cosmetic: Fix extra empty line ...................................................................... cosmetic: Fix extra empty line Change-Id: Ibd499fc9376523e6dcfe8ba6792603c237db59f5 --- M src/osmo_ss7.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/87/25687/1 diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 6d68290..ebed9cf 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1196,7 +1196,6 @@ * \param[in] host string containing an IP addresses. * \returns 0 on success; negtive otherwise */ int osmo_ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host) - { int i; bool new_is_v6 = osmo_ip_str_type(host) == AF_INET6; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibd499fc9376523e6dcfe8ba6792603c237db59f5 Gerrit-Change-Number: 25687 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 14:09:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 14:09:27 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: Fix typos in documentation References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25688 ) Change subject: cosmetic: Fix typos in documentation ...................................................................... cosmetic: Fix typos in documentation Change-Id: I1164490c140cc5ca82e5977d24f5971ba216014b --- M src/sccp_user.c 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/88/25688/1 diff --git a/src/sccp_user.c b/src/sccp_user.c index d8e78f0..a654cc6 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -475,10 +475,10 @@ * \param[in] name human readable name * \param[in] default_pc pointcode to be used on missing VTY setting * \param[in] prot protocol to be used (e.g OSMO_SS7_ASP_PROT_M3UA) - * \param[in] default_local_port local port to be usd on missing VTY setting - * \param[in] default_local_ip local IP-address to be usd on missing VTY setting - * \param[in] default_remote_port remote port to be usd on missing VTY setting - * \param[in] default_remote_ip remote IP-address to be usd on missing VTY setting + * \param[in] default_local_port local port to be used on missing VTY setting + * \param[in] default_local_ip local IP-address to be used on missing VTY setting + * \param[in] default_remote_port remote port to be used on missing VTY setting + * \param[in] default_remote_ip remote IP-address to be used on missing VTY setting * \returns callee-allocated SCCP instance on success; NULL on error */ struct osmo_sccp_instance * @@ -664,10 +664,10 @@ * \param[in] name human readable name * \param[in] default_pc pointcode to be used on missing VTY setting * \param[in] prot protocol to be used (e.g OSMO_SS7_ASP_PROT_M3UA) - * \param[in] default_local_port local port to be usd on missing VTY setting - * \param[in] default_local_ip local IP-address to be usd on missing VTY setting - * \param[in] default_remote_port remote port to be usd on missing VTY setting - * \param[in] default_remote_ip remote IP-address to be usd on missing VTY setting + * \param[in] default_local_port local port to be used on missing VTY setting + * \param[in] default_local_ip local IP-address to be used on missing VTY setting + * \param[in] default_remote_port remote port to be used on missing VTY setting + * \param[in] default_remote_ip remote IP-address to be used on missing VTY setting * \returns callee-allocated SCCP instance on success; NULL on error */ struct osmo_sccp_instance * osmo_sccp_simple_client(void *ctx, const char *name, uint32_t default_pc, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1164490c140cc5ca82e5977d24f5971ba216014b Gerrit-Change-Number: 25688 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 14:25:19 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 5 Oct 2021 14:25:19 +0000 Subject: Change in osmocom-bb[master]: logging: use meaningful default loglevels In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16892 ) Change subject: logging: use meaningful default loglevels ...................................................................... Patch Set 2: Do we still have useful logging, such as the state of network selection and RR/MM connection establishment? Yes, currently the logging may look like Tank's screen in "The Matrix"... However it's easy to see if (and sometimes why) something goes wrong, given the instability of some layer23 apps. I am afraid with the new "meaningful" defaults we may end up with meaningless emptiness in the output... -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 05 Oct 2021 14:25:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 15:03:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 15:03:59 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 ) Change subject: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts ...................................................................... osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts Allow user apps to relay the decision of proper default local/remote hosts values to the library. Proper configuration of these addresses can be quite cumbersome to get correctly, or confusing at least. That's due to the multi-homing feature of SCTP where both IPv4 and IPv6 are involved. We were already doing this kind of automatic setup in osmo_ss7_vty_go_parent(), where we do validations and assign addresses based on IPv6 availability. On the other hand, apps using osmo_sccp_simple_client_on_ss7_id() API usually pass "localhost" as default address. In Linux, when IPv6 is enabled localhost is resolved as "::1", and "127.0.0.1" when IPv6 is disabled. Let's instead allow apps to relay the setup to the lib, so same addresses can be applied both during VTY command as well as if there was no VTY setup at all. Related: OS#5186 Change-Id: I82e203612571b7651d758d8148661f706a1642ba --- M src/Makefile.am M src/osmo_ss7.c M src/osmo_ss7_vty.c M src/sccp_user.c A src/ss7_internal.h 5 files changed, 104 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/89/25689/1 diff --git a/src/Makefile.am b/src/Makefile.am index aee7fd5..9d5e9a3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) -noinst_HEADERS = sccp_internal.h xua_asp_fsm.h xua_as_fsm.h xua_internal.h +noinst_HEADERS = sccp_internal.h ss7_internal.h xua_asp_fsm.h xua_as_fsm.h xua_internal.h # Legacy static libs diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index ebed9cf..749e987 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1225,6 +1225,73 @@ return 0; } +static bool ipv6_sctp_supported(const char *host, bool bind) +{ + int rc; + struct addrinfo hints; + struct addrinfo *result; + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_INET6; + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_NUMERICHOST; + hints.ai_protocol = 0; /* Any protocol */ + + if (bind) /* For wildcard IP address */ + hints.ai_flags |= AI_PASSIVE; + + /* man getaddrinfo: Either node or service, but not both, may be NULL. */ + OSMO_ASSERT(host); + rc = getaddrinfo(host, NULL, &hints, &result); + if (rc != 0) { + LOGP(DLSS7, LOGL_NOTICE, "Default IPv6 address %s not supported: %s\n", + host, gai_strerror(rc)); + return false; + } else { + freeaddrinfo(result); + return true; + } +} + +/* Set default values for local and remote peer hosts if they are not yet set. + * \param[in] asp ASP for which to set default hosts. + * \returns true if values where changed, false oterwise. + * + * If the ASP is already started, osmo_ss7_asp_restart() must be called + * afterwards in order to apply the new settings. + * This API is internal, hence doesn't appear in osmo_ss7.h + */ +bool osmo_ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp) +{ + bool changed = false; + /* If no local addr was set */ + if (!asp->cfg.local.host_cnt) { + bool rem_has_v4 = false, rem_has_v6 = false; + int i; + for (i = 0; i < asp->cfg.remote.host_cnt; i++) { + if (osmo_ip_str_type(asp->cfg.remote.host[i]) == AF_INET6) + rem_has_v6 = true; + else + rem_has_v4 = true; + } + /* "::" Covers both IPv4 and IPv6, but if only IPv4 + * address are set on the remote side, IPv4 on the local + * side must be set too */ + if (ipv6_sctp_supported("::", true) && !(rem_has_v4 && !rem_has_v6)) + osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "::"); + else + osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "0.0.0.0"); + changed = true; + } + /* If no remote addr was set */ + if (!asp->cfg.remote.host_cnt) { + osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "127.0.0.1"); + if (ipv6_sctp_supported("::1", false)) + osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "::1"); + changed = true; + } + return changed; +} + struct osmo_ss7_asp * osmo_ss7_asp_find_by_name(struct osmo_ss7_instance *inst, const char *name) { @@ -2171,6 +2238,20 @@ return osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt); } +bool osmo_ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs) +{ + /* If no local addr was set, or erased after _create(): */ + if (!oxs->cfg.local.host_cnt) { + /* "::" Covers both IPv4 and IPv6 */ + if (ipv6_sctp_supported("::", true)) + osmo_ss7_xua_server_set_local_host(oxs, "::"); + else + osmo_ss7_xua_server_set_local_host(oxs, "0.0.0.0"); + return true; + } + return false; +} + void osmo_ss7_xua_server_destroy(struct osmo_xua_server *xs) { struct osmo_ss7_asp *asp, *asp2; diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 3b39a61..8ee3087 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -45,8 +45,7 @@ #include "xua_internal.h" #include #include "sccp_internal.h" - -#include "sccp_internal.h" +#include "ss7_internal.h" #define XUA_VAR_STR "(sua|m3ua|ipa)" @@ -1937,33 +1936,6 @@ osmo_sccp_vty_write_cs7_node(vty, " ", inst->sccp); } -static bool ipv6_sctp_supported(const char *host, bool bind) -{ - int rc; - struct addrinfo hints; - struct addrinfo *result; - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_INET6; - hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_NUMERICHOST; - hints.ai_protocol = 0; /* Any protocol */ - - if (bind) /* For wildcard IP address */ - hints.ai_flags |= AI_PASSIVE; - - /* man getaddrinfo: Either node or service, but not both, may be NULL. */ - OSMO_ASSERT(host); - rc = getaddrinfo(host, NULL, &hints, &result); - if (rc != 0) { - LOGP(DLSS7, LOGL_NOTICE, "Default IPv6 address %s not supported: %s\n", - host, gai_strerror(rc)); - return false; - } else { - freeaddrinfo(result); - return true; - } -} - int osmo_ss7_vty_go_parent(struct vty *vty) { struct osmo_ss7_as *as; @@ -1975,30 +1947,8 @@ switch (vty->node) { case L_CS7_ASP_NODE: asp = vty->index; - /* If no local addr was set */ - if (!asp->cfg.local.host_cnt) { - bool rem_has_v4 = false, rem_has_v6 = false; - int i; - for (i = 0; i < asp->cfg.remote.host_cnt; i++) { - if (osmo_ip_str_type(asp->cfg.remote.host[i]) == AF_INET6) - rem_has_v6 = true; - else - rem_has_v4 = true; - } - /* "::" Covers both IPv4 and IPv6, but if only IPv4 - * address are set on the remote side, IPv4 on the local - * side must be set too */ - if (ipv6_sctp_supported("::", true) && !(rem_has_v4 && !rem_has_v6)) - osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "::"); - else - osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "0.0.0.0"); - } - /* If no remote addr was set */ - if (!asp->cfg.remote.host_cnt) { - osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "127.0.0.1"); - if (ipv6_sctp_supported("::1", false)) - osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "::1"); - } + /* Make sure proper defaults values are set */ + osmo_ss7_asp_set_default_peer_hosts(asp); osmo_ss7_asp_restart(asp); vty->node = L_CS7_NODE; vty->index = asp->inst; @@ -2016,13 +1966,7 @@ case L_CS7_XUA_NODE: oxs = vty->index; /* If no local addr was set, or erased after _create(): */ - if (!oxs->cfg.local.host_cnt) { - /* "::" Covers both IPv4 and IPv6 */ - if (ipv6_sctp_supported("::", true)) - osmo_ss7_xua_server_set_local_host(oxs, "::"); - else - osmo_ss7_xua_server_set_local_host(oxs, "0.0.0.0"); - } + osmo_ss7_xua_server_set_default_local_hosts(oxs); if (osmo_ss7_xua_server_bind(oxs) < 0) vty_out(vty, "%% Unable to bind xUA server to IP(s)%s", VTY_NEWLINE); vty->node = L_CS7_NODE; diff --git a/src/sccp_user.c b/src/sccp_user.c index a654cc6..ade9487 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -38,6 +38,7 @@ #include "sccp_internal.h" #include "xua_internal.h" +#include "ss7_internal.h" /*! \brief Find a SCCP User registered for given PC+SSN or SSN only * First search all users with a valid PC for a full PC+SSN match. @@ -476,9 +477,9 @@ * \param[in] default_pc pointcode to be used on missing VTY setting * \param[in] prot protocol to be used (e.g OSMO_SS7_ASP_PROT_M3UA) * \param[in] default_local_port local port to be used on missing VTY setting - * \param[in] default_local_ip local IP-address to be used on missing VTY setting + * \param[in] default_local_ip local IP-address to be used on missing VTY setting (NULL: use library own defaults) * \param[in] default_remote_port remote port to be used on missing VTY setting - * \param[in] default_remote_ip remote IP-address to be used on missing VTY setting + * \param[in] default_remote_ip remote IP-address to be used on missing VTY setting (NULL: use library own defaults) * \returns callee-allocated SCCP instance on success; NULL on error */ struct osmo_sccp_instance * @@ -618,8 +619,12 @@ if (!asp) goto out_rt; asp_created = true; - osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp, &default_local_ip, 1); - osmo_ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1); + if (default_local_ip) + osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp, &default_local_ip, 1); + if (default_remote_ip) + osmo_ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1); + /* Make sure proper defaults are applied if app didn't provide specific default values */ + osmo_ss7_asp_set_default_peer_hosts(asp); asp->simple_client_allocated = true; } diff --git a/src/ss7_internal.h b/src/ss7_internal.h new file mode 100644 index 0000000..28e239c --- /dev/null +++ b/src/ss7_internal.h @@ -0,0 +1,9 @@ +#pragma once + +/* Internal header used by libosmo-sccp, not available publicly for lib users */ + +#include +#include + +bool osmo_ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp); +bool osmo_ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I82e203612571b7651d758d8148661f706a1642ba Gerrit-Change-Number: 25689 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 15:07:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 15:07:19 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4... In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 ) Change subject: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I82e203612571b7651d758d8148661f706a1642ba Gerrit-Change-Number: 25689 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 15:07:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 15:07:35 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 ) Change subject: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts ...................................................................... Patch Set 1: linter doesn't apply here since I'm just moving one function around. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I82e203612571b7651d758d8148661f706a1642ba Gerrit-Change-Number: 25689 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 05 Oct 2021 15:07:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 15:25:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 15:25:42 +0000 Subject: Change in osmo-gsm-manuals[master]: cs7-config.adoc: Improve doc on default SS7 SCTP addresses References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/25690 ) Change subject: cs7-config.adoc: Improve doc on default SS7 SCTP addresses ...................................................................... cs7-config.adoc: Improve doc on default SS7 SCTP addresses Related: OS#5186 Change-Id: Ic8d9c00ae50907f1adad8f70b773e7b1362c4f50 --- M common/chapters/cs7-config.adoc 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/90/25690/1 diff --git a/common/chapters/cs7-config.adoc b/common/chapters/cs7-config.adoc index 62e85bb..5ac9bae 100644 --- a/common/chapters/cs7-config.adoc +++ b/common/chapters/cs7-config.adoc @@ -76,9 +76,6 @@ === Connect to STP Instance -By default, an STP instance is assumed to listen on the default M3UA port -(2905) on the local host (127.0.0.1). - Establishing an SCCP/M3UA link towards a remote STP instance can be configured as: @@ -93,6 +90,19 @@ Be aware that such an `asp` needs to be linked to an `as`, see <>. +By default, an STP instance is assumed to listen on the default M3UA port +(2905) on the local host. That means in general `127.0.0.1` will be used as +default remote SCTP address, and `::1` will be added to the SCTP association if +IPv6 support is available on the system. + +NOTE: OsmoSTP listens by default on `::` if IPv6 is enabled on the system, +and on `0.0.0.0` otherwise. Address `::` actually superseeds `0.0.0.0`, meaning +it will listen on all IPv4 and IPv6 addresses available on the system. + +CAUTION: Some applications overwrite the default target remote address to +be `localhost`. If IPv6 support is available on the system, `localhost` will +usually resolve to `::1`, otherwise it will usually resolve to `127.0.0.1`. + === Local Point-Code Each CNI program on an SCCP/M3UA link typically has a local point-code, -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/25690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic8d9c00ae50907f1adad8f70b773e7b1362c4f50 Gerrit-Change-Number: 25690 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 15:58:52 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 5 Oct 2021 15:58:52 +0000 Subject: Change in osmocom-bb[master]: logging: use meaningful default loglevels In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16892 ) Change subject: logging: use meaningful default loglevels ...................................................................... Patch Set 2: > Patch Set 2: > > Do we still have useful logging, such as the state of network selection and RR/MM connection establishment? Yes, currently the logging may look like Tank's screen in "The Matrix"... However it's easy to see if (and sometimes why) something goes wrong, given the instability of some layer23 apps. I am afraid with the new "meaningful" defaults we may end up with meaningless emptiness in the output... I do not insist of changing the logging levels but since this patch got a +1 from laforge and pespin I thought it might be worth to rebase it. osmocom-bb also special. It is not used productively, so the logging defaults do not play such a big role I think. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 05 Oct 2021 15:58:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 16:03:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 16:03:32 +0000 Subject: Change in osmo-bts[master]: load_indication.c: Avoid sending if CCCH is still not operational References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25691 ) Change subject: load_indication.c: Avoid sending if CCCH is still not operational ...................................................................... load_indication.c: Avoid sending if CCCH is still not operational It makes no sense to transmit load information if the channel is still not operational. This solves errors messages seen in osmo-bsc. Related: OS#4872 Change-Id: I7ddda9776158eed0694df9e458f3f91df90bf674 --- M src/common/load_indication.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/91/25691/1 diff --git a/src/common/load_indication.c b/src/common/load_indication.c index 69af9c6..d5b76ea 100644 --- a/src/common/load_indication.c +++ b/src/common/load_indication.c @@ -41,6 +41,10 @@ struct gsm_bts *bts = data; unsigned int pch_percent, rach_percent; + /* It makes no sense to send Load Indication if CCCH is still disabled...*/ + if (bts->c0->ts[0].mo.nm_state.operational != NM_OPSTATE_ENABLED) + goto retry_later; + /* compute percentages */ if (bts->load.ccch.pch_total == 0) pch_percent = 0; @@ -73,6 +77,7 @@ bts->load.rach.access); } +retry_later: reset_load_counters(bts); /* re-schedule the timer */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ddda9776158eed0694df9e458f3f91df90bf674 Gerrit-Change-Number: 25691 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 16:24:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 16:24:28 +0000 Subject: Change in osmo-bsc[master]: cosmetic: Fix typo in comment References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25692 ) Change subject: cosmetic: Fix typo in comment ...................................................................... cosmetic: Fix typo in comment Change-Id: If95b653d9c31292f8e771f0d460fc8f008fd3e24 --- M src/osmo-bsc/nm_rcarrier_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/92/25692/1 diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c index 4bb62fc..b9e67c1 100644 --- a/src/osmo-bsc/nm_rcarrier_fsm.c +++ b/src/osmo-bsc/nm_rcarrier_fsm.c @@ -120,7 +120,7 @@ * be sent during Dependency, so we simply move to OFFLINE state here to * avoid duplicating code. However, RadioCarrier seems to be implemented * correctly and goes to Offline state during startup. If some HW - * version is found with the aboev estated bug, this code needs to be + * version is found with the above estated bug, this code needs to be * enabled, similar to what we do in nm_bb_transc_fsm: */ /*if (trx->bts->site_mgr.peer_has_no_avstate_offline) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If95b653d9c31292f8e771f0d460fc8f008fd3e24 Gerrit-Change-Number: 25692 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 17:10:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 5 Oct 2021 17:10:21 +0000 Subject: Change in osmo-bts[master]: load_indication.c: Avoid sending if CCCH is still not operational In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25691 ) Change subject: load_indication.c: Avoid sending if CCCH is still not operational ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ddda9776158eed0694df9e458f3f91df90bf674 Gerrit-Change-Number: 25691 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 05 Oct 2021 17:10:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 17:33:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 17:33:29 +0000 Subject: Change in osmo-bsc[master]: bts_trx: Fix timeslot_fsm not properly freed during trx free() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25693 ) Change subject: bts_trx: Fix timeslot_fsm not properly freed during trx free() ...................................................................... bts_trx: Fix timeslot_fsm not properly freed during trx free() osmo_fsm_inst_free() must be called explicitly, otherwise the instance is kept in the llit of instances and produces heap-use-after-free. Change-Id: Ib0e5560efe518833f76f846d7269e82d85c186a1 --- M include/osmocom/bsc/timeslot_fsm.h M src/osmo-bsc/bts_trx.c M src/osmo-bsc/timeslot_fsm.c 3 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/25693/1 diff --git a/include/osmocom/bsc/timeslot_fsm.h b/include/osmocom/bsc/timeslot_fsm.h index f5e4b4c..1831537 100644 --- a/include/osmocom/bsc/timeslot_fsm.h +++ b/include/osmocom/bsc/timeslot_fsm.h @@ -45,6 +45,7 @@ void ts_fsm_init(); void ts_fsm_alloc(struct gsm_bts_trx_ts *ts); +void ts_fsm_free(struct gsm_bts_trx_ts *ts); bool ts_is_capable_of_pchan(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config pchan); bool ts_is_capable_of_lchant(struct gsm_bts_trx_ts *ts, enum gsm_chan_t type); diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c index 9f8837b..9b90c91 100644 --- a/src/osmo-bsc/bts_trx.c +++ b/src/osmo-bsc/bts_trx.c @@ -50,6 +50,7 @@ osmo_fsm_inst_free(ts->mo.fi); ts->mo.fi = NULL; } + ts_fsm_free(ts); } return 0; } diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index adca31d..8d256bb 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -66,6 +66,14 @@ ts_fsm_update_id(ts); } +void ts_fsm_free(struct gsm_bts_trx_ts *ts) +{ + if (ts->fi) { + osmo_fsm_inst_free(ts->fi); + ts->fi = NULL; + } +} + enum lchan_sanity { LCHAN_IS_INSANE = -1, LCHAN_IS_READY_TO_GO, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib0e5560efe518833f76f846d7269e82d85c186a1 Gerrit-Change-Number: 25693 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 17:33:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 17:33:57 +0000 Subject: Change in osmo-bsc[master]: bts_trx: Fix timeslot_fsm not properly freed during trx free() In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bsc/+/25693 ) Change subject: bts_trx: Fix timeslot_fsm not properly freed during trx free() ...................................................................... bts_trx: Fix timeslot_fsm not properly freed during trx free() osmo_fsm_inst_free() must be called explicitly, otherwise the instance is kept in the llist of instances and produces heap-use-after-free. Change-Id: Ib0e5560efe518833f76f846d7269e82d85c186a1 --- M include/osmocom/bsc/timeslot_fsm.h M src/osmo-bsc/bts_trx.c M src/osmo-bsc/timeslot_fsm.c 3 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/25693/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib0e5560efe518833f76f846d7269e82d85c186a1 Gerrit-Change-Number: 25693 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 17:40:19 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 5 Oct 2021 17:40:19 +0000 Subject: Change in osmo-bts[master]: Power-Loop: Fix LOG when Keeping MX Power level at the same level. References: Message-ID: keith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25694 ) Change subject: Power-Loop: Fix LOG when Keeping MX Power level at the same level. ...................................................................... Power-Loop: Fix LOG when Keeping MX Power level at the same level. The log message used the calcuated NEW power level and dB that would have been set if the conditions to actually change MX Power had been met. It was slightly confusing, resulting in erroneuos LOG messages such as: Lowering MS power control level 18 (7 dBm) => 19 (5 dBm) Keeping MS power at control level 19, 3 dBm Change-Id: I002b708cfda60371f57e32617e7ee33cb41c42f7 --- M src/common/power_control.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/94/25694/1 diff --git a/src/common/power_control.c b/src/common/power_control.c index 8f5ce37..d81a440 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -287,7 +287,7 @@ LOGPLCHAN(lchan, DLOOP, LOGL_INFO, "Keeping MS power at control level %d (%d dBm): " "ms-pwr-lvl[curr %" PRIu8 ", max %" PRIu8 "], RSSI[curr %d, avg %d, thresh %d..%d] dBm," " C/I[curr %d, avg %d, thresh %d..%d] dB\n", - new_power_lvl, new_dbm, ms_power_lvl, state->max, ul_rssi_dbm, rxlev2dbm(rxlev_avg), + ms_power_lvl, ms_dbm, ms_power_lvl, state->max, ul_rssi_dbm, rxlev2dbm(rxlev_avg), rxlev2dbm(params->rxlev_meas.lower_thresh), rxlev2dbm(params->rxlev_meas.upper_thresh), ul_lqual_cb/10, ul_lqual_cb_avg/10, ci_meas->lower_thresh, ci_meas->upper_thresh); return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I002b708cfda60371f57e32617e7ee33cb41c42f7 Gerrit-Change-Number: 25694 Gerrit-PatchSet: 1 Gerrit-Owner: keith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 17:41:46 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 5 Oct 2021 17:41:46 +0000 Subject: Change in osmo-bts[master]: Power-Loop: Fix LOG when Keeping MS Power level at the same level. In-Reply-To: References: Message-ID: keith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/25694 ) Change subject: Power-Loop: Fix LOG when Keeping MS Power level at the same level. ...................................................................... Power-Loop: Fix LOG when Keeping MS Power level at the same level. The log message used the calcuated NEW power level and dB that would have been set if the conditions to actually change MS Power had been met. It was slightly confusing, resulting in erroneuos LOG messages such as: Lowering MS power control level 18 (7 dBm) => 19 (5 dBm) Keeping MS power at control level 19, 3 dBm Change-Id: I002b708cfda60371f57e32617e7ee33cb41c42f7 --- M src/common/power_control.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/94/25694/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I002b708cfda60371f57e32617e7ee33cb41c42f7 Gerrit-Change-Number: 25694 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 18:14:54 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 5 Oct 2021 18:14:54 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: Fix extra empty line In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25687 ) Change subject: cosmetic: Fix extra empty line ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibd499fc9376523e6dcfe8ba6792603c237db59f5 Gerrit-Change-Number: 25687 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 05 Oct 2021 18:14:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 18:16:16 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 5 Oct 2021 18:16:16 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: Fix typos in documentation In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25688 ) Change subject: cosmetic: Fix typos in documentation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1164490c140cc5ca82e5977d24f5971ba216014b Gerrit-Change-Number: 25688 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 05 Oct 2021 18:16:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 18:37:42 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 5 Oct 2021 18:37:42 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 ) Change subject: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I82e203612571b7651d758d8148661f706a1642ba Gerrit-Change-Number: 25689 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 05 Oct 2021 18:37:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 19:07:03 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 5 Oct 2021 19:07:03 +0000 Subject: Change in osmo-gsm-manuals[master]: cs7-config.adoc: Improve doc on default SS7 SCTP addresses In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/25690 ) Change subject: cs7-config.adoc: Improve doc on default SS7 SCTP addresses ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/25690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic8d9c00ae50907f1adad8f70b773e7b1362c4f50 Gerrit-Change-Number: 25690 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 05 Oct 2021 19:07:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 19:11:37 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 5 Oct 2021 19:11:37 +0000 Subject: Change in osmo-bsc[master]: bts_trx: Fix timeslot_fsm not properly freed during trx free() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25693 ) Change subject: bts_trx: Fix timeslot_fsm not properly freed during trx free() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib0e5560efe518833f76f846d7269e82d85c186a1 Gerrit-Change-Number: 25693 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 05 Oct 2021 19:11:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 19:12:02 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 5 Oct 2021 19:12:02 +0000 Subject: Change in pysim[master]: cards: remove unused function card_autodetect() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25686 ) Change subject: cards: remove unused function card_autodetect() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic188e1fffb4a40e89ad276941d20f94cf35e1538 Gerrit-Change-Number: 25686 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 05 Oct 2021 19:12:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 19:13:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 19:13:21 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: Fix extra empty line In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25687 ) Change subject: cosmetic: Fix extra empty line ...................................................................... cosmetic: Fix extra empty line Change-Id: Ibd499fc9376523e6dcfe8ba6792603c237db59f5 --- M src/osmo_ss7.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 6d68290..ebed9cf 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1196,7 +1196,6 @@ * \param[in] host string containing an IP addresses. * \returns 0 on success; negtive otherwise */ int osmo_ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host) - { int i; bool new_is_v6 = osmo_ip_str_type(host) == AF_INET6; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibd499fc9376523e6dcfe8ba6792603c237db59f5 Gerrit-Change-Number: 25687 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 19:13:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 19:13:23 +0000 Subject: Change in libosmo-sccp[master]: cosmetic: Fix typos in documentation In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25688 ) Change subject: cosmetic: Fix typos in documentation ...................................................................... cosmetic: Fix typos in documentation Change-Id: I1164490c140cc5ca82e5977d24f5971ba216014b --- M src/sccp_user.c 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/sccp_user.c b/src/sccp_user.c index d8e78f0..a654cc6 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -475,10 +475,10 @@ * \param[in] name human readable name * \param[in] default_pc pointcode to be used on missing VTY setting * \param[in] prot protocol to be used (e.g OSMO_SS7_ASP_PROT_M3UA) - * \param[in] default_local_port local port to be usd on missing VTY setting - * \param[in] default_local_ip local IP-address to be usd on missing VTY setting - * \param[in] default_remote_port remote port to be usd on missing VTY setting - * \param[in] default_remote_ip remote IP-address to be usd on missing VTY setting + * \param[in] default_local_port local port to be used on missing VTY setting + * \param[in] default_local_ip local IP-address to be used on missing VTY setting + * \param[in] default_remote_port remote port to be used on missing VTY setting + * \param[in] default_remote_ip remote IP-address to be used on missing VTY setting * \returns callee-allocated SCCP instance on success; NULL on error */ struct osmo_sccp_instance * @@ -664,10 +664,10 @@ * \param[in] name human readable name * \param[in] default_pc pointcode to be used on missing VTY setting * \param[in] prot protocol to be used (e.g OSMO_SS7_ASP_PROT_M3UA) - * \param[in] default_local_port local port to be usd on missing VTY setting - * \param[in] default_local_ip local IP-address to be usd on missing VTY setting - * \param[in] default_remote_port remote port to be usd on missing VTY setting - * \param[in] default_remote_ip remote IP-address to be usd on missing VTY setting + * \param[in] default_local_port local port to be used on missing VTY setting + * \param[in] default_local_ip local IP-address to be used on missing VTY setting + * \param[in] default_remote_port remote port to be used on missing VTY setting + * \param[in] default_remote_ip remote IP-address to be used on missing VTY setting * \returns callee-allocated SCCP instance on success; NULL on error */ struct osmo_sccp_instance * osmo_sccp_simple_client(void *ctx, const char *name, uint32_t default_pc, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I1164490c140cc5ca82e5977d24f5971ba216014b Gerrit-Change-Number: 25688 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 19:21:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 19:21:52 +0000 Subject: Change in osmo-bts[master]: Power-Loop: Fix LOG when Keeping MS Power level at the same level. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25694 ) Change subject: Power-Loop: Fix LOG when Keeping MS Power level at the same level. ...................................................................... Patch Set 2: Code-Review-1 That's not correct. We want to print the power level we request, not the one the MS was using. You already have the information you want in ms_power_lvl. I guess you see a difference there because it falls into the ignore=true case there. I wanted to print "Ignoring" instead of "Keeping" in that case, but fixeria voted against it because he said it was confusing. If "Ignoring" is printed, then the other values make sense imho. If you still don't want to print "ignoring" in that case, then, the 2 params you are changing should be set to instead: """ state->current, current_dbm """ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I002b708cfda60371f57e32617e7ee33cb41c42f7 Gerrit-Change-Number: 25694 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 05 Oct 2021 19:21:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 19:24:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 19:24:04 +0000 Subject: Change in osmo-bsc[master]: cosmetic: Fix typo in comment In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25692 ) Change subject: cosmetic: Fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If95b653d9c31292f8e771f0d460fc8f008fd3e24 Gerrit-Change-Number: 25692 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 05 Oct 2021 19:24:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 19:24:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 5 Oct 2021 19:24:06 +0000 Subject: Change in osmo-bsc[master]: cosmetic: Fix typo in comment In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25692 ) Change subject: cosmetic: Fix typo in comment ...................................................................... cosmetic: Fix typo in comment Change-Id: If95b653d9c31292f8e771f0d460fc8f008fd3e24 --- M src/osmo-bsc/nm_rcarrier_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/osmo-bsc/nm_rcarrier_fsm.c b/src/osmo-bsc/nm_rcarrier_fsm.c index 4bb62fc..b9e67c1 100644 --- a/src/osmo-bsc/nm_rcarrier_fsm.c +++ b/src/osmo-bsc/nm_rcarrier_fsm.c @@ -120,7 +120,7 @@ * be sent during Dependency, so we simply move to OFFLINE state here to * avoid duplicating code. However, RadioCarrier seems to be implemented * correctly and goes to Offline state during startup. If some HW - * version is found with the aboev estated bug, this code needs to be + * version is found with the above estated bug, this code needs to be * enabled, similar to what we do in nm_bb_transc_fsm: */ /*if (trx->bts->site_mgr.peer_has_no_avstate_offline) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25692 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If95b653d9c31292f8e771f0d460fc8f008fd3e24 Gerrit-Change-Number: 25692 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 20:04:38 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 5 Oct 2021 20:04:38 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/24236 ) Change subject: Add support for LCLS to the MSC ...................................................................... Patch Set 6: (1 comment) This change is ready for review. https://gerrit.osmocom.org/c/osmo-msc/+/24236/6/include/osmocom/msc/transaction.h File include/osmocom/msc/transaction.h: https://gerrit.osmocom.org/c/osmo-msc/+/24236/6/include/osmocom/msc/transaction.h at 103 PS6, Line 103: struct osmo_lcls *lcls; I had some conversation with @neels before about not having this here as a pointer, which requires quite a lot of changes; - I think then trans_lcls_compose() would modify the member directly and return a status int ? I have a branch where I was working on it that way, but I never got it quite right. I don't know how important it would be to do this. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 6 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 05 Oct 2021 20:04:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 20:04:49 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 5 Oct 2021 20:04:49 +0000 Subject: Change in osmo-sip-connector[master]: MNCC v8: Implement Basic Support for Global Call Reference. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 ) Change subject: MNCC v8: Implement Basic Support for Global Call Reference. ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Id40d7e0fed9356f801b3627c118150055e7232b1 Gerrit-Change-Number: 25675 Gerrit-PatchSet: 3 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 05 Oct 2021 20:04:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 20:20:23 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 5 Oct 2021 20:20:23 +0000 Subject: Change in osmo-bts[master]: Power-Loop: Fix LOG when Keeping MS Power level at the same level. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25694 ) Change subject: Power-Loop: Fix LOG when Keeping MS Power level at the same level. ...................................................................... Patch Set 2: > Patch Set 2: Code-Review-1 > > That's not correct. We want to print the power level we request, not the one the MS was using. You already have the information you want in ms_power_lvl. OK, I don't see how it makes sense to print the power level we "request", when we are not actually "requesting" anything. > I guess you see a difference there because it falls into the ignore=true case there. I wanted to print "Ignoring" instead of "Keeping" in that case, but fixeria voted against it because he said it was confusing. If "Ignoring" is printed, then the other values make sense imho. "Keeping" is a problem, you just can't say "Keeping 3 == 5" > > If you still don't want to print "ignoring" in that case, then, the 2 params you are changing should be set to instead: > """ > state->current, current_dbm > """ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I002b708cfda60371f57e32617e7ee33cb41c42f7 Gerrit-Change-Number: 25694 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 05 Oct 2021 20:20:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 20:23:45 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 5 Oct 2021 20:23:45 +0000 Subject: Change in osmo-bts[master]: Power-Loop: Fix LOG when Keeping MS Power level at the same level. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25694 ) Change subject: Power-Loop: Fix LOG when Keeping MS Power level at the same level. ...................................................................... Patch Set 2: Also, this "3dBm" I mention in the commit msg is even invalid for the band. But, I don't mind really.. Happy to abandon it rather than consume time. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I002b708cfda60371f57e32617e7ee33cb41c42f7 Gerrit-Change-Number: 25694 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 05 Oct 2021 20:23:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 20:29:34 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 5 Oct 2021 20:29:34 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: Hello Jenkins Builder, neels, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 to look at the new patch set (#7). Change subject: Add support for LCLS to the MSC ...................................................................... Add support for LCLS to the MSC This commit is largely based on work by Max Adds LCLS parameters for A-interface transactions This commit also adds a vty option to facilitate globally disabling LCLS for all calls on this MSC. Add a global call reference (GCR) to MNCC and therefore bump the MNCC version to version 8. (This commit has to be merged at the same time as the corresponing commit in the osmo-sip-connector for mncc-external use.) Related: #OS2487 Depends: osmo-sip-connector Id40d7e0fed9356f801b3627c118150055e7232b1 Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b --- M include/osmocom/msc/debug.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/mncc.h M include/osmocom/msc/ran_msg.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_a.c M src/libmsc/msc_vty.c M src/libmsc/ran_msg_a.c M src/libmsc/transaction.c M src/osmo-msc/msc_main.c M tests/mncc/mncc_test.ok M tests/test_nodes.vty 13 files changed, 130 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/36/24236/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 20:30:22 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 5 Oct 2021 20:30:22 +0000 Subject: Change in osmo-sip-connector[master]: MNCC v8: Implement Basic Support for Global Call Reference. In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 to look at the new patch set (#4). Change subject: MNCC v8: Implement Basic Support for Global Call Reference. ...................................................................... MNCC v8: Implement Basic Support for Global Call Reference. * Add GCR to mncc struct and therefore bump mncc version. * Pass the GCR as a SIP Header to SIP UA and retrieve any such header from incoming SIP calls, passing the GCR on to MNCC Related: #OS5164 Depends: osmo-msc I705c860e51637b4537cad65a330ecbaaca96dd5b Change-Id: Id40d7e0fed9356f801b3627c118150055e7232b1 --- M src/call.h M src/mncc.c M src/mncc_protocol.h M src/sip.c 4 files changed, 79 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/75/25675/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Id40d7e0fed9356f801b3627c118150055e7232b1 Gerrit-Change-Number: 25675 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 20:39:10 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 5 Oct 2021 20:39:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: execute TC_dyn_osmo_pdch_{tchh, sdcch8}_race_act last References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25695 ) Change subject: BTS_Tests: execute TC_dyn_osmo_pdch_{tchh,sdcch8}_race_act last ...................................................................... BTS_Tests: execute TC_dyn_osmo_pdch_{tchh,sdcch8}_race_act last These test cases can potentially break the IUT or cause weird/unexpected behavior. Ensure that they are executed last, not affecting the others. Change-Id: I167a9e6eb2e3fe1d9c73994c428d8419074d96c3 Fixes: I3b602ac9dbe0ab3e80eb30de573c9b48a79872d8 Related: OS#5245 --- M bts/BTS_Tests.ttcn 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/25695/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 6753eec..cf47d33 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -7981,8 +7981,6 @@ execute( TC_dyn_osmo_pdch_tchf_act() ); execute( TC_dyn_osmo_pdch_tchh_act() ); execute( TC_dyn_osmo_pdch_sdcch8_act() ); - execute( TC_dyn_osmo_pdch_tchh_race_act() ); - execute( TC_dyn_osmo_pdch_sdcch8_race_act() ); execute( TC_dyn_ipa_pdch_tchf_act() ); execute( TC_dyn_ipa_pdch_tchf_act_pdch_act_nack() ); @@ -8027,6 +8025,11 @@ execute( TC_speech_rtp_tchh() ); execute( TC_early_immediate_assignment() ); + + /* BEWARE: these test cases can potentially break the IUT or cause + * weird/unexpected behavior. Ensure that they are executed last. */ + execute( TC_dyn_osmo_pdch_tchh_race_act() ); + execute( TC_dyn_osmo_pdch_sdcch8_race_act() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I167a9e6eb2e3fe1d9c73994c428d8419074d96c3 Gerrit-Change-Number: 25695 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 20:41:54 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 5 Oct 2021 20:41:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: execute TC_dyn_osmo_pdch_{tchh, sdcch8}_race_act last In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25695 ) Change subject: BTS_Tests: execute TC_dyn_osmo_pdch_{tchh,sdcch8}_race_act last ...................................................................... Patch Set 1: Code-Review+2 I am giving CR+2 myself and merging this patch to un-break ttcn3-bts-test. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I167a9e6eb2e3fe1d9c73994c428d8419074d96c3 Gerrit-Change-Number: 25695 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 05 Oct 2021 20:41:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 20:42:12 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 5 Oct 2021 20:42:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: execute TC_dyn_osmo_pdch_{tchh, sdcch8}_race_act last In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25695 ) Change subject: BTS_Tests: execute TC_dyn_osmo_pdch_{tchh,sdcch8}_race_act last ...................................................................... BTS_Tests: execute TC_dyn_osmo_pdch_{tchh,sdcch8}_race_act last These test cases can potentially break the IUT or cause weird/unexpected behavior. Ensure that they are executed last, not affecting the others. Change-Id: I167a9e6eb2e3fe1d9c73994c428d8419074d96c3 Fixes: I3b602ac9dbe0ab3e80eb30de573c9b48a79872d8 Related: OS#5245 --- M bts/BTS_Tests.ttcn 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 6753eec..cf47d33 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -7981,8 +7981,6 @@ execute( TC_dyn_osmo_pdch_tchf_act() ); execute( TC_dyn_osmo_pdch_tchh_act() ); execute( TC_dyn_osmo_pdch_sdcch8_act() ); - execute( TC_dyn_osmo_pdch_tchh_race_act() ); - execute( TC_dyn_osmo_pdch_sdcch8_race_act() ); execute( TC_dyn_ipa_pdch_tchf_act() ); execute( TC_dyn_ipa_pdch_tchf_act_pdch_act_nack() ); @@ -8027,6 +8025,11 @@ execute( TC_speech_rtp_tchh() ); execute( TC_early_immediate_assignment() ); + + /* BEWARE: these test cases can potentially break the IUT or cause + * weird/unexpected behavior. Ensure that they are executed last. */ + execute( TC_dyn_osmo_pdch_tchh_race_act() ); + execute( TC_dyn_osmo_pdch_sdcch8_race_act() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25695 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I167a9e6eb2e3fe1d9c73994c428d8419074d96c3 Gerrit-Change-Number: 25695 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 20:51:08 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 5 Oct 2021 20:51:08 +0000 Subject: Change in osmo-gsm-manuals[master]: cs7-config.adoc: Improve doc on default SS7 SCTP addresses In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/25690 ) Change subject: cs7-config.adoc: Improve doc on default SS7 SCTP addresses ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/25690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic8d9c00ae50907f1adad8f70b773e7b1362c4f50 Gerrit-Change-Number: 25690 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Comment-Date: Tue, 05 Oct 2021 20:51:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 5 21:13:02 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 5 Oct 2021 21:13:02 +0000 Subject: Change in osmo-bts[master]: rsl: prevent race condition during timeslot re-configuration In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25674 to look at the new patch set (#3). Change subject: rsl: prevent race condition during timeslot re-configuration ...................................................................... rsl: prevent race condition during timeslot re-configuration It may happen that the BSC requests logical channel activation on a dynamic timeslot, which is in a process of switching from one pchan type to another due to a preceding channel activation request. In this case 'struct gsm_bts_trx_ts' already holds an msgb with the preceding RSL CHANnel ACTIVation message, that is normally handled once the PHY completes the process of timeslot re-configuration. On receipt of subsequent RSL CHANnel ACTIVation messages, in function dyn_ts_l1_reconnect() we overwrite the preceeding msgb (memleak), by the most recent one. And once the timeslot re-configuration is done, only the most recent CHANnel ACTIVation message gets ACKed. In order to avoid this, let's move the msgb ownership to 'struct gsm_lchan', so it cannot be overwritten by the CHANnel ACTIVation message that is related to a different lchan on the same timeslot. Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Related: I3b602ac9dbe0ab3e80eb30de573c9b48a79872d8 Fixes: OS#5245 --- M include/osmo-bts/gsm_data.h M src/common/rsl.c 2 files changed, 22 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/74/25674/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Gerrit-Change-Number: 25674 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 08:50:30 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 6 Oct 2021 08:50:30 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/24236 ) Change subject: Add support for LCLS to the MSC ...................................................................... Patch Set 7: (2 comments) I am not through yet. I have only looked at debug.h, gsm_data.h so far... So far I have only a few cosmetic hints. https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/include/osmocom/msc/gsm_data.h File include/osmocom/msc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/include/osmocom/msc/gsm_data.h at 264 PS7, Line 264: bool lcls_disable; Maybe this integrates better when you put this below call_waiting? I would write it like this: /* Whether to use call waiting on the network */ bool call_waiting; /* Whether to use lcls on the network */ bool lcls_disable; char *sms_db_file_path; Also I wonder why there is negative logic. I guess you want to have lcls enabled by default? I wonder if this is a good idea. We probably might want to have it disabled by default to keep the default config as simple as possible. https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/include/osmocom/msc/mncc.h File include/osmocom/msc/mncc.h: https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/include/osmocom/msc/mncc.h at 164 PS7, Line 164: struct osmo_gcr_parsed gcr; There is probably a better place for this. Maybe below callref? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 06 Oct 2021 08:50:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 10:14:43 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 6 Oct 2021 10:14:43 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/24236 ) Change subject: Add support for LCLS to the MSC ...................................................................... Patch Set 7: (5 comments) https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/src/libmsc/msc_vty.c at 503 PS7, Line 503: "lcls-disable", Maybe use DEFUN_ATTR(...., CMD_ATTR_IMMEDIATE). There are new variants of DEFUN which allow to indicate when a config change takes effect. There is also an DEFUN_USRATTR() that allows to specify user defined attributes. bsc_vty.c is a good example to see how to use it. See also command.h in libosmocore. https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/src/libmsc/msc_vty.c at 506 PS7, Line 506: gsmnet->lcls_disable = 1; maybe use "true" - its also declared as bool https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/src/libmsc/msc_vty.c at 513 PS7, Line 513: { This probably should probably be "Globally enable LCLS..." ? I still would prefer to have "lcls-enable" and "no lcls-enable" commands. https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/src/libmsc/msc_vty.c at 514 PS7, Line 514: gsmnet->lcls_disable = 0; same here, better use "false" https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/src/osmo-msc/msc_main.c File src/osmo-msc/msc_main.c: https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/src/osmo-msc/msc_main.c at 261 PS7, Line 261: net->lcls_disable = 1; better use "true" -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 06 Oct 2021 10:14:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 10:36:04 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 6 Oct 2021 10:36:04 +0000 Subject: Change in osmo-sgsn[master]: VTY: Don't display 'PDP Address: invalid' for IPv4v6 In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/25649 ) Change subject: VTY: Don't display 'PDP Address: invalid' for IPv4v6 ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/25649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id36b7520677e4a0af40d05dc503b26d1b0b74a26 Gerrit-Change-Number: 25649 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 06 Oct 2021 10:36:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 10:40:43 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 6 Oct 2021 10:40:43 +0000 Subject: Change in libosmocore[master]: gsmtap: allow 127.0.0.x local listeners In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25622 ) Change subject: gsmtap: allow 127.0.0.x local listeners ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1043dfd8075f14481011f43db45c943e9320413c Gerrit-Change-Number: 25622 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 06 Oct 2021 10:40:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 13:01:15 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 6 Oct 2021 13:01:15 +0000 Subject: Change in libosmocore[master]: gsmtap: allow 127.0.0.x local listeners In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25622 ) Change subject: gsmtap: allow 127.0.0.x local listeners ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1043dfd8075f14481011f43db45c943e9320413c Gerrit-Change-Number: 25622 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 06 Oct 2021 13:01:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 13:01:26 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 6 Oct 2021 13:01:26 +0000 Subject: Change in libosmocore[master]: gsmtap: allow 127.0.0.x local listeners In-Reply-To: References: Message-ID: Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25622 ) Change subject: gsmtap: allow 127.0.0.x local listeners ...................................................................... gsmtap: allow 127.0.0.x local listeners Even if not bound to a IF they just exist and work as expected, and make distinguishing traffic for local setups easy. Change-Id: I1043dfd8075f14481011f43db45c943e9320413c --- M src/socket.c 1 file changed, 22 insertions(+), 0 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Hoernchen: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/socket.c b/src/socket.c index 19d48e4..45b0f5b 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1129,6 +1129,25 @@ return 0; } +/* linux has a default route: +local 127.0.0.0/8 dev lo proto kernel scope host src 127.0.0.1 +*/ +static int sockaddr_is_local_routed(const struct sockaddr *a) +{ +#if __linux__ + if (a->sa_family != AF_INET) + return 0; + + uint32_t address = ((struct sockaddr_in *)a)->sin_addr.s_addr; /* already BE */ + uint32_t eightmask = htonl(0xff000000); /* /8 mask */ + uint32_t local_prefix_127 = htonl(0x7f000000); /* 127.0.0.0 */ + + if ((address & eightmask) == local_prefix_127) + return 1; +#endif + return 0; +} + /*! Determine if the given address is a local address * \param[in] addr Socket Address * \param[in] addrlen Length of socket address in bytes @@ -1138,6 +1157,9 @@ { struct ifaddrs *ifaddr, *ifa; + if (sockaddr_is_local_routed(addr)) + return 1; + if (getifaddrs(&ifaddr) == -1) { LOGP(DLGLOBAL, LOGL_ERROR, "getifaddrs:" " %s\n", strerror(errno)); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1043dfd8075f14481011f43db45c943e9320413c Gerrit-Change-Number: 25622 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 14:24:57 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 6 Oct 2021 14:24:57 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/24236 ) Change subject: Add support for LCLS to the MSC ...................................................................... Patch Set 7: (5 comments) Thanks for review! https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/include/osmocom/msc/gsm_data.h File include/osmocom/msc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/include/osmocom/msc/gsm_data.h at 264 PS7, Line 264: bool lcls_disable; > Maybe this integrates better when you put this below call_waiting? I would write it like this: [?] A long long time ago, in a land far far away, (https://gerrit.osmocom.org/c/osmo-msc/+/13421) LaF0rge said: "I would rather say it is "permit lcls" than "enable lcls", as whether or not LCLS can be used depends on a lot of other conditions, not just this newly introduced flag." Based on that logic, this was the result. We don't just magically "enable" lcls with this flag, but we CAN disable it. As you later saw, it is disabled by default. https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/src/libmsc/msc_vty.c at 503 PS7, Line 503: "lcls-disable", > Maybe use DEFUN_ATTR(...., CMD_ATTR_IMMEDIATE). [?] Ack https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/src/libmsc/msc_vty.c at 506 PS7, Line 506: gsmnet->lcls_disable = 1; > maybe use "true" - its also declared as bool Ack https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/src/libmsc/msc_vty.c at 514 PS7, Line 514: gsmnet->lcls_disable = 0; > same here, better use "false" Ack https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/src/osmo-msc/msc_main.c File src/osmo-msc/msc_main.c: https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/src/osmo-msc/msc_main.c at 261 PS7, Line 261: net->lcls_disable = 1; > better use "true" Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 06 Oct 2021 14:24:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 14:25:57 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 6 Oct 2021 14:25:57 +0000 Subject: Change in osmo-sgsn[master]: VTY: Don't display 'PDP Address: invalid' for IPv4v6 In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/25649 ) Change subject: VTY: Don't display 'PDP Address: invalid' for IPv4v6 ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/25649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id36b7520677e4a0af40d05dc503b26d1b0b74a26 Gerrit-Change-Number: 25649 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 06 Oct 2021 14:25:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 14:26:02 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 6 Oct 2021 14:26:02 +0000 Subject: Change in osmo-sgsn[master]: VTY: Don't display 'PDP Address: invalid' for IPv4v6 In-Reply-To: References: Message-ID: keith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/25649 ) Change subject: VTY: Don't display 'PDP Address: invalid' for IPv4v6 ...................................................................... VTY: Don't display 'PDP Address: invalid' for IPv4v6 We were not handling the case of PDP_TYPE_N_IETF_IPv4v6 in gprs_pdpaddr2str() and showed "invalid" for these addresses. Depends: libosmocore Change-Id: I1f82f9d8fc13dcc4474760329bd74ae9685b9031 Change-Id: Id36b7520677e4a0af40d05dc503b26d1b0b74a26 --- M include/osmocom/sgsn/gprs_sgsn.h M src/sgsn/sgsn_ctrl.c M src/sgsn/sgsn_vty.c 3 files changed, 24 insertions(+), 6 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve keith: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h index c176494..dcda5c3 100644 --- a/include/osmocom/sgsn/gprs_sgsn.h +++ b/include/osmocom/sgsn/gprs_sgsn.h @@ -417,7 +417,7 @@ struct sgsn_instance *sgsn_instance_alloc(void *talloc_ctx); void sgsn_inst_init(struct sgsn_instance *sgsn); -char *gprs_pdpaddr2str(uint8_t *pdpa, uint8_t len); +char *gprs_pdpaddr2str(uint8_t *pdpa, uint8_t len, bool return_ipv6); /* * ctrl interface related work diff --git a/src/sgsn/sgsn_ctrl.c b/src/sgsn/sgsn_ctrl.c index ad91d25..69034e2 100644 --- a/src/sgsn/sgsn_ctrl.c +++ b/src/sgsn/sgsn_ctrl.c @@ -43,7 +43,7 @@ llist_for_each_entry(pdp, &mm->pdp_list, list) addr = gprs_pdpaddr2str(pdp->lib->eua.v, - pdp->lib->eua.l); + pdp->lib->eua.l, false); cmd->reply = talloc_asprintf_append( cmd->reply, diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index e0e2677..6327d1a 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -135,7 +135,7 @@ return osmo_tdef_vty_set_cmd(vty, g_cfg->T_defs, argv); } -char *gprs_pdpaddr2str(uint8_t *pdpa, uint8_t len) +char *gprs_pdpaddr2str(uint8_t *pdpa, uint8_t len, bool return_ipv6) { static char str[INET6_ADDRSTRLEN + 10]; @@ -148,15 +148,28 @@ case PDP_TYPE_N_IETF_IPv4: if (len < 2 + 4) break; - strcpy(str, "IPv4 "); + osmo_strlcpy(str, "IPv4 ", sizeof(str)); inet_ntop(AF_INET, pdpa+2, str+5, sizeof(str)-5); return str; case PDP_TYPE_N_IETF_IPv6: if (len < 2 + 8) break; - strcpy(str, "IPv6 "); + osmo_strlcpy(str, "IPv6 ", sizeof(str)); inet_ntop(AF_INET6, pdpa+2, str+5, sizeof(str)-5); return str; + case PDP_TYPE_N_IETF_IPv4v6: + if (len < 2 + 20) + break; + if (return_ipv6) { + /* The IPv6 token, (rightmost four fields) is a duplicate of + * the site prefix + subnetID (leftmost fields) in pdpa here */ + osmo_strlcpy(str, "IPv6 ", sizeof(str)); + inet_ntop(AF_INET6, pdpa+6, str+5, sizeof(str)-5); + return str; + } + osmo_strlcpy(str, "IPv4 ", sizeof(str)); + inet_ntop(AF_INET, pdpa+2, str+5, sizeof(str)-5); + return str; default: break; } @@ -552,8 +565,13 @@ osmo_apn_to_str(apnbuf, pdp->lib->apn_use.v, pdp->lib->apn_use.l), VTY_NEWLINE); vty_out(vty, "%s PDP Address: %s%s", pfx, - gprs_pdpaddr2str(pdp->lib->eua.v, pdp->lib->eua.l), + gprs_pdpaddr2str(pdp->lib->eua.v, pdp->lib->eua.l, false), VTY_NEWLINE); + if (pdp->lib->eua.v[1] == PDP_TYPE_N_IETF_IPv4v6) { + vty_out(vty, "%s PDP Address: %s%s", pfx, + gprs_pdpaddr2str(pdp->lib->eua.v, pdp->lib->eua.l, true), + VTY_NEWLINE); + } vty_out(vty, "%s GTPv%d Local Control(%s / TEIC: 0x%08x) ", pfx, pdp->lib->version, sgsn_gtp_ntoa(&pdp->lib->gsnlc), pdp->lib->teic_own); vty_out(vty, "Data(%s / TEID: 0x%08x)%s", -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/25649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Id36b7520677e4a0af40d05dc503b26d1b0b74a26 Gerrit-Change-Number: 25649 Gerrit-PatchSet: 5 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 14:36:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 14:36:42 +0000 Subject: Change in osmo-bts[master]: Power-Loop: Fix LOG when Keeping MS Power level at the same level. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25694 ) Change subject: Power-Loop: Fix LOG when Keeping MS Power level at the same level. ...................................................................... Patch Set 2: > OK, I don't see how it makes sense to print the power level we "request", when we are not actually "requesting" anything. For sure we are. We are always requesting a given MS Power level to the MS. MS doesn't necessarily need to support that power level afair, it should then use the one immediately below (above in dBm) which is supported IIRC. See my previous comment, I believe the fix should be using: > state->current, current_dbm Before the "ignore" flag was added, this was not needed because well, the value used in current code and the changes I propose were basically the same. Please give it a try and submit the fix if it improves the situation. Another topic to improve would be the "curr %d" part of the message, which prints the currently used Power level by the MS on that period (Announced MS Power Level). "curr" is a bit vague here, specially since it conflicts with our naming "current" we use in variable name for the "currently requested MS Power level". Maybe "announced %d" would be clearer there too, feel free to submit an extra patch with that fix. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I002b708cfda60371f57e32617e7ee33cb41c42f7 Gerrit-Change-Number: 25694 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 06 Oct 2021 14:36:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 14:37:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 14:37:38 +0000 Subject: Change in osmo-sip-connector[master]: MNCC v8: Implement Basic Support for Global Call Reference. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 ) Change subject: MNCC v8: Implement Basic Support for Global Call Reference. ...................................................................... Patch Set 4: Leaving review of these patches to neels, I think he knows better the MNCC part and what stuff he has WIP. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Id40d7e0fed9356f801b3627c118150055e7232b1 Gerrit-Change-Number: 25675 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 06 Oct 2021 14:37:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 14:38:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 14:38:12 +0000 Subject: Change in osmo-gsm-manuals[master]: cs7-config.adoc: Improve doc on default SS7 SCTP addresses In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/25690 ) Change subject: cs7-config.adoc: Improve doc on default SS7 SCTP addresses ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/25690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic8d9c00ae50907f1adad8f70b773e7b1362c4f50 Gerrit-Change-Number: 25690 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 06 Oct 2021 14:38:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 14:41:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 14:41:29 +0000 Subject: Change in osmo-bts[master]: rsl: prevent race condition during timeslot re-configuration In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25674 ) Change subject: rsl: prevent race condition during timeslot re-configuration ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Gerrit-Change-Number: 25674 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Wed, 06 Oct 2021 14:41:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 15:24:19 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 6 Oct 2021 15:24:19 +0000 Subject: Change in osmo-bts[master]: osmo-trx: fix maxdly In-Reply-To: References: Message-ID: Hoernchen has restored this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25619 ) Change subject: osmo-trx: fix maxdly ...................................................................... Restored -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Gerrit-Change-Number: 25619 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: restore -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 15:26:47 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 6 Oct 2021 15:26:47 +0000 Subject: Change in osmo-bts[master]: osmo-trx: fix maxdly In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 to look at the new patch set (#2). Change subject: osmo-trx: fix maxdly ...................................................................... osmo-trx: fix maxdly - one gsm symbol is 0,00000369 seconds - 2*550m/c = 0,00000366 seconds -> one ta symbol is a DISTANCE of 550m (or a RTT of 550m*2) between bts and ue. -> no idea why this was constrained to TA/2. Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Related: OS#5140 --- M src/osmo-bts-trx/trx_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/19/25619/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Gerrit-Change-Number: 25619 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 15:28:20 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 6 Oct 2021 15:28:20 +0000 Subject: Change in osmo-bts[master]: osmo-trx: fix maxdly In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 to look at the new patch set (#3). Change subject: osmo-trx: fix maxdly ...................................................................... osmo-trx: fix maxdly - one gsm symbol is 0,00000369 seconds - 2*550m/c = 0,00000366 seconds -> one ta symbol is a DISTANCE of 550m (or a RTT of 550m*2) between bts and ue. -> no idea why this was constrained to TA/2. Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Related: OS#5140 --- M src/osmo-bts-trx/trx_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/19/25619/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Gerrit-Change-Number: 25619 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 15:28:57 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 6 Oct 2021 15:28:57 +0000 Subject: Change in osmo-bts[master]: osmo-trx: fix maxdly In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25619 ) Change subject: osmo-trx: fix maxdly ...................................................................... Patch Set 3: Now that keith mentioned the maxdly i do think this actually was a valid fix. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Gerrit-Change-Number: 25619 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 06 Oct 2021 15:28:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 16:07:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 16:07:38 +0000 Subject: Change in osmo-bts[master]: Introduce gsm_lchan_name_init() function helper References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25696 ) Change subject: Introduce gsm_lchan_name_init() function helper ...................................................................... Introduce gsm_lchan_name_init() function helper Let's move lchan specific struct stuff into lchan.c Change-Id: I9cb96707c63b8b7d76591d25fe906f02e34bb76b --- M include/osmo-bts/gsm_data.h M src/common/bts_trx.c M src/common/lchan.c 3 files changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/25696/1 diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index fe2862d..ce410a8 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -556,6 +556,7 @@ const char *gsm_lchant_name(enum gsm_chan_t c); char *gsm_ts_name(const struct gsm_bts_trx_ts *ts); char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts); +void gsm_lchan_name_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr); void gsm_lchan_name_update(struct gsm_lchan *lchan); const char *gsm_lchans_name(enum gsm_lchan_state s); diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c index 127e797..f4f8ae8 100644 --- a/src/common/bts_trx.c +++ b/src/common/bts_trx.c @@ -59,14 +59,7 @@ for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) { struct gsm_lchan *lchan = &ts->lchan[ln]; - - lchan->ts = ts; - lchan->nr = ln; - lchan->type = GSM_LCHAN_NONE; - gsm_lchan_name_update(lchan); - - INIT_LLIST_HEAD(&lchan->sapi_cmds); - INIT_LLIST_HEAD(&lchan->dl_tch_queue); + gsm_lchan_name_init(lchan, ts, ln); } } diff --git a/src/common/lchan.c b/src/common/lchan.c index dcec0a3..08ef1b8 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -25,6 +25,17 @@ #include #include +void gsm_lchan_name_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr) +{ + lchan->ts = ts; + lchan->nr = lchan_nr; + lchan->type = GSM_LCHAN_NONE; + gsm_lchan_name_update(lchan); + + INIT_LLIST_HEAD(&lchan->sapi_cmds); + INIT_LLIST_HEAD(&lchan->dl_tch_queue); +} + void early_rr_ia_delay_cb(void *data) { struct gsm_lchan *lchan = data; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9cb96707c63b8b7d76591d25fe906f02e34bb76b Gerrit-Change-Number: 25696 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 16:07:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 16:07:39 +0000 Subject: Change in osmo-bts[master]: Move lchan specific code from gsm_Data.h to lchan.h References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25697 ) Change subject: Move lchan specific code from gsm_Data.h to lchan.h ...................................................................... Move lchan specific code from gsm_Data.h to lchan.h Let's split all lchan specific stuff into its own header, it helps finding out data and operations available related to an lchan. We already have similar classification in osmo-bsc. Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e --- M include/osmo-bts/Makefile.am M include/osmo-bts/gsm_data.h A include/osmo-bts/lchan.h M src/common/lchan.c 4 files changed, 432 insertions(+), 415 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/25697/1 diff --git a/include/osmo-bts/Makefile.am b/include/osmo-bts/Makefile.am index d52c9aa..247e43e 100644 --- a/include/osmo-bts/Makefile.am +++ b/include/osmo-bts/Makefile.am @@ -22,6 +22,7 @@ control_if.h \ cbch.h \ l1sap.h \ + lchan.h \ power_control.h \ scheduler.h \ scheduler_backend.h \ diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index ce410a8..c2f8984 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -10,15 +10,12 @@ #include #include #include -#include -#include #include #include #include #include #include #include -#include #include #include #include @@ -30,6 +27,7 @@ #include #include #include +#include #define GSM_FR_BITS 260 #define GSM_EFR_BITS 244 @@ -43,8 +41,6 @@ #define GSM_BTS_AGCH_QUEUE_LOW_LEVEL_DEFAULT 41 #define GSM_BTS_AGCH_QUEUE_HIGH_LEVEL_DEFAULT 91 -#define LOGPLCHAN(lchan, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_lchan_name(lchan), ## args) - struct gsm_network { struct llist_head bts_list; unsigned int num_bts; @@ -52,15 +48,6 @@ struct pcu_sock_state *pcu_state; }; -enum lchan_ciph_state { - LCHAN_CIPH_NONE, - LCHAN_CIPH_RX_REQ, - LCHAN_CIPH_RX_CONF, - LCHAN_CIPH_RXTX_REQ, - LCHAN_CIPH_RX_CONF_TX_REQ, - LCHAN_CIPH_RXTX_CONF, -}; - /* 16 is the max. number of SI2quater messages according to 3GPP TS 44.018 Table 10.5.2.33b.1: 4-bit index is used (2#1111 = 10#15) */ #define SI2Q_MAX_NUM 16 @@ -82,373 +69,6 @@ struct pcu_sock_state; struct smscb_msg; -#define MAX_A5_KEY_LEN (128/8) -#define RSL_ENC_ALG_A5(x) (x+1) - -/* state of a logical channel */ -enum gsm_lchan_state { - LCHAN_S_NONE, /* channel is not active */ - LCHAN_S_ACT_REQ, /* channel activation requested */ - LCHAN_S_ACTIVE, /* channel is active and operational */ - LCHAN_S_REL_REQ, /* channel release has been requested */ - LCHAN_S_REL_ERR, /* channel is in an error state */ - LCHAN_S_BROKEN, /* channel is somehow unusable */ -}; - -#define MAX_NUM_UL_MEAS 104 -#define LC_UL_M_F_L1_VALID (1 << 0) -#define LC_UL_M_F_RES_VALID (1 << 1) -#define LC_UL_M_F_OSMO_EXT_VALID (1 << 2) - -struct bts_ul_meas { - /* BER in units of 0.01%: 10.000 == 100% ber, 0 == 0% ber */ - uint16_t ber10k; - /* timing advance offset (in 1/256 bits) */ - int16_t ta_offs_256bits; - /* C/I ratio in cB */ - int16_t c_i; - /* flags */ - uint8_t is_sub:1; - /* RSSI in dBm * -1 */ - uint8_t inv_rssi; -}; - -struct amr_mode { - uint8_t mode; - uint8_t threshold; - uint8_t hysteresis; -}; - -struct amr_multirate_conf { - uint8_t gsm48_ie[2]; - struct amr_mode ms_mode[4]; - struct amr_mode bts_mode[4]; - uint8_t num_modes; -}; - -enum lchan_csd_mode { - LCHAN_CSD_M_NT, - LCHAN_CSD_M_T_1200_75, - LCHAN_CSD_M_T_600, - LCHAN_CSD_M_T_1200, - LCHAN_CSD_M_T_2400, - LCHAN_CSD_M_T_9600, - LCHAN_CSD_M_T_14400, - LCHAN_CSD_M_T_29000, - LCHAN_CSD_M_T_32000, -}; - -/* State of the SAPIs in the lchan */ -enum lchan_sapi_state { - LCHAN_SAPI_S_NONE, - LCHAN_SAPI_S_REQ, - LCHAN_SAPI_S_ASSIGNED, - LCHAN_SAPI_S_REL, - LCHAN_SAPI_S_ERROR, -}; - -/* What kind of release/activation is done? A silent one for - * the PDCH or one triggered through RSL? */ -enum lchan_rel_act_kind { - LCHAN_REL_ACT_RSL, - LCHAN_REL_ACT_PCU, - LCHAN_REL_ACT_OML, - LCHAN_REL_ACT_REACT, /* remove once auto-activation hack is removed from opstart_compl() */ -}; - -struct gsm_rep_facch { - struct msgb *msg; - uint32_t fn; -}; - -/* MS/BS Power related measurement averaging algo */ -enum gsm_power_ctrl_meas_avg_algo { - GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE = 0x00, - GSM_PWR_CTRL_MEAS_AVG_ALGO_UNWEIGHTED = 0x01, - GSM_PWR_CTRL_MEAS_AVG_ALGO_WEIGHTED = 0x02, - GSM_PWR_CTRL_MEAS_AVG_ALGO_MOD_MEDIAN = 0x03, - /* EWMA is an Osmocom specific algo */ - GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA = 0x04, -}; - -/* MS/BS Power related measurement parameters */ -struct gsm_power_ctrl_meas_params { - /* Thresholds (see 3GPP TS 45.008, section A.3.2.1) */ - uint8_t lower_thresh; /* lower (decreasing) direction */ - uint8_t upper_thresh; /* upper (increasing) direction */ - - /* Threshold Comparators for lower (decreasing) direction */ - uint8_t lower_cmp_p; /* P1 for RxLev, P3 for RxQual */ - uint8_t lower_cmp_n; /* N1 for RxLev, N3 for RxQual */ - /* Threshold Comparators for upper (increasing) direction */ - uint8_t upper_cmp_p; /* P2 for RxLev, P4 for RxQual */ - uint8_t upper_cmp_n; /* N2 for RxLev, N4 for RxQual */ - - /* Hreqave and Hreqt (see 3GPP TS 45.008, Annex A) */ - uint8_t h_reqave; - uint8_t h_reqt; - - /* AVG algorithm and its specific parameters */ - enum gsm_power_ctrl_meas_avg_algo algo; - union { - /* Exponentially Weighted Moving Average */ - struct { - /* Smoothing factor: higher the value - less smoothing */ - uint8_t alpha; /* 1 .. 99 (in %) */ - } ewma; - }; -}; - -/* MS/BS Power Control parameters */ -struct gsm_power_ctrl_params { - /* Minimum interval between power level changes */ - uint8_t ctrl_interval; /* 1 step is 2 SACCH periods */ - - /* Power change step size (maximum) */ - uint8_t inc_step_size_db; /* increasing direction */ - uint8_t red_step_size_db; /* reducing direction */ - - /* Measurement averaging parameters for RxLev & RxQual */ - struct gsm_power_ctrl_meas_params rxqual_meas; - struct gsm_power_ctrl_meas_params rxlev_meas; - - /* Measurement averaging parameters for C/I, per chan type */ - struct gsm_power_ctrl_meas_params ci_fr_meas; - struct gsm_power_ctrl_meas_params ci_hr_meas; - struct gsm_power_ctrl_meas_params ci_amr_fr_meas; - struct gsm_power_ctrl_meas_params ci_amr_hr_meas; - struct gsm_power_ctrl_meas_params ci_sdcch_meas; - struct gsm_power_ctrl_meas_params ci_gprs_meas; -}; - -/* Default MS/BS Power Control parameters */ -extern const struct gsm_power_ctrl_params power_ctrl_params_def; - -/* Measurement pre-processing state */ -struct gsm_power_ctrl_meas_proc_state { - /* Number of measurements processed */ - unsigned int meas_num; - /* Algorithm specific data */ - union { - struct { - /* Scaled up 100 times average value */ - int Avg100; - } ewma; - }; -}; - -struct lchan_power_ctrl_state { - /* Dynamic Power Control parameters (NULL in static mode) */ - const struct gsm_power_ctrl_params *dpc_params; - /* Measurement pre-processing state (for dynamic mode) */ - struct gsm_power_ctrl_meas_proc_state rxlev_meas_proc; - struct gsm_power_ctrl_meas_proc_state rxqual_meas_proc; - struct gsm_power_ctrl_meas_proc_state ci_meas_proc; - /* Number of SACCH blocks to skip (for dynamic mode) */ - int skip_block_num; - - /* Depending on the context (MS or BS power control), fields 'current' and 'max' - * reflect either the MS power level (magic numbers), or BS Power reduction level - * (attenuation, in dB). */ - uint8_t current; - uint8_t max; -}; - -struct lchan_ta_ctrl_state { - /* Number of SACCH blocks to skip */ - int skip_block_num; - /* Currently requested TA */ - uint8_t current; -}; - -struct gsm_lchan { - /* The TS that we're part of */ - struct gsm_bts_trx_ts *ts; - /* The logical subslot number in the TS */ - uint8_t nr; - /* The logical channel type */ - enum gsm_chan_t type; - /* RSL channel mode */ - enum rsl_cmod_spd rsl_cmode; - /* If TCH, traffic channel mode */ - enum gsm48_chan_mode tch_mode; - enum lchan_csd_mode csd_mode; - /* State */ - enum gsm_lchan_state state; - const char *broken_reason; - /* Encryption information */ - struct { - uint8_t alg_id; - uint8_t key_len; - uint8_t key[MAX_A5_KEY_LEN]; - } encr; - - struct { - uint32_t bound_ip; - uint32_t connect_ip; - uint16_t bound_port; - uint16_t connect_port; - uint16_t conn_id; - uint8_t rtp_payload; - uint8_t rtp_payload2; - uint8_t speech_mode; - struct osmo_rtp_socket *rtp_socket; - } abis_ip; - - char *name; - - /* For handover, activation is described in 3GPP TS 48.058 4.1.3 and 4.1.4: - * - * | | Access || transmit | activate - * | MS Power | Delay || on main channel | dl SACCH - * ---------------------------------------------------------------------- - * async ho no * --> yes no - * async ho yes * --> yes may be started - * sync ho no no --> yes no - * sync ho yes no --> yes may be started - * sync ho yes yes --> yes shall be started - * - * Always start the main channel immediately. - * want_dl_sacch_active indicates whether dl SACCH should be activated on CHAN ACT. - */ - bool want_dl_sacch_active; - - /* Number of different GsmL1_Sapi_t used in osmo_bts_sysmo is 23. - * Currently we don't share these headers so this is a magic number. */ - struct llist_head sapi_cmds; - uint8_t sapis_dl[23]; - uint8_t sapis_ul[23]; - struct lapdm_channel lapdm_ch; - struct llist_head dl_tch_queue; - struct { - /* bitmask of all SI that are present/valid in si_buf */ - uint32_t valid; - /* bitmask of all SI that do not mirror the BTS-global SI values */ - uint32_t overridden; - uint32_t last; - /* buffers where we put the pre-computed SI: - SI2Q_MAX_NUM is the max number of SI2quater messages (see 3GPP TS 44.018) */ - sysinfo_buf_t buf[_MAX_SYSINFO_TYPE][SI2Q_MAX_NUM]; - } si; - struct { - uint8_t flags; - /* RSL measurement result number, 0 at lchan_act */ - uint8_t res_nr; - /* number of measurements stored in array below */ - uint8_t num_ul_meas; - struct bts_ul_meas uplink[MAX_NUM_UL_MEAS]; - /* last L1 header from the MS */ - struct rsl_l1_info l1_info; - struct gsm_meas_rep_unidir ul_res; - int16_t ms_toa256; - int16_t ul_ci_cb_full; - int16_t ul_ci_cb_sub; - /* Frame number of the last measurement indication receceived */ - uint32_t last_fn; - /* Osmocom extended measurement results, see LC_UL_M_F_EXTD_VALID */ - struct { - /* minimum value of toa256 during measurement period */ - int16_t toa256_min; - /* maximum value of toa256 during measurement period */ - int16_t toa256_max; - /* standard deviation of toa256 value during measurement period */ - uint16_t toa256_std_dev; - } ext; - /* Interference levels reported by PHY (in dBm) */ - int16_t interf_meas_dbm[31]; /* Intave max is 31 */ - uint8_t interf_meas_num; - } meas; - struct { - struct amr_multirate_conf amr_mr; - struct { - struct osmo_fsm_inst *dl_amr_fsm; - /* TCH cache */ - uint8_t cache[20]; - /* FACCH cache */ - uint8_t facch[GSM_MACBLOCK_LEN]; - uint8_t len; - uint32_t fn; - bool is_update; - /* set for each SID frame to detect talkspurt for codecs - without explicit ONSET event */ - bool ul_sid; - /* indicates if DTXd was active during DL measurement - period */ - bool dl_active; - /* last UL SPEECH resume flag */ - bool is_speech_resume; - } dtx; - uint8_t last_cmr; - uint32_t last_fn; - - /* SLOT #0 and #1 to store FACCH for repetition */ - struct gsm_rep_facch rep_facch[2]; - - } tch; - - /* 3GPP TS 48.058 ? 9.3.37: [0; 255] ok, -1 means invalid*/ - int16_t ms_t_offs; - /* 3GPP TS 45.010 ? 1.2 round trip propagation delay (in symbols) or -1 */ - int16_t p_offs; - - /* BTS-side ciphering state (rx only, bi-directional, ...) */ - uint8_t ciph_state; - uint8_t ciph_ns; - uint8_t loopback; - struct { - uint8_t active; - uint8_t ref; - /* T3105: PHYS INF retransmission */ - struct osmo_timer_list t3105; - /* counts up to Ny1 */ - unsigned int phys_info_count; - } ho; - /* S counter for link loss */ - int s; - /* Kind of the release/activation. E.g. RSL or PCU */ - enum lchan_rel_act_kind rel_act_kind; - /* RTP header Marker bit to indicate beginning of speech after pause */ - bool rtp_tx_marker; - - /* TA Control Loop */ - struct lchan_ta_ctrl_state ta_ctrl; - - /* MS/BS power control state */ - struct lchan_power_ctrl_state ms_power_ctrl; - struct lchan_power_ctrl_state bs_power_ctrl; - - /* MS/BS Dynamic Power Control parameters */ - struct gsm_power_ctrl_params ms_dpc_params; - struct gsm_power_ctrl_params bs_dpc_params; - - /* Temporary Overpower for SACCH/FACCH */ - uint8_t bs_acch_overpower_db; - - struct msgb *pending_rel_ind_msg; - - /* ECU (Error Concealment Unit) state */ - struct osmo_ecu_state *ecu_state; - - struct abis_rsl_osmo_rep_acch_cap repeated_acch_capability; - bool repeated_dl_facch_active; - bool repeated_ul_sacch_active; - bool repeated_dl_sacch_active; - - /* Message buffer to store DL-SACCH repeation candidate */ - struct msgb *rep_sacch; - - /* Cached early Immediate Assignment message: if the Immediate Assignment arrives before the channel is - * confirmed active, then cache it here and send it once the channel is confirmed to be active. This is related - * to the Early IA feature, see OsmoBSC config option 'immediate-assignment pre-chan-ack'. */ - struct msgb *early_rr_ia; - struct osmo_timer_list early_rr_ia_delay; -}; - -extern const struct value_string lchan_ciph_state_names[]; -static inline const char *lchan_ciph_state_name(uint8_t state) { - return get_value_string(lchan_ciph_state_names, state); -} - enum gsm_bts_trx_ts_flags { TS_F_PDCH_ACTIVE = 0x1000, TS_F_PDCH_ACT_PENDING = 0x2000, @@ -508,8 +128,6 @@ struct gsm_lchan lchan[TS_MAX_LCHAN]; }; -#define GSM_LCHAN_SI(lchan, i) (void *)((lchan)->si.buf[i][0]) - enum gprs_rlc_par { RLC_T3142, RLC_T3169, @@ -556,9 +174,6 @@ const char *gsm_lchant_name(enum gsm_chan_t c); char *gsm_ts_name(const struct gsm_bts_trx_ts *ts); char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts); -void gsm_lchan_name_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr); -void gsm_lchan_name_update(struct gsm_lchan *lchan); -const char *gsm_lchans_name(enum gsm_lchan_state s); #define GSM_TS_NAME_FMT \ "bts=%u,trx=%u,ts=%u" "%s" @@ -566,19 +181,6 @@ (ts)->trx->bts->nr, (ts)->trx->nr, (ts)->nr, \ (ts)->vamos.is_shadow ? ",shadow" : "" -static inline char *gsm_lchan_name(const struct gsm_lchan *lchan) -{ - return lchan->name; -} - -uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan); -uint8_t gsm_lchan2chan_nr_rsl(const struct gsm_lchan *lchan); -uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, - enum gsm_phys_chan_config as_pchan); - -void gsm_lchan_interf_meas_push(struct gsm_lchan *lchan, int dbm); -int gsm_lchan_interf_meas_calc_band(struct gsm_lchan *lchan); - #define BSIC2BCC(bsic) ((bsic) & 0x07) #define BTS_TSC(bts) BSIC2BCC((bts)->bsic) @@ -589,9 +191,6 @@ uint8_t ts_subslots(const struct gsm_bts_trx_ts *ts); bool ts_is_tch(const struct gsm_bts_trx_ts *ts); -int lchan2ecu_codec(const struct gsm_lchan *lchan); - -void lchan_set_state(struct gsm_lchan *lchan, enum gsm_lchan_state state); int conf_lchans_as_pchan(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config pchan); @@ -600,16 +199,4 @@ bool ts_is_pdch(const struct gsm_bts_trx_ts *ts); -static inline bool lchan_is_dcch(const struct gsm_lchan *lchan) -{ - switch (lchan->type) { - case GSM_LCHAN_SDCCH: - case GSM_LCHAN_TCH_F: - case GSM_LCHAN_TCH_H: - return true; - default: - return false; - } -} - #endif /* _GSM_DATA_H */ diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h new file mode 100644 index 0000000..b91fd66 --- /dev/null +++ b/include/osmo-bts/lchan.h @@ -0,0 +1,429 @@ +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define LOGPLCHAN(lchan, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_lchan_name(lchan), ## args) + +enum lchan_ciph_state { + LCHAN_CIPH_NONE, + LCHAN_CIPH_RX_REQ, + LCHAN_CIPH_RX_CONF, + LCHAN_CIPH_RXTX_REQ, + LCHAN_CIPH_RX_CONF_TX_REQ, + LCHAN_CIPH_RXTX_CONF, +}; + +/* state of a logical channel */ +enum gsm_lchan_state { + LCHAN_S_NONE, /* channel is not active */ + LCHAN_S_ACT_REQ, /* channel activation requested */ + LCHAN_S_ACTIVE, /* channel is active and operational */ + LCHAN_S_REL_REQ, /* channel release has been requested */ + LCHAN_S_REL_ERR, /* channel is in an error state */ + LCHAN_S_BROKEN, /* channel is somehow unusable */ +}; + +#define MAX_NUM_UL_MEAS 104 +#define LC_UL_M_F_L1_VALID (1 << 0) +#define LC_UL_M_F_RES_VALID (1 << 1) +#define LC_UL_M_F_OSMO_EXT_VALID (1 << 2) + +#define MAX_A5_KEY_LEN (128/8) +#define RSL_ENC_ALG_A5(x) (x+1) + +struct bts_ul_meas { + /* BER in units of 0.01%: 10.000 == 100% ber, 0 == 0% ber */ + uint16_t ber10k; + /* timing advance offset (in 1/256 bits) */ + int16_t ta_offs_256bits; + /* C/I ratio in cB */ + int16_t c_i; + /* flags */ + uint8_t is_sub:1; + /* RSSI in dBm * -1 */ + uint8_t inv_rssi; +}; + +struct amr_mode { + uint8_t mode; + uint8_t threshold; + uint8_t hysteresis; +}; + +struct amr_multirate_conf { + uint8_t gsm48_ie[2]; + struct amr_mode ms_mode[4]; + struct amr_mode bts_mode[4]; + uint8_t num_modes; +}; + +enum lchan_csd_mode { + LCHAN_CSD_M_NT, + LCHAN_CSD_M_T_1200_75, + LCHAN_CSD_M_T_600, + LCHAN_CSD_M_T_1200, + LCHAN_CSD_M_T_2400, + LCHAN_CSD_M_T_9600, + LCHAN_CSD_M_T_14400, + LCHAN_CSD_M_T_29000, + LCHAN_CSD_M_T_32000, +}; + +/* State of the SAPIs in the lchan */ +enum lchan_sapi_state { + LCHAN_SAPI_S_NONE, + LCHAN_SAPI_S_REQ, + LCHAN_SAPI_S_ASSIGNED, + LCHAN_SAPI_S_REL, + LCHAN_SAPI_S_ERROR, +}; + +/* What kind of release/activation is done? A silent one for + * the PDCH or one triggered through RSL? */ +enum lchan_rel_act_kind { + LCHAN_REL_ACT_RSL, + LCHAN_REL_ACT_PCU, + LCHAN_REL_ACT_OML, + LCHAN_REL_ACT_REACT, /* remove once auto-activation hack is removed from opstart_compl() */ +}; + +struct gsm_rep_facch { + struct msgb *msg; + uint32_t fn; +}; + +/* MS/BS Power related measurement averaging algo */ +enum gsm_power_ctrl_meas_avg_algo { + GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE = 0x00, + GSM_PWR_CTRL_MEAS_AVG_ALGO_UNWEIGHTED = 0x01, + GSM_PWR_CTRL_MEAS_AVG_ALGO_WEIGHTED = 0x02, + GSM_PWR_CTRL_MEAS_AVG_ALGO_MOD_MEDIAN = 0x03, + /* EWMA is an Osmocom specific algo */ + GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA = 0x04, +}; + +/* MS/BS Power related measurement parameters */ +struct gsm_power_ctrl_meas_params { + /* Thresholds (see 3GPP TS 45.008, section A.3.2.1) */ + uint8_t lower_thresh; /* lower (decreasing) direction */ + uint8_t upper_thresh; /* upper (increasing) direction */ + + /* Threshold Comparators for lower (decreasing) direction */ + uint8_t lower_cmp_p; /* P1 for RxLev, P3 for RxQual */ + uint8_t lower_cmp_n; /* N1 for RxLev, N3 for RxQual */ + /* Threshold Comparators for upper (increasing) direction */ + uint8_t upper_cmp_p; /* P2 for RxLev, P4 for RxQual */ + uint8_t upper_cmp_n; /* N2 for RxLev, N4 for RxQual */ + + /* Hreqave and Hreqt (see 3GPP TS 45.008, Annex A) */ + uint8_t h_reqave; + uint8_t h_reqt; + + /* AVG algorithm and its specific parameters */ + enum gsm_power_ctrl_meas_avg_algo algo; + union { + /* Exponentially Weighted Moving Average */ + struct { + /* Smoothing factor: higher the value - less smoothing */ + uint8_t alpha; /* 1 .. 99 (in %) */ + } ewma; + }; +}; + +/* MS/BS Power Control parameters */ +struct gsm_power_ctrl_params { + /* Minimum interval between power level changes */ + uint8_t ctrl_interval; /* 1 step is 2 SACCH periods */ + + /* Power change step size (maximum) */ + uint8_t inc_step_size_db; /* increasing direction */ + uint8_t red_step_size_db; /* reducing direction */ + + /* Measurement averaging parameters for RxLev & RxQual */ + struct gsm_power_ctrl_meas_params rxqual_meas; + struct gsm_power_ctrl_meas_params rxlev_meas; + + /* Measurement averaging parameters for C/I, per chan type */ + struct gsm_power_ctrl_meas_params ci_fr_meas; + struct gsm_power_ctrl_meas_params ci_hr_meas; + struct gsm_power_ctrl_meas_params ci_amr_fr_meas; + struct gsm_power_ctrl_meas_params ci_amr_hr_meas; + struct gsm_power_ctrl_meas_params ci_sdcch_meas; + struct gsm_power_ctrl_meas_params ci_gprs_meas; +}; + +/* Default MS/BS Power Control parameters */ +extern const struct gsm_power_ctrl_params power_ctrl_params_def; + +/* Measurement pre-processing state */ +struct gsm_power_ctrl_meas_proc_state { + /* Number of measurements processed */ + unsigned int meas_num; + /* Algorithm specific data */ + union { + struct { + /* Scaled up 100 times average value */ + int Avg100; + } ewma; + }; +}; + +struct lchan_power_ctrl_state { + /* Dynamic Power Control parameters (NULL in static mode) */ + const struct gsm_power_ctrl_params *dpc_params; + /* Measurement pre-processing state (for dynamic mode) */ + struct gsm_power_ctrl_meas_proc_state rxlev_meas_proc; + struct gsm_power_ctrl_meas_proc_state rxqual_meas_proc; + struct gsm_power_ctrl_meas_proc_state ci_meas_proc; + /* Number of SACCH blocks to skip (for dynamic mode) */ + int skip_block_num; + + /* Depending on the context (MS or BS power control), fields 'current' and 'max' + * reflect either the MS power level (magic numbers), or BS Power reduction level + * (attenuation, in dB). */ + uint8_t current; + uint8_t max; +}; + +struct lchan_ta_ctrl_state { + /* Number of SACCH blocks to skip */ + int skip_block_num; + /* Currently requested TA */ + uint8_t current; +}; + +struct gsm_lchan { + /* The TS that we're part of */ + struct gsm_bts_trx_ts *ts; + /* The logical subslot number in the TS */ + uint8_t nr; + /* The logical channel type */ + enum gsm_chan_t type; + /* RSL channel mode */ + enum rsl_cmod_spd rsl_cmode; + /* If TCH, traffic channel mode */ + enum gsm48_chan_mode tch_mode; + enum lchan_csd_mode csd_mode; + /* State */ + enum gsm_lchan_state state; + const char *broken_reason; + /* Encryption information */ + struct { + uint8_t alg_id; + uint8_t key_len; + uint8_t key[MAX_A5_KEY_LEN]; + } encr; + + struct { + uint32_t bound_ip; + uint32_t connect_ip; + uint16_t bound_port; + uint16_t connect_port; + uint16_t conn_id; + uint8_t rtp_payload; + uint8_t rtp_payload2; + uint8_t speech_mode; + struct osmo_rtp_socket *rtp_socket; + } abis_ip; + + char *name; + + /* For handover, activation is described in 3GPP TS 48.058 4.1.3 and 4.1.4: + * + * | | Access || transmit | activate + * | MS Power | Delay || on main channel | dl SACCH + * ---------------------------------------------------------------------- + * async ho no * --> yes no + * async ho yes * --> yes may be started + * sync ho no no --> yes no + * sync ho yes no --> yes may be started + * sync ho yes yes --> yes shall be started + * + * Always start the main channel immediately. + * want_dl_sacch_active indicates whether dl SACCH should be activated on CHAN ACT. + */ + bool want_dl_sacch_active; + + /* Number of different GsmL1_Sapi_t used in osmo_bts_sysmo is 23. + * Currently we don't share these headers so this is a magic number. */ + struct llist_head sapi_cmds; + uint8_t sapis_dl[23]; + uint8_t sapis_ul[23]; + struct lapdm_channel lapdm_ch; + struct llist_head dl_tch_queue; + struct { + /* bitmask of all SI that are present/valid in si_buf */ + uint32_t valid; + /* bitmask of all SI that do not mirror the BTS-global SI values */ + uint32_t overridden; + uint32_t last; + /* buffers where we put the pre-computed SI: + SI2Q_MAX_NUM is the max number of SI2quater messages (see 3GPP TS 44.018) */ + sysinfo_buf_t buf[_MAX_SYSINFO_TYPE][SI2Q_MAX_NUM]; + } si; + struct { + uint8_t flags; + /* RSL measurement result number, 0 at lchan_act */ + uint8_t res_nr; + /* number of measurements stored in array below */ + uint8_t num_ul_meas; + struct bts_ul_meas uplink[MAX_NUM_UL_MEAS]; + /* last L1 header from the MS */ + struct rsl_l1_info l1_info; + struct gsm_meas_rep_unidir ul_res; + int16_t ms_toa256; + int16_t ul_ci_cb_full; + int16_t ul_ci_cb_sub; + /* Frame number of the last measurement indication receceived */ + uint32_t last_fn; + /* Osmocom extended measurement results, see LC_UL_M_F_EXTD_VALID */ + struct { + /* minimum value of toa256 during measurement period */ + int16_t toa256_min; + /* maximum value of toa256 during measurement period */ + int16_t toa256_max; + /* standard deviation of toa256 value during measurement period */ + uint16_t toa256_std_dev; + } ext; + /* Interference levels reported by PHY (in dBm) */ + int16_t interf_meas_dbm[31]; /* Intave max is 31 */ + uint8_t interf_meas_num; + } meas; + struct { + struct amr_multirate_conf amr_mr; + struct { + struct osmo_fsm_inst *dl_amr_fsm; + /* TCH cache */ + uint8_t cache[20]; + /* FACCH cache */ + uint8_t facch[GSM_MACBLOCK_LEN]; + uint8_t len; + uint32_t fn; + bool is_update; + /* set for each SID frame to detect talkspurt for codecs + without explicit ONSET event */ + bool ul_sid; + /* indicates if DTXd was active during DL measurement + period */ + bool dl_active; + /* last UL SPEECH resume flag */ + bool is_speech_resume; + } dtx; + uint8_t last_cmr; + uint32_t last_fn; + + /* SLOT #0 and #1 to store FACCH for repetition */ + struct gsm_rep_facch rep_facch[2]; + + } tch; + + /* 3GPP TS 48.058 ? 9.3.37: [0; 255] ok, -1 means invalid*/ + int16_t ms_t_offs; + /* 3GPP TS 45.010 ? 1.2 round trip propagation delay (in symbols) or -1 */ + int16_t p_offs; + + /* BTS-side ciphering state (rx only, bi-directional, ...) */ + uint8_t ciph_state; + uint8_t ciph_ns; + uint8_t loopback; + struct { + uint8_t active; + uint8_t ref; + /* T3105: PHYS INF retransmission */ + struct osmo_timer_list t3105; + /* counts up to Ny1 */ + unsigned int phys_info_count; + } ho; + /* S counter for link loss */ + int s; + /* Kind of the release/activation. E.g. RSL or PCU */ + enum lchan_rel_act_kind rel_act_kind; + /* RTP header Marker bit to indicate beginning of speech after pause */ + bool rtp_tx_marker; + + /* TA Control Loop */ + struct lchan_ta_ctrl_state ta_ctrl; + + /* MS/BS power control state */ + struct lchan_power_ctrl_state ms_power_ctrl; + struct lchan_power_ctrl_state bs_power_ctrl; + + /* MS/BS Dynamic Power Control parameters */ + struct gsm_power_ctrl_params ms_dpc_params; + struct gsm_power_ctrl_params bs_dpc_params; + + /* Temporary Overpower for SACCH/FACCH */ + uint8_t bs_acch_overpower_db; + + struct msgb *pending_rel_ind_msg; + + /* ECU (Error Concealment Unit) state */ + struct osmo_ecu_state *ecu_state; + + struct abis_rsl_osmo_rep_acch_cap repeated_acch_capability; + bool repeated_dl_facch_active; + bool repeated_ul_sacch_active; + bool repeated_dl_sacch_active; + + /* Message buffer to store DL-SACCH repeation candidate */ + struct msgb *rep_sacch; + + /* Cached early Immediate Assignment message: if the Immediate Assignment arrives before the channel is + * confirmed active, then cache it here and send it once the channel is confirmed to be active. This is related + * to the Early IA feature, see OsmoBSC config option 'immediate-assignment pre-chan-ack'. */ + struct msgb *early_rr_ia; + struct osmo_timer_list early_rr_ia_delay; +}; + +extern const struct value_string lchan_ciph_state_names[]; +static inline const char *lchan_ciph_state_name(uint8_t state) { + return get_value_string(lchan_ciph_state_names, state); +} + +#define GSM_LCHAN_SI(lchan, i) (void *)((lchan)->si.buf[i][0]) + +void gsm_lchan_name_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr); +void gsm_lchan_name_update(struct gsm_lchan *lchan); +const char *gsm_lchans_name(enum gsm_lchan_state s); + +static inline char *gsm_lchan_name(const struct gsm_lchan *lchan) +{ + return lchan->name; +} + +uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan); +uint8_t gsm_lchan2chan_nr_rsl(const struct gsm_lchan *lchan); +uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, + enum gsm_phys_chan_config as_pchan); + +void gsm_lchan_interf_meas_push(struct gsm_lchan *lchan, int dbm); +int gsm_lchan_interf_meas_calc_band(struct gsm_lchan *lchan); + +int lchan2ecu_codec(const struct gsm_lchan *lchan); + +void lchan_set_state(struct gsm_lchan *lchan, enum gsm_lchan_state state); + +static inline bool lchan_is_dcch(const struct gsm_lchan *lchan) +{ + switch (lchan->type) { + case GSM_LCHAN_SDCCH: + case GSM_LCHAN_TCH_F: + case GSM_LCHAN_TCH_H: + return true; + default: + return false; + } +} diff --git a/src/common/lchan.c b/src/common/lchan.c index 08ef1b8..fa11331 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e Gerrit-Change-Number: 25697 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 16:07:40 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 16:07:40 +0000 Subject: Change in osmo-bts[master]: Move lchan related code from gsm_data.c to lchan.c References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25698 ) Change subject: Move lchan related code from gsm_data.c to lchan.c ...................................................................... Move lchan related code from gsm_data.c to lchan.c We already have similar classification in osmo-bsc. Change-Id: I1493f40d99f88a565f15d3e0943a512fb9b8719a --- M src/common/gsm_data.c M src/common/lchan.c 2 files changed, 397 insertions(+), 396 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/25698/1 diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index 1525328..2edeb4d 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -90,21 +90,6 @@ return get_value_string(gsm_chan_t_names, c); } -static const struct value_string lchan_s_names[] = { - { LCHAN_S_NONE, "NONE" }, - { LCHAN_S_ACT_REQ, "ACTIVATION REQUESTED" }, - { LCHAN_S_ACTIVE, "ACTIVE" }, - { LCHAN_S_REL_REQ, "RELEASE REQUESTED" }, - { LCHAN_S_REL_ERR, "RELEASE DUE ERROR" }, - { LCHAN_S_BROKEN, "BROKEN UNUSABLE" }, - { 0, NULL } -}; - -const char *gsm_lchans_name(enum gsm_lchan_state s) -{ - return get_value_string(lchan_s_names, s); -} - static char ts2str[255]; char *gsm_ts_name(const struct gsm_bts_trx_ts *ts) @@ -162,187 +147,6 @@ return ts2str; } -void gsm_lchan_name_update(struct gsm_lchan *lchan) -{ - const struct gsm_bts_trx_ts *ts = lchan->ts; - const struct gsm_bts_trx *trx = ts->trx; - char *name; - - name = talloc_asprintf(trx, "(" GSM_TS_NAME_FMT ",ss=%u)", - GSM_TS_NAME_ARGS(ts), lchan->nr); - if (lchan->name != NULL) - talloc_free(lchan->name); - lchan->name = name; -} - -/* See Table 10.5.25 of GSM04.08 */ -static uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan, - uint8_t ts_nr, uint8_t lchan_nr) -{ - uint8_t cbits, chan_nr; - - OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN); - OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH); - - switch (pchan) { - case GSM_PCHAN_TCH_F: - OSMO_ASSERT(lchan_nr == 0); - cbits = ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs; - break; - case GSM_PCHAN_PDCH: - OSMO_ASSERT(lchan_nr == 0); - cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH; - break; - case GSM_PCHAN_TCH_H: - OSMO_ASSERT(lchan_nr < 2); - cbits = ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(lchan_nr); - break; - case GSM_PCHAN_CCCH_SDCCH4: - case GSM_PCHAN_CCCH_SDCCH4_CBCH: - /* - * As a special hack for BCCH, lchan_nr == 4 may be passed - * here. This should never be sent in an RSL message. - * See osmo-bts-xxx/oml.c:opstart_compl(). - */ - if (lchan_nr == CCCH_LCHAN) - cbits = ABIS_RSL_CHAN_NR_CBITS_BCCH; - else { - OSMO_ASSERT(lchan_nr < 4); - cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(lchan_nr); - } - break; - case GSM_PCHAN_SDCCH8_SACCH8C: - case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: - OSMO_ASSERT(lchan_nr < 8); - cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(lchan_nr); - break; - case GSM_PCHAN_CCCH: - cbits = ABIS_RSL_CHAN_NR_CBITS_BCCH; - break; - case GSM_PCHAN_NONE: - LOGP(DRSL, LOGL_ERROR, "Physical channel %s not expected!\n", - gsm_pchan_name(pchan)); - cbits = 0x00; - break; - default: - LOGP(DRSL, LOGL_ERROR, "Physical channel %s (0x%02x) not expected!\n", - gsm_pchan_name(pchan), (int)pchan); - /* OSMO_ASSERT(lchan_nr == 0); - * FIXME: On octphy and litecell, we hit above assertion (see - * Max's comment at https://gerrit.osmocom.org/589 ); disabled - * for BTS until this is clarified; remove the #ifdef when it - * is fixed. Tracked in OS#2906. - */ -#pragma message "fix caller that passes lchan_nr != 0" - cbits = 0x10; - break; - } - - chan_nr = (cbits << 3) | (ts_nr & 0x7); - - return chan_nr; -} - -static uint8_t _gsm_lchan2chan_nr(const struct gsm_lchan *lchan, bool rsl) -{ - uint8_t chan_nr; - - switch (lchan->ts->pchan) { - case GSM_PCHAN_OSMO_DYN: - /* Return chan_nr reflecting the current TS pchan, either a standard TCH kind, or the - * nonstandard value reflecting PDCH for Osmocom style dyn TS. */ - chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, lchan->ts->dyn.pchan_is); - break; - case GSM_PCHAN_TCH_F_PDCH: - /* For ip.access style dyn TS, on RSL we want to use the chan_nr as if it was TCH/F. - * We're using custom PDCH ACT and DEACT messages that use the usual chan_nr values. */ - if (rsl) - chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, GSM_PCHAN_TCH_F); - else if (~lchan->ts->flags & TS_F_PDCH_ACTIVE) - chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, GSM_PCHAN_TCH_F); - else - chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, GSM_PCHAN_PDCH); - break; - default: - chan_nr = gsm_pchan2chan_nr(lchan->ts->pchan, lchan->ts->nr, lchan->nr); - break; - } - - /* VAMOS: if this lchan belongs to a shadow timeslot, we must reflect - * this in the channel number. Convert it to Osmocom specific value. */ - if (lchan->ts->vamos.is_shadow) - chan_nr |= RSL_CHAN_OSMO_VAMOS_MASK; - - return chan_nr; -} - -uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan) -{ - return _gsm_lchan2chan_nr(lchan, false); -} - -uint8_t gsm_lchan2chan_nr_rsl(const struct gsm_lchan *lchan) -{ - return _gsm_lchan2chan_nr(lchan, true); -} - -uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, - enum gsm_phys_chan_config as_pchan) -{ - if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN - && as_pchan == GSM_PCHAN_PDCH) - return RSL_CHAN_OSMO_PDCH | (lchan->ts->nr & ~RSL_CHAN_NR_MASK); - return gsm_pchan2chan_nr(as_pchan, lchan->ts->nr, lchan->nr); -} - -/* Called by the model specific code every 104 TDMA frames (SACCH period) */ -void gsm_lchan_interf_meas_push(struct gsm_lchan *lchan, int dbm) -{ - const uint8_t meas_num = lchan->meas.interf_meas_num; - - if (meas_num >= ARRAY_SIZE(lchan->meas.interf_meas_dbm)) { - LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Not enough room " - "to store interference report (%ddBm)\n", dbm); - return; - } - - lchan->meas.interf_meas_dbm[meas_num] = dbm; - lchan->meas.interf_meas_num++; -} - -/* Called by the higher layers every Intave * 104 TDMA frames */ -int gsm_lchan_interf_meas_calc_band(struct gsm_lchan *lchan) -{ - const uint8_t meas_num = lchan->meas.interf_meas_num; - const struct gsm_bts *bts = lchan->ts->trx->bts; - int b, meas_avg, meas_sum = 0; - - /* There must be at least one sample */ - if (meas_num == 0) - return -EAGAIN; - - /* Calculate the sum of all collected samples (in -x dBm) */ - while (lchan->meas.interf_meas_num) { - uint8_t i = --lchan->meas.interf_meas_num; - meas_sum += lchan->meas.interf_meas_dbm[i]; - } - - /* Calculate the average of all collected samples */ - meas_avg = meas_sum / (int) meas_num; - - /* Determine the band using interference boundaries from BSC */ - for (b = 0; b < ARRAY_SIZE(bts->interference.boundary); b++) { - if (meas_avg >= bts->interference.boundary[b]) - break; /* Current 'b' is the band value */ - } - - LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, - "Interference AVG: %ddBm (band %d, samples %u)\n", - meas_avg, b, meas_num); - - return b; -} - /* determine logical channel based on TRX and channel number IE */ struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, int *rc) @@ -486,197 +290,18 @@ return pchan_is_tch(ts_pchan(ts)); } -const struct value_string lchan_ciph_state_names[] = { - { LCHAN_CIPH_NONE, "NONE" }, - { LCHAN_CIPH_RX_REQ, "RX_REQ" }, - { LCHAN_CIPH_RX_CONF, "RX_CONF" }, - { LCHAN_CIPH_RXTX_REQ, "RXTX_REQ" }, - { LCHAN_CIPH_RX_CONF_TX_REQ, "RX_CONF_TX_REQ" }, - { LCHAN_CIPH_RXTX_CONF, "RXTX_CONF" }, - { 0, NULL } -}; - -/* determine the ECU codec constant for the codec used by given lchan */ -int lchan2ecu_codec(const struct gsm_lchan *lchan) +bool ts_is_pdch(const struct gsm_bts_trx_ts *ts) { - const struct gsm_bts_trx_ts *ts = lchan->ts; - - switch (lchan->tch_mode) { - case GSM48_CMODE_SPEECH_V1: - if (ts_pchan(ts) == GSM_PCHAN_TCH_H) - return OSMO_ECU_CODEC_HR; - else - return OSMO_ECU_CODEC_FR; - break; - case GSM48_CMODE_SPEECH_EFR: - return OSMO_ECU_CODEC_EFR; - case GSM48_CMODE_SPEECH_AMR: - return OSMO_ECU_CODEC_AMR; + switch (ts->pchan) { + case GSM_PCHAN_PDCH: + return true; + case GSM_PCHAN_TCH_F_PDCH: + return (ts->flags & TS_F_PDCH_ACTIVE) + && !(ts->flags & TS_F_PDCH_PENDING_MASK); + case GSM_PCHAN_OSMO_DYN: + return ts->dyn.pchan_is == GSM_PCHAN_PDCH + && ts->dyn.pchan_want == ts->dyn.pchan_is; default: - return -1; + return false; } } - -/* Default MS/BS Power Control parameters (see 3GPP TS 45.008, table A.1) */ -const struct gsm_power_ctrl_params power_ctrl_params_def = { - - .ctrl_interval = 1, /* Trigger loop every second SACCH block. TS 45.008 sec 4.7.1 */ - - /* Power increasing/reducing step size (optimal defaults) */ - .inc_step_size_db = 4, /* quickly increase MS/BS power */ - .red_step_size_db = 2, /* slowly decrease MS/BS power */ - - /* RxLev measurement parameters */ - .rxlev_meas = { - /* Thresholds for RxLev (see 3GPP TS 45.008, A.3.2.1) */ - .lower_thresh = 32, /* L_RXLEV_XX_P (-78 dBm) */ - .upper_thresh = 38, /* U_RXLEV_XX_P (-72 dBm) */ - - /* NOTE: only Osmocom specific EWMA is supported */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA, - .ewma.alpha = 50, /* Smoothing factor 50% */ - }, - - /* RxQual measurement parameters */ - .rxqual_meas = { - /* Thresholds for RxQual (see 3GPP TS 45.008, A.3.2.1) */ - .lower_thresh = 3, /* L_RXQUAL_XX_P (0.8% <= BER < 1.6%) */ - .upper_thresh = 0, /* U_RXQUAL_XX_P (BER < 0.2%) */ - - /* No averaging (filtering) by default. - * NOTE: only Osmocom specific EWMA is supported */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, - }, - - /* C/I measurement parameters. - * Target C/I retrieved from "GSM/EDGE: Evolution and Performance" Table 10.3. - * Set lower and upper so that (lower + upper) / 2 is equal or slightly - * above the target. - */ - .ci_fr_meas = { /* FR: Target C/I = 15 dB, Soft blocking threshold = 10 dB */ - .lower_thresh = 13, - .upper_thresh = 17, - - /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages - * out of LOWER_CMP_N averages are lower than L_CI_FR_XX_P */ - .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages - * out of UPPER_CMP_N averages are greater than L_CI_FR_XX_P */ - .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - - /* No averaging (filtering) by default */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, - - /* Hreqave: the period over which an average is produced */ - .h_reqave = 4, /* TODO: investigate a reasonable default value */ - /* Hreqt: the number of averaged results maintained */ - .h_reqt = 6, /* TODO: investigate a reasonable default value */ - }, - .ci_hr_meas = { /* HR: Target C/I = 18 dB, Soft blocking threshold = 13 dB */ - .lower_thresh = 16, - .upper_thresh = 21, - - /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages - * out of LOWER_CMP_N averages are lower than L_CI_HR_XX_P */ - .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages - * out of UPPER_CMP_N averages are greater than L_CI_HR_XX_P */ - .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - - /* No averaging (filtering) by default */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, - - /* Hreqave: the period over which an average is produced */ - .h_reqave = 4, /* TODO: investigate a reasonable default value */ - /* Hreqt: the number of averaged results maintained */ - .h_reqt = 6, /* TODO: investigate a reasonable default value */ - }, - .ci_amr_fr_meas = { /* AMR-FR: Target C/I = 9 dB, Soft blocking threshold = 4 dB */ - .lower_thresh = 7, - .upper_thresh = 11, - - /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages - * out of LOWER_CMP_N averages are lower than L_CI_AMR_FR_XX_P */ - .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages - * out of UPPER_CMP_N averages are greater than L_CI_AMR_FR_XX_P */ - .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - - /* No averaging (filtering) by default */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, - - /* Hreqave: the period over which an average is produced */ - .h_reqave = 4, /* TODO: investigate a reasonable default value */ - /* Hreqt: the number of averaged results maintained */ - .h_reqt = 6, /* TODO: investigate a reasonable default value */ - }, - .ci_amr_hr_meas = { /* AMR-HR: Target C/I = 15 dB, Soft blocking threshold = 10 dB */ - .lower_thresh = 13, - .upper_thresh = 17, - - /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages - * out of LOWER_CMP_N averages are lower than L_CI_AMR_HR_XX_P */ - .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages - * out of UPPER_CMP_N averages are greater than L_CI_AMR_HR_XX_P */ - .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - - /* No averaging (filtering) by default */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, - - /* Hreqave: the period over which an average is produced */ - .h_reqave = 4, /* TODO: investigate a reasonable default value */ - /* Hreqt: the number of averaged results maintained */ - .h_reqt = 6, /* TODO: investigate a reasonable default value */ - }, - .ci_sdcch_meas = { /* SDCCH: Target C/I = 14 dB, Soft blocking threshold = 9 dB */ - .lower_thresh = 12, - .upper_thresh = 16, - - /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages - * out of LOWER_CMP_N averages are lower than L_CI_SDCCH_XX_P */ - .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages - * out of UPPER_CMP_N averages are greater than L_CI_SDCCH_XX_P */ - .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - - /* No averaging (filtering) by default */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, - - /* Hreqave: the period over which an average is produced */ - .h_reqave = 4, /* TODO: investigate a reasonable default value */ - /* Hreqt: the number of averaged results maintained */ - .h_reqt = 6, /* TODO: investigate a reasonable default value */ - }, - .ci_gprs_meas = { /* GPRS: Target C/I = 20 dB, Soft blocking threshold = 15 dB */ - .lower_thresh = 18, - .upper_thresh = 24, - - /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages - * out of LOWER_CMP_N averages are lower than L_CI_GPRS_XX_P */ - .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages - * out of UPPER_CMP_N averages are greater than L_CI_GPRS_XX_P */ - .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - - /* No averaging (filtering) by default */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, - - /* Hreqave: the period over which an average is produced */ - .h_reqave = 4, /* TODO: investigate a reasonable default value */ - /* Hreqt: the number of averaged results maintained */ - .h_reqt = 6, /* TODO: investigate a reasonable default value */ - }, -}; diff --git a/src/common/lchan.c b/src/common/lchan.c index fa11331..e98984b 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -24,6 +24,27 @@ #include #include #include +#include + +static const struct value_string lchan_s_names[] = { + { LCHAN_S_NONE, "NONE" }, + { LCHAN_S_ACT_REQ, "ACTIVATION REQUESTED" }, + { LCHAN_S_ACTIVE, "ACTIVE" }, + { LCHAN_S_REL_REQ, "RELEASE REQUESTED" }, + { LCHAN_S_REL_ERR, "RELEASE DUE ERROR" }, + { LCHAN_S_BROKEN, "BROKEN UNUSABLE" }, + { 0, NULL } +}; + +const struct value_string lchan_ciph_state_names[] = { + { LCHAN_CIPH_NONE, "NONE" }, + { LCHAN_CIPH_RX_REQ, "RX_REQ" }, + { LCHAN_CIPH_RX_CONF, "RX_CONF" }, + { LCHAN_CIPH_RXTX_REQ, "RXTX_REQ" }, + { LCHAN_CIPH_RX_CONF_TX_REQ, "RX_CONF_TX_REQ" }, + { LCHAN_CIPH_RXTX_CONF, "RXTX_CONF" }, + { 0, NULL } +}; void gsm_lchan_name_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr) { @@ -36,6 +57,24 @@ INIT_LLIST_HEAD(&lchan->dl_tch_queue); } +void gsm_lchan_name_update(struct gsm_lchan *lchan) +{ + const struct gsm_bts_trx_ts *ts = lchan->ts; + const struct gsm_bts_trx *trx = ts->trx; + char *name; + + name = talloc_asprintf(trx, "(" GSM_TS_NAME_FMT ",ss=%u)", + GSM_TS_NAME_ARGS(ts), lchan->nr); + if (lchan->name != NULL) + talloc_free(lchan->name); + lchan->name = name; +} + +const char *gsm_lchans_name(enum gsm_lchan_state s) +{ + return get_value_string(lchan_s_names, s); +} + void early_rr_ia_delay_cb(void *data) { struct gsm_lchan *lchan = data; @@ -98,18 +137,355 @@ } } -bool ts_is_pdch(const struct gsm_bts_trx_ts *ts) +/* See Table 10.5.25 of GSM04.08 */ +static uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan, + uint8_t ts_nr, uint8_t lchan_nr) { - switch (ts->pchan) { + uint8_t cbits, chan_nr; + + OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN); + OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH); + + switch (pchan) { + case GSM_PCHAN_TCH_F: + OSMO_ASSERT(lchan_nr == 0); + cbits = ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs; + break; case GSM_PCHAN_PDCH: - return true; - case GSM_PCHAN_TCH_F_PDCH: - return (ts->flags & TS_F_PDCH_ACTIVE) - && !(ts->flags & TS_F_PDCH_PENDING_MASK); - case GSM_PCHAN_OSMO_DYN: - return ts->dyn.pchan_is == GSM_PCHAN_PDCH - && ts->dyn.pchan_want == ts->dyn.pchan_is; + OSMO_ASSERT(lchan_nr == 0); + cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH; + break; + case GSM_PCHAN_TCH_H: + OSMO_ASSERT(lchan_nr < 2); + cbits = ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(lchan_nr); + break; + case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + /* + * As a special hack for BCCH, lchan_nr == 4 may be passed + * here. This should never be sent in an RSL message. + * See osmo-bts-xxx/oml.c:opstart_compl(). + */ + if (lchan_nr == CCCH_LCHAN) + cbits = ABIS_RSL_CHAN_NR_CBITS_BCCH; + else { + OSMO_ASSERT(lchan_nr < 4); + cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(lchan_nr); + } + break; + case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: + OSMO_ASSERT(lchan_nr < 8); + cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(lchan_nr); + break; + case GSM_PCHAN_CCCH: + cbits = ABIS_RSL_CHAN_NR_CBITS_BCCH; + break; + case GSM_PCHAN_NONE: + LOGP(DRSL, LOGL_ERROR, "Physical channel %s not expected!\n", + gsm_pchan_name(pchan)); + cbits = 0x00; + break; default: - return false; + LOGP(DRSL, LOGL_ERROR, "Physical channel %s (0x%02x) not expected!\n", + gsm_pchan_name(pchan), (int)pchan); + /* OSMO_ASSERT(lchan_nr == 0); + * FIXME: On octphy and litecell, we hit above assertion (see + * Max's comment at https://gerrit.osmocom.org/589 ); disabled + * for BTS until this is clarified; remove the #ifdef when it + * is fixed. Tracked in OS#2906. + */ +#pragma message "fix caller that passes lchan_nr != 0" + cbits = 0x10; + break; + } + + chan_nr = (cbits << 3) | (ts_nr & 0x7); + + return chan_nr; +} + +static uint8_t _gsm_lchan2chan_nr(const struct gsm_lchan *lchan, bool rsl) +{ + uint8_t chan_nr; + + switch (lchan->ts->pchan) { + case GSM_PCHAN_OSMO_DYN: + /* Return chan_nr reflecting the current TS pchan, either a standard TCH kind, or the + * nonstandard value reflecting PDCH for Osmocom style dyn TS. */ + chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, lchan->ts->dyn.pchan_is); + break; + case GSM_PCHAN_TCH_F_PDCH: + /* For ip.access style dyn TS, on RSL we want to use the chan_nr as if it was TCH/F. + * We're using custom PDCH ACT and DEACT messages that use the usual chan_nr values. */ + if (rsl) + chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, GSM_PCHAN_TCH_F); + else if (~lchan->ts->flags & TS_F_PDCH_ACTIVE) + chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, GSM_PCHAN_TCH_F); + else + chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, GSM_PCHAN_PDCH); + break; + default: + chan_nr = gsm_pchan2chan_nr(lchan->ts->pchan, lchan->ts->nr, lchan->nr); + break; + } + + /* VAMOS: if this lchan belongs to a shadow timeslot, we must reflect + * this in the channel number. Convert it to Osmocom specific value. */ + if (lchan->ts->vamos.is_shadow) + chan_nr |= RSL_CHAN_OSMO_VAMOS_MASK; + + return chan_nr; +} + +uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan) +{ + return _gsm_lchan2chan_nr(lchan, false); +} + +uint8_t gsm_lchan2chan_nr_rsl(const struct gsm_lchan *lchan) +{ + return _gsm_lchan2chan_nr(lchan, true); +} + +uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, + enum gsm_phys_chan_config as_pchan) +{ + if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN + && as_pchan == GSM_PCHAN_PDCH) + return RSL_CHAN_OSMO_PDCH | (lchan->ts->nr & ~RSL_CHAN_NR_MASK); + return gsm_pchan2chan_nr(as_pchan, lchan->ts->nr, lchan->nr); +} + +/* Called by the model specific code every 104 TDMA frames (SACCH period) */ +void gsm_lchan_interf_meas_push(struct gsm_lchan *lchan, int dbm) +{ + const uint8_t meas_num = lchan->meas.interf_meas_num; + + if (meas_num >= ARRAY_SIZE(lchan->meas.interf_meas_dbm)) { + LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Not enough room " + "to store interference report (%ddBm)\n", dbm); + return; + } + + lchan->meas.interf_meas_dbm[meas_num] = dbm; + lchan->meas.interf_meas_num++; +} + +/* Called by the higher layers every Intave * 104 TDMA frames */ +int gsm_lchan_interf_meas_calc_band(struct gsm_lchan *lchan) +{ + const uint8_t meas_num = lchan->meas.interf_meas_num; + const struct gsm_bts *bts = lchan->ts->trx->bts; + int b, meas_avg, meas_sum = 0; + + /* There must be at least one sample */ + if (meas_num == 0) + return -EAGAIN; + + /* Calculate the sum of all collected samples (in -x dBm) */ + while (lchan->meas.interf_meas_num) { + uint8_t i = --lchan->meas.interf_meas_num; + meas_sum += lchan->meas.interf_meas_dbm[i]; + } + + /* Calculate the average of all collected samples */ + meas_avg = meas_sum / (int) meas_num; + + /* Determine the band using interference boundaries from BSC */ + for (b = 0; b < ARRAY_SIZE(bts->interference.boundary); b++) { + if (meas_avg >= bts->interference.boundary[b]) + break; /* Current 'b' is the band value */ + } + + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, + "Interference AVG: %ddBm (band %d, samples %u)\n", + meas_avg, b, meas_num); + + return b; +} + +/* determine the ECU codec constant for the codec used by given lchan */ +int lchan2ecu_codec(const struct gsm_lchan *lchan) +{ + const struct gsm_bts_trx_ts *ts = lchan->ts; + + switch (lchan->tch_mode) { + case GSM48_CMODE_SPEECH_V1: + if (ts_pchan(ts) == GSM_PCHAN_TCH_H) + return OSMO_ECU_CODEC_HR; + else + return OSMO_ECU_CODEC_FR; + break; + case GSM48_CMODE_SPEECH_EFR: + return OSMO_ECU_CODEC_EFR; + case GSM48_CMODE_SPEECH_AMR: + return OSMO_ECU_CODEC_AMR; + default: + return -1; } } + +/* Default MS/BS Power Control parameters (see 3GPP TS 45.008, table A.1) */ +const struct gsm_power_ctrl_params power_ctrl_params_def = { + + .ctrl_interval = 1, /* Trigger loop every second SACCH block. TS 45.008 sec 4.7.1 */ + + /* Power increasing/reducing step size (optimal defaults) */ + .inc_step_size_db = 4, /* quickly increase MS/BS power */ + .red_step_size_db = 2, /* slowly decrease MS/BS power */ + + /* RxLev measurement parameters */ + .rxlev_meas = { + /* Thresholds for RxLev (see 3GPP TS 45.008, A.3.2.1) */ + .lower_thresh = 32, /* L_RXLEV_XX_P (-78 dBm) */ + .upper_thresh = 38, /* U_RXLEV_XX_P (-72 dBm) */ + + /* NOTE: only Osmocom specific EWMA is supported */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA, + .ewma.alpha = 50, /* Smoothing factor 50% */ + }, + + /* RxQual measurement parameters */ + .rxqual_meas = { + /* Thresholds for RxQual (see 3GPP TS 45.008, A.3.2.1) */ + .lower_thresh = 3, /* L_RXQUAL_XX_P (0.8% <= BER < 1.6%) */ + .upper_thresh = 0, /* U_RXQUAL_XX_P (BER < 0.2%) */ + + /* No averaging (filtering) by default. + * NOTE: only Osmocom specific EWMA is supported */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, + }, + + /* C/I measurement parameters. + * Target C/I retrieved from "GSM/EDGE: Evolution and Performance" Table 10.3. + * Set lower and upper so that (lower + upper) / 2 is equal or slightly + * above the target. + */ + .ci_fr_meas = { /* FR: Target C/I = 15 dB, Soft blocking threshold = 10 dB */ + .lower_thresh = 13, + .upper_thresh = 17, + + /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages + * out of LOWER_CMP_N averages are lower than L_CI_FR_XX_P */ + .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages + * out of UPPER_CMP_N averages are greater than L_CI_FR_XX_P */ + .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + + /* No averaging (filtering) by default */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, + + /* Hreqave: the period over which an average is produced */ + .h_reqave = 4, /* TODO: investigate a reasonable default value */ + /* Hreqt: the number of averaged results maintained */ + .h_reqt = 6, /* TODO: investigate a reasonable default value */ + }, + .ci_hr_meas = { /* HR: Target C/I = 18 dB, Soft blocking threshold = 13 dB */ + .lower_thresh = 16, + .upper_thresh = 21, + + /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages + * out of LOWER_CMP_N averages are lower than L_CI_HR_XX_P */ + .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages + * out of UPPER_CMP_N averages are greater than L_CI_HR_XX_P */ + .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + + /* No averaging (filtering) by default */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, + + /* Hreqave: the period over which an average is produced */ + .h_reqave = 4, /* TODO: investigate a reasonable default value */ + /* Hreqt: the number of averaged results maintained */ + .h_reqt = 6, /* TODO: investigate a reasonable default value */ + }, + .ci_amr_fr_meas = { /* AMR-FR: Target C/I = 9 dB, Soft blocking threshold = 4 dB */ + .lower_thresh = 7, + .upper_thresh = 11, + + /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages + * out of LOWER_CMP_N averages are lower than L_CI_AMR_FR_XX_P */ + .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages + * out of UPPER_CMP_N averages are greater than L_CI_AMR_FR_XX_P */ + .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + + /* No averaging (filtering) by default */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, + + /* Hreqave: the period over which an average is produced */ + .h_reqave = 4, /* TODO: investigate a reasonable default value */ + /* Hreqt: the number of averaged results maintained */ + .h_reqt = 6, /* TODO: investigate a reasonable default value */ + }, + .ci_amr_hr_meas = { /* AMR-HR: Target C/I = 15 dB, Soft blocking threshold = 10 dB */ + .lower_thresh = 13, + .upper_thresh = 17, + + /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages + * out of LOWER_CMP_N averages are lower than L_CI_AMR_HR_XX_P */ + .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages + * out of UPPER_CMP_N averages are greater than L_CI_AMR_HR_XX_P */ + .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + + /* No averaging (filtering) by default */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, + + /* Hreqave: the period over which an average is produced */ + .h_reqave = 4, /* TODO: investigate a reasonable default value */ + /* Hreqt: the number of averaged results maintained */ + .h_reqt = 6, /* TODO: investigate a reasonable default value */ + }, + .ci_sdcch_meas = { /* SDCCH: Target C/I = 14 dB, Soft blocking threshold = 9 dB */ + .lower_thresh = 12, + .upper_thresh = 16, + + /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages + * out of LOWER_CMP_N averages are lower than L_CI_SDCCH_XX_P */ + .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages + * out of UPPER_CMP_N averages are greater than L_CI_SDCCH_XX_P */ + .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + + /* No averaging (filtering) by default */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, + + /* Hreqave: the period over which an average is produced */ + .h_reqave = 4, /* TODO: investigate a reasonable default value */ + /* Hreqt: the number of averaged results maintained */ + .h_reqt = 6, /* TODO: investigate a reasonable default value */ + }, + .ci_gprs_meas = { /* GPRS: Target C/I = 20 dB, Soft blocking threshold = 15 dB */ + .lower_thresh = 18, + .upper_thresh = 24, + + /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages + * out of LOWER_CMP_N averages are lower than L_CI_GPRS_XX_P */ + .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages + * out of UPPER_CMP_N averages are greater than L_CI_GPRS_XX_P */ + .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + + /* No averaging (filtering) by default */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, + + /* Hreqave: the period over which an average is produced */ + .h_reqave = 4, /* TODO: investigate a reasonable default value */ + /* Hreqt: the number of averaged results maintained */ + .h_reqt = 6, /* TODO: investigate a reasonable default value */ + }, +}; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1493f40d99f88a565f15d3e0943a512fb9b8719a Gerrit-Change-Number: 25698 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 16:07:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 16:07:58 +0000 Subject: Change in osmo-bts[master]: Move lchan specific code from gsm_data.h to lchan.h In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/25697 ) Change subject: Move lchan specific code from gsm_data.h to lchan.h ...................................................................... Move lchan specific code from gsm_data.h to lchan.h Let's split all lchan specific stuff into its own header, it helps finding out data and operations available related to an lchan. We already have similar classification in osmo-bsc. Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e --- M include/osmo-bts/Makefile.am M include/osmo-bts/gsm_data.h A include/osmo-bts/lchan.h M src/common/lchan.c 4 files changed, 432 insertions(+), 415 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/25697/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e Gerrit-Change-Number: 25697 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 16:07:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 16:07:58 +0000 Subject: Change in osmo-bts[master]: Move lchan related code from gsm_data.c to lchan.c In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/25698 ) Change subject: Move lchan related code from gsm_data.c to lchan.c ...................................................................... Move lchan related code from gsm_data.c to lchan.c We already have similar classification in osmo-bsc. Change-Id: I1493f40d99f88a565f15d3e0943a512fb9b8719a --- M src/common/gsm_data.c M src/common/lchan.c 2 files changed, 397 insertions(+), 396 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/25698/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1493f40d99f88a565f15d3e0943a512fb9b8719a Gerrit-Change-Number: 25698 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 16:35:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 16:35:51 +0000 Subject: Change in osmo-bts[master]: Move lchan specific code from gsm_data.h to lchan.h In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25697 to look at the new patch set (#3). Change subject: Move lchan specific code from gsm_data.h to lchan.h ...................................................................... Move lchan specific code from gsm_data.h to lchan.h Let's split all lchan specific stuff into its own header, it helps finding out data and operations available related to an lchan. We already have similar classification in osmo-bsc. Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e --- M include/osmo-bts/Makefile.am M include/osmo-bts/gsm_data.h A include/osmo-bts/lchan.h M src/common/lchan.c M src/common/rsl.c 5 files changed, 433 insertions(+), 416 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/25697/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e Gerrit-Change-Number: 25697 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 16:35:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 16:35:51 +0000 Subject: Change in osmo-bts[master]: lchan.h: Add related ticket info to FIXME comment References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25699 ) Change subject: lchan.h: Add related ticket info to FIXME comment ...................................................................... lchan.h: Add related ticket info to FIXME comment Change-Id: I09ea92e843383d65c8033196814d345135ff918e --- M include/osmo-bts/lchan.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/99/25699/1 diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index b91fd66..86a09bf 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -97,7 +97,7 @@ LCHAN_REL_ACT_RSL, LCHAN_REL_ACT_PCU, LCHAN_REL_ACT_OML, - LCHAN_REL_ACT_REACT, /* remove once auto-activation hack is removed from opstart_compl() */ + LCHAN_REL_ACT_REACT, /* FIXME: remove once auto-activation hack is removed from opstart_compl() (OS#1575) */ }; struct gsm_rep_facch { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I09ea92e843383d65c8033196814d345135ff918e Gerrit-Change-Number: 25699 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 16:52:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 16:52:34 +0000 Subject: Change in osmo-bts[master]: Move lchan specific code from gsm_data.h to lchan.h In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25697 to look at the new patch set (#4). Change subject: Move lchan specific code from gsm_data.h to lchan.h ...................................................................... Move lchan specific code from gsm_data.h to lchan.h Let's split all lchan specific stuff into its own header, it helps finding out data and operations available related to an lchan. We already have similar classification in osmo-bsc. Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e --- M include/osmo-bts/Makefile.am M include/osmo-bts/gsm_data.h A include/osmo-bts/lchan.h M src/common/lchan.c M src/common/rsl.c 5 files changed, 434 insertions(+), 416 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/25697/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e Gerrit-Change-Number: 25697 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 18:05:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 18:05:26 +0000 Subject: Change in osmo-bts[master]: Introduce gsm_lchan_release function helper References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25700 ) Change subject: Introduce gsm_lchan_release function helper ...................................................................... Introduce gsm_lchan_release function helper Change-Id: I0525beaba3c833f8d7adf9701fe373761a7720d3 --- M include/osmo-bts/lchan.h M src/common/lchan.c M src/common/rsl.c 3 files changed, 77 insertions(+), 60 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/00/25700/1 diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 188b81b..1d0b2d8 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -398,6 +398,7 @@ void gsm_lchan_name_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr); void gsm_lchan_name_update(struct gsm_lchan *lchan); +void gsm_lchan_release(struct gsm_lchan *lchan, enum lchan_rel_act_kind rel_act_kind); const char *gsm_lchans_name(enum gsm_lchan_state s); static inline char *gsm_lchan_name(const struct gsm_lchan *lchan) diff --git a/src/common/lchan.c b/src/common/lchan.c index e98984b..ec5347d 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -20,10 +20,16 @@ */ #include + +#include + #include #include #include #include +#include +#include +#include #include static const struct value_string lchan_s_names[] = { @@ -70,6 +76,75 @@ lchan->name = name; } +static int dyn_ts_pdch_release(struct gsm_lchan *lchan) +{ + struct gsm_bts_trx_ts *ts = lchan->ts; + + if (ts->dyn.pchan_is != ts->dyn.pchan_want) { + LOGP(DRSL, LOGL_ERROR, "%s: PDCH release requested but already" + " in switchover\n", gsm_ts_and_pchan_name(ts)); + return -EINVAL; + } + + /* + * Indicate PDCH Disconnect in dyn_pdch.want, let pcu_tx_info_ind() + * pick it up and wait for PCU to disable the channel. + */ + ts->dyn.pchan_want = GSM_PCHAN_NONE; + + if (!pcu_connected()) { + /* PCU not connected yet. Just record the new type and done, + * the PCU will pick it up once connected. */ + ts->dyn.pchan_is = GSM_PCHAN_NONE; + return 1; + } + + return pcu_tx_info_ind(); +} + +void gsm_lchan_release(struct gsm_lchan *lchan, enum lchan_rel_act_kind rel_act_kind) +{ + int rc; + + if (lchan->abis_ip.rtp_socket) { + rsl_tx_ipac_dlcx_ind(lchan, RSL_ERR_NORMAL_UNSPEC); + osmo_rtp_socket_log_stats(lchan->abis_ip.rtp_socket, DRTP, LOGL_INFO, + "Closing RTP socket on Channel Release "); + osmo_rtp_socket_free(lchan->abis_ip.rtp_socket); + lchan->abis_ip.rtp_socket = NULL; + msgb_queue_flush(&lchan->dl_tch_queue); + } + + /* FIXME: right now we allow creating the rtp_socket even if chan is not + * activated... Once we check for that, we can move this check at the + * start of the function */ + if (lchan->state == LCHAN_S_NONE) + return; + + /* release handover state */ + handover_reset(lchan); + + lchan->rel_act_kind = rel_act_kind; + + /* Dynamic channel in PDCH mode is released via PCU */ + if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN + && lchan->ts->dyn.pchan_is == GSM_PCHAN_PDCH) { + rc = dyn_ts_pdch_release(lchan); + if (rc == 1) { + /* If the PCU is not connected, continue to rel ack right away. */ + lchan->rel_act_kind = LCHAN_REL_ACT_PCU; + rsl_tx_rf_rel_ack(lchan); + return; + } + /* Waiting for PDCH release */ + return; + } + + l1sap_chan_rel(lchan->ts->trx, gsm_lchan2chan_nr(lchan)); + + lapdm_channel_exit(&lchan->lapdm_ch); +} + const char *gsm_lchans_name(enum gsm_lchan_state s) { return get_value_string(lchan_s_names, s); diff --git a/src/common/rsl.c b/src/common/rsl.c index 96a2a67..cda0b37 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1925,37 +1925,9 @@ return 0; } -static int dyn_ts_pdch_release(struct gsm_lchan *lchan) -{ - struct gsm_bts_trx_ts *ts = lchan->ts; - - if (ts->dyn.pchan_is != ts->dyn.pchan_want) { - LOGP(DRSL, LOGL_ERROR, "%s: PDCH release requested but already" - " in switchover\n", gsm_ts_and_pchan_name(ts)); - return -EINVAL; - } - - /* - * Indicate PDCH Disconnect in dyn_pdch.want, let pcu_tx_info_ind() - * pick it up and wait for PCU to disable the channel. - */ - ts->dyn.pchan_want = GSM_PCHAN_NONE; - - if (!pcu_connected()) { - /* PCU not connected yet. Just record the new type and done, - * the PCU will pick it up once connected. */ - ts->dyn.pchan_is = GSM_PCHAN_NONE; - return 1; - } - - return pcu_tx_info_ind(); -} - /* 8.4.14 RF CHANnel RELease is received */ static int rsl_rx_rf_chan_rel(struct gsm_lchan *lchan, uint8_t chan_nr) { - int rc; - if (lchan->state == LCHAN_S_NONE) { LOGP(DRSL, LOGL_ERROR, "%s ss=%d state=%s Rx RSL RF Channel Release, but is already inactive;" @@ -1966,38 +1938,7 @@ * not necessarily reflecting the current lchan state. */ return tx_rf_rel_ack(lchan, chan_nr); } - - if (lchan->abis_ip.rtp_socket) { - rsl_tx_ipac_dlcx_ind(lchan, RSL_ERR_NORMAL_UNSPEC); - osmo_rtp_socket_log_stats(lchan->abis_ip.rtp_socket, DRTP, LOGL_INFO, - "Closing RTP socket on Channel Release "); - osmo_rtp_socket_free(lchan->abis_ip.rtp_socket); - lchan->abis_ip.rtp_socket = NULL; - msgb_queue_flush(&lchan->dl_tch_queue); - } - - /* release handover state */ - handover_reset(lchan); - - lchan->rel_act_kind = LCHAN_REL_ACT_RSL; - - /* Dynamic channel in PDCH mode is released via PCU */ - if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN - && lchan->ts->dyn.pchan_is == GSM_PCHAN_PDCH) { - rc = dyn_ts_pdch_release(lchan); - if (rc == 1) { - /* If the PCU is not connected, continue to rel ack right away. */ - lchan->rel_act_kind = LCHAN_REL_ACT_PCU; - return rsl_tx_rf_rel_ack(lchan); - } - /* Waiting for PDCH release */ - return rc; - } - - l1sap_chan_rel(lchan->ts->trx, chan_nr); - - lapdm_channel_exit(&lchan->lapdm_ch); - + gsm_lchan_release(lchan, LCHAN_REL_ACT_RSL); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0525beaba3c833f8d7adf9701fe373761a7720d3 Gerrit-Change-Number: 25700 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 18:05:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 18:05:27 +0000 Subject: Change in osmo-bts[master]: nm_channel_fsm: Release lchans after BTS shutdown References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25701 ) Change subject: nm_channel_fsm: Release lchans after BTS shutdown ...................................................................... nm_channel_fsm: Release lchans after BTS shutdown This fixes some TTCN3 tests where some lchan resources were kept from previous tests. Change-Id: I78dca32cd061fba86cc88c4c4f323b33d51c58d0 --- M include/osmo-bts/gsm_data.h M src/common/gsm_data.c M src/common/nm_channel_fsm.c 3 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/01/25701/1 diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index c2f8984..a7ecbde 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -199,4 +199,6 @@ bool ts_is_pdch(const struct gsm_bts_trx_ts *ts); +void gsm_ts_release(struct gsm_bts_trx_ts *ts); + #endif /* _GSM_DATA_H */ diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index 2edeb4d..4446958 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -305,3 +305,13 @@ return false; } } + +void gsm_ts_release(struct gsm_bts_trx_ts *ts) +{ + unsigned int ln; + + for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) { + struct gsm_lchan *lchan = &ts->lchan[ln]; + gsm_lchan_release(lchan, LCHAN_REL_ACT_OML); + } +} diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index f933a16..1f47a3e 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -193,6 +193,7 @@ oml_mo_state_chg(&ts->mo, -1, -1, NM_STATE_SHUTDOWN); break; case NM_EV_SHUTDOWN_FINISH: + gsm_ts_release(ts); nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_NOTINSTALLED); break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I78dca32cd061fba86cc88c4c4f323b33d51c58d0 Gerrit-Change-Number: 25701 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 18:27:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 18:27:03 +0000 Subject: Change in osmo-bts[master]: rsl: NACK Chan Activation for lchans on disabled TS References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25702 ) Change subject: rsl: NACK Chan Activation for lchans on disabled TS ...................................................................... rsl: NACK Chan Activation for lchans on disabled TS A broken BSC could send a Chan Activation on a TS which has not yet been enabled (or even configured). This is the case with our TTCN3 tests, where OML side is currently handled in parallel by an osmo-bts while TTCN3 takes care of the RSL side. This can actually be seen as a malfunctioning BSC, but it was spotted that given this sequence os events osmo-bts can crash (see ticket below). Hence, let's NACK any attempt from a BSC to activate an lchan on a disabled TS. Related: OS#5249 Change-Id: I9c3b68487c12efc412a057728a561e061560c544 --- M src/common/rsl.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/02/25702/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 507a7cf..2db06d7 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1633,6 +1633,12 @@ return rsl_tx_chan_act_nack(lchan, RSL_ERR_EQUIPMENT_FAIL); } + if (ts->mo.nm_state.operational != NM_OPSTATE_ENABLED || + ts->mo.nm_state.availability != NM_AVSTATE_OK) { + DEBUGP(DRSL, "%s rx chan activ is not state oper=ENABLED avail=OK, nack!\n", gsm_ts_and_pchan_name(ts)); + return rsl_tx_chan_act_nack(lchan, RSL_ERR_RR_UNAVAIL); + } + if (ts->pchan == GSM_PCHAN_OSMO_DYN) { ts->dyn.pchan_want = dyn_pchan_from_chan_nr(dch->chan_nr); DEBUGP(DRSL, "%s rx chan activ\n", gsm_ts_and_pchan_name(ts)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9c3b68487c12efc412a057728a561e061560c544 Gerrit-Change-Number: 25702 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 19:07:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 6 Oct 2021 19:07:34 +0000 Subject: Change in simtrace2[master]: Use osmo_libusb_{init, exit}() instead of libusb_{init, exit}() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/25703 ) Change subject: Use osmo_libusb_{init,exit}() instead of libusb_{init,exit}() ...................................................................... Use osmo_libusb_{init,exit}() instead of libusb_{init,exit}() We use other osmo_libusb_* functions later in the code, so it is best to initialize the library via libosmousb, and not directly. Change-Id: I2fd981935e1420e529f5dd8a98edd347c317284c --- M host/src/simtrace2-cardem-pcsc.c M host/src/simtrace2-sniff.c M host/src/simtrace2-tool.c M host/src/simtrace2_usb.c 4 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/03/25703/1 diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 8e143ba..510a371 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -633,7 +633,7 @@ if (transp->usb_devh) libusb_close(transp->usb_devh); - libusb_exit(NULL); + osmo_libusb_exit(NULL); do_exit: return ret; } diff --git a/host/src/simtrace2-sniff.c b/host/src/simtrace2-sniff.c index c44029a..653508d 100644 --- a/host/src/simtrace2-sniff.c +++ b/host/src/simtrace2-sniff.c @@ -379,7 +379,7 @@ } /* Scan for available SIMtrace USB devices supporting sniffing */ - rc = libusb_init(NULL); + rc = osmo_libusb_init(NULL); if (rc < 0) { fprintf(stderr, "libusb initialization failed\n"); goto do_exit; @@ -505,7 +505,7 @@ sleep(1); } while (keep_running); - libusb_exit(NULL); + osmo_libusb_exit(NULL); do_exit: return ret; } diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index 658f84a..f1423b0 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -265,7 +265,7 @@ transp->udp_fd = -1; - rc = libusb_init(NULL); + rc = osmo_libusb_init(NULL); if (rc < 0) { fprintf(stderr, "libusb initialization failed\n"); goto do_exit; @@ -326,7 +326,7 @@ libusb_close(transp->usb_devh); } while (0); - libusb_exit(NULL); + osmo_libusb_exit(NULL); do_exit: return ret; } diff --git a/host/src/simtrace2_usb.c b/host/src/simtrace2_usb.c index 8fa41fc..be1ba6e 100644 --- a/host/src/simtrace2_usb.c +++ b/host/src/simtrace2_usb.c @@ -77,7 +77,7 @@ int main(int argc, char **argv) { - libusb_init(NULL); + osmo_libusb_init(NULL); find_devices(); return 0; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2fd981935e1420e529f5dd8a98edd347c317284c Gerrit-Change-Number: 25703 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 19:07:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 6 Oct 2021 19:07:35 +0000 Subject: Change in simtrace2[master]: simtrace2-cardem-pcsc: Remove double libusb initialization References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/25704 ) Change subject: simtrace2-cardem-pcsc: Remove double libusb initialization ...................................................................... simtrace2-cardem-pcsc: Remove double libusb initialization This code already calls osmo_libusb_init further above in the top of the main() function, so there's no use of calling libusb_init() directly in the same function lines below. Change-Id: I2e0c7446aaa644c5aae1059ce91ff9f729903cbc --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/04/25704/1 diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 510a371..df191df 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -524,12 +524,6 @@ ci->card_prof = &osim_uicc_sim_cic_profile; - rc = libusb_init(NULL); - if (rc < 0) { - fprintf(stderr, "libusb initialization failed\n"); - goto do_exit; - } - rc = osmo_st2_gsmtap_init(gsmtap_host); if (rc < 0) { perror("unable to open GSMTAP"); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2e0c7446aaa644c5aae1059ce91ff9f729903cbc Gerrit-Change-Number: 25704 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 19:10:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 6 Oct 2021 19:10:57 +0000 Subject: Change in simtrace2[master]: simtrace2-tool: Initialize logging to avoid error on first log output References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/25705 ) Change subject: simtrace2-tool: Initialize logging to avoid error on first log output ...................................................................... simtrace2-tool: Initialize logging to avoid error on first log output This avoids ERROR: osmo_log_info == NULL! You must call log_init() before using logging in log_check_level() Change-Id: Id355ef33e10164f8e8eb40c2fd0b606bc8e9b6f7 --- M host/src/simtrace2-tool.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/05/25705/1 diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index f1423b0..97d7706 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -39,6 +39,8 @@ #include #include +#include +#include /*********************************************************************** * Incoming Messages @@ -213,6 +215,7 @@ return rc; } +static struct log_info log_info = {}; int main(int argc, char **argv) { @@ -265,6 +268,8 @@ transp->udp_fd = -1; + osmo_init_logging2(NULL, &log_info); + rc = osmo_libusb_init(NULL); if (rc < 0) { fprintf(stderr, "libusb initialization failed\n"); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id355ef33e10164f8e8eb40c2fd0b606bc8e9b6f7 Gerrit-Change-Number: 25705 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 20:01:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 20:01:42 +0000 Subject: Change in simtrace2[master]: Use osmo_libusb_{init, exit}() instead of libusb_{init, exit}() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25703 ) Change subject: Use osmo_libusb_{init,exit}() instead of libusb_{init,exit}() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2fd981935e1420e529f5dd8a98edd347c317284c Gerrit-Change-Number: 25703 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 06 Oct 2021 20:01:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 20:02:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 20:02:57 +0000 Subject: Change in simtrace2[master]: simtrace2-cardem-pcsc: Remove double libusb initialization In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25704 ) Change subject: simtrace2-cardem-pcsc: Remove double libusb initialization ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2e0c7446aaa644c5aae1059ce91ff9f729903cbc Gerrit-Change-Number: 25704 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 06 Oct 2021 20:02:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 6 20:03:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 6 Oct 2021 20:03:39 +0000 Subject: Change in simtrace2[master]: simtrace2-tool: Initialize logging to avoid error on first log output In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25705 ) Change subject: simtrace2-tool: Initialize logging to avoid error on first log output ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id355ef33e10164f8e8eb40c2fd0b606bc8e9b6f7 Gerrit-Change-Number: 25705 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 06 Oct 2021 20:03:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 02:07:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 02:07:35 +0000 Subject: Change in osmo-bts[master]: rsl: NACK Chan Activation for lchans on disabled TS In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25702 ) Change subject: rsl: NACK Chan Activation for lchans on disabled TS ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-bts/+/25702/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/25702/1//COMMIT_MSG at 11 PS1, Line 11: bts bsc https://gerrit.osmocom.org/c/osmo-bts/+/25702/1//COMMIT_MSG at 13 PS1, Line 13: os of https://gerrit.osmocom.org/c/osmo-bts/+/25702/1/src/common/rsl.c File src/common/rsl.c: https://gerrit.osmocom.org/c/osmo-bts/+/25702/1/src/common/rsl.c at 1638 PS1, Line 1638: DEBUGP I would use LOGL_ERROR here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9c3b68487c12efc412a057728a561e061560c544 Gerrit-Change-Number: 25702 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 02:07:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 07:20:29 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 07:20:29 +0000 Subject: Change in osmo-bts[master]: Introduce gsm_lchan_name_init() function helper In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25696 ) Change subject: Introduce gsm_lchan_name_init() function helper ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25696/1/src/common/lchan.c File src/common/lchan.c: https://gerrit.osmocom.org/c/osmo-bts/+/25696/1/src/common/lchan.c at 28 PS1, Line 28: gsm_lchan_name_init This naming is confusing, I would remove the _name_ part. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9cb96707c63b8b7d76591d25fe906f02e34bb76b Gerrit-Change-Number: 25696 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 07:20:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 09:08:24 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 09:08:24 +0000 Subject: Change in osmo-bts[master]: Introduce gsm_lchan_init() function helper In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25696 to look at the new patch set (#2). Change subject: Introduce gsm_lchan_init() function helper ...................................................................... Introduce gsm_lchan_init() function helper Let's move lchan specific struct stuff into lchan.c Change-Id: I9cb96707c63b8b7d76591d25fe906f02e34bb76b --- M include/osmo-bts/gsm_data.h M src/common/bts_trx.c M src/common/lchan.c 3 files changed, 13 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/25696/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9cb96707c63b8b7d76591d25fe906f02e34bb76b Gerrit-Change-Number: 25696 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 09:08:24 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 09:08:24 +0000 Subject: Change in osmo-bts[master]: Move lchan specific code from gsm_data.h to lchan.h In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, neels, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25697 to look at the new patch set (#5). Change subject: Move lchan specific code from gsm_data.h to lchan.h ...................................................................... Move lchan specific code from gsm_data.h to lchan.h Let's split all lchan specific stuff into its own header, it helps finding out data and operations available related to an lchan. We already have similar classification in osmo-bsc. Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e --- M include/osmo-bts/Makefile.am M include/osmo-bts/gsm_data.h A include/osmo-bts/lchan.h M src/common/lchan.c 4 files changed, 433 insertions(+), 415 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/25697/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e Gerrit-Change-Number: 25697 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 09:12:25 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 09:12:25 +0000 Subject: Change in osmo-bts[master]: rsl: NACK Chan Activation for lchans on disabled TS In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25702 to look at the new patch set (#2). Change subject: rsl: NACK Chan Activation for lchans on disabled TS ...................................................................... rsl: NACK Chan Activation for lchans on disabled TS A broken BSC could send a Chan Activation on a TS which has not yet been enabled (or even configured). This is the case with our TTCN3 tests, where OML side is currently handled in parallel by an osmo-bsc while TTCN3 takes care of the RSL side. This can actually be seen as a malfunctioning BSC, but it was spotted that given this sequence of events osmo-bts can crash (see ticket below). Hence, let's NACK any attempt from a BSC to activate an lchan on a disabled TS. Related: OS#5249 Change-Id: I9c3b68487c12efc412a057728a561e061560c544 --- M src/common/rsl.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/02/25702/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9c3b68487c12efc412a057728a561e061560c544 Gerrit-Change-Number: 25702 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 09:45:22 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 7 Oct 2021 09:45:22 +0000 Subject: Change in osmo-bts[master]: Introduce gsm_lchan_release function helper In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25700 ) Change subject: Introduce gsm_lchan_release function helper ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0525beaba3c833f8d7adf9701fe373761a7720d3 Gerrit-Change-Number: 25700 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 07 Oct 2021 09:45:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 09:59:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 09:59:56 +0000 Subject: Change in osmo-bts[master]: rsl: NACK Chan Activation for lchans on disabled TS In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25702 ) Change subject: rsl: NACK Chan Activation for lchans on disabled TS ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9c3b68487c12efc412a057728a561e061560c544 Gerrit-Change-Number: 25702 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 09:59:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:21:18 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 10:21:18 +0000 Subject: Change in osmo-bts[master]: Move lchan specific code from gsm_data.h to lchan.h In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25697 ) Change subject: Move lchan specific code from gsm_data.h to lchan.h ...................................................................... Patch Set 5: (3 comments) https://gerrit.osmocom.org/c/osmo-bts/+/25697/4/include/osmo-bts/gsm_data.h File include/osmo-bts/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bts/+/25697/4/include/osmo-bts/gsm_data.h at a80 PS4, Line 80: struct gsm_lchan; Can be removed now. https://gerrit.osmocom.org/c/osmo-bts/+/25697/4/include/osmo-bts/gsm_data.h at a164 PS4, Line 164: /* MS/BS Power related measurement averaging algo */ We may want to move power control related stuff to power_control.h. These structures are also part of 'struct gsm_bts' and 'struct gsm_bts_trx', so having them in lchan.h is not 100% correct from the architectural point of view. https://gerrit.osmocom.org/c/osmo-bts/+/25697/4/src/common/rsl.c File src/common/rsl.c: https://gerrit.osmocom.org/c/osmo-bts/+/25697/4/src/common/rsl.c at 392 PS4, Line 392: const uint8_t *link_id, const struct msgb *orig_msg) Unrelated. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e Gerrit-Change-Number: 25697 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 10:21:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:22:14 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 10:22:14 +0000 Subject: Change in osmo-bts[master]: Introduce gsm_lchan_init() function helper In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25696 ) Change subject: Introduce gsm_lchan_init() function helper ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9cb96707c63b8b7d76591d25fe906f02e34bb76b Gerrit-Change-Number: 25696 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 10:22:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:25:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 10:25:32 +0000 Subject: Change in osmo-bts[master]: rsl: NACK Chan Activation for lchans on disabled TS In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25702 ) Change subject: rsl: NACK Chan Activation for lchans on disabled TS ...................................................................... rsl: NACK Chan Activation for lchans on disabled TS A broken BSC could send a Chan Activation on a TS which has not yet been enabled (or even configured). This is the case with our TTCN3 tests, where OML side is currently handled in parallel by an osmo-bsc while TTCN3 takes care of the RSL side. This can actually be seen as a malfunctioning BSC, but it was spotted that given this sequence of events osmo-bts can crash (see ticket below). Hence, let's NACK any attempt from a BSC to activate an lchan on a disabled TS. Related: OS#5249 Change-Id: I9c3b68487c12efc412a057728a561e061560c544 --- M src/common/rsl.c 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index 507a7cf..c73b093 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1633,6 +1633,13 @@ return rsl_tx_chan_act_nack(lchan, RSL_ERR_EQUIPMENT_FAIL); } + if (ts->mo.nm_state.operational != NM_OPSTATE_ENABLED || + ts->mo.nm_state.availability != NM_AVSTATE_OK) { + LOGP(DRSL, LOGL_ERROR, "%s rx chan activ but TS not in nm_state oper=ENABLED avail=OK, nack!\n", + gsm_ts_and_pchan_name(ts)); + return rsl_tx_chan_act_nack(lchan, RSL_ERR_RR_UNAVAIL); + } + if (ts->pchan == GSM_PCHAN_OSMO_DYN) { ts->dyn.pchan_want = dyn_pchan_from_chan_nr(dch->chan_nr); DEBUGP(DRSL, "%s rx chan activ\n", gsm_ts_and_pchan_name(ts)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9c3b68487c12efc412a057728a561e061560c544 Gerrit-Change-Number: 25702 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:26:25 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 10:26:25 +0000 Subject: Change in osmo-bts[master]: Introduce gsm_lchan_init() function helper In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25696 ) Change subject: Introduce gsm_lchan_init() function helper ...................................................................... Introduce gsm_lchan_init() function helper Let's move lchan specific struct stuff into lchan.c Change-Id: I9cb96707c63b8b7d76591d25fe906f02e34bb76b --- M include/osmo-bts/gsm_data.h M src/common/bts_trx.c M src/common/lchan.c 3 files changed, 13 insertions(+), 8 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index fe2862d..b73df5f 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -556,6 +556,7 @@ const char *gsm_lchant_name(enum gsm_chan_t c); char *gsm_ts_name(const struct gsm_bts_trx_ts *ts); char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts); +void gsm_lchan_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr); void gsm_lchan_name_update(struct gsm_lchan *lchan); const char *gsm_lchans_name(enum gsm_lchan_state s); diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c index 127e797..7ef5b52 100644 --- a/src/common/bts_trx.c +++ b/src/common/bts_trx.c @@ -59,14 +59,7 @@ for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) { struct gsm_lchan *lchan = &ts->lchan[ln]; - - lchan->ts = ts; - lchan->nr = ln; - lchan->type = GSM_LCHAN_NONE; - gsm_lchan_name_update(lchan); - - INIT_LLIST_HEAD(&lchan->sapi_cmds); - INIT_LLIST_HEAD(&lchan->dl_tch_queue); + gsm_lchan_init(lchan, ts, ln); } } diff --git a/src/common/lchan.c b/src/common/lchan.c index dcec0a3..3b99fc5 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -25,6 +25,17 @@ #include #include +void gsm_lchan_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr) +{ + lchan->ts = ts; + lchan->nr = lchan_nr; + lchan->type = GSM_LCHAN_NONE; + gsm_lchan_name_update(lchan); + + INIT_LLIST_HEAD(&lchan->sapi_cmds); + INIT_LLIST_HEAD(&lchan->dl_tch_queue); +} + void early_rr_ia_delay_cb(void *data) { struct gsm_lchan *lchan = data; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25696 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9cb96707c63b8b7d76591d25fe906f02e34bb76b Gerrit-Change-Number: 25696 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:26:45 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 10:26:45 +0000 Subject: Change in osmo-bts[master]: Move lchan related code from gsm_data.c to lchan.c In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25698 ) Change subject: Move lchan related code from gsm_data.c to lchan.c ...................................................................... Patch Set 5: (2 comments) https://gerrit.osmocom.org/c/osmo-bts/+/25698/5/src/common/gsm_data.c File src/common/gsm_data.c: https://gerrit.osmocom.org/c/osmo-bts/+/25698/5/src/common/gsm_data.c at a179 PS5, Line 179: gsm_pchan2chan_nr This does not look like an lchan specific API to me. https://gerrit.osmocom.org/c/osmo-bts/+/25698/5/src/common/gsm_data.c at a521 PS5, Line 521: power_ctrl_params_def I would keep the power control related stuff here, or rather move to power_control.c. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1493f40d99f88a565f15d3e0943a512fb9b8719a Gerrit-Change-Number: 25698 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 10:26:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:27:18 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 10:27:18 +0000 Subject: Change in osmo-bts[master]: lchan.h: Add related ticket info to FIXME comment In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25699 ) Change subject: lchan.h: Add related ticket info to FIXME comment ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I09ea92e843383d65c8033196814d345135ff918e Gerrit-Change-Number: 25699 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 10:27:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:30:38 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 10:30:38 +0000 Subject: Change in osmo-bts[master]: Introduce gsm_lchan_release function helper In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25700 ) Change subject: Introduce gsm_lchan_release function helper ...................................................................... Patch Set 2: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-bts/+/25700/2/include/osmo-bts/lchan.h File include/osmo-bts/lchan.h: https://gerrit.osmocom.org/c/osmo-bts/+/25700/2/include/osmo-bts/lchan.h at 401 PS2, Line 401: rel_act_kind 'rel_kind' in this case. https://gerrit.osmocom.org/c/osmo-bts/+/25700/2/src/common/lchan.c File src/common/lchan.c: https://gerrit.osmocom.org/c/osmo-bts/+/25700/2/src/common/lchan.c at 79 PS2, Line 79: struct gsm_lchan *lchan Can't we just pass 'struct gsm_bts_trx_ts *ts' directly? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0525beaba3c833f8d7adf9701fe373761a7720d3 Gerrit-Change-Number: 25700 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 10:30:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:31:12 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 10:31:12 +0000 Subject: Change in osmo-bts[master]: nm_channel_fsm: Release lchans after BTS shutdown In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25701 ) Change subject: nm_channel_fsm: Release lchans after BTS shutdown ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I78dca32cd061fba86cc88c4c4f323b33d51c58d0 Gerrit-Change-Number: 25701 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 07 Oct 2021 10:31:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:32:40 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 10:32:40 +0000 Subject: Change in osmo-bts[master]: nm_channel_fsm: Release lchans after BTS shutdown In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25701 ) Change subject: nm_channel_fsm: Release lchans after BTS shutdown ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25701/2/src/common/nm_channel_fsm.c File src/common/nm_channel_fsm.c: https://gerrit.osmocom.org/c/osmo-bts/+/25701/2/src/common/nm_channel_fsm.c at 196 PS2, Line 196: gsm_ts_release(ts); We might also need to release lchans of ts->vamos.peer here (if not NULL)? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I78dca32cd061fba86cc88c4c4f323b33d51c58d0 Gerrit-Change-Number: 25701 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 07 Oct 2021 10:32:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:39:13 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 10:39:13 +0000 Subject: Change in osmo-bsc[master]: MS Power Control Loop: Use P_CON_INTERVAL=2 by default In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25681 ) Change subject: MS Power Control Loop: Use P_CON_INTERVAL=2 by default ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I46be244a5e01a74086e3a977ec3ea139742a0074 Gerrit-Change-Number: 25681 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 10:39:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:44:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 10:44:44 +0000 Subject: Change in osmo-bsc[master]: MS Power Control Loop: Use P_CON_INTERVAL=2 by default In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25681 ) Change subject: MS Power Control Loop: Use P_CON_INTERVAL=2 by default ...................................................................... MS Power Control Loop: Use P_CON_INTERVAL=2 by default Increase the reaction time at the expense of more stable loop with less temporary oscillations. See updated user manual documentation in this commit for a larger description. Related: SYS#5371 Change-Id: I46be244a5e01a74086e3a977ec3ea139742a0074 --- M doc/manuals/chapters/power_control.adoc M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/gsm_data.c M tests/power_ctrl.vty 6 files changed, 69 insertions(+), 33 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/doc/manuals/chapters/power_control.adoc b/doc/manuals/chapters/power_control.adoc index 51a38cb..f94dd2e 100644 --- a/doc/manuals/chapters/power_control.adoc +++ b/doc/manuals/chapters/power_control.adoc @@ -168,6 +168,23 @@ <0-31> P_CON_INTERVAL, in units of 2 SACCH periods (0.96 seconds) ---- +3GPP TS 45.008 briefly mentions this parameter in table A.1 (`P_Con_INTERVAL`). + +A small time graph is depicted below for better understanding of the meaning of +values for this parameter, since it is not obvious at all. + +.Example: Suspension interval accomplished by several values of P_CON_INTERVAL +---- +|<-->| - one SACCH multi-frame period +| | +|----|----|----|----|----|----|----|----|----> SACCH multi-frames +a) * * * * * * * * * P_CON_INTERVAL=0 (0.48 s) +b) * * * * * P_CON_INTERVAL=1 (0.96 s) +c) * * * P_CON_INTERVAL=2 (1.92 s, default) +d) * * P_CON_INTERVAL=3 (2.88 s) +e) * * P_CON_INTERVAL=4 (3.84 s) +---- + The value to use for this parameter is closely related to that of VTY option `step-size inc <2-6> red <2-4>`, which configures the maximum step (in dB) at which the MS Power can be requested to changed when the MS Power Control Loop is @@ -181,31 +198,42 @@ By default, increment `step-size` is set to 4 dB and the decrement `step-size` is set to 2 dB, hence the MS requiring `4 * 60 = 240` milliseconds. That's less than 1 measurement period (480 ms), hence only the first measurement period -needs to be skipped. Therefore, the suspension interval is set to 1 for both -MS/BS power control loops, and so the power control decision is taken every 960 -ms (every second SACCH block period). +needs to be skipped. Therefore, a suspension interval of 1 for both +MS/BS power control loops can be used, and so the power control decision is +taken every 960 ms (every second SACCH block period). + +However, OsmoBSC currently uses a default value of `ctrl-interval 2` +(`P_CON_INTERVAL=2`, 1.92s, 3/4 received SACCH blocks are skipped), because +that's the minimum amount of frames required for one loop step to run +completely, that is: BTS fetching measurements and transmitting the new MS Power +Level, then the MS retrieving the MS Power Level, transmitting with that exact +MS Power level during the entire period and then finally submitting the +Measurement Result containing that same MS Power Level. Using a value of +`P_CON_INTERVAL=1` also provides good results, but in that case the loop tends +to produce more temporary power oscillations due to the loop acting on periods +where an older (earlier requested) MS Power level is still in use (and +announced) by the MS. + +.Example: Timeline showing propagation of a new MS Power Level (P_CON_INTERVAL=2) +---- +|<------------->| - one SACCH multi-frame period +| 1 | 2 | 3 | 4 | ---> SACCH multi-frames +|SA0|SA1|SA2|SA3|SA0|SA1|SA2|SA3|SA0|SA1|SA2|SA3|SA0|SA1|SA2|SA3| ---> SACCH bursts +|<1>|...|...|<2>|<3>|...|...|<4>|<5>|...|...|<6>|<7>|...|...|<8>| +---- +<1> BTS sends new requested MS Power Level in header of SACCH +<2> MS receives SACCH block (new MS Power Level) +<3> MS starts ramping towards new MS Power Level (hence potentially variable power used over the period) +<4> MS should already be in desired MS Power Level (for step increments of less-or-equal than 8 dB) +<5> MS starts transmitting at desired MS Power level constantly (ramping is over) +<6> MS builds Measurement Results to be sent on next SACCH period +<7> MS sends the Measurement Results of the previous multiframe to the BTS +<8> BTS receives the Measurement Results from MS on SACCH, starts next loop iteration + Setting `ctrl-interval` to 0 increases the interval to 480 ms, so basically no SACCH block is skipped and MS Power Control loop is triggered upon receival of -every UL SACCH block. Value 2 corresponds to the interval of 1920 ms, so 3/4 -received SACCH blocks are skipped. - -3GPP TS 45.008 briefly mentions this parameter in table A.1 (`P_Con_INTERVAL`). - -A small time graph is depicted below for better understanding of the meaning of -values for this parameter, since it is not obvious at all. - -.Example: Suspension interval accomplished by several values of P_CON_INTERVAL ----- -|<-->| - one SACCH multi-frame period -| | -|----|----|----|----|----|----|----|----|----> SACCH multi-frames -a) * * * * * * * * * P_CON_INTERVAL=0 (0.48 s) -b) * * * * * P_CON_INTERVAL=1 (0.96 s, default) -c) * * * P_CON_INTERVAL=2 (1.92 s) -d) * * P_CON_INTERVAL=3 (2.88 s) -e) * * P_CON_INTERVAL=4 (3.84 s) ----- +every UL SACCH block. ==== Power change step size diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 99d1d18..cb56028 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1395,6 +1395,8 @@ }; extern const struct gsm_power_ctrl_params power_ctrl_params_def; +void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, + enum gsm_power_ctrl_dir dir); /* Interference Measurement Parameters */ struct gsm_interf_meas_params { diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index c0d6634..3f782c1 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -351,12 +351,10 @@ bts->repeated_acch_policy.rxqual = 4; /* MS Power Control parameters (defaults) */ - bts->ms_power_ctrl = power_ctrl_params_def; - bts->ms_power_ctrl.dir = GSM_PWR_CTRL_DIR_UL; + power_ctrl_params_def_reset(&bts->ms_power_ctrl, GSM_PWR_CTRL_DIR_UL); /* BS Power Control parameters (defaults) */ - bts->bs_power_ctrl = power_ctrl_params_def; - bts->bs_power_ctrl.dir = GSM_PWR_CTRL_DIR_DL; + power_ctrl_params_def_reset(&bts->bs_power_ctrl, GSM_PWR_CTRL_DIR_DL); /* Interference Measurement Parameters (defaults) */ bts->interf_meas_params_cfg = interf_meas_params_def; diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 460e14a..a05d965 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -2927,9 +2927,7 @@ /* Do we need to reset? */ if (argc > 1) { vty_out(vty, "%% Reset to default parameters%s", VTY_NEWLINE); - enum gsm_power_ctrl_dir dir = params->dir; - *params = power_ctrl_params_def; - params->dir = dir; + power_ctrl_params_def_reset(params, params->dir); } if (strcmp(argv[0], "static") == 0) diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index c8108e8..5d57072 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -1333,6 +1333,16 @@ }, }; +void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, + enum gsm_power_ctrl_dir dir) +{ + *params = power_ctrl_params_def; + params->dir = dir; + if (dir == GSM_PWR_CTRL_DIR_UL) + /* Trigger loop every fourth SACCH block (1.92s). TS 45.008 sec 4.7.1: */ + params->ctrl_interval = 2; +} + enum rsl_cmod_spd chan_mode_to_rsl_cmod_spd(enum gsm48_chan_mode chan_mode) { switch (gsm48_chan_mode_to_non_vamos(chan_mode)) { diff --git a/tests/power_ctrl.vty b/tests/power_ctrl.vty index 9747ec2..374002d 100644 --- a/tests/power_ctrl.vty +++ b/tests/power_ctrl.vty @@ -7,7 +7,7 @@ mode static ms-power-control mode dyn-bts - ctrl-interval 1 + ctrl-interval 2 step-size inc 4 red 2 rxlev-thresh lower 32 upper 38 rxlev-thresh-comp lower 10 12 upper 19 20 @@ -102,7 +102,7 @@ ... ms-power-control ... - ctrl-interval 1 + ctrl-interval 2 ... OsmoBSC(config-bs-power-ctrl)# exit @@ -137,7 +137,7 @@ ... ms-power-control mode dyn-bts - ctrl-interval 1 + ctrl-interval 2 step-size inc 4 red 2 rxlev-thresh lower 32 upper 38 rxlev-thresh-comp lower 10 12 upper 19 20 @@ -296,7 +296,7 @@ mode static ms-power-control mode dyn-bts - ctrl-interval 1 + ctrl-interval 2 step-size inc 4 red 2 rxlev-thresh lower 32 upper 38 rxlev-thresh-comp lower 10 12 upper 19 20 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25681 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I46be244a5e01a74086e3a977ec3ea139742a0074 Gerrit-Change-Number: 25681 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:45:14 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 10:45:14 +0000 Subject: Change in pysim[master]: pySim-shell: allow card insertion at runtime In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25549 ) Change subject: pySim-shell: allow card insertion at runtime ...................................................................... Patch Set 3: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/pysim/+/25549/3/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/25549/3/pySim-shell.py at 127 PS3, Line 127: if (cmd_set != []): A more elegant solution would be: if not cmd_set: self.unregister_command_set(cmd_set[0]) Not critical though. https://gerrit.osmocom.org/c/pysim/+/25549/3/pySim-shell.py at 130 PS3, Line 130: if (cmd_set != []): Same here. See https://stackoverflow.com/questions/53513/how-do-i-check-if-a-list-is-empty. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 Gerrit-Change-Number: 25549 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 07 Oct 2021 10:45:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:46:43 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 10:46:43 +0000 Subject: Change in osmo-bts[master]: MS Power Control Loop: Use P_CON_INTERVAL=2 by default In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25682 ) Change subject: MS Power Control Loop: Use P_CON_INTERVAL=2 by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I91c505447f68714239a4f033d4f06e91893df201 Gerrit-Change-Number: 25682 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 10:46:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:47:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 10:47:00 +0000 Subject: Change in osmo-bts[master]: MS Power Control Loop: Use P_CON_INTERVAL=2 by default In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25682 ) Change subject: MS Power Control Loop: Use P_CON_INTERVAL=2 by default ...................................................................... MS Power Control Loop: Use P_CON_INTERVAL=2 by default Have a more stable loop with less temporary oscillations at the expense of increased reaction time. 4 SACCH blocks (P_CON_INTERVAL=2) is the minimum interval to get stable measurements for the last requested MS Power level. With P_CON_INTERVAL=1, are also made during a period with stable power being use to transmit, but the MS Power level used (and announced in MR) is not the last one requested by the BTS, but the one requested in the previous loop iteration. This can make the MS and BTS bounce 2 values forth and back, and create some temporary oscillation. See osmo-bsc User manual section "Power Control" for more information. Related: SYS#5371 Change-Id: I91c505447f68714239a4f033d4f06e91893df201 --- M include/osmo-bts/gsm_data.h M src/common/bts.c M src/common/gsm_data.c M src/common/rsl.c 4 files changed, 15 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index b73df5f..8ae36ca 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -223,6 +223,7 @@ /* Default MS/BS Power Control parameters */ extern const struct gsm_power_ctrl_params power_ctrl_params_def; +void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, bool is_bs_pwr); /* Measurement pre-processing state */ struct gsm_power_ctrl_meas_proc_state { diff --git a/src/common/bts.c b/src/common/bts.c index 191c331..b226df2 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -340,8 +340,8 @@ bts->rtp_priority = -1; /* Default (fall-back) MS/BS Power control parameters */ - bts->bs_dpc_params = power_ctrl_params_def; - bts->ms_dpc_params = power_ctrl_params_def; + power_ctrl_params_def_reset(&bts->bs_dpc_params, true); + power_ctrl_params_def_reset(&bts->ms_dpc_params, false); /* configurable via OML */ bts->load.ccch.load_ind_period = 112; diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index 1525328..89a740d 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -680,3 +680,11 @@ .h_reqt = 6, /* TODO: investigate a reasonable default value */ }, }; + +void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, bool is_bs_pwr) +{ + *params = power_ctrl_params_def; + if (!is_bs_pwr) + /* Trigger loop every fourth SACCH block (1.92s). TS 45.008 sec 4.7.1: */ + params->ctrl_interval = 2; +} diff --git a/src/common/rsl.c b/src/common/rsl.c index c73b093..89c3b96 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1111,7 +1111,8 @@ /* TLV (O) BS Power Parameters IE */ if ((ie = TLVP_GET(&tp, RSL_IE_BS_POWER_PARAM)) != NULL) { /* Allocate a new chunk and initialize with default values */ - params = talloc_memdup(trx, &power_ctrl_params_def, sizeof(*params)); + params = talloc(trx, struct gsm_power_ctrl_params); + power_ctrl_params_def_reset(params, true); if (ie->len && parse_power_ctrl_params(params, ie->val, ie->len) == 0) { /* Initially it points to the global defaults */ @@ -1128,7 +1129,8 @@ /* TLV (O) MS Power Parameters IE */ if ((ie = TLVP_GET(&tp, RSL_IE_MS_POWER_PARAM)) != NULL) { /* Allocate a new chunk and initialize with default values */ - params = talloc_memdup(trx, &power_ctrl_params_def, sizeof(*params)); + params = talloc(trx, struct gsm_power_ctrl_params); + power_ctrl_params_def_reset(params, false); if (ie->len && parse_power_ctrl_params(params, ie->val, ie->len) == 0) { /* Initially it points to the global defaults */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25682 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I91c505447f68714239a4f033d4f06e91893df201 Gerrit-Change-Number: 25682 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:51:14 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 10:51:14 +0000 Subject: Change in osmo-bts[master]: osmo-trx: fix maxdly In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25619 ) Change subject: osmo-trx: fix maxdly ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Gerrit-Change-Number: 25619 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 07 Oct 2021 10:51:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:53:03 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 10:53:03 +0000 Subject: Change in osmo-bts[master]: osmo-trx: fix maxdly In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25619 ) Change subject: osmo-trx: fix maxdly ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25619/3/src/osmo-bts-trx/trx_vty.c File src/osmo-bts-trx/trx_vty.c: https://gerrit.osmocom.org/c/osmo-bts/+/25619/3/src/osmo-bts-trx/trx_vty.c at 269 PS3, Line 269: 62 Why not 63? The TA value is normally between 0 and 63... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Gerrit-Change-Number: 25619 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 07 Oct 2021 10:53:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:55:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 10:55:28 +0000 Subject: Change in osmo-bts[master]: Move lchan related code from gsm_data.c to lchan.c In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25698 ) Change subject: Move lchan related code from gsm_data.c to lchan.c ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25698/5/src/common/gsm_data.c File src/common/gsm_data.c: https://gerrit.osmocom.org/c/osmo-bts/+/25698/5/src/common/gsm_data.c at a179 PS5, Line 179: gsm_pchan2chan_nr > This does not look like an lchan specific API to me. It's anyway being used only by function passed an lchan, so I'm moving it with the function below since it's a static helper. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1493f40d99f88a565f15d3e0943a512fb9b8719a Gerrit-Change-Number: 25698 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 10:55:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:57:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 10:57:49 +0000 Subject: Change in osmo-bts[master]: Move lchan, power_ctrl specific code from gsm_data.h to their own files In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25697 ) Change subject: Move lchan,power_ctrl specific code from gsm_data.h to their own files ...................................................................... Patch Set 6: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e Gerrit-Change-Number: 25697 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 10:57:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:57:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 10:57:51 +0000 Subject: Change in osmo-bts[master]: Move lchan, power_control related code from gsm_data.c to their own files In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25698 ) Change subject: Move lchan,power_control related code from gsm_data.c to their own files ...................................................................... Patch Set 6: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1493f40d99f88a565f15d3e0943a512fb9b8719a Gerrit-Change-Number: 25698 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 10:57:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:57:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 10:57:54 +0000 Subject: Change in osmo-bts[master]: lchan.h: Add related ticket info to FIXME comment In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25699 ) Change subject: lchan.h: Add related ticket info to FIXME comment ...................................................................... Patch Set 4: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I09ea92e843383d65c8033196814d345135ff918e Gerrit-Change-Number: 25699 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 10:57:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:57:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 10:57:56 +0000 Subject: Change in osmo-bts[master]: Introduce gsm_lchan_release function helper In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25700 ) Change subject: Introduce gsm_lchan_release function helper ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0525beaba3c833f8d7adf9701fe373761a7720d3 Gerrit-Change-Number: 25700 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 10:57:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 10:57:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 10:57:59 +0000 Subject: Change in osmo-bts[master]: nm_channel_fsm: Release lchans after BTS shutdown In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25701 ) Change subject: nm_channel_fsm: Release lchans after BTS shutdown ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I78dca32cd061fba86cc88c4c4f323b33d51c58d0 Gerrit-Change-Number: 25701 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Comment-Date: Thu, 07 Oct 2021 10:57:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:14:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:14:03 +0000 Subject: Change in osmo-bsc[master]: Move global var bsc_gsmnet into libbsc References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25707 ) Change subject: Move global var bsc_gsmnet into libbsc ...................................................................... Move global var bsc_gsmnet into libbsc This is used inside group of files forming libbsc (shared files used by several apps). Let's instantie only once inside a file from libbsc instead of doing so on each binary. Change-Id: I9b287aa492ca6aae5fc56133e1510aff3146fe25 --- M src/ipaccess/ipaccess-config.c M src/osmo-bsc/bsc_init.c M src/osmo-bsc/osmo_bsc_main.c M tests/bsc/bsc_test.c M tests/gsm0408/gsm0408_test.c M tests/handover/handover_test.c 6 files changed, 2 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/25707/1 diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 02501bd..741a97e 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -58,8 +58,6 @@ #include #include -struct gsm_network *bsc_gsmnet; - static int net_listen_testnr; static int restart; static bool get_attr; diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c index a85e76f..bf150cb 100644 --- a/src/osmo-bsc/bsc_init.c +++ b/src/osmo-bsc/bsc_init.c @@ -47,6 +47,8 @@ #include #include +struct gsm_network *bsc_gsmnet; + int bsc_shutdown_net(struct gsm_network *net) { struct gsm_bts *bts; diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 0ed0033..8d6901d 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -87,7 +87,6 @@ #include "../../bscconfig.h" -struct gsm_network *bsc_gsmnet = 0; static const char *config_file = "osmo-bsc.cfg"; static const char *rf_ctrl = NULL; static int daemonize = 0; diff --git a/tests/bsc/bsc_test.c b/tests/bsc/bsc_test.c index dbb547e..0cf0bc2 100644 --- a/tests/bsc/bsc_test.c +++ b/tests/bsc/bsc_test.c @@ -39,7 +39,6 @@ #include void *ctx = NULL; -struct gsm_network *bsc_gsmnet = NULL; enum test { TEST_SCAN_TO_BTS, diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 4255ab2..4017293 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -57,9 +57,6 @@ __FILE__, __LINE__, (int) res, # cmp, (int) wanted); \ } - -struct gsm_network *bsc_gsmnet = NULL; - static inline void gen(struct gsm_bts *bts, const char *s) { int r; diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index a355d3b..bd65b2f 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -58,8 +58,6 @@ void *ctx; -struct gsm_network *bsc_gsmnet; - /* override, requires '-Wl,--wrap=osmo_mgcpc_ep_ci_request'. * Catch modification of an MGCP connection. */ void __real_osmo_mgcpc_ep_ci_request(struct osmo_mgcpc_ep_ci *ci, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9b287aa492ca6aae5fc56133e1510aff3146fe25 Gerrit-Change-Number: 25707 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:14:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:14:03 +0000 Subject: Change in osmo-bsc[master]: Move ts_fsm_init to static constructor References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25708 ) Change subject: Move ts_fsm_init to static constructor ...................................................................... Move ts_fsm_init to static constructor This allows having it initialized automatically, as we usually do with this type of code. As a result, tests or other apps importing libbsc don't need to take care of calling it. Change-Id: I0e4b95b5e73fbb3844d83ba33e66786831088e1f --- M include/osmocom/bsc/timeslot_fsm.h M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/timeslot_fsm.c M tests/handover/handover_test.c 4 files changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/08/25708/1 diff --git a/include/osmocom/bsc/timeslot_fsm.h b/include/osmocom/bsc/timeslot_fsm.h index 1831537..5e62188 100644 --- a/include/osmocom/bsc/timeslot_fsm.h +++ b/include/osmocom/bsc/timeslot_fsm.h @@ -42,8 +42,6 @@ TS_EV_PDCH_DEACT_NACK, }; -void ts_fsm_init(); - void ts_fsm_alloc(struct gsm_bts_trx_ts *ts); void ts_fsm_free(struct gsm_bts_trx_ts *ts); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 8d6901d..e8a22fe 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -979,7 +979,6 @@ /* seed the PRNG */ srand(time(NULL)); - ts_fsm_init(); lchan_fsm_init(); bsc_subscr_conn_fsm_init(); assignment_fsm_init(); diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 8d256bb..76ac1af 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -52,7 +52,7 @@ gsm_pchan_id(ts->pchan_on_init)); } -void ts_fsm_init() +static __attribute__((constructor)) void ts_fsm_init(void) { OSMO_ASSERT(osmo_fsm_register(&ts_fsm) == 0); } diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index bd65b2f..1dc7c1f 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -1626,7 +1626,6 @@ bsc_vty_init(bsc_gsmnet); ho_test_vty_init(); - ts_fsm_init(); lchan_fsm_init(); bsc_subscr_conn_fsm_init(); handover_fsm_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0e4b95b5e73fbb3844d83ba33e66786831088e1f Gerrit-Change-Number: 25708 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:14:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:14:03 +0000 Subject: Change in osmo-bsc[master]: Get rid of lots of stubs References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25709 ) Change subject: Get rid of lots of stubs ...................................................................... Get rid of lots of stubs These are not needed anymore since we re-introduced libbsc, specially to avoid all this churn. Some specific methods are explicitly required to be overwritten by tests, so we specificially mark those with __attribute__((weak)) in order to be able to overwrite them. Change-Id: Ic7401b8a6eb903882e30fda1cf091ac99a254ef0 --- M src/ipaccess/ipaccess-config.c M src/ipaccess/ipaccess-proxy.c M src/ipaccess/stubs.c M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/pcu_sock.c M src/utils/bs11_config.c M src/utils/meas_json.c M tests/abis/abis_test.c M tests/acc/acc_test.c M tests/bsc/bsc_test.c M tests/gsm0408/gsm0408_test.c M tests/handover/handover_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.c 14 files changed, 23 insertions(+), 284 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/25709/1 diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 741a97e..ada23ea 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -1129,15 +1129,3 @@ exit(0); } - -/* Stub */ -int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ return 0; } -int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ return 0; } -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index d676038..7ede283 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -1253,11 +1253,3 @@ osmo_select_main(0); } } - -/* Stub */ -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/src/ipaccess/stubs.c b/src/ipaccess/stubs.c index cb56105..60fa626 100644 --- a/src/ipaccess/stubs.c +++ b/src/ipaccess/stubs.c @@ -30,17 +30,3 @@ /* No TS init required here. */ return true; } - -int abis_rsl_rcvmsg(struct msgb *msg) -{ - /* No RSL handling here */ - return 0; -} - -void paging_flush_bts(struct gsm_bts *bts, struct bsc_msc_data *msc) -{ - /* No paging flushing */ -} - -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) -{} diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index a7b267d..46c4d4f 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -260,7 +260,9 @@ } /* Send a BCCH_INFO message as per Chapter 8.5.1 */ -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +/* Allow test to overwrite it */ +__attribute__((weak)) int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, + const uint8_t *data, int len) { struct abis_rsl_dchan_hdr *dh; const struct gsm_bts *bts = trx->bts; @@ -294,7 +296,8 @@ return abis_rsl_sendmsg(msg); } -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, +/* Allow test to overwrite it */ +__attribute__((weak)) int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { struct abis_rsl_common_hdr *ch; diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index d3c636d..04c2e99 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -312,7 +312,8 @@ } /* Open a new connection oriented sigtran connection */ -int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) +/* Allow test to overwrite it */ +__attribute__((weak)) int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) { struct osmo_ss7_instance *ss7; struct bsc_msc_data *msc; diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 329bab0..6f7ee77 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -263,7 +263,8 @@ return pcu_sock_send(bts, msg); } -void pcu_info_update(struct gsm_bts *bts) +/* Allow test to overwrite it */ +__attribute__((weak)) void pcu_info_update(struct gsm_bts *bts) { if (pcu_connected(bts)) pcu_tx_info_ind(bts); diff --git a/src/utils/bs11_config.c b/src/utils/bs11_config.c index c279179..e795076 100644 --- a/src/utils/bs11_config.c +++ b/src/utils/bs11_config.c @@ -974,24 +974,3 @@ exit(0); } - -/* Stub */ -int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ - return 0; -} - -/* Stub */ -int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ - return 0; -} - -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} -int abis_rsl_rcvmsg(struct msgb *msg) { return 0; } -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/src/utils/meas_json.c b/src/utils/meas_json.c index 82b1e57..00b90e8 100644 --- a/src/utils/meas_json.c +++ b/src/utils/meas_json.c @@ -201,12 +201,3 @@ exit(0); } - -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} -int abis_rsl_rcvmsg(struct msgb *msg) { return 0; } -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/tests/abis/abis_test.c b/tests/abis/abis_test.c index 9d26edd..a48154b 100644 --- a/tests/abis/abis_test.c +++ b/tests/abis/abis_test.c @@ -183,16 +183,3 @@ return EXIT_SUCCESS; } - -struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { - OSMO_ASSERT(0); -} - -bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts) { return true; } -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/tests/acc/acc_test.c b/tests/acc/acc_test.c index 759ff13..6357d4b 100644 --- a/tests/acc/acc_test.c +++ b/tests/acc/acc_test.c @@ -524,8 +524,8 @@ return EXIT_SUCCESS; } -/* Whenever ACC code changes the set of barred ACCs, gsm_bts_set_system_infos() - * is called which ends up calling pcu_info_update */ +/* stub: Whenever ACC code changes the set of barred ACCs, gsm_bts_set_system_infos() + * is called which ends up calling pcu_info_update. */ void pcu_info_update(struct gsm_bts *bts) { struct gsm48_rach_control rach_control = {0}; @@ -545,15 +545,15 @@ ); } - -struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { - OSMO_ASSERT(0); -} - -bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts) { return true; } -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +/* stub: Whenever ACC code changes the set of barred ACCs, gsm_bts_set_system_infos() + * is called which ends up calling rsl_bcch_info. We need to return success to + * have pcu_info_update() called. */ int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) { return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } + +/* stub: Whenever ACC code changes the set of barred ACCs, gsm_bts_set_system_infos() + * is called which ends up calling rsl_sacch_filling. We need to return success to + * have pcu_info_update() called. */ +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, + const uint8_t *data, int len) +{ return 0; } diff --git a/tests/bsc/bsc_test.c b/tests/bsc/bsc_test.c index 0cf0bc2..4a97b9f 100644 --- a/tests/bsc/bsc_test.c +++ b/tests/bsc/bsc_test.c @@ -221,30 +221,3 @@ talloc_free(ctx); return 0; } - -struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { - OSMO_ASSERT(0); -} - -void bsc_sapi_n_reject(struct gsm_subscriber_connection *conn, uint8_t dlci, enum gsm0808_cause cause) {} -void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t chosen_encr) {} -int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel) -{ return 0; } -void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg) {} -void bsc_assign_compl(struct gsm_subscriber_connection *conn, uint8_t rr_cause) {} -void bsc_assign_fail(struct gsm_subscriber_connection *conn, uint8_t cause, uint8_t *rr_cause) {} -void bsc_cm_update(struct gsm_subscriber_connection *conn, - const uint8_t *cm2, uint8_t cm2_len, - const uint8_t *cm3, uint8_t cm3_len) {} -void gscon_submit_rsl_dtap(struct gsm_subscriber_connection *conn, - struct msgb *msg, int link_id, int allow_sacch) {} -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} -void lchan_activate(struct gsm_lchan *lchan, void *info) {} -bool neighbor_ident_bts_entry_exists(uint8_t from_bts) { return false; } -const char *handover_status(struct gsm_subscriber_connection *conn) { return "x"; } -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 4017293..90b294e 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -595,60 +595,3 @@ return EXIT_SUCCESS; } - -struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { - OSMO_ASSERT(0); -} - -void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release) { - OSMO_ASSERT(0); -} - -bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts) -{ - return true; -} - -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} - -void bsc_cm_update(struct gsm_subscriber_connection *conn, - const uint8_t *cm2, uint8_t cm2_len, - const uint8_t *cm3, uint8_t cm3_len) {} - -int rsl_siemens_mrpci(struct gsm_lchan *lchan, struct rsl_mrpci *mrpci) -{ return 0; } - -int rsl_chan_mode_modify_req(struct gsm_lchan *ts) { return 0; } - -int rsl_tx_ipacc_crcx(const struct gsm_lchan *lchan) { return 0; } - -void gscon_submit_rsl_dtap(struct gsm_subscriber_connection *conn, - struct msgb *msg, int link_id, int allow_sacch) {} - -bool lchan_may_receive_data(struct gsm_lchan *lchan) { return true; } - -int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel) -{ return 0; } - -void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, - struct msgb *msg) {} - -void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, - struct msgb *msg, uint8_t chosen_encr) {} - -const char *bsc_subscr_name(struct bsc_subscr *bsub) { return NULL; } - -void lchan_release(struct gsm_lchan *lchan, bool do_rr_release, - bool err, enum gsm48_rr_cause cause_rr) {} - -int rsl_data_request(struct msgb *msg, uint8_t link_id) { return 0; } - -int rsl_encryption_cmd(struct msgb *msg) { return 0; } - -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } - -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -struct e1inp_sign_link *rsl_chan_link(const struct gsm_lchan *lchan) { return NULL; } diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 1dc7c1f..17bc048 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -1682,31 +1682,17 @@ void trau_mux_map_lchan() {} void trau_recv_lchan() {} void trau_send_frame() {} -int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) { return 0; } +/* Stub */ int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) { return 0; } void bsc_sapi_n_reject(struct gsm_subscriber_connection *conn, uint8_t dlci, enum gsm0808_cause cause) {} void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t chosen_encr) {} int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel) { return 0; } -int bsc_paging_start(struct bsc_paging_params *params) -{ return 0; } void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg) {} void bsc_assign_compl(struct gsm_subscriber_connection *conn, uint8_t rr_cause) {} void bsc_cm_update(struct gsm_subscriber_connection *conn, const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len) {} -struct gsm0808_handover_required; -int bsc_tx_bssmap_ho_required(struct gsm_lchan *lchan, const struct gsm0808_cell_id_list2 *target_cells) -{ return 0; } -int bsc_tx_bssmap_ho_request_ack(struct gsm_subscriber_connection *conn, struct msgb *rr_ho_command) -{ return 0; } -int bsc_tx_bssmap_ho_detect(struct gsm_subscriber_connection *conn) { return 0; } -enum handover_result bsc_tx_bssmap_ho_complete(struct gsm_subscriber_connection *conn, - struct gsm_lchan *lchan) { return HO_RESULT_OK; } -void bsc_tx_bssmap_ho_failure(struct gsm_subscriber_connection *conn) {} -void osmo_bsc_sigtran_tx_reset(void) {} -void osmo_bsc_sigtran_tx_reset_ack(void) {} -void osmo_bsc_sigtran_reset(void) {} const char *osmo_mgcpc_ep_name(const struct osmo_mgcpc_ep *ep) { return "fake-ep"; diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index 73ba869..0b9f6d9 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -32,76 +32,7 @@ #include #include -struct gsm_bts_model bts_model_nanobts = { - .type = GSM_BTS_TYPE_NANOBTS, - .name = "nanobts", - .start = NULL, - .oml_rcvmsg = NULL, - .e1line_bind_ops = NULL, - .nm_att_tlvdef = { - .def = { - /* ip.access specifics */ - [NM_ATT_IPACC_DST_IP] = {TLV_TYPE_FIXED, 4}, - [NM_ATT_IPACC_DST_IP_PORT] = - {TLV_TYPE_FIXED, 2}, - [NM_ATT_IPACC_STREAM_ID] = {TLV_TYPE_TV,}, - [NM_ATT_IPACC_SEC_OML_CFG] = - {TLV_TYPE_FIXED, 6}, - [NM_ATT_IPACC_IP_IF_CFG] = - {TLV_TYPE_FIXED, 8}, - [NM_ATT_IPACC_IP_GW_CFG] = - {TLV_TYPE_FIXED, 12}, - [NM_ATT_IPACC_IN_SERV_TIME] = - {TLV_TYPE_FIXED, 4}, - [NM_ATT_IPACC_LOCATION] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_PAGING_CFG] = - {TLV_TYPE_FIXED, 2}, - [NM_ATT_IPACC_UNIT_ID] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_UNIT_NAME] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_SNMP_CFG] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_PRIM_OML_CFG_LIST] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_NV_FLAGS] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_FREQ_CTRL] = - {TLV_TYPE_FIXED, 2}, - [NM_ATT_IPACC_PRIM_OML_FB_TOUT] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_CUR_SW_CFG] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_TIMING_BUS] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_CGI] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_RAC] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_OBJ_VERSION] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_GPRS_PAGING_CFG] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_NSEI] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_BVCI] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_NSVCI] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_NS_CFG] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_BSSGP_CFG] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_NS_LINK_CFG] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_RLC_CFG] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_ALM_THRESH_LIST] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_MONIT_VAL_LIST] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_TIB_CONTROL] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_SUPP_FEATURES] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_CODING_SCHEMES] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_RLC_CFG_2] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_HEARTB_TOUT] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_UPTIME] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_RLC_CFG_3] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_SSL_CFG] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_SEC_POSSIBLE] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_IML_SSL_STATE] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_REVOC_DATE] = {TLV_TYPE_TL16V}, - }, - }, -}; +extern struct gsm_bts_model bts_model_nanobts; static void test_nanobts_attr_bts_get(struct gsm_bts *bts, uint8_t *expected) { @@ -323,25 +254,3 @@ talloc_free(ctx); return 0; } - -/* stubs */ -struct osmo_prim_hdr; -int bssgp_prim_cb(struct osmo_prim_hdr *oph, void *ctx) -{ - abort(); -} - -struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { - OSMO_ASSERT(0); -} - -bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts) -{ return true; } - -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic7401b8a6eb903882e30fda1cf091ac99a254ef0 Gerrit-Change-Number: 25709 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:18:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:18:47 +0000 Subject: Change in osmo-bsc[master]: nm_channel_fsm: drop ipa link if SetChannelAttr fails References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25710 ) Change subject: nm_channel_fsm: drop ipa link if SetChannelAttr fails ...................................................................... nm_channel_fsm: drop ipa link if SetChannelAttr fails Now that we solved all the interdependency symbol mess, we can finally enable call to this function. Change-Id: Id4c724ef17beae4bb0918ebd1a809665b59e4861 --- M src/osmo-bsc/nm_channel_fsm.c 1 file changed, 2 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/25710/1 diff --git a/src/osmo-bsc/nm_channel_fsm.c b/src/osmo-bsc/nm_channel_fsm.c index 31b8c03..52ff437 100644 --- a/src/osmo-bsc/nm_channel_fsm.c +++ b/src/osmo-bsc/nm_channel_fsm.c @@ -95,16 +95,8 @@ if (!ts->mo.set_attr_sent && !ts->mo.set_attr_ack_received) { ts->mo.set_attr_sent = true; ccomb = abis_nm_chcomb4pchan(ts->pchan_from_config); - if (abis_nm_set_channel_attr(ts, ccomb) == -EINVAL) { - /* FIXME: using this here makes crazy lots of .o - dependencies be fulled in, ending up in - osmo_bsc_main.o which conficts due to containing its - own main() */ - LOGPFSML(ts->mo.fi, LOGL_ERROR, - "FIXME: Here OML link should br dropped, " - "something is wrong in your setup!\n"); - //ipaccess_drop_oml_deferred(trx->bts); - } + if (abis_nm_set_channel_attr(ts, ccomb) == -EINVAL) + ipaccess_drop_oml_deferred(trx->bts); } if (state->administrative != NM_STATE_UNLOCKED && !ts->mo.adm_unlock_sent) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id4c724ef17beae4bb0918ebd1a809665b59e4861 Gerrit-Change-Number: 25710 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:20:39 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 7 Oct 2021 11:20:39 +0000 Subject: Change in osmo-bts[master]: load_indication.c: Avoid sending if CCCH is still not operational In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25691 ) Change subject: load_indication.c: Avoid sending if CCCH is still not operational ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ddda9776158eed0694df9e458f3f91df90bf674 Gerrit-Change-Number: 25691 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 11:20:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:21:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:21:50 +0000 Subject: Change in osmo-bsc[master]: Get rid of lots of stubs In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25709 to look at the new patch set (#2). Change subject: Get rid of lots of stubs ...................................................................... Get rid of lots of stubs These are not needed anymore since we re-introduced libbsc, specially to avoid all this churn. Some specific methods are explicitly required to be overwritten by tests, so we specificially mark those with __attribute__((weak)) in order to be able to overwrite them. Change-Id: Ic7401b8a6eb903882e30fda1cf091ac99a254ef0 --- M src/ipaccess/ipaccess-config.c M src/ipaccess/ipaccess-proxy.c M src/ipaccess/stubs.c M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/pcu_sock.c M src/utils/bs11_config.c M src/utils/meas_json.c M tests/abis/abis_test.c M tests/acc/acc_test.c M tests/bsc/bsc_test.c M tests/gsm0408/gsm0408_test.c M tests/handover/handover_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.c 14 files changed, 23 insertions(+), 284 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/25709/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic7401b8a6eb903882e30fda1cf091ac99a254ef0 Gerrit-Change-Number: 25709 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:22:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:22:05 +0000 Subject: Change in osmo-bts[master]: load_indication.c: Avoid sending if CCCH is still not operational In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25691 ) Change subject: load_indication.c: Avoid sending if CCCH is still not operational ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ddda9776158eed0694df9e458f3f91df90bf674 Gerrit-Change-Number: 25691 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 07 Oct 2021 11:22:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:22:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:22:07 +0000 Subject: Change in osmo-bts[master]: load_indication.c: Avoid sending if CCCH is still not operational In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25691 ) Change subject: load_indication.c: Avoid sending if CCCH is still not operational ...................................................................... load_indication.c: Avoid sending if CCCH is still not operational It makes no sense to transmit load information if the channel is still not operational. This solves errors messages seen in osmo-bsc. Related: OS#4872 Change-Id: I7ddda9776158eed0694df9e458f3f91df90bf674 --- M src/common/load_indication.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/load_indication.c b/src/common/load_indication.c index 69af9c6..d5b76ea 100644 --- a/src/common/load_indication.c +++ b/src/common/load_indication.c @@ -41,6 +41,10 @@ struct gsm_bts *bts = data; unsigned int pch_percent, rach_percent; + /* It makes no sense to send Load Indication if CCCH is still disabled...*/ + if (bts->c0->ts[0].mo.nm_state.operational != NM_OPSTATE_ENABLED) + goto retry_later; + /* compute percentages */ if (bts->load.ccch.pch_total == 0) pch_percent = 0; @@ -73,6 +77,7 @@ bts->load.rach.access); } +retry_later: reset_load_counters(bts); /* re-schedule the timer */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7ddda9776158eed0694df9e458f3f91df90bf674 Gerrit-Change-Number: 25691 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:24:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:24:29 +0000 Subject: Change in osmo-bts[master]: nm_*_fsm: Make sure adm state is LOCKED when entering state Disabled ... In-Reply-To: References: Message-ID: pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25492 ) Change subject: nm_*_fsm: Make sure adm state is LOCKED when entering state Disabled Offline ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25492 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ife5fa22f007897db8b0f15b28f3b72c9970d298a Gerrit-Change-Number: 25492 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:28:40 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 7 Oct 2021 11:28:40 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4... In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 ) Change subject: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/25689/1/src/osmo_ss7.c File src/osmo_ss7.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/25689/1/src/osmo_ss7.c at 1257 PS1, Line 1257: oterwise otherwise https://gerrit.osmocom.org/c/libosmo-sccp/+/25689/1/src/osmo_ss7.c at 1279 PS1, Line 1279: !(rem_has_v4 && !rem_has_v6) Can it be that no remote addr is set and no local addr is set? if that is the case, it seems that it will because of rem_has_v6 == false, use "0.0.0.0" for the local addr even if IPv6 is supported. So maybe it makes more sense to switch the "if (!asp->cfg.local.host_cnt)" and "if (!asp->cfg.remote.host_cnt)" blocks? I know that this is existing code that was only moved around in this patch, so if this is a problem it should probably be fixed in a follow up patch. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I82e203612571b7651d758d8148661f706a1642ba Gerrit-Change-Number: 25689 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 11:28:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:33:10 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 7 Oct 2021 11:33:10 +0000 Subject: Change in osmo-bsc[master]: bts_trx: Fix timeslot_fsm not properly freed during trx free() In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25693 ) Change subject: bts_trx: Fix timeslot_fsm not properly freed during trx free() ...................................................................... Patch Set 3: Code-Review+1 The patch is plausible - still wonder why jenkins fails with "undefined reference to `bsc_gsmnet'" -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib0e5560efe518833f76f846d7269e82d85c186a1 Gerrit-Change-Number: 25693 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 11:33:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:36:00 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 11:36:00 +0000 Subject: Change in osmo-bts[master]: Move lchan, power_ctrl specific code from gsm_data.h to their own files In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25697 ) Change subject: Move lchan,power_ctrl specific code from gsm_data.h to their own files ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e Gerrit-Change-Number: 25697 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 11:36:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:36:54 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 11:36:54 +0000 Subject: Change in osmo-bts[master]: Move lchan, power_control related code from gsm_data.c to their own files In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25698 ) Change subject: Move lchan,power_control related code from gsm_data.c to their own files ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1493f40d99f88a565f15d3e0943a512fb9b8719a Gerrit-Change-Number: 25698 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 11:36:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:36:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:36:58 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 ) Change subject: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/25689/1/src/osmo_ss7.c File src/osmo_ss7.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/25689/1/src/osmo_ss7.c at 1279 PS1, Line 1279: !(rem_has_v4 && !rem_has_v6) > Can it be that no remote addr is set and no local addr is set? if that is the case, it seems that it [?] With current code: if ipv6 is supported, the only case where we don't want to use ipv6 in local addr (which being "::" means it will also support ipv4) is in the case where only remote ipv4 addresses are set. If not remote addr and no local addr are set, then we'll pick the defaults, that is: local="::" (which includes support listening for ipv4) remote=("127.0.0.1","::1") -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I82e203612571b7651d758d8148661f706a1642ba Gerrit-Change-Number: 25689 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 11:36:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:37:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:37:23 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 ) Change subject: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/25689/1/src/osmo_ss7.c File src/osmo_ss7.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/25689/1/src/osmo_ss7.c at 1257 PS1, Line 1257: oterwise > otherwise otters are wise! -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I82e203612571b7651d758d8148661f706a1642ba Gerrit-Change-Number: 25689 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 11:37:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:37:58 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 7 Oct 2021 11:37:58 +0000 Subject: Change in osmo-bsc[master]: Move global var bsc_gsmnet into libbsc In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25707 ) Change subject: Move global var bsc_gsmnet into libbsc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9b287aa492ca6aae5fc56133e1510aff3146fe25 Gerrit-Change-Number: 25707 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 07 Oct 2021 11:37:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:39:02 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:39:02 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4... In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, laforge, fixeria, daniel, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 to look at the new patch set (#2). Change subject: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts ...................................................................... osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts Allow user apps to relay the decision of proper default local/remote hosts values to the library. Proper configuration of these addresses can be quite cumbersome to get correctly, or confusing at least. That's due to the multi-homing feature of SCTP where both IPv4 and IPv6 are involved. We were already doing this kind of automatic setup in osmo_ss7_vty_go_parent(), where we do validations and assign addresses based on IPv6 availability. On the other hand, apps using osmo_sccp_simple_client_on_ss7_id() API usually pass "localhost" as default address. In Linux, when IPv6 is enabled localhost is resolved as "::1", and "127.0.0.1" when IPv6 is disabled. Let's instead allow apps to relay the setup to the lib, so same addresses can be applied both during VTY command as well as if there was no VTY setup at all. Related: OS#5186 Change-Id: I82e203612571b7651d758d8148661f706a1642ba --- M src/Makefile.am M src/osmo_ss7.c M src/osmo_ss7_vty.c M src/sccp_user.c A src/ss7_internal.h 5 files changed, 104 insertions(+), 65 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/89/25689/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I82e203612571b7651d758d8148661f706a1642ba Gerrit-Change-Number: 25689 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:39:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:39:03 +0000 Subject: Change in libosmo-sccp[master]: osmo_ss7.c: Fix typo in doc for osmo_ss7_asp_peer_add_host() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25711 ) Change subject: osmo_ss7.c: Fix typo in doc for osmo_ss7_asp_peer_add_host() ...................................................................... osmo_ss7.c: Fix typo in doc for osmo_ss7_asp_peer_add_host() Change-Id: Idba9ed3dc1d8968d304f88fdb1ebef422dd982e9 --- M src/osmo_ss7.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/11/25711/1 diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index e1e7ace..38206fb 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1194,7 +1194,7 @@ * \param[in] peer Application Server Process peer the address is appened to. * \param[in] talloc_ctx talloc context used to allocate new address. * \param[in] host string containing an IP addresses. - * \returns 0 on success; negtive otherwise */ + * \returns 0 on success; negative otherwise */ int osmo_ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host) { int i; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idba9ed3dc1d8968d304f88fdb1ebef422dd982e9 Gerrit-Change-Number: 25711 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:43:25 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 7 Oct 2021 11:43:25 +0000 Subject: Change in osmo-bsc[master]: Get rid of lots of stubs In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25709 ) Change subject: Get rid of lots of stubs ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic7401b8a6eb903882e30fda1cf091ac99a254ef0 Gerrit-Change-Number: 25709 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 07 Oct 2021 11:43:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:45:55 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 7 Oct 2021 11:45:55 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4... In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 ) Change subject: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/25689/1/src/osmo_ss7.c File src/osmo_ss7.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/25689/1/src/osmo_ss7.c at 1279 PS1, Line 1279: !(rem_has_v4 && !rem_has_v6) > With current code: if ipv6 is supported, the only case where we don't want to use ipv6 in local addr [?] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I82e203612571b7651d758d8148661f706a1642ba Gerrit-Change-Number: 25689 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 11:45:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:46:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:46:11 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4... In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 ) Change subject: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I82e203612571b7651d758d8148661f706a1642ba Gerrit-Change-Number: 25689 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:46:25 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 7 Oct 2021 11:46:25 +0000 Subject: Change in libosmo-sccp[master]: osmo_ss7.c: Fix typo in doc for osmo_ss7_asp_peer_add_host() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25711 ) Change subject: osmo_ss7.c: Fix typo in doc for osmo_ss7_asp_peer_add_host() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idba9ed3dc1d8968d304f88fdb1ebef422dd982e9 Gerrit-Change-Number: 25711 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 11:46:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:46:45 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:46:45 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 ) Change subject: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts ...................................................................... Patch Set 2: Code-Review+2 Readding the +1 from fixeria and dropping the linter warning I don't want to change in this commit. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I82e203612571b7651d758d8148661f706a1642ba Gerrit-Change-Number: 25689 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 07 Oct 2021 11:46:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:46:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:46:52 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 ) Change subject: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I82e203612571b7651d758d8148661f706a1642ba Gerrit-Change-Number: 25689 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 07 Oct 2021 11:46:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:46:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:46:54 +0000 Subject: Change in libosmo-sccp[master]: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 ) Change subject: osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts ...................................................................... osmo_sccp_simple_client_on_ss7_id(): Allow set internally proper IPv4/v6 default hosts Allow user apps to relay the decision of proper default local/remote hosts values to the library. Proper configuration of these addresses can be quite cumbersome to get correctly, or confusing at least. That's due to the multi-homing feature of SCTP where both IPv4 and IPv6 are involved. We were already doing this kind of automatic setup in osmo_ss7_vty_go_parent(), where we do validations and assign addresses based on IPv6 availability. On the other hand, apps using osmo_sccp_simple_client_on_ss7_id() API usually pass "localhost" as default address. In Linux, when IPv6 is enabled localhost is resolved as "::1", and "127.0.0.1" when IPv6 is disabled. Let's instead allow apps to relay the setup to the lib, so same addresses can be applied both during VTY command as well as if there was no VTY setup at all. Related: OS#5186 Change-Id: I82e203612571b7651d758d8148661f706a1642ba --- M src/Makefile.am M src/osmo_ss7.c M src/osmo_ss7_vty.c M src/sccp_user.c A src/ss7_internal.h 5 files changed, 104 insertions(+), 65 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved; Verified diff --git a/src/Makefile.am b/src/Makefile.am index aee7fd5..9d5e9a3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMONETIF_CFLAGS) -noinst_HEADERS = sccp_internal.h xua_asp_fsm.h xua_as_fsm.h xua_internal.h +noinst_HEADERS = sccp_internal.h ss7_internal.h xua_asp_fsm.h xua_as_fsm.h xua_internal.h # Legacy static libs diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index ebed9cf..e1e7ace 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1225,6 +1225,73 @@ return 0; } +static bool ipv6_sctp_supported(const char *host, bool bind) +{ + int rc; + struct addrinfo hints; + struct addrinfo *result; + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_family = AF_INET6; + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags = AI_NUMERICHOST; + hints.ai_protocol = 0; /* Any protocol */ + + if (bind) /* For wildcard IP address */ + hints.ai_flags |= AI_PASSIVE; + + /* man getaddrinfo: Either node or service, but not both, may be NULL. */ + OSMO_ASSERT(host); + rc = getaddrinfo(host, NULL, &hints, &result); + if (rc != 0) { + LOGP(DLSS7, LOGL_NOTICE, "Default IPv6 address %s not supported: %s\n", + host, gai_strerror(rc)); + return false; + } else { + freeaddrinfo(result); + return true; + } +} + +/* Set default values for local and remote peer hosts if they are not yet set. + * \param[in] asp ASP for which to set default hosts. + * \returns true if values where changed, false otherwise. + * + * If the ASP is already started, osmo_ss7_asp_restart() must be called + * afterwards in order to apply the new settings. + * This API is internal, hence doesn't appear in osmo_ss7.h + */ +bool osmo_ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp) +{ + bool changed = false; + /* If no local addr was set */ + if (!asp->cfg.local.host_cnt) { + bool rem_has_v4 = false, rem_has_v6 = false; + int i; + for (i = 0; i < asp->cfg.remote.host_cnt; i++) { + if (osmo_ip_str_type(asp->cfg.remote.host[i]) == AF_INET6) + rem_has_v6 = true; + else + rem_has_v4 = true; + } + /* "::" Covers both IPv4 and IPv6, but if only IPv4 + * address are set on the remote side, IPv4 on the local + * side must be set too */ + if (ipv6_sctp_supported("::", true) && !(rem_has_v4 && !rem_has_v6)) + osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "::"); + else + osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "0.0.0.0"); + changed = true; + } + /* If no remote addr was set */ + if (!asp->cfg.remote.host_cnt) { + osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "127.0.0.1"); + if (ipv6_sctp_supported("::1", false)) + osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "::1"); + changed = true; + } + return changed; +} + struct osmo_ss7_asp * osmo_ss7_asp_find_by_name(struct osmo_ss7_instance *inst, const char *name) { @@ -2171,6 +2238,20 @@ return osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt); } +bool osmo_ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs) +{ + /* If no local addr was set, or erased after _create(): */ + if (!oxs->cfg.local.host_cnt) { + /* "::" Covers both IPv4 and IPv6 */ + if (ipv6_sctp_supported("::", true)) + osmo_ss7_xua_server_set_local_host(oxs, "::"); + else + osmo_ss7_xua_server_set_local_host(oxs, "0.0.0.0"); + return true; + } + return false; +} + void osmo_ss7_xua_server_destroy(struct osmo_xua_server *xs) { struct osmo_ss7_asp *asp, *asp2; diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 3b39a61..8ee3087 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -45,8 +45,7 @@ #include "xua_internal.h" #include #include "sccp_internal.h" - -#include "sccp_internal.h" +#include "ss7_internal.h" #define XUA_VAR_STR "(sua|m3ua|ipa)" @@ -1937,33 +1936,6 @@ osmo_sccp_vty_write_cs7_node(vty, " ", inst->sccp); } -static bool ipv6_sctp_supported(const char *host, bool bind) -{ - int rc; - struct addrinfo hints; - struct addrinfo *result; - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = AF_INET6; - hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_NUMERICHOST; - hints.ai_protocol = 0; /* Any protocol */ - - if (bind) /* For wildcard IP address */ - hints.ai_flags |= AI_PASSIVE; - - /* man getaddrinfo: Either node or service, but not both, may be NULL. */ - OSMO_ASSERT(host); - rc = getaddrinfo(host, NULL, &hints, &result); - if (rc != 0) { - LOGP(DLSS7, LOGL_NOTICE, "Default IPv6 address %s not supported: %s\n", - host, gai_strerror(rc)); - return false; - } else { - freeaddrinfo(result); - return true; - } -} - int osmo_ss7_vty_go_parent(struct vty *vty) { struct osmo_ss7_as *as; @@ -1975,30 +1947,8 @@ switch (vty->node) { case L_CS7_ASP_NODE: asp = vty->index; - /* If no local addr was set */ - if (!asp->cfg.local.host_cnt) { - bool rem_has_v4 = false, rem_has_v6 = false; - int i; - for (i = 0; i < asp->cfg.remote.host_cnt; i++) { - if (osmo_ip_str_type(asp->cfg.remote.host[i]) == AF_INET6) - rem_has_v6 = true; - else - rem_has_v4 = true; - } - /* "::" Covers both IPv4 and IPv6, but if only IPv4 - * address are set on the remote side, IPv4 on the local - * side must be set too */ - if (ipv6_sctp_supported("::", true) && !(rem_has_v4 && !rem_has_v6)) - osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "::"); - else - osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "0.0.0.0"); - } - /* If no remote addr was set */ - if (!asp->cfg.remote.host_cnt) { - osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "127.0.0.1"); - if (ipv6_sctp_supported("::1", false)) - osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "::1"); - } + /* Make sure proper defaults values are set */ + osmo_ss7_asp_set_default_peer_hosts(asp); osmo_ss7_asp_restart(asp); vty->node = L_CS7_NODE; vty->index = asp->inst; @@ -2016,13 +1966,7 @@ case L_CS7_XUA_NODE: oxs = vty->index; /* If no local addr was set, or erased after _create(): */ - if (!oxs->cfg.local.host_cnt) { - /* "::" Covers both IPv4 and IPv6 */ - if (ipv6_sctp_supported("::", true)) - osmo_ss7_xua_server_set_local_host(oxs, "::"); - else - osmo_ss7_xua_server_set_local_host(oxs, "0.0.0.0"); - } + osmo_ss7_xua_server_set_default_local_hosts(oxs); if (osmo_ss7_xua_server_bind(oxs) < 0) vty_out(vty, "%% Unable to bind xUA server to IP(s)%s", VTY_NEWLINE); vty->node = L_CS7_NODE; diff --git a/src/sccp_user.c b/src/sccp_user.c index a654cc6..ade9487 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -38,6 +38,7 @@ #include "sccp_internal.h" #include "xua_internal.h" +#include "ss7_internal.h" /*! \brief Find a SCCP User registered for given PC+SSN or SSN only * First search all users with a valid PC for a full PC+SSN match. @@ -476,9 +477,9 @@ * \param[in] default_pc pointcode to be used on missing VTY setting * \param[in] prot protocol to be used (e.g OSMO_SS7_ASP_PROT_M3UA) * \param[in] default_local_port local port to be used on missing VTY setting - * \param[in] default_local_ip local IP-address to be used on missing VTY setting + * \param[in] default_local_ip local IP-address to be used on missing VTY setting (NULL: use library own defaults) * \param[in] default_remote_port remote port to be used on missing VTY setting - * \param[in] default_remote_ip remote IP-address to be used on missing VTY setting + * \param[in] default_remote_ip remote IP-address to be used on missing VTY setting (NULL: use library own defaults) * \returns callee-allocated SCCP instance on success; NULL on error */ struct osmo_sccp_instance * @@ -618,8 +619,12 @@ if (!asp) goto out_rt; asp_created = true; - osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp, &default_local_ip, 1); - osmo_ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1); + if (default_local_ip) + osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp, &default_local_ip, 1); + if (default_remote_ip) + osmo_ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1); + /* Make sure proper defaults are applied if app didn't provide specific default values */ + osmo_ss7_asp_set_default_peer_hosts(asp); asp->simple_client_allocated = true; } diff --git a/src/ss7_internal.h b/src/ss7_internal.h new file mode 100644 index 0000000..28e239c --- /dev/null +++ b/src/ss7_internal.h @@ -0,0 +1,9 @@ +#pragma once + +/* Internal header used by libosmo-sccp, not available publicly for lib users */ + +#include +#include + +bool osmo_ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp); +bool osmo_ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I82e203612571b7651d758d8148661f706a1642ba Gerrit-Change-Number: 25689 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:46:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:46:58 +0000 Subject: Change in libosmo-sccp[master]: osmo_ss7.c: Fix typo in doc for osmo_ss7_asp_peer_add_host() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25711 ) Change subject: osmo_ss7.c: Fix typo in doc for osmo_ss7_asp_peer_add_host() ...................................................................... osmo_ss7.c: Fix typo in doc for osmo_ss7_asp_peer_add_host() Change-Id: Idba9ed3dc1d8968d304f88fdb1ebef422dd982e9 --- M src/osmo_ss7.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index e1e7ace..38206fb 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1194,7 +1194,7 @@ * \param[in] peer Application Server Process peer the address is appened to. * \param[in] talloc_ctx talloc context used to allocate new address. * \param[in] host string containing an IP addresses. - * \returns 0 on success; negtive otherwise */ + * \returns 0 on success; negative otherwise */ int osmo_ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host) { int i; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Idba9ed3dc1d8968d304f88fdb1ebef422dd982e9 Gerrit-Change-Number: 25711 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:47:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:47:04 +0000 Subject: Change in osmo-gsm-manuals[master]: cs7-config.adoc: Improve doc on default SS7 SCTP addresses In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/25690 ) Change subject: cs7-config.adoc: Improve doc on default SS7 SCTP addresses ...................................................................... cs7-config.adoc: Improve doc on default SS7 SCTP addresses Related: OS#5186 Change-Id: Ic8d9c00ae50907f1adad8f70b773e7b1362c4f50 --- M common/chapters/cs7-config.adoc 1 file changed, 13 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve keith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/common/chapters/cs7-config.adoc b/common/chapters/cs7-config.adoc index 62e85bb..5ac9bae 100644 --- a/common/chapters/cs7-config.adoc +++ b/common/chapters/cs7-config.adoc @@ -76,9 +76,6 @@ === Connect to STP Instance -By default, an STP instance is assumed to listen on the default M3UA port -(2905) on the local host (127.0.0.1). - Establishing an SCCP/M3UA link towards a remote STP instance can be configured as: @@ -93,6 +90,19 @@ Be aware that such an `asp` needs to be linked to an `as`, see <>. +By default, an STP instance is assumed to listen on the default M3UA port +(2905) on the local host. That means in general `127.0.0.1` will be used as +default remote SCTP address, and `::1` will be added to the SCTP association if +IPv6 support is available on the system. + +NOTE: OsmoSTP listens by default on `::` if IPv6 is enabled on the system, +and on `0.0.0.0` otherwise. Address `::` actually superseeds `0.0.0.0`, meaning +it will listen on all IPv4 and IPv6 addresses available on the system. + +CAUTION: Some applications overwrite the default target remote address to +be `localhost`. If IPv6 support is available on the system, `localhost` will +usually resolve to `::1`, otherwise it will usually resolve to `127.0.0.1`. + === Local Point-Code Each CNI program on an SCCP/M3UA link typically has a local point-code, -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/25690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: Ic8d9c00ae50907f1adad8f70b773e7b1362c4f50 Gerrit-Change-Number: 25690 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:50:25 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:50:25 +0000 Subject: Change in osmo-bsc[master]: bts_trx: Fix timeslot_fsm not properly freed during trx free() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25693 ) Change subject: bts_trx: Fix timeslot_fsm not properly freed during trx free() ...................................................................... Patch Set 3: NOTE: All the patches in this patchset need to be merged together at the same time in order to fix the interdependency mess of symbols and stubs. There's no real 100% acceptable way to fix this, since fixing some of the itnerdependency issues actually make some of the other arise. It even depends on compiler/linker versions... I could submit them together in one big patch but I thought it's better to submit them in several patches like this since it's a lot clear to understand the different parts I'm fixing. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib0e5560efe518833f76f846d7269e82d85c186a1 Gerrit-Change-Number: 25693 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 11:50:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:50:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:50:31 +0000 Subject: Change in osmo-bsc[master]: Move global var bsc_gsmnet into libbsc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25707 ) Change subject: Move global var bsc_gsmnet into libbsc ...................................................................... Patch Set 1: NOTE: All the patches in this patchset need to be merged together at the same time in order to fix the interdependency mess of symbols and stubs. There's no real 100% acceptable way to fix this, since fixing some of the itnerdependency issues actually make some of the other arise. It even depends on compiler/linker versions... I could submit them together in one big patch but I thought it's better to submit them in several patches like this since it's a lot clear to understand the different parts I'm fixing. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9b287aa492ca6aae5fc56133e1510aff3146fe25 Gerrit-Change-Number: 25707 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 07 Oct 2021 11:50:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:50:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:50:37 +0000 Subject: Change in osmo-bsc[master]: Move ts_fsm_init to static constructor In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25708 ) Change subject: Move ts_fsm_init to static constructor ...................................................................... Patch Set 1: NOTE: All the patches in this patchset need to be merged together at the same time in order to fix the interdependency mess of symbols and stubs. There's no real 100% acceptable way to fix this, since fixing some of the itnerdependency issues actually make some of the other arise. It even depends on compiler/linker versions... I could submit them together in one big patch but I thought it's better to submit them in several patches like this since it's a lot clear to understand the different parts I'm fixing. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0e4b95b5e73fbb3844d83ba33e66786831088e1f Gerrit-Change-Number: 25708 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 07 Oct 2021 11:50:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:50:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:50:59 +0000 Subject: Change in osmo-bsc[master]: Get rid of lots of stubs In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25709 ) Change subject: Get rid of lots of stubs ...................................................................... Patch Set 2: NOTE: All the patches in this patchset need to be merged together at the same time in order to fix the interdependency mess of symbols and stubs. There's no real 100% acceptable way to fix this, since fixing some of the itnerdependency issues actually make some of the other arise. It even depends on compiler/linker versions... I could submit them together in one big patch but I thought it's better to submit them in several patches like this since it's a lot clear to understand the different parts I'm fixing. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic7401b8a6eb903882e30fda1cf091ac99a254ef0 Gerrit-Change-Number: 25709 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 07 Oct 2021 11:50:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:51:21 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 7 Oct 2021 11:51:21 +0000 Subject: Change in osmo-bsc[master]: Move ts_fsm_init to static constructor In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25708 ) Change subject: Move ts_fsm_init to static constructor ...................................................................... Patch Set 1: Code-Review+1 I don't think that this helps to improve the readability of the code. Its now no longer obvious to the reader that there is a timeslot FSM that needs to be started. In any case I am sure there are reasons for this to use the static constructor. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0e4b95b5e73fbb3844d83ba33e66786831088e1f Gerrit-Change-Number: 25708 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 07 Oct 2021 11:51:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:51:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:51:21 +0000 Subject: Change in osmo-bsc[master]: nm_channel_fsm: drop ipa link if SetChannelAttr fails In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25710 ) Change subject: nm_channel_fsm: drop ipa link if SetChannelAttr fails ...................................................................... Patch Set 2: And this is the patch I wanted to fix to start with, which also triggered interdependency issues ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id4c724ef17beae4bb0918ebd1a809665b59e4861 Gerrit-Change-Number: 25710 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 07 Oct 2021 11:51:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:52:16 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 7 Oct 2021 11:52:16 +0000 Subject: Change in osmo-bts[master]: lchan.h: Add related ticket info to FIXME comment In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25699 ) Change subject: lchan.h: Add related ticket info to FIXME comment ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I09ea92e843383d65c8033196814d345135ff918e Gerrit-Change-Number: 25699 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 11:52:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:53:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 11:53:56 +0000 Subject: Change in osmo-bts[master]: Introduce gsm_lchan_release function helper In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25700 ) Change subject: Introduce gsm_lchan_release function helper ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25700/2/src/common/lchan.c File src/common/lchan.c: https://gerrit.osmocom.org/c/osmo-bts/+/25700/2/src/common/lchan.c at 79 PS2, Line 79: struct gsm_lchan *lchan > Can't we just pass 'struct gsm_bts_trx_ts *ts' directly? I can submit this as a follow-up patch if at all. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0525beaba3c833f8d7adf9701fe373761a7720d3 Gerrit-Change-Number: 25700 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 11:53:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 11:58:00 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 7 Oct 2021 11:58:00 +0000 Subject: Change in osmo-bts[master]: osmo-trx: fix maxdly In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25619 ) Change subject: osmo-trx: fix maxdly ...................................................................... Patch Set 3: Code-Review+1 (1 comment) Seems plausible, did you try it out somehow? https://gerrit.osmocom.org/c/osmo-bts/+/25619/3/src/osmo-bts-trx/trx_vty.c File src/osmo-bts-trx/trx_vty.c: https://gerrit.osmocom.org/c/osmo-bts/+/25619/3/src/osmo-bts-trx/trx_vty.c at 269 PS3, Line 269: 62 > Why not 63? The TA value is normally between 0 and 63... 3GPP TS 45.010, 5.5 Maximum timing advance value -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Gerrit-Change-Number: 25619 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 07 Oct 2021 11:58:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:02:52 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 7 Oct 2021 12:02:52 +0000 Subject: Change in osmo-bts[master]: Move lchan, power_ctrl specific code from gsm_data.h to their own files In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25697 ) Change subject: Move lchan,power_ctrl specific code from gsm_data.h to their own files ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e Gerrit-Change-Number: 25697 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 12:02:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:04:58 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 7 Oct 2021 12:04:58 +0000 Subject: Change in osmo-bts[master]: Move lchan, power_control related code from gsm_data.c to their own files In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25698 ) Change subject: Move lchan,power_control related code from gsm_data.c to their own files ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1493f40d99f88a565f15d3e0943a512fb9b8719a Gerrit-Change-Number: 25698 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 12:04:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:10:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:10:21 +0000 Subject: Change in osmo-bsc[master]: bts_trx: Fix timeslot_fsm not properly freed during trx free() [1/4] In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, fixeria, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25693 to look at the new patch set (#4). Change subject: bts_trx: Fix timeslot_fsm not properly freed during trx free() [1/4] ...................................................................... bts_trx: Fix timeslot_fsm not properly freed during trx free() [1/4] osmo_fsm_inst_free() must be called explicitly, otherwise the instance is kept in the llist of instances and produces heap-use-after-free. Note: This fix is required by follow-up patches where some stubs are removed and hence some tests start using FSMs internally. Due to this bug, tests will crash due to reason explain in previous paragraph. This patch itself may introduced failures to build due to some new interdependencies being introduced in same follow-up patches mentioned above, which are in turn fixed by this present patch. So they are expected to be merged together. Change-Id: Ib0e5560efe518833f76f846d7269e82d85c186a1 --- M include/osmocom/bsc/timeslot_fsm.h M src/osmo-bsc/bts_trx.c M src/osmo-bsc/timeslot_fsm.c 3 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/25693/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib0e5560efe518833f76f846d7269e82d85c186a1 Gerrit-Change-Number: 25693 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:10:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:10:21 +0000 Subject: Change in osmo-bsc[master]: Move global var bsc_gsmnet into libbsc [2/4] In-Reply-To: References: Message-ID: Hello Jenkins Builder, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25707 to look at the new patch set (#2). Change subject: Move global var bsc_gsmnet into libbsc [2/4] ...................................................................... Move global var bsc_gsmnet into libbsc [2/4] This is used inside group of files forming libbsc (shared files used by several apps). Let's instantie only once inside a file from libbsc instead of doing so on each binary. This is one further step towards fixing interdependency mess of symbols and stubs. Change-Id: I9b287aa492ca6aae5fc56133e1510aff3146fe25 --- M src/ipaccess/ipaccess-config.c M src/osmo-bsc/bsc_init.c M src/osmo-bsc/osmo_bsc_main.c M tests/bsc/bsc_test.c M tests/gsm0408/gsm0408_test.c M tests/handover/handover_test.c 6 files changed, 2 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/25707/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9b287aa492ca6aae5fc56133e1510aff3146fe25 Gerrit-Change-Number: 25707 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:10:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:10:21 +0000 Subject: Change in osmo-bsc[master]: Move ts_fsm_init to static constructor [3/4] In-Reply-To: References: Message-ID: Hello Jenkins Builder, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25708 to look at the new patch set (#2). Change subject: Move ts_fsm_init to static constructor [3/4] ...................................................................... Move ts_fsm_init to static constructor [3/4] This allows having it initialized automatically, as we usually do with this type of code. As a result, tests or other apps importing libbsc don't need to take care of calling it. NOTE: This fix is required by follow-up patches where some stubs are removed and hence some tests start using FSMs internally. Since tests were not using those FSMs before, there was no need to call ts_fsm_init(). This is one further step towards fixing interdependency mess of symbols and stubs. Change-Id: I0e4b95b5e73fbb3844d83ba33e66786831088e1f --- M include/osmocom/bsc/timeslot_fsm.h M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/timeslot_fsm.c M tests/handover/handover_test.c 4 files changed, 1 insertion(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/08/25708/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0e4b95b5e73fbb3844d83ba33e66786831088e1f Gerrit-Change-Number: 25708 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:10:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:10:21 +0000 Subject: Change in osmo-bsc[master]: Get rid of lots of stubs [4/4] In-Reply-To: References: Message-ID: Hello Jenkins Builder, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25709 to look at the new patch set (#3). Change subject: Get rid of lots of stubs [4/4] ...................................................................... Get rid of lots of stubs [4/4] These are not needed anymore since we re-introduced libbsc, specially to avoid all this churn. Some specific methods are explicitly required to be overwritten by tests, so we specificially mark those with __attribute__((weak)) in order to be able to overwrite them. This is the last step towards fixing interdependency mess of symbols and stubs, and requires previous patches in order to have tests apssing fine. Change-Id: Ic7401b8a6eb903882e30fda1cf091ac99a254ef0 --- M src/ipaccess/ipaccess-config.c M src/ipaccess/ipaccess-proxy.c M src/ipaccess/stubs.c M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/pcu_sock.c M src/utils/bs11_config.c M src/utils/meas_json.c M tests/abis/abis_test.c M tests/acc/acc_test.c M tests/bsc/bsc_test.c M tests/gsm0408/gsm0408_test.c M tests/handover/handover_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.c 14 files changed, 23 insertions(+), 284 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/25709/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic7401b8a6eb903882e30fda1cf091ac99a254ef0 Gerrit-Change-Number: 25709 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:10:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:10:21 +0000 Subject: Change in osmo-bsc[master]: nm_channel_fsm: drop ipa link if SetChannelAttr fails In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25710 to look at the new patch set (#3). Change subject: nm_channel_fsm: drop ipa link if SetChannelAttr fails ...................................................................... nm_channel_fsm: drop ipa link if SetChannelAttr fails Now that we solved all the interdependency symbol mess, we can finally enable call to this function. Change-Id: Id4c724ef17beae4bb0918ebd1a809665b59e4861 --- M src/osmo-bsc/nm_channel_fsm.c 1 file changed, 2 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/10/25710/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id4c724ef17beae4bb0918ebd1a809665b59e4861 Gerrit-Change-Number: 25710 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:11:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:11:10 +0000 Subject: Change in osmo-bts[master]: Move lchan, power_ctrl specific code from gsm_data.h to their own files In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25697 ) Change subject: Move lchan,power_ctrl specific code from gsm_data.h to their own files ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e Gerrit-Change-Number: 25697 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 07 Oct 2021 12:11:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:11:13 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 7 Oct 2021 12:11:13 +0000 Subject: Change in osmo-bts[master]: Introduce gsm_lchan_release function helper In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25700 ) Change subject: Introduce gsm_lchan_release function helper ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25700/3/src/common/lchan.c File src/common/lchan.c: https://gerrit.osmocom.org/c/osmo-bts/+/25700/3/src/common/lchan.c at 121 PS3, Line 121: if (lchan->state == LCHAN_S_NONE) Would be nice to mention in the commit message that this check is added, because the next commit will call gsm_lchan_release with lchan that may be in state LCHAN_S_NONE. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0525beaba3c833f8d7adf9701fe373761a7720d3 Gerrit-Change-Number: 25700 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 12:11:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:11:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:11:13 +0000 Subject: Change in osmo-bts[master]: Move lchan, power_control related code from gsm_data.c to their own files In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25698 ) Change subject: Move lchan,power_control related code from gsm_data.c to their own files ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1493f40d99f88a565f15d3e0943a512fb9b8719a Gerrit-Change-Number: 25698 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 07 Oct 2021 12:11:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:11:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:11:47 +0000 Subject: Change in osmo-bts[master]: Introduce gsm_lchan_release function helper In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25700 ) Change subject: Introduce gsm_lchan_release function helper ...................................................................... Patch Set 3: Code-Review+2 re-adding fixeria's +1 after changing var name as mentioned. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0525beaba3c833f8d7adf9701fe373761a7720d3 Gerrit-Change-Number: 25700 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 07 Oct 2021 12:11:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:11:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:11:52 +0000 Subject: Change in osmo-bts[master]: Move lchan, power_ctrl specific code from gsm_data.h to their own files In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25697 ) Change subject: Move lchan,power_ctrl specific code from gsm_data.h to their own files ...................................................................... Move lchan,power_ctrl specific code from gsm_data.h to their own files Let's split all lchan and power_control specific stuff into their own headers, it helps finding out data and operations available related to them. We already have similar classification in osmo-bsc. Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e --- M include/osmo-bts/Makefile.am M include/osmo-bts/gsm_data.h A include/osmo-bts/lchan.h M include/osmo-bts/power_control.h M src/common/lchan.c 5 files changed, 439 insertions(+), 422 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/Makefile.am b/include/osmo-bts/Makefile.am index d52c9aa..247e43e 100644 --- a/include/osmo-bts/Makefile.am +++ b/include/osmo-bts/Makefile.am @@ -22,6 +22,7 @@ control_if.h \ cbch.h \ l1sap.h \ + lchan.h \ power_control.h \ scheduler.h \ scheduler_backend.h \ diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 8ae36ca..85f9089 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -10,15 +10,12 @@ #include #include #include -#include -#include #include #include #include #include #include #include -#include #include #include #include @@ -30,6 +27,7 @@ #include #include #include +#include #define GSM_FR_BITS 260 #define GSM_EFR_BITS 244 @@ -43,8 +41,6 @@ #define GSM_BTS_AGCH_QUEUE_LOW_LEVEL_DEFAULT 41 #define GSM_BTS_AGCH_QUEUE_HIGH_LEVEL_DEFAULT 91 -#define LOGPLCHAN(lchan, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_lchan_name(lchan), ## args) - struct gsm_network { struct llist_head bts_list; unsigned int num_bts; @@ -52,15 +48,6 @@ struct pcu_sock_state *pcu_state; }; -enum lchan_ciph_state { - LCHAN_CIPH_NONE, - LCHAN_CIPH_RX_REQ, - LCHAN_CIPH_RX_CONF, - LCHAN_CIPH_RXTX_REQ, - LCHAN_CIPH_RX_CONF_TX_REQ, - LCHAN_CIPH_RXTX_CONF, -}; - /* 16 is the max. number of SI2quater messages according to 3GPP TS 44.018 Table 10.5.2.33b.1: 4-bit index is used (2#1111 = 10#15) */ #define SI2Q_MAX_NUM 16 @@ -77,379 +64,6 @@ #define MAX_VERSION_LENGTH 64 -struct gsm_lchan; -struct osmo_rtp_socket; -struct pcu_sock_state; -struct smscb_msg; - -#define MAX_A5_KEY_LEN (128/8) -#define RSL_ENC_ALG_A5(x) (x+1) - -/* state of a logical channel */ -enum gsm_lchan_state { - LCHAN_S_NONE, /* channel is not active */ - LCHAN_S_ACT_REQ, /* channel activation requested */ - LCHAN_S_ACTIVE, /* channel is active and operational */ - LCHAN_S_REL_REQ, /* channel release has been requested */ - LCHAN_S_REL_ERR, /* channel is in an error state */ - LCHAN_S_BROKEN, /* channel is somehow unusable */ -}; - -#define MAX_NUM_UL_MEAS 104 -#define LC_UL_M_F_L1_VALID (1 << 0) -#define LC_UL_M_F_RES_VALID (1 << 1) -#define LC_UL_M_F_OSMO_EXT_VALID (1 << 2) - -struct bts_ul_meas { - /* BER in units of 0.01%: 10.000 == 100% ber, 0 == 0% ber */ - uint16_t ber10k; - /* timing advance offset (in 1/256 bits) */ - int16_t ta_offs_256bits; - /* C/I ratio in cB */ - int16_t c_i; - /* flags */ - uint8_t is_sub:1; - /* RSSI in dBm * -1 */ - uint8_t inv_rssi; -}; - -struct amr_mode { - uint8_t mode; - uint8_t threshold; - uint8_t hysteresis; -}; - -struct amr_multirate_conf { - uint8_t gsm48_ie[2]; - struct amr_mode ms_mode[4]; - struct amr_mode bts_mode[4]; - uint8_t num_modes; -}; - -enum lchan_csd_mode { - LCHAN_CSD_M_NT, - LCHAN_CSD_M_T_1200_75, - LCHAN_CSD_M_T_600, - LCHAN_CSD_M_T_1200, - LCHAN_CSD_M_T_2400, - LCHAN_CSD_M_T_9600, - LCHAN_CSD_M_T_14400, - LCHAN_CSD_M_T_29000, - LCHAN_CSD_M_T_32000, -}; - -/* State of the SAPIs in the lchan */ -enum lchan_sapi_state { - LCHAN_SAPI_S_NONE, - LCHAN_SAPI_S_REQ, - LCHAN_SAPI_S_ASSIGNED, - LCHAN_SAPI_S_REL, - LCHAN_SAPI_S_ERROR, -}; - -/* What kind of release/activation is done? A silent one for - * the PDCH or one triggered through RSL? */ -enum lchan_rel_act_kind { - LCHAN_REL_ACT_RSL, - LCHAN_REL_ACT_PCU, - LCHAN_REL_ACT_OML, - LCHAN_REL_ACT_REACT, /* remove once auto-activation hack is removed from opstart_compl() */ -}; - -struct gsm_rep_facch { - struct msgb *msg; - uint32_t fn; -}; - -/* MS/BS Power related measurement averaging algo */ -enum gsm_power_ctrl_meas_avg_algo { - GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE = 0x00, - GSM_PWR_CTRL_MEAS_AVG_ALGO_UNWEIGHTED = 0x01, - GSM_PWR_CTRL_MEAS_AVG_ALGO_WEIGHTED = 0x02, - GSM_PWR_CTRL_MEAS_AVG_ALGO_MOD_MEDIAN = 0x03, - /* EWMA is an Osmocom specific algo */ - GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA = 0x04, -}; - -/* MS/BS Power related measurement parameters */ -struct gsm_power_ctrl_meas_params { - /* Thresholds (see 3GPP TS 45.008, section A.3.2.1) */ - uint8_t lower_thresh; /* lower (decreasing) direction */ - uint8_t upper_thresh; /* upper (increasing) direction */ - - /* Threshold Comparators for lower (decreasing) direction */ - uint8_t lower_cmp_p; /* P1 for RxLev, P3 for RxQual */ - uint8_t lower_cmp_n; /* N1 for RxLev, N3 for RxQual */ - /* Threshold Comparators for upper (increasing) direction */ - uint8_t upper_cmp_p; /* P2 for RxLev, P4 for RxQual */ - uint8_t upper_cmp_n; /* N2 for RxLev, N4 for RxQual */ - - /* Hreqave and Hreqt (see 3GPP TS 45.008, Annex A) */ - uint8_t h_reqave; - uint8_t h_reqt; - - /* AVG algorithm and its specific parameters */ - enum gsm_power_ctrl_meas_avg_algo algo; - union { - /* Exponentially Weighted Moving Average */ - struct { - /* Smoothing factor: higher the value - less smoothing */ - uint8_t alpha; /* 1 .. 99 (in %) */ - } ewma; - }; -}; - -/* MS/BS Power Control parameters */ -struct gsm_power_ctrl_params { - /* Minimum interval between power level changes */ - uint8_t ctrl_interval; /* 1 step is 2 SACCH periods */ - - /* Power change step size (maximum) */ - uint8_t inc_step_size_db; /* increasing direction */ - uint8_t red_step_size_db; /* reducing direction */ - - /* Measurement averaging parameters for RxLev & RxQual */ - struct gsm_power_ctrl_meas_params rxqual_meas; - struct gsm_power_ctrl_meas_params rxlev_meas; - - /* Measurement averaging parameters for C/I, per chan type */ - struct gsm_power_ctrl_meas_params ci_fr_meas; - struct gsm_power_ctrl_meas_params ci_hr_meas; - struct gsm_power_ctrl_meas_params ci_amr_fr_meas; - struct gsm_power_ctrl_meas_params ci_amr_hr_meas; - struct gsm_power_ctrl_meas_params ci_sdcch_meas; - struct gsm_power_ctrl_meas_params ci_gprs_meas; -}; - -/* Default MS/BS Power Control parameters */ -extern const struct gsm_power_ctrl_params power_ctrl_params_def; -void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, bool is_bs_pwr); - -/* Measurement pre-processing state */ -struct gsm_power_ctrl_meas_proc_state { - /* Number of measurements processed */ - unsigned int meas_num; - /* Algorithm specific data */ - union { - struct { - /* Scaled up 100 times average value */ - int Avg100; - } ewma; - }; -}; - -struct lchan_power_ctrl_state { - /* Dynamic Power Control parameters (NULL in static mode) */ - const struct gsm_power_ctrl_params *dpc_params; - /* Measurement pre-processing state (for dynamic mode) */ - struct gsm_power_ctrl_meas_proc_state rxlev_meas_proc; - struct gsm_power_ctrl_meas_proc_state rxqual_meas_proc; - struct gsm_power_ctrl_meas_proc_state ci_meas_proc; - /* Number of SACCH blocks to skip (for dynamic mode) */ - int skip_block_num; - - /* Depending on the context (MS or BS power control), fields 'current' and 'max' - * reflect either the MS power level (magic numbers), or BS Power reduction level - * (attenuation, in dB). */ - uint8_t current; - uint8_t max; -}; - -struct lchan_ta_ctrl_state { - /* Number of SACCH blocks to skip */ - int skip_block_num; - /* Currently requested TA */ - uint8_t current; -}; - -struct gsm_lchan { - /* The TS that we're part of */ - struct gsm_bts_trx_ts *ts; - /* The logical subslot number in the TS */ - uint8_t nr; - /* The logical channel type */ - enum gsm_chan_t type; - /* RSL channel mode */ - enum rsl_cmod_spd rsl_cmode; - /* If TCH, traffic channel mode */ - enum gsm48_chan_mode tch_mode; - enum lchan_csd_mode csd_mode; - /* State */ - enum gsm_lchan_state state; - const char *broken_reason; - /* Encryption information */ - struct { - uint8_t alg_id; - uint8_t key_len; - uint8_t key[MAX_A5_KEY_LEN]; - } encr; - - struct { - uint32_t bound_ip; - uint32_t connect_ip; - uint16_t bound_port; - uint16_t connect_port; - uint16_t conn_id; - uint8_t rtp_payload; - uint8_t rtp_payload2; - uint8_t speech_mode; - struct osmo_rtp_socket *rtp_socket; - } abis_ip; - - char *name; - - /* For handover, activation is described in 3GPP TS 48.058 4.1.3 and 4.1.4: - * - * | | Access || transmit | activate - * | MS Power | Delay || on main channel | dl SACCH - * ---------------------------------------------------------------------- - * async ho no * --> yes no - * async ho yes * --> yes may be started - * sync ho no no --> yes no - * sync ho yes no --> yes may be started - * sync ho yes yes --> yes shall be started - * - * Always start the main channel immediately. - * want_dl_sacch_active indicates whether dl SACCH should be activated on CHAN ACT. - */ - bool want_dl_sacch_active; - - /* Number of different GsmL1_Sapi_t used in osmo_bts_sysmo is 23. - * Currently we don't share these headers so this is a magic number. */ - struct llist_head sapi_cmds; - uint8_t sapis_dl[23]; - uint8_t sapis_ul[23]; - struct lapdm_channel lapdm_ch; - struct llist_head dl_tch_queue; - struct { - /* bitmask of all SI that are present/valid in si_buf */ - uint32_t valid; - /* bitmask of all SI that do not mirror the BTS-global SI values */ - uint32_t overridden; - uint32_t last; - /* buffers where we put the pre-computed SI: - SI2Q_MAX_NUM is the max number of SI2quater messages (see 3GPP TS 44.018) */ - sysinfo_buf_t buf[_MAX_SYSINFO_TYPE][SI2Q_MAX_NUM]; - } si; - struct { - uint8_t flags; - /* RSL measurement result number, 0 at lchan_act */ - uint8_t res_nr; - /* number of measurements stored in array below */ - uint8_t num_ul_meas; - struct bts_ul_meas uplink[MAX_NUM_UL_MEAS]; - /* last L1 header from the MS */ - struct rsl_l1_info l1_info; - struct gsm_meas_rep_unidir ul_res; - int16_t ms_toa256; - int16_t ul_ci_cb_full; - int16_t ul_ci_cb_sub; - /* Frame number of the last measurement indication receceived */ - uint32_t last_fn; - /* Osmocom extended measurement results, see LC_UL_M_F_EXTD_VALID */ - struct { - /* minimum value of toa256 during measurement period */ - int16_t toa256_min; - /* maximum value of toa256 during measurement period */ - int16_t toa256_max; - /* standard deviation of toa256 value during measurement period */ - uint16_t toa256_std_dev; - } ext; - /* Interference levels reported by PHY (in dBm) */ - int16_t interf_meas_dbm[31]; /* Intave max is 31 */ - uint8_t interf_meas_num; - } meas; - struct { - struct amr_multirate_conf amr_mr; - struct { - struct osmo_fsm_inst *dl_amr_fsm; - /* TCH cache */ - uint8_t cache[20]; - /* FACCH cache */ - uint8_t facch[GSM_MACBLOCK_LEN]; - uint8_t len; - uint32_t fn; - bool is_update; - /* set for each SID frame to detect talkspurt for codecs - without explicit ONSET event */ - bool ul_sid; - /* indicates if DTXd was active during DL measurement - period */ - bool dl_active; - /* last UL SPEECH resume flag */ - bool is_speech_resume; - } dtx; - uint8_t last_cmr; - uint32_t last_fn; - - /* SLOT #0 and #1 to store FACCH for repetition */ - struct gsm_rep_facch rep_facch[2]; - - } tch; - - /* 3GPP TS 48.058 ? 9.3.37: [0; 255] ok, -1 means invalid*/ - int16_t ms_t_offs; - /* 3GPP TS 45.010 ? 1.2 round trip propagation delay (in symbols) or -1 */ - int16_t p_offs; - - /* BTS-side ciphering state (rx only, bi-directional, ...) */ - uint8_t ciph_state; - uint8_t ciph_ns; - uint8_t loopback; - struct { - uint8_t active; - uint8_t ref; - /* T3105: PHYS INF retransmission */ - struct osmo_timer_list t3105; - /* counts up to Ny1 */ - unsigned int phys_info_count; - } ho; - /* S counter for link loss */ - int s; - /* Kind of the release/activation. E.g. RSL or PCU */ - enum lchan_rel_act_kind rel_act_kind; - /* RTP header Marker bit to indicate beginning of speech after pause */ - bool rtp_tx_marker; - - /* TA Control Loop */ - struct lchan_ta_ctrl_state ta_ctrl; - - /* MS/BS power control state */ - struct lchan_power_ctrl_state ms_power_ctrl; - struct lchan_power_ctrl_state bs_power_ctrl; - - /* MS/BS Dynamic Power Control parameters */ - struct gsm_power_ctrl_params ms_dpc_params; - struct gsm_power_ctrl_params bs_dpc_params; - - /* Temporary Overpower for SACCH/FACCH */ - uint8_t bs_acch_overpower_db; - - struct msgb *pending_rel_ind_msg; - - /* ECU (Error Concealment Unit) state */ - struct osmo_ecu_state *ecu_state; - - struct abis_rsl_osmo_rep_acch_cap repeated_acch_capability; - bool repeated_dl_facch_active; - bool repeated_ul_sacch_active; - bool repeated_dl_sacch_active; - - /* Message buffer to store DL-SACCH repeation candidate */ - struct msgb *rep_sacch; - - /* Cached early Immediate Assignment message: if the Immediate Assignment arrives before the channel is - * confirmed active, then cache it here and send it once the channel is confirmed to be active. This is related - * to the Early IA feature, see OsmoBSC config option 'immediate-assignment pre-chan-ack'. */ - struct msgb *early_rr_ia; - struct osmo_timer_list early_rr_ia_delay; -}; - -extern const struct value_string lchan_ciph_state_names[]; -static inline const char *lchan_ciph_state_name(uint8_t state) { - return get_value_string(lchan_ciph_state_names, state); -} - enum gsm_bts_trx_ts_flags { TS_F_PDCH_ACTIVE = 0x1000, TS_F_PDCH_ACT_PENDING = 0x2000, @@ -509,8 +123,6 @@ struct gsm_lchan lchan[TS_MAX_LCHAN]; }; -#define GSM_LCHAN_SI(lchan, i) (void *)((lchan)->si.buf[i][0]) - enum gprs_rlc_par { RLC_T3142, RLC_T3169, @@ -557,9 +169,6 @@ const char *gsm_lchant_name(enum gsm_chan_t c); char *gsm_ts_name(const struct gsm_bts_trx_ts *ts); char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts); -void gsm_lchan_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr); -void gsm_lchan_name_update(struct gsm_lchan *lchan); -const char *gsm_lchans_name(enum gsm_lchan_state s); #define GSM_TS_NAME_FMT \ "bts=%u,trx=%u,ts=%u" "%s" @@ -567,19 +176,6 @@ (ts)->trx->bts->nr, (ts)->trx->nr, (ts)->nr, \ (ts)->vamos.is_shadow ? ",shadow" : "" -static inline char *gsm_lchan_name(const struct gsm_lchan *lchan) -{ - return lchan->name; -} - -uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan); -uint8_t gsm_lchan2chan_nr_rsl(const struct gsm_lchan *lchan); -uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, - enum gsm_phys_chan_config as_pchan); - -void gsm_lchan_interf_meas_push(struct gsm_lchan *lchan, int dbm); -int gsm_lchan_interf_meas_calc_band(struct gsm_lchan *lchan); - #define BSIC2BCC(bsic) ((bsic) & 0x07) #define BTS_TSC(bts) BSIC2BCC((bts)->bsic) @@ -590,9 +186,6 @@ uint8_t ts_subslots(const struct gsm_bts_trx_ts *ts); bool ts_is_tch(const struct gsm_bts_trx_ts *ts); -int lchan2ecu_codec(const struct gsm_lchan *lchan); - -void lchan_set_state(struct gsm_lchan *lchan, enum gsm_lchan_state state); int conf_lchans_as_pchan(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config pchan); @@ -601,16 +194,4 @@ bool ts_is_pdch(const struct gsm_bts_trx_ts *ts); -static inline bool lchan_is_dcch(const struct gsm_lchan *lchan) -{ - switch (lchan->type) { - case GSM_LCHAN_SDCCH: - case GSM_LCHAN_TCH_F: - case GSM_LCHAN_TCH_H: - return true; - default: - return false; - } -} - #endif /* _GSM_DATA_H */ diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h new file mode 100644 index 0000000..330b0bb --- /dev/null +++ b/include/osmo-bts/lchan.h @@ -0,0 +1,357 @@ +#pragma once + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define LOGPLCHAN(lchan, ss, lvl, fmt, args...) LOGP(ss, lvl, "%s " fmt, gsm_lchan_name(lchan), ## args) + +enum lchan_ciph_state { + LCHAN_CIPH_NONE, + LCHAN_CIPH_RX_REQ, + LCHAN_CIPH_RX_CONF, + LCHAN_CIPH_RXTX_REQ, + LCHAN_CIPH_RX_CONF_TX_REQ, + LCHAN_CIPH_RXTX_CONF, +}; + +/* state of a logical channel */ +enum gsm_lchan_state { + LCHAN_S_NONE, /* channel is not active */ + LCHAN_S_ACT_REQ, /* channel activation requested */ + LCHAN_S_ACTIVE, /* channel is active and operational */ + LCHAN_S_REL_REQ, /* channel release has been requested */ + LCHAN_S_REL_ERR, /* channel is in an error state */ + LCHAN_S_BROKEN, /* channel is somehow unusable */ +}; + +#define MAX_NUM_UL_MEAS 104 +#define LC_UL_M_F_L1_VALID (1 << 0) +#define LC_UL_M_F_RES_VALID (1 << 1) +#define LC_UL_M_F_OSMO_EXT_VALID (1 << 2) + +#define MAX_A5_KEY_LEN (128/8) +#define RSL_ENC_ALG_A5(x) (x+1) + +struct bts_ul_meas { + /* BER in units of 0.01%: 10.000 == 100% ber, 0 == 0% ber */ + uint16_t ber10k; + /* timing advance offset (in 1/256 bits) */ + int16_t ta_offs_256bits; + /* C/I ratio in cB */ + int16_t c_i; + /* flags */ + uint8_t is_sub:1; + /* RSSI in dBm * -1 */ + uint8_t inv_rssi; +}; + +struct amr_mode { + uint8_t mode; + uint8_t threshold; + uint8_t hysteresis; +}; + +struct amr_multirate_conf { + uint8_t gsm48_ie[2]; + struct amr_mode ms_mode[4]; + struct amr_mode bts_mode[4]; + uint8_t num_modes; +}; + +enum lchan_csd_mode { + LCHAN_CSD_M_NT, + LCHAN_CSD_M_T_1200_75, + LCHAN_CSD_M_T_600, + LCHAN_CSD_M_T_1200, + LCHAN_CSD_M_T_2400, + LCHAN_CSD_M_T_9600, + LCHAN_CSD_M_T_14400, + LCHAN_CSD_M_T_29000, + LCHAN_CSD_M_T_32000, +}; + +/* State of the SAPIs in the lchan */ +enum lchan_sapi_state { + LCHAN_SAPI_S_NONE, + LCHAN_SAPI_S_REQ, + LCHAN_SAPI_S_ASSIGNED, + LCHAN_SAPI_S_REL, + LCHAN_SAPI_S_ERROR, +}; + +/* What kind of release/activation is done? A silent one for + * the PDCH or one triggered through RSL? */ +enum lchan_rel_act_kind { + LCHAN_REL_ACT_RSL, + LCHAN_REL_ACT_PCU, + LCHAN_REL_ACT_OML, + LCHAN_REL_ACT_REACT, /* remove once auto-activation hack is removed from opstart_compl() */ +}; + +struct gsm_rep_facch { + struct msgb *msg; + uint32_t fn; +}; + + +struct lchan_power_ctrl_state { + /* Dynamic Power Control parameters (NULL in static mode) */ + const struct gsm_power_ctrl_params *dpc_params; + /* Measurement pre-processing state (for dynamic mode) */ + struct gsm_power_ctrl_meas_proc_state rxlev_meas_proc; + struct gsm_power_ctrl_meas_proc_state rxqual_meas_proc; + struct gsm_power_ctrl_meas_proc_state ci_meas_proc; + /* Number of SACCH blocks to skip (for dynamic mode) */ + int skip_block_num; + + /* Depending on the context (MS or BS power control), fields 'current' and 'max' + * reflect either the MS power level (magic numbers), or BS Power reduction level + * (attenuation, in dB). */ + uint8_t current; + uint8_t max; +}; + +struct lchan_ta_ctrl_state { + /* Number of SACCH blocks to skip */ + int skip_block_num; + /* Currently requested TA */ + uint8_t current; +}; + +struct gsm_lchan { + /* The TS that we're part of */ + struct gsm_bts_trx_ts *ts; + /* The logical subslot number in the TS */ + uint8_t nr; + /* The logical channel type */ + enum gsm_chan_t type; + /* RSL channel mode */ + enum rsl_cmod_spd rsl_cmode; + /* If TCH, traffic channel mode */ + enum gsm48_chan_mode tch_mode; + enum lchan_csd_mode csd_mode; + /* State */ + enum gsm_lchan_state state; + const char *broken_reason; + /* Encryption information */ + struct { + uint8_t alg_id; + uint8_t key_len; + uint8_t key[MAX_A5_KEY_LEN]; + } encr; + + struct { + uint32_t bound_ip; + uint32_t connect_ip; + uint16_t bound_port; + uint16_t connect_port; + uint16_t conn_id; + uint8_t rtp_payload; + uint8_t rtp_payload2; + uint8_t speech_mode; + struct osmo_rtp_socket *rtp_socket; + } abis_ip; + + char *name; + + /* For handover, activation is described in 3GPP TS 48.058 4.1.3 and 4.1.4: + * + * | | Access || transmit | activate + * | MS Power | Delay || on main channel | dl SACCH + * ---------------------------------------------------------------------- + * async ho no * --> yes no + * async ho yes * --> yes may be started + * sync ho no no --> yes no + * sync ho yes no --> yes may be started + * sync ho yes yes --> yes shall be started + * + * Always start the main channel immediately. + * want_dl_sacch_active indicates whether dl SACCH should be activated on CHAN ACT. + */ + bool want_dl_sacch_active; + + /* Number of different GsmL1_Sapi_t used in osmo_bts_sysmo is 23. + * Currently we don't share these headers so this is a magic number. */ + struct llist_head sapi_cmds; + uint8_t sapis_dl[23]; + uint8_t sapis_ul[23]; + struct lapdm_channel lapdm_ch; + struct llist_head dl_tch_queue; + struct { + /* bitmask of all SI that are present/valid in si_buf */ + uint32_t valid; + /* bitmask of all SI that do not mirror the BTS-global SI values */ + uint32_t overridden; + uint32_t last; + /* buffers where we put the pre-computed SI: + SI2Q_MAX_NUM is the max number of SI2quater messages (see 3GPP TS 44.018) */ + sysinfo_buf_t buf[_MAX_SYSINFO_TYPE][SI2Q_MAX_NUM]; + } si; + struct { + uint8_t flags; + /* RSL measurement result number, 0 at lchan_act */ + uint8_t res_nr; + /* number of measurements stored in array below */ + uint8_t num_ul_meas; + struct bts_ul_meas uplink[MAX_NUM_UL_MEAS]; + /* last L1 header from the MS */ + struct rsl_l1_info l1_info; + struct gsm_meas_rep_unidir ul_res; + int16_t ms_toa256; + int16_t ul_ci_cb_full; + int16_t ul_ci_cb_sub; + /* Frame number of the last measurement indication receceived */ + uint32_t last_fn; + /* Osmocom extended measurement results, see LC_UL_M_F_EXTD_VALID */ + struct { + /* minimum value of toa256 during measurement period */ + int16_t toa256_min; + /* maximum value of toa256 during measurement period */ + int16_t toa256_max; + /* standard deviation of toa256 value during measurement period */ + uint16_t toa256_std_dev; + } ext; + /* Interference levels reported by PHY (in dBm) */ + int16_t interf_meas_dbm[31]; /* Intave max is 31 */ + uint8_t interf_meas_num; + } meas; + struct { + struct amr_multirate_conf amr_mr; + struct { + struct osmo_fsm_inst *dl_amr_fsm; + /* TCH cache */ + uint8_t cache[20]; + /* FACCH cache */ + uint8_t facch[GSM_MACBLOCK_LEN]; + uint8_t len; + uint32_t fn; + bool is_update; + /* set for each SID frame to detect talkspurt for codecs + without explicit ONSET event */ + bool ul_sid; + /* indicates if DTXd was active during DL measurement + period */ + bool dl_active; + /* last UL SPEECH resume flag */ + bool is_speech_resume; + } dtx; + uint8_t last_cmr; + uint32_t last_fn; + + /* SLOT #0 and #1 to store FACCH for repetition */ + struct gsm_rep_facch rep_facch[2]; + + } tch; + + /* 3GPP TS 48.058 ? 9.3.37: [0; 255] ok, -1 means invalid*/ + int16_t ms_t_offs; + /* 3GPP TS 45.010 ? 1.2 round trip propagation delay (in symbols) or -1 */ + int16_t p_offs; + + /* BTS-side ciphering state (rx only, bi-directional, ...) */ + uint8_t ciph_state; + uint8_t ciph_ns; + uint8_t loopback; + struct { + uint8_t active; + uint8_t ref; + /* T3105: PHYS INF retransmission */ + struct osmo_timer_list t3105; + /* counts up to Ny1 */ + unsigned int phys_info_count; + } ho; + /* S counter for link loss */ + int s; + /* Kind of the release/activation. E.g. RSL or PCU */ + enum lchan_rel_act_kind rel_act_kind; + /* RTP header Marker bit to indicate beginning of speech after pause */ + bool rtp_tx_marker; + + /* TA Control Loop */ + struct lchan_ta_ctrl_state ta_ctrl; + + /* MS/BS power control state */ + struct lchan_power_ctrl_state ms_power_ctrl; + struct lchan_power_ctrl_state bs_power_ctrl; + + /* MS/BS Dynamic Power Control parameters */ + struct gsm_power_ctrl_params ms_dpc_params; + struct gsm_power_ctrl_params bs_dpc_params; + + /* Temporary Overpower for SACCH/FACCH */ + uint8_t bs_acch_overpower_db; + + struct msgb *pending_rel_ind_msg; + + /* ECU (Error Concealment Unit) state */ + struct osmo_ecu_state *ecu_state; + + struct abis_rsl_osmo_rep_acch_cap repeated_acch_capability; + bool repeated_dl_facch_active; + bool repeated_ul_sacch_active; + bool repeated_dl_sacch_active; + + /* Message buffer to store DL-SACCH repeation candidate */ + struct msgb *rep_sacch; + + /* Cached early Immediate Assignment message: if the Immediate Assignment arrives before the channel is + * confirmed active, then cache it here and send it once the channel is confirmed to be active. This is related + * to the Early IA feature, see OsmoBSC config option 'immediate-assignment pre-chan-ack'. */ + struct msgb *early_rr_ia; + struct osmo_timer_list early_rr_ia_delay; +}; + +extern const struct value_string lchan_ciph_state_names[]; +static inline const char *lchan_ciph_state_name(uint8_t state) +{ + return get_value_string(lchan_ciph_state_names, state); +} + +#define GSM_LCHAN_SI(lchan, i) (void *)((lchan)->si.buf[i][0]) + +void gsm_lchan_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr); +void gsm_lchan_name_update(struct gsm_lchan *lchan); +const char *gsm_lchans_name(enum gsm_lchan_state s); + +static inline char *gsm_lchan_name(const struct gsm_lchan *lchan) +{ + return lchan->name; +} + +uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan); +uint8_t gsm_lchan2chan_nr_rsl(const struct gsm_lchan *lchan); +uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, + enum gsm_phys_chan_config as_pchan); + +void gsm_lchan_interf_meas_push(struct gsm_lchan *lchan, int dbm); +int gsm_lchan_interf_meas_calc_band(struct gsm_lchan *lchan); + +int lchan2ecu_codec(const struct gsm_lchan *lchan); + +void lchan_set_state(struct gsm_lchan *lchan, enum gsm_lchan_state state); + +static inline bool lchan_is_dcch(const struct gsm_lchan *lchan) +{ + switch (lchan->type) { + case GSM_LCHAN_SDCCH: + case GSM_LCHAN_TCH_F: + case GSM_LCHAN_TCH_H: + return true; + default: + return false; + } +} diff --git a/include/osmo-bts/power_control.h b/include/osmo-bts/power_control.h index ed9f891..e8b035d 100644 --- a/include/osmo-bts/power_control.h +++ b/include/osmo-bts/power_control.h @@ -1,8 +1,86 @@ #pragma once #include -#include +#include +/* MS/BS Power related measurement averaging algo */ +enum gsm_power_ctrl_meas_avg_algo { + GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE = 0x00, + GSM_PWR_CTRL_MEAS_AVG_ALGO_UNWEIGHTED = 0x01, + GSM_PWR_CTRL_MEAS_AVG_ALGO_WEIGHTED = 0x02, + GSM_PWR_CTRL_MEAS_AVG_ALGO_MOD_MEDIAN = 0x03, + /* EWMA is an Osmocom specific algo */ + GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA = 0x04, +}; + +/* MS/BS Power related measurement parameters */ +struct gsm_power_ctrl_meas_params { + /* Thresholds (see 3GPP TS 45.008, section A.3.2.1) */ + uint8_t lower_thresh; /* lower (decreasing) direction */ + uint8_t upper_thresh; /* upper (increasing) direction */ + + /* Threshold Comparators for lower (decreasing) direction */ + uint8_t lower_cmp_p; /* P1 for RxLev, P3 for RxQual */ + uint8_t lower_cmp_n; /* N1 for RxLev, N3 for RxQual */ + /* Threshold Comparators for upper (increasing) direction */ + uint8_t upper_cmp_p; /* P2 for RxLev, P4 for RxQual */ + uint8_t upper_cmp_n; /* N2 for RxLev, N4 for RxQual */ + + /* Hreqave and Hreqt (see 3GPP TS 45.008, Annex A) */ + uint8_t h_reqave; + uint8_t h_reqt; + + /* AVG algorithm and its specific parameters */ + enum gsm_power_ctrl_meas_avg_algo algo; + union { + /* Exponentially Weighted Moving Average */ + struct { + /* Smoothing factor: higher the value - less smoothing */ + uint8_t alpha; /* 1 .. 99 (in %) */ + } ewma; + }; +}; + +/* MS/BS Power Control parameters */ +struct gsm_power_ctrl_params { + /* Minimum interval between power level changes */ + uint8_t ctrl_interval; /* 1 step is 2 SACCH periods */ + + /* Power change step size (maximum) */ + uint8_t inc_step_size_db; /* increasing direction */ + uint8_t red_step_size_db; /* reducing direction */ + + /* Measurement averaging parameters for RxLev & RxQual */ + struct gsm_power_ctrl_meas_params rxqual_meas; + struct gsm_power_ctrl_meas_params rxlev_meas; + + /* Measurement averaging parameters for C/I, per chan type */ + struct gsm_power_ctrl_meas_params ci_fr_meas; + struct gsm_power_ctrl_meas_params ci_hr_meas; + struct gsm_power_ctrl_meas_params ci_amr_fr_meas; + struct gsm_power_ctrl_meas_params ci_amr_hr_meas; + struct gsm_power_ctrl_meas_params ci_sdcch_meas; + struct gsm_power_ctrl_meas_params ci_gprs_meas; +}; + +/* Measurement pre-processing state */ +struct gsm_power_ctrl_meas_proc_state { + /* Number of measurements processed */ + unsigned int meas_num; + /* Algorithm specific data */ + union { + struct { + /* Scaled up 100 times average value */ + int Avg100; + } ewma; + }; +}; + +/* Default MS/BS Power Control parameters */ +extern const struct gsm_power_ctrl_params power_ctrl_params_def; +void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, bool is_bs_pwr); + +struct gsm_lchan; int lchan_ms_pwr_ctrl(struct gsm_lchan *lchan, const uint8_t ms_power_lvl, const int8_t ul_rssi_dbm, diff --git a/src/common/lchan.c b/src/common/lchan.c index 3b99fc5..cd99be7 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25697 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6424dcbd2e329fc1a516f8886359554ed7e9487e Gerrit-Change-Number: 25697 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:11:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:11:52 +0000 Subject: Change in osmo-bts[master]: Move lchan, power_control related code from gsm_data.c to their own files In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25698 ) Change subject: Move lchan,power_control related code from gsm_data.c to their own files ...................................................................... Move lchan,power_control related code from gsm_data.c to their own files We already have similar classification in osmo-bsc. Change-Id: I1493f40d99f88a565f15d3e0943a512fb9b8719a --- M src/common/gsm_data.c M src/common/lchan.c M src/common/power_control.c 3 files changed, 405 insertions(+), 404 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index 89a740d..2edeb4d 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -90,21 +90,6 @@ return get_value_string(gsm_chan_t_names, c); } -static const struct value_string lchan_s_names[] = { - { LCHAN_S_NONE, "NONE" }, - { LCHAN_S_ACT_REQ, "ACTIVATION REQUESTED" }, - { LCHAN_S_ACTIVE, "ACTIVE" }, - { LCHAN_S_REL_REQ, "RELEASE REQUESTED" }, - { LCHAN_S_REL_ERR, "RELEASE DUE ERROR" }, - { LCHAN_S_BROKEN, "BROKEN UNUSABLE" }, - { 0, NULL } -}; - -const char *gsm_lchans_name(enum gsm_lchan_state s) -{ - return get_value_string(lchan_s_names, s); -} - static char ts2str[255]; char *gsm_ts_name(const struct gsm_bts_trx_ts *ts) @@ -162,187 +147,6 @@ return ts2str; } -void gsm_lchan_name_update(struct gsm_lchan *lchan) -{ - const struct gsm_bts_trx_ts *ts = lchan->ts; - const struct gsm_bts_trx *trx = ts->trx; - char *name; - - name = talloc_asprintf(trx, "(" GSM_TS_NAME_FMT ",ss=%u)", - GSM_TS_NAME_ARGS(ts), lchan->nr); - if (lchan->name != NULL) - talloc_free(lchan->name); - lchan->name = name; -} - -/* See Table 10.5.25 of GSM04.08 */ -static uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan, - uint8_t ts_nr, uint8_t lchan_nr) -{ - uint8_t cbits, chan_nr; - - OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN); - OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH); - - switch (pchan) { - case GSM_PCHAN_TCH_F: - OSMO_ASSERT(lchan_nr == 0); - cbits = ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs; - break; - case GSM_PCHAN_PDCH: - OSMO_ASSERT(lchan_nr == 0); - cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH; - break; - case GSM_PCHAN_TCH_H: - OSMO_ASSERT(lchan_nr < 2); - cbits = ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(lchan_nr); - break; - case GSM_PCHAN_CCCH_SDCCH4: - case GSM_PCHAN_CCCH_SDCCH4_CBCH: - /* - * As a special hack for BCCH, lchan_nr == 4 may be passed - * here. This should never be sent in an RSL message. - * See osmo-bts-xxx/oml.c:opstart_compl(). - */ - if (lchan_nr == CCCH_LCHAN) - cbits = ABIS_RSL_CHAN_NR_CBITS_BCCH; - else { - OSMO_ASSERT(lchan_nr < 4); - cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(lchan_nr); - } - break; - case GSM_PCHAN_SDCCH8_SACCH8C: - case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: - OSMO_ASSERT(lchan_nr < 8); - cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(lchan_nr); - break; - case GSM_PCHAN_CCCH: - cbits = ABIS_RSL_CHAN_NR_CBITS_BCCH; - break; - case GSM_PCHAN_NONE: - LOGP(DRSL, LOGL_ERROR, "Physical channel %s not expected!\n", - gsm_pchan_name(pchan)); - cbits = 0x00; - break; - default: - LOGP(DRSL, LOGL_ERROR, "Physical channel %s (0x%02x) not expected!\n", - gsm_pchan_name(pchan), (int)pchan); - /* OSMO_ASSERT(lchan_nr == 0); - * FIXME: On octphy and litecell, we hit above assertion (see - * Max's comment at https://gerrit.osmocom.org/589 ); disabled - * for BTS until this is clarified; remove the #ifdef when it - * is fixed. Tracked in OS#2906. - */ -#pragma message "fix caller that passes lchan_nr != 0" - cbits = 0x10; - break; - } - - chan_nr = (cbits << 3) | (ts_nr & 0x7); - - return chan_nr; -} - -static uint8_t _gsm_lchan2chan_nr(const struct gsm_lchan *lchan, bool rsl) -{ - uint8_t chan_nr; - - switch (lchan->ts->pchan) { - case GSM_PCHAN_OSMO_DYN: - /* Return chan_nr reflecting the current TS pchan, either a standard TCH kind, or the - * nonstandard value reflecting PDCH for Osmocom style dyn TS. */ - chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, lchan->ts->dyn.pchan_is); - break; - case GSM_PCHAN_TCH_F_PDCH: - /* For ip.access style dyn TS, on RSL we want to use the chan_nr as if it was TCH/F. - * We're using custom PDCH ACT and DEACT messages that use the usual chan_nr values. */ - if (rsl) - chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, GSM_PCHAN_TCH_F); - else if (~lchan->ts->flags & TS_F_PDCH_ACTIVE) - chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, GSM_PCHAN_TCH_F); - else - chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, GSM_PCHAN_PDCH); - break; - default: - chan_nr = gsm_pchan2chan_nr(lchan->ts->pchan, lchan->ts->nr, lchan->nr); - break; - } - - /* VAMOS: if this lchan belongs to a shadow timeslot, we must reflect - * this in the channel number. Convert it to Osmocom specific value. */ - if (lchan->ts->vamos.is_shadow) - chan_nr |= RSL_CHAN_OSMO_VAMOS_MASK; - - return chan_nr; -} - -uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan) -{ - return _gsm_lchan2chan_nr(lchan, false); -} - -uint8_t gsm_lchan2chan_nr_rsl(const struct gsm_lchan *lchan) -{ - return _gsm_lchan2chan_nr(lchan, true); -} - -uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, - enum gsm_phys_chan_config as_pchan) -{ - if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN - && as_pchan == GSM_PCHAN_PDCH) - return RSL_CHAN_OSMO_PDCH | (lchan->ts->nr & ~RSL_CHAN_NR_MASK); - return gsm_pchan2chan_nr(as_pchan, lchan->ts->nr, lchan->nr); -} - -/* Called by the model specific code every 104 TDMA frames (SACCH period) */ -void gsm_lchan_interf_meas_push(struct gsm_lchan *lchan, int dbm) -{ - const uint8_t meas_num = lchan->meas.interf_meas_num; - - if (meas_num >= ARRAY_SIZE(lchan->meas.interf_meas_dbm)) { - LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Not enough room " - "to store interference report (%ddBm)\n", dbm); - return; - } - - lchan->meas.interf_meas_dbm[meas_num] = dbm; - lchan->meas.interf_meas_num++; -} - -/* Called by the higher layers every Intave * 104 TDMA frames */ -int gsm_lchan_interf_meas_calc_band(struct gsm_lchan *lchan) -{ - const uint8_t meas_num = lchan->meas.interf_meas_num; - const struct gsm_bts *bts = lchan->ts->trx->bts; - int b, meas_avg, meas_sum = 0; - - /* There must be at least one sample */ - if (meas_num == 0) - return -EAGAIN; - - /* Calculate the sum of all collected samples (in -x dBm) */ - while (lchan->meas.interf_meas_num) { - uint8_t i = --lchan->meas.interf_meas_num; - meas_sum += lchan->meas.interf_meas_dbm[i]; - } - - /* Calculate the average of all collected samples */ - meas_avg = meas_sum / (int) meas_num; - - /* Determine the band using interference boundaries from BSC */ - for (b = 0; b < ARRAY_SIZE(bts->interference.boundary); b++) { - if (meas_avg >= bts->interference.boundary[b]) - break; /* Current 'b' is the band value */ - } - - LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, - "Interference AVG: %ddBm (band %d, samples %u)\n", - meas_avg, b, meas_num); - - return b; -} - /* determine logical channel based on TRX and channel number IE */ struct gsm_lchan *rsl_lchan_lookup(struct gsm_bts_trx *trx, uint8_t chan_nr, int *rc) @@ -486,205 +290,18 @@ return pchan_is_tch(ts_pchan(ts)); } -const struct value_string lchan_ciph_state_names[] = { - { LCHAN_CIPH_NONE, "NONE" }, - { LCHAN_CIPH_RX_REQ, "RX_REQ" }, - { LCHAN_CIPH_RX_CONF, "RX_CONF" }, - { LCHAN_CIPH_RXTX_REQ, "RXTX_REQ" }, - { LCHAN_CIPH_RX_CONF_TX_REQ, "RX_CONF_TX_REQ" }, - { LCHAN_CIPH_RXTX_CONF, "RXTX_CONF" }, - { 0, NULL } -}; - -/* determine the ECU codec constant for the codec used by given lchan */ -int lchan2ecu_codec(const struct gsm_lchan *lchan) +bool ts_is_pdch(const struct gsm_bts_trx_ts *ts) { - const struct gsm_bts_trx_ts *ts = lchan->ts; - - switch (lchan->tch_mode) { - case GSM48_CMODE_SPEECH_V1: - if (ts_pchan(ts) == GSM_PCHAN_TCH_H) - return OSMO_ECU_CODEC_HR; - else - return OSMO_ECU_CODEC_FR; - break; - case GSM48_CMODE_SPEECH_EFR: - return OSMO_ECU_CODEC_EFR; - case GSM48_CMODE_SPEECH_AMR: - return OSMO_ECU_CODEC_AMR; + switch (ts->pchan) { + case GSM_PCHAN_PDCH: + return true; + case GSM_PCHAN_TCH_F_PDCH: + return (ts->flags & TS_F_PDCH_ACTIVE) + && !(ts->flags & TS_F_PDCH_PENDING_MASK); + case GSM_PCHAN_OSMO_DYN: + return ts->dyn.pchan_is == GSM_PCHAN_PDCH + && ts->dyn.pchan_want == ts->dyn.pchan_is; default: - return -1; + return false; } } - -/* Default MS/BS Power Control parameters (see 3GPP TS 45.008, table A.1) */ -const struct gsm_power_ctrl_params power_ctrl_params_def = { - - .ctrl_interval = 1, /* Trigger loop every second SACCH block. TS 45.008 sec 4.7.1 */ - - /* Power increasing/reducing step size (optimal defaults) */ - .inc_step_size_db = 4, /* quickly increase MS/BS power */ - .red_step_size_db = 2, /* slowly decrease MS/BS power */ - - /* RxLev measurement parameters */ - .rxlev_meas = { - /* Thresholds for RxLev (see 3GPP TS 45.008, A.3.2.1) */ - .lower_thresh = 32, /* L_RXLEV_XX_P (-78 dBm) */ - .upper_thresh = 38, /* U_RXLEV_XX_P (-72 dBm) */ - - /* NOTE: only Osmocom specific EWMA is supported */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA, - .ewma.alpha = 50, /* Smoothing factor 50% */ - }, - - /* RxQual measurement parameters */ - .rxqual_meas = { - /* Thresholds for RxQual (see 3GPP TS 45.008, A.3.2.1) */ - .lower_thresh = 3, /* L_RXQUAL_XX_P (0.8% <= BER < 1.6%) */ - .upper_thresh = 0, /* U_RXQUAL_XX_P (BER < 0.2%) */ - - /* No averaging (filtering) by default. - * NOTE: only Osmocom specific EWMA is supported */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, - }, - - /* C/I measurement parameters. - * Target C/I retrieved from "GSM/EDGE: Evolution and Performance" Table 10.3. - * Set lower and upper so that (lower + upper) / 2 is equal or slightly - * above the target. - */ - .ci_fr_meas = { /* FR: Target C/I = 15 dB, Soft blocking threshold = 10 dB */ - .lower_thresh = 13, - .upper_thresh = 17, - - /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages - * out of LOWER_CMP_N averages are lower than L_CI_FR_XX_P */ - .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages - * out of UPPER_CMP_N averages are greater than L_CI_FR_XX_P */ - .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - - /* No averaging (filtering) by default */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, - - /* Hreqave: the period over which an average is produced */ - .h_reqave = 4, /* TODO: investigate a reasonable default value */ - /* Hreqt: the number of averaged results maintained */ - .h_reqt = 6, /* TODO: investigate a reasonable default value */ - }, - .ci_hr_meas = { /* HR: Target C/I = 18 dB, Soft blocking threshold = 13 dB */ - .lower_thresh = 16, - .upper_thresh = 21, - - /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages - * out of LOWER_CMP_N averages are lower than L_CI_HR_XX_P */ - .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages - * out of UPPER_CMP_N averages are greater than L_CI_HR_XX_P */ - .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - - /* No averaging (filtering) by default */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, - - /* Hreqave: the period over which an average is produced */ - .h_reqave = 4, /* TODO: investigate a reasonable default value */ - /* Hreqt: the number of averaged results maintained */ - .h_reqt = 6, /* TODO: investigate a reasonable default value */ - }, - .ci_amr_fr_meas = { /* AMR-FR: Target C/I = 9 dB, Soft blocking threshold = 4 dB */ - .lower_thresh = 7, - .upper_thresh = 11, - - /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages - * out of LOWER_CMP_N averages are lower than L_CI_AMR_FR_XX_P */ - .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages - * out of UPPER_CMP_N averages are greater than L_CI_AMR_FR_XX_P */ - .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - - /* No averaging (filtering) by default */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, - - /* Hreqave: the period over which an average is produced */ - .h_reqave = 4, /* TODO: investigate a reasonable default value */ - /* Hreqt: the number of averaged results maintained */ - .h_reqt = 6, /* TODO: investigate a reasonable default value */ - }, - .ci_amr_hr_meas = { /* AMR-HR: Target C/I = 15 dB, Soft blocking threshold = 10 dB */ - .lower_thresh = 13, - .upper_thresh = 17, - - /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages - * out of LOWER_CMP_N averages are lower than L_CI_AMR_HR_XX_P */ - .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages - * out of UPPER_CMP_N averages are greater than L_CI_AMR_HR_XX_P */ - .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - - /* No averaging (filtering) by default */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, - - /* Hreqave: the period over which an average is produced */ - .h_reqave = 4, /* TODO: investigate a reasonable default value */ - /* Hreqt: the number of averaged results maintained */ - .h_reqt = 6, /* TODO: investigate a reasonable default value */ - }, - .ci_sdcch_meas = { /* SDCCH: Target C/I = 14 dB, Soft blocking threshold = 9 dB */ - .lower_thresh = 12, - .upper_thresh = 16, - - /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages - * out of LOWER_CMP_N averages are lower than L_CI_SDCCH_XX_P */ - .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages - * out of UPPER_CMP_N averages are greater than L_CI_SDCCH_XX_P */ - .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - - /* No averaging (filtering) by default */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, - - /* Hreqave: the period over which an average is produced */ - .h_reqave = 4, /* TODO: investigate a reasonable default value */ - /* Hreqt: the number of averaged results maintained */ - .h_reqt = 6, /* TODO: investigate a reasonable default value */ - }, - .ci_gprs_meas = { /* GPRS: Target C/I = 20 dB, Soft blocking threshold = 15 dB */ - .lower_thresh = 18, - .upper_thresh = 24, - - /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages - * out of LOWER_CMP_N averages are lower than L_CI_GPRS_XX_P */ - .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ - /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages - * out of UPPER_CMP_N averages are greater than L_CI_GPRS_XX_P */ - .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ - - /* No averaging (filtering) by default */ - .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, - - /* Hreqave: the period over which an average is produced */ - .h_reqave = 4, /* TODO: investigate a reasonable default value */ - /* Hreqt: the number of averaged results maintained */ - .h_reqt = 6, /* TODO: investigate a reasonable default value */ - }, -}; - -void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, bool is_bs_pwr) -{ - *params = power_ctrl_params_def; - if (!is_bs_pwr) - /* Trigger loop every fourth SACCH block (1.92s). TS 45.008 sec 4.7.1: */ - params->ctrl_interval = 2; -} diff --git a/src/common/lchan.c b/src/common/lchan.c index cd99be7..afcb2c3 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -24,6 +24,27 @@ #include #include #include +#include + +static const struct value_string lchan_s_names[] = { + { LCHAN_S_NONE, "NONE" }, + { LCHAN_S_ACT_REQ, "ACTIVATION REQUESTED" }, + { LCHAN_S_ACTIVE, "ACTIVE" }, + { LCHAN_S_REL_REQ, "RELEASE REQUESTED" }, + { LCHAN_S_REL_ERR, "RELEASE DUE ERROR" }, + { LCHAN_S_BROKEN, "BROKEN UNUSABLE" }, + { 0, NULL } +}; + +const struct value_string lchan_ciph_state_names[] = { + { LCHAN_CIPH_NONE, "NONE" }, + { LCHAN_CIPH_RX_REQ, "RX_REQ" }, + { LCHAN_CIPH_RX_CONF, "RX_CONF" }, + { LCHAN_CIPH_RXTX_REQ, "RXTX_REQ" }, + { LCHAN_CIPH_RX_CONF_TX_REQ, "RX_CONF_TX_REQ" }, + { LCHAN_CIPH_RXTX_CONF, "RXTX_CONF" }, + { 0, NULL } +}; void gsm_lchan_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr) { @@ -36,6 +57,24 @@ INIT_LLIST_HEAD(&lchan->dl_tch_queue); } +void gsm_lchan_name_update(struct gsm_lchan *lchan) +{ + const struct gsm_bts_trx_ts *ts = lchan->ts; + const struct gsm_bts_trx *trx = ts->trx; + char *name; + + name = talloc_asprintf(trx, "(" GSM_TS_NAME_FMT ",ss=%u)", + GSM_TS_NAME_ARGS(ts), lchan->nr); + if (lchan->name != NULL) + talloc_free(lchan->name); + lchan->name = name; +} + +const char *gsm_lchans_name(enum gsm_lchan_state s) +{ + return get_value_string(lchan_s_names, s); +} + void early_rr_ia_delay_cb(void *data) { struct gsm_lchan *lchan = data; @@ -98,18 +137,191 @@ } } -bool ts_is_pdch(const struct gsm_bts_trx_ts *ts) +/* See Table 10.5.25 of GSM04.08 */ +static uint8_t gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan, + uint8_t ts_nr, uint8_t lchan_nr) { - switch (ts->pchan) { + uint8_t cbits, chan_nr; + + OSMO_ASSERT(pchan != GSM_PCHAN_OSMO_DYN); + OSMO_ASSERT(pchan != GSM_PCHAN_TCH_F_PDCH); + + switch (pchan) { + case GSM_PCHAN_TCH_F: + OSMO_ASSERT(lchan_nr == 0); + cbits = ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs; + break; case GSM_PCHAN_PDCH: - return true; - case GSM_PCHAN_TCH_F_PDCH: - return (ts->flags & TS_F_PDCH_ACTIVE) - && !(ts->flags & TS_F_PDCH_PENDING_MASK); - case GSM_PCHAN_OSMO_DYN: - return ts->dyn.pchan_is == GSM_PCHAN_PDCH - && ts->dyn.pchan_want == ts->dyn.pchan_is; + OSMO_ASSERT(lchan_nr == 0); + cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH; + break; + case GSM_PCHAN_TCH_H: + OSMO_ASSERT(lchan_nr < 2); + cbits = ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(lchan_nr); + break; + case GSM_PCHAN_CCCH_SDCCH4: + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + /* + * As a special hack for BCCH, lchan_nr == 4 may be passed + * here. This should never be sent in an RSL message. + * See osmo-bts-xxx/oml.c:opstart_compl(). + */ + if (lchan_nr == CCCH_LCHAN) + cbits = ABIS_RSL_CHAN_NR_CBITS_BCCH; + else { + OSMO_ASSERT(lchan_nr < 4); + cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(lchan_nr); + } + break; + case GSM_PCHAN_SDCCH8_SACCH8C: + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: + OSMO_ASSERT(lchan_nr < 8); + cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(lchan_nr); + break; + case GSM_PCHAN_CCCH: + cbits = ABIS_RSL_CHAN_NR_CBITS_BCCH; + break; + case GSM_PCHAN_NONE: + LOGP(DRSL, LOGL_ERROR, "Physical channel %s not expected!\n", + gsm_pchan_name(pchan)); + cbits = 0x00; + break; default: - return false; + LOGP(DRSL, LOGL_ERROR, "Physical channel %s (0x%02x) not expected!\n", + gsm_pchan_name(pchan), (int)pchan); + /* OSMO_ASSERT(lchan_nr == 0); + * FIXME: On octphy and litecell, we hit above assertion (see + * Max's comment at https://gerrit.osmocom.org/589 ); disabled + * for BTS until this is clarified; remove the #ifdef when it + * is fixed. Tracked in OS#2906. + */ +#pragma message "fix caller that passes lchan_nr != 0" + cbits = 0x10; + break; + } + + chan_nr = (cbits << 3) | (ts_nr & 0x7); + + return chan_nr; +} + +static uint8_t _gsm_lchan2chan_nr(const struct gsm_lchan *lchan, bool rsl) +{ + uint8_t chan_nr; + + switch (lchan->ts->pchan) { + case GSM_PCHAN_OSMO_DYN: + /* Return chan_nr reflecting the current TS pchan, either a standard TCH kind, or the + * nonstandard value reflecting PDCH for Osmocom style dyn TS. */ + chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, lchan->ts->dyn.pchan_is); + break; + case GSM_PCHAN_TCH_F_PDCH: + /* For ip.access style dyn TS, on RSL we want to use the chan_nr as if it was TCH/F. + * We're using custom PDCH ACT and DEACT messages that use the usual chan_nr values. */ + if (rsl) + chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, GSM_PCHAN_TCH_F); + else if (~lchan->ts->flags & TS_F_PDCH_ACTIVE) + chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, GSM_PCHAN_TCH_F); + else + chan_nr = gsm_lchan_as_pchan2chan_nr(lchan, GSM_PCHAN_PDCH); + break; + default: + chan_nr = gsm_pchan2chan_nr(lchan->ts->pchan, lchan->ts->nr, lchan->nr); + break; + } + + /* VAMOS: if this lchan belongs to a shadow timeslot, we must reflect + * this in the channel number. Convert it to Osmocom specific value. */ + if (lchan->ts->vamos.is_shadow) + chan_nr |= RSL_CHAN_OSMO_VAMOS_MASK; + + return chan_nr; +} + +uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan) +{ + return _gsm_lchan2chan_nr(lchan, false); +} + +uint8_t gsm_lchan2chan_nr_rsl(const struct gsm_lchan *lchan) +{ + return _gsm_lchan2chan_nr(lchan, true); +} + +uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, + enum gsm_phys_chan_config as_pchan) +{ + if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN + && as_pchan == GSM_PCHAN_PDCH) + return RSL_CHAN_OSMO_PDCH | (lchan->ts->nr & ~RSL_CHAN_NR_MASK); + return gsm_pchan2chan_nr(as_pchan, lchan->ts->nr, lchan->nr); +} + +/* Called by the model specific code every 104 TDMA frames (SACCH period) */ +void gsm_lchan_interf_meas_push(struct gsm_lchan *lchan, int dbm) +{ + const uint8_t meas_num = lchan->meas.interf_meas_num; + + if (meas_num >= ARRAY_SIZE(lchan->meas.interf_meas_dbm)) { + LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Not enough room " + "to store interference report (%ddBm)\n", dbm); + return; + } + + lchan->meas.interf_meas_dbm[meas_num] = dbm; + lchan->meas.interf_meas_num++; +} + +/* Called by the higher layers every Intave * 104 TDMA frames */ +int gsm_lchan_interf_meas_calc_band(struct gsm_lchan *lchan) +{ + const uint8_t meas_num = lchan->meas.interf_meas_num; + const struct gsm_bts *bts = lchan->ts->trx->bts; + int b, meas_avg, meas_sum = 0; + + /* There must be at least one sample */ + if (meas_num == 0) + return -EAGAIN; + + /* Calculate the sum of all collected samples (in -x dBm) */ + while (lchan->meas.interf_meas_num) { + uint8_t i = --lchan->meas.interf_meas_num; + meas_sum += lchan->meas.interf_meas_dbm[i]; + } + + /* Calculate the average of all collected samples */ + meas_avg = meas_sum / (int) meas_num; + + /* Determine the band using interference boundaries from BSC */ + for (b = 0; b < ARRAY_SIZE(bts->interference.boundary); b++) { + if (meas_avg >= bts->interference.boundary[b]) + break; /* Current 'b' is the band value */ + } + + LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, + "Interference AVG: %ddBm (band %d, samples %u)\n", + meas_avg, b, meas_num); + + return b; +} + +/* determine the ECU codec constant for the codec used by given lchan */ +int lchan2ecu_codec(const struct gsm_lchan *lchan) +{ + const struct gsm_bts_trx_ts *ts = lchan->ts; + + switch (lchan->tch_mode) { + case GSM48_CMODE_SPEECH_V1: + if (ts_pchan(ts) == GSM_PCHAN_TCH_H) + return OSMO_ECU_CODEC_HR; + else + return OSMO_ECU_CODEC_FR; + break; + case GSM48_CMODE_SPEECH_EFR: + return OSMO_ECU_CODEC_EFR; + case GSM48_CMODE_SPEECH_AMR: + return OSMO_ECU_CODEC_AMR; + default: + return -1; } } diff --git a/src/common/power_control.c b/src/common/power_control.c index 8f5ce37..a81000e 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -421,3 +421,175 @@ state->current = new_att; return 1; } + +/* Default MS/BS Power Control parameters (see 3GPP TS 45.008, table A.1) */ +const struct gsm_power_ctrl_params power_ctrl_params_def = { + + .ctrl_interval = 1, /* Trigger loop every second SACCH block. TS 45.008 sec 4.7.1 */ + + /* Power increasing/reducing step size (optimal defaults) */ + .inc_step_size_db = 4, /* quickly increase MS/BS power */ + .red_step_size_db = 2, /* slowly decrease MS/BS power */ + + /* RxLev measurement parameters */ + .rxlev_meas = { + /* Thresholds for RxLev (see 3GPP TS 45.008, A.3.2.1) */ + .lower_thresh = 32, /* L_RXLEV_XX_P (-78 dBm) */ + .upper_thresh = 38, /* U_RXLEV_XX_P (-72 dBm) */ + + /* NOTE: only Osmocom specific EWMA is supported */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA, + .ewma.alpha = 50, /* Smoothing factor 50% */ + }, + + /* RxQual measurement parameters */ + .rxqual_meas = { + /* Thresholds for RxQual (see 3GPP TS 45.008, A.3.2.1) */ + .lower_thresh = 3, /* L_RXQUAL_XX_P (0.8% <= BER < 1.6%) */ + .upper_thresh = 0, /* U_RXQUAL_XX_P (BER < 0.2%) */ + + /* No averaging (filtering) by default. + * NOTE: only Osmocom specific EWMA is supported */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, + }, + + /* C/I measurement parameters. + * Target C/I retrieved from "GSM/EDGE: Evolution and Performance" Table 10.3. + * Set lower and upper so that (lower + upper) / 2 is equal or slightly + * above the target. + */ + .ci_fr_meas = { /* FR: Target C/I = 15 dB, Soft blocking threshold = 10 dB */ + .lower_thresh = 13, + .upper_thresh = 17, + + /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages + * out of LOWER_CMP_N averages are lower than L_CI_FR_XX_P */ + .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages + * out of UPPER_CMP_N averages are greater than L_CI_FR_XX_P */ + .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + + /* No averaging (filtering) by default */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, + + /* Hreqave: the period over which an average is produced */ + .h_reqave = 4, /* TODO: investigate a reasonable default value */ + /* Hreqt: the number of averaged results maintained */ + .h_reqt = 6, /* TODO: investigate a reasonable default value */ + }, + .ci_hr_meas = { /* HR: Target C/I = 18 dB, Soft blocking threshold = 13 dB */ + .lower_thresh = 16, + .upper_thresh = 21, + + /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages + * out of LOWER_CMP_N averages are lower than L_CI_HR_XX_P */ + .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages + * out of UPPER_CMP_N averages are greater than L_CI_HR_XX_P */ + .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + + /* No averaging (filtering) by default */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, + + /* Hreqave: the period over which an average is produced */ + .h_reqave = 4, /* TODO: investigate a reasonable default value */ + /* Hreqt: the number of averaged results maintained */ + .h_reqt = 6, /* TODO: investigate a reasonable default value */ + }, + .ci_amr_fr_meas = { /* AMR-FR: Target C/I = 9 dB, Soft blocking threshold = 4 dB */ + .lower_thresh = 7, + .upper_thresh = 11, + + /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages + * out of LOWER_CMP_N averages are lower than L_CI_AMR_FR_XX_P */ + .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages + * out of UPPER_CMP_N averages are greater than L_CI_AMR_FR_XX_P */ + .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + + /* No averaging (filtering) by default */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, + + /* Hreqave: the period over which an average is produced */ + .h_reqave = 4, /* TODO: investigate a reasonable default value */ + /* Hreqt: the number of averaged results maintained */ + .h_reqt = 6, /* TODO: investigate a reasonable default value */ + }, + .ci_amr_hr_meas = { /* AMR-HR: Target C/I = 15 dB, Soft blocking threshold = 10 dB */ + .lower_thresh = 13, + .upper_thresh = 17, + + /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages + * out of LOWER_CMP_N averages are lower than L_CI_AMR_HR_XX_P */ + .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages + * out of UPPER_CMP_N averages are greater than L_CI_AMR_HR_XX_P */ + .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + + /* No averaging (filtering) by default */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, + + /* Hreqave: the period over which an average is produced */ + .h_reqave = 4, /* TODO: investigate a reasonable default value */ + /* Hreqt: the number of averaged results maintained */ + .h_reqt = 6, /* TODO: investigate a reasonable default value */ + }, + .ci_sdcch_meas = { /* SDCCH: Target C/I = 14 dB, Soft blocking threshold = 9 dB */ + .lower_thresh = 12, + .upper_thresh = 16, + + /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages + * out of LOWER_CMP_N averages are lower than L_CI_SDCCH_XX_P */ + .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages + * out of UPPER_CMP_N averages are greater than L_CI_SDCCH_XX_P */ + .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + + /* No averaging (filtering) by default */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, + + /* Hreqave: the period over which an average is produced */ + .h_reqave = 4, /* TODO: investigate a reasonable default value */ + /* Hreqt: the number of averaged results maintained */ + .h_reqt = 6, /* TODO: investigate a reasonable default value */ + }, + .ci_gprs_meas = { /* GPRS: Target C/I = 20 dB, Soft blocking threshold = 15 dB */ + .lower_thresh = 18, + .upper_thresh = 24, + + /* Increase {UL,DL}_TXPWR if at least LOWER_CMP_P averages + * out of LOWER_CMP_N averages are lower than L_CI_GPRS_XX_P */ + .lower_cmp_p = 5, /* P3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + .lower_cmp_n = 7, /* N3 as in 3GPP TS 45.008, A.3.2.1 (case c) */ + /* Decrease {UL,DL}_TXPWR if at least UPPER_CMP_P averages + * out of UPPER_CMP_N averages are greater than L_CI_GPRS_XX_P */ + .upper_cmp_p = 15, /* P4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + .upper_cmp_n = 18, /* N4 as in 3GPP TS 45.008, A.3.2.1 (case d) */ + + /* No averaging (filtering) by default */ + .algo = GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE, + + /* Hreqave: the period over which an average is produced */ + .h_reqave = 4, /* TODO: investigate a reasonable default value */ + /* Hreqt: the number of averaged results maintained */ + .h_reqt = 6, /* TODO: investigate a reasonable default value */ + }, +}; + +void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, bool is_bs_pwr) +{ + *params = power_ctrl_params_def; + if (!is_bs_pwr) + /* Trigger loop every fourth SACCH block (1.92s). TS 45.008 sec 4.7.1: */ + params->ctrl_interval = 2; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25698 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1493f40d99f88a565f15d3e0943a512fb9b8719a Gerrit-Change-Number: 25698 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:11:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:11:53 +0000 Subject: Change in osmo-bts[master]: lchan.h: Add related ticket info to FIXME comment In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25699 ) Change subject: lchan.h: Add related ticket info to FIXME comment ...................................................................... lchan.h: Add related ticket info to FIXME comment Change-Id: I09ea92e843383d65c8033196814d345135ff918e --- M include/osmo-bts/lchan.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved dexter: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 330b0bb..b9496b9 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -99,7 +99,7 @@ LCHAN_REL_ACT_RSL, LCHAN_REL_ACT_PCU, LCHAN_REL_ACT_OML, - LCHAN_REL_ACT_REACT, /* remove once auto-activation hack is removed from opstart_compl() */ + LCHAN_REL_ACT_REACT, /* FIXME: remove once auto-activation hack is removed from opstart_compl() (OS#1575) */ }; struct gsm_rep_facch { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I09ea92e843383d65c8033196814d345135ff918e Gerrit-Change-Number: 25699 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:11:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:11:53 +0000 Subject: Change in osmo-bts[master]: Introduce gsm_lchan_release function helper In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25700 ) Change subject: Introduce gsm_lchan_release function helper ...................................................................... Introduce gsm_lchan_release function helper Change-Id: I0525beaba3c833f8d7adf9701fe373761a7720d3 --- M include/osmo-bts/lchan.h M src/common/lchan.c M src/common/rsl.c 3 files changed, 77 insertions(+), 60 deletions(-) Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index b9496b9..4cf957a 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -325,6 +325,7 @@ void gsm_lchan_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr); void gsm_lchan_name_update(struct gsm_lchan *lchan); +void gsm_lchan_release(struct gsm_lchan *lchan, enum lchan_rel_act_kind rel_kind); const char *gsm_lchans_name(enum gsm_lchan_state s); static inline char *gsm_lchan_name(const struct gsm_lchan *lchan) diff --git a/src/common/lchan.c b/src/common/lchan.c index afcb2c3..10a375e 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -20,10 +20,16 @@ */ #include + +#include + #include #include #include #include +#include +#include +#include #include static const struct value_string lchan_s_names[] = { @@ -70,6 +76,75 @@ lchan->name = name; } +static int dyn_ts_pdch_release(struct gsm_lchan *lchan) +{ + struct gsm_bts_trx_ts *ts = lchan->ts; + + if (ts->dyn.pchan_is != ts->dyn.pchan_want) { + LOGP(DRSL, LOGL_ERROR, "%s: PDCH release requested but already" + " in switchover\n", gsm_ts_and_pchan_name(ts)); + return -EINVAL; + } + + /* + * Indicate PDCH Disconnect in dyn_pdch.want, let pcu_tx_info_ind() + * pick it up and wait for PCU to disable the channel. + */ + ts->dyn.pchan_want = GSM_PCHAN_NONE; + + if (!pcu_connected()) { + /* PCU not connected yet. Just record the new type and done, + * the PCU will pick it up once connected. */ + ts->dyn.pchan_is = GSM_PCHAN_NONE; + return 1; + } + + return pcu_tx_info_ind(); +} + +void gsm_lchan_release(struct gsm_lchan *lchan, enum lchan_rel_act_kind rel_kind) +{ + int rc; + + if (lchan->abis_ip.rtp_socket) { + rsl_tx_ipac_dlcx_ind(lchan, RSL_ERR_NORMAL_UNSPEC); + osmo_rtp_socket_log_stats(lchan->abis_ip.rtp_socket, DRTP, LOGL_INFO, + "Closing RTP socket on Channel Release "); + osmo_rtp_socket_free(lchan->abis_ip.rtp_socket); + lchan->abis_ip.rtp_socket = NULL; + msgb_queue_flush(&lchan->dl_tch_queue); + } + + /* FIXME: right now we allow creating the rtp_socket even if chan is not + * activated... Once we check for that, we can move this check at the + * start of the function */ + if (lchan->state == LCHAN_S_NONE) + return; + + /* release handover state */ + handover_reset(lchan); + + lchan->rel_act_kind = rel_kind; + + /* Dynamic channel in PDCH mode is released via PCU */ + if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN + && lchan->ts->dyn.pchan_is == GSM_PCHAN_PDCH) { + rc = dyn_ts_pdch_release(lchan); + if (rc == 1) { + /* If the PCU is not connected, continue to rel ack right away. */ + lchan->rel_act_kind = LCHAN_REL_ACT_PCU; + rsl_tx_rf_rel_ack(lchan); + return; + } + /* Waiting for PDCH release */ + return; + } + + l1sap_chan_rel(lchan->ts->trx, gsm_lchan2chan_nr(lchan)); + + lapdm_channel_exit(&lchan->lapdm_ch); +} + const char *gsm_lchans_name(enum gsm_lchan_state s) { return get_value_string(lchan_s_names, s); diff --git a/src/common/rsl.c b/src/common/rsl.c index 89c3b96..f03d510 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1934,37 +1934,9 @@ return 0; } -static int dyn_ts_pdch_release(struct gsm_lchan *lchan) -{ - struct gsm_bts_trx_ts *ts = lchan->ts; - - if (ts->dyn.pchan_is != ts->dyn.pchan_want) { - LOGP(DRSL, LOGL_ERROR, "%s: PDCH release requested but already" - " in switchover\n", gsm_ts_and_pchan_name(ts)); - return -EINVAL; - } - - /* - * Indicate PDCH Disconnect in dyn_pdch.want, let pcu_tx_info_ind() - * pick it up and wait for PCU to disable the channel. - */ - ts->dyn.pchan_want = GSM_PCHAN_NONE; - - if (!pcu_connected()) { - /* PCU not connected yet. Just record the new type and done, - * the PCU will pick it up once connected. */ - ts->dyn.pchan_is = GSM_PCHAN_NONE; - return 1; - } - - return pcu_tx_info_ind(); -} - /* 8.4.14 RF CHANnel RELease is received */ static int rsl_rx_rf_chan_rel(struct gsm_lchan *lchan, uint8_t chan_nr) { - int rc; - if (lchan->state == LCHAN_S_NONE) { LOGP(DRSL, LOGL_ERROR, "%s ss=%d state=%s Rx RSL RF Channel Release, but is already inactive;" @@ -1975,38 +1947,7 @@ * not necessarily reflecting the current lchan state. */ return tx_rf_rel_ack(lchan, chan_nr); } - - if (lchan->abis_ip.rtp_socket) { - rsl_tx_ipac_dlcx_ind(lchan, RSL_ERR_NORMAL_UNSPEC); - osmo_rtp_socket_log_stats(lchan->abis_ip.rtp_socket, DRTP, LOGL_INFO, - "Closing RTP socket on Channel Release "); - osmo_rtp_socket_free(lchan->abis_ip.rtp_socket); - lchan->abis_ip.rtp_socket = NULL; - msgb_queue_flush(&lchan->dl_tch_queue); - } - - /* release handover state */ - handover_reset(lchan); - - lchan->rel_act_kind = LCHAN_REL_ACT_RSL; - - /* Dynamic channel in PDCH mode is released via PCU */ - if (lchan->ts->pchan == GSM_PCHAN_OSMO_DYN - && lchan->ts->dyn.pchan_is == GSM_PCHAN_PDCH) { - rc = dyn_ts_pdch_release(lchan); - if (rc == 1) { - /* If the PCU is not connected, continue to rel ack right away. */ - lchan->rel_act_kind = LCHAN_REL_ACT_PCU; - return rsl_tx_rf_rel_ack(lchan); - } - /* Waiting for PDCH release */ - return rc; - } - - l1sap_chan_rel(lchan->ts->trx, chan_nr); - - lapdm_channel_exit(&lchan->lapdm_ch); - + gsm_lchan_release(lchan, LCHAN_REL_ACT_RSL); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25700 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0525beaba3c833f8d7adf9701fe373761a7720d3 Gerrit-Change-Number: 25700 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:14:10 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 7 Oct 2021 12:14:10 +0000 Subject: Change in osmo-bts[master]: nm_channel_fsm: Release lchans after BTS shutdown In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25701 ) Change subject: nm_channel_fsm: Release lchans after BTS shutdown ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25701/2/src/common/nm_channel_fsm.c File src/common/nm_channel_fsm.c: https://gerrit.osmocom.org/c/osmo-bts/+/25701/2/src/common/nm_channel_fsm.c at 196 PS2, Line 196: gsm_ts_release(ts); > We might also need to release lchans of ts->vamos. [?] (unresolved / not answered, but seems like it could be done in a follow-up patch too) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I78dca32cd061fba86cc88c4c4f323b33d51c58d0 Gerrit-Change-Number: 25701 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 12:14:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:16:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:16:54 +0000 Subject: Change in osmo-bts[master]: nm_channel_fsm: Release lchans after BTS shutdown In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, neels, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25701 to look at the new patch set (#4). Change subject: nm_channel_fsm: Release lchans after BTS shutdown ...................................................................... nm_channel_fsm: Release lchans after BTS shutdown This fixes some TTCN3 tests where some lchan resources were kept from previous tests. Change-Id: I78dca32cd061fba86cc88c4c4f323b33d51c58d0 --- M include/osmo-bts/gsm_data.h M src/common/gsm_data.c M src/common/nm_channel_fsm.c 3 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/01/25701/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I78dca32cd061fba86cc88c4c4f323b33d51c58d0 Gerrit-Change-Number: 25701 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:17:37 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 7 Oct 2021 12:17:37 +0000 Subject: Change in osmo-bsc[master]: bts_trx: Fix timeslot_fsm not properly freed during trx free() [1/4] In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25693 ) Change subject: bts_trx: Fix timeslot_fsm not properly freed during trx free() [1/4] ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib0e5560efe518833f76f846d7269e82d85c186a1 Gerrit-Change-Number: 25693 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 12:17:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:18:22 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 7 Oct 2021 12:18:22 +0000 Subject: Change in osmo-bts[master]: nm_channel_fsm: Release lchans after BTS shutdown In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25701 ) Change subject: nm_channel_fsm: Release lchans after BTS shutdown ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I78dca32cd061fba86cc88c4c4f323b33d51c58d0 Gerrit-Change-Number: 25701 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 12:18:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:19:28 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 7 Oct 2021 12:19:28 +0000 Subject: Change in osmo-bsc[master]: Move global var bsc_gsmnet into libbsc [2/4] In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25707 ) Change subject: Move global var bsc_gsmnet into libbsc [2/4] ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9b287aa492ca6aae5fc56133e1510aff3146fe25 Gerrit-Change-Number: 25707 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 12:19:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:20:10 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 12:20:10 +0000 Subject: Change in osmo-bts[master]: nm_channel_fsm: Release lchans after BTS shutdown In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25701 ) Change subject: nm_channel_fsm: Release lchans after BTS shutdown ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I78dca32cd061fba86cc88c4c4f323b33d51c58d0 Gerrit-Change-Number: 25701 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 12:20:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:20:51 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 7 Oct 2021 12:20:51 +0000 Subject: Change in osmo-bsc[master]: Move ts_fsm_init to static constructor [3/4] In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25708 ) Change subject: Move ts_fsm_init to static constructor [3/4] ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0e4b95b5e73fbb3844d83ba33e66786831088e1f Gerrit-Change-Number: 25708 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 12:20:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:23:16 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 7 Oct 2021 12:23:16 +0000 Subject: Change in osmo-bsc[master]: Get rid of lots of stubs [4/4] In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25709 ) Change subject: Get rid of lots of stubs [4/4] ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic7401b8a6eb903882e30fda1cf091ac99a254ef0 Gerrit-Change-Number: 25709 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 12:23:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:24:26 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 7 Oct 2021 12:24:26 +0000 Subject: Change in osmo-bsc[master]: nm_channel_fsm: drop ipa link if SetChannelAttr fails In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25710 ) Change subject: nm_channel_fsm: drop ipa link if SetChannelAttr fails ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id4c724ef17beae4bb0918ebd1a809665b59e4861 Gerrit-Change-Number: 25710 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 12:24:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:25:14 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:25:14 +0000 Subject: Change in osmo-bsc[master]: bts_trx: Fix timeslot_fsm not properly freed during trx free() [1/4] In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25693 ) Change subject: bts_trx: Fix timeslot_fsm not properly freed during trx free() [1/4] ...................................................................... Patch Set 4: Code-Review+2 Re-adding dexter's +1 after having submitted new version with updated commit description as requested by osmith. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib0e5560efe518833f76f846d7269e82d85c186a1 Gerrit-Change-Number: 25693 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 07 Oct 2021 12:25:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:25:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:25:18 +0000 Subject: Change in osmo-bsc[master]: Move global var bsc_gsmnet into libbsc [2/4] In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25707 ) Change subject: Move global var bsc_gsmnet into libbsc [2/4] ...................................................................... Patch Set 2: Code-Review+2 Re-adding dexter's +1 after having submitted new version with updated commit description as requested by osmith. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9b287aa492ca6aae5fc56133e1510aff3146fe25 Gerrit-Change-Number: 25707 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 07 Oct 2021 12:25:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:25:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:25:22 +0000 Subject: Change in osmo-bsc[master]: Move ts_fsm_init to static constructor [3/4] In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25708 ) Change subject: Move ts_fsm_init to static constructor [3/4] ...................................................................... Patch Set 2: Code-Review+2 Re-adding dexter's +1 after having submitted new version with updated commit description as requested by osmith. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0e4b95b5e73fbb3844d83ba33e66786831088e1f Gerrit-Change-Number: 25708 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 07 Oct 2021 12:25:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:25:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:25:26 +0000 Subject: Change in osmo-bsc[master]: Get rid of lots of stubs [4/4] In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25709 ) Change subject: Get rid of lots of stubs [4/4] ...................................................................... Patch Set 3: Code-Review+2 Re-adding dexter's +1 after having submitted new version with updated commit description as requested by osmith. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic7401b8a6eb903882e30fda1cf091ac99a254ef0 Gerrit-Change-Number: 25709 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 07 Oct 2021 12:25:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:25:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:25:31 +0000 Subject: Change in osmo-bsc[master]: bts_trx: Fix timeslot_fsm not properly freed during trx free() [1/4] In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25693 ) Change subject: bts_trx: Fix timeslot_fsm not properly freed during trx free() [1/4] ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib0e5560efe518833f76f846d7269e82d85c186a1 Gerrit-Change-Number: 25693 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:25:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:25:34 +0000 Subject: Change in osmo-bsc[master]: bts_trx: Fix timeslot_fsm not properly freed during trx free() [1/4] In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25693 ) Change subject: bts_trx: Fix timeslot_fsm not properly freed during trx free() [1/4] ...................................................................... Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib0e5560efe518833f76f846d7269e82d85c186a1 Gerrit-Change-Number: 25693 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 07 Oct 2021 12:25:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:25:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:25:37 +0000 Subject: Change in osmo-bsc[master]: Move global var bsc_gsmnet into libbsc [2/4] In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25707 ) Change subject: Move global var bsc_gsmnet into libbsc [2/4] ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9b287aa492ca6aae5fc56133e1510aff3146fe25 Gerrit-Change-Number: 25707 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:25:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:25:39 +0000 Subject: Change in osmo-bsc[master]: Move global var bsc_gsmnet into libbsc [2/4] In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25707 ) Change subject: Move global var bsc_gsmnet into libbsc [2/4] ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9b287aa492ca6aae5fc56133e1510aff3146fe25 Gerrit-Change-Number: 25707 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 07 Oct 2021 12:25:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:25:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:25:41 +0000 Subject: Change in osmo-bsc[master]: Move ts_fsm_init to static constructor [3/4] In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25708 ) Change subject: Move ts_fsm_init to static constructor [3/4] ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0e4b95b5e73fbb3844d83ba33e66786831088e1f Gerrit-Change-Number: 25708 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:25:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:25:43 +0000 Subject: Change in osmo-bsc[master]: Move ts_fsm_init to static constructor [3/4] In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25708 ) Change subject: Move ts_fsm_init to static constructor [3/4] ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0e4b95b5e73fbb3844d83ba33e66786831088e1f Gerrit-Change-Number: 25708 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 07 Oct 2021 12:25:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:25:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:25:47 +0000 Subject: Change in osmo-bsc[master]: bts_trx: Fix timeslot_fsm not properly freed during trx free() [1/4] In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25693 ) Change subject: bts_trx: Fix timeslot_fsm not properly freed during trx free() [1/4] ...................................................................... bts_trx: Fix timeslot_fsm not properly freed during trx free() [1/4] osmo_fsm_inst_free() must be called explicitly, otherwise the instance is kept in the llist of instances and produces heap-use-after-free. Note: This fix is required by follow-up patches where some stubs are removed and hence some tests start using FSMs internally. Due to this bug, tests will crash due to reason explain in previous paragraph. This patch itself may introduced failures to build due to some new interdependencies being introduced in same follow-up patches mentioned above, which are in turn fixed by this present patch. So they are expected to be merged together. Change-Id: Ib0e5560efe518833f76f846d7269e82d85c186a1 --- M include/osmocom/bsc/timeslot_fsm.h M src/osmo-bsc/bts_trx.c M src/osmo-bsc/timeslot_fsm.c 3 files changed, 10 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved; Verified diff --git a/include/osmocom/bsc/timeslot_fsm.h b/include/osmocom/bsc/timeslot_fsm.h index f5e4b4c..1831537 100644 --- a/include/osmocom/bsc/timeslot_fsm.h +++ b/include/osmocom/bsc/timeslot_fsm.h @@ -45,6 +45,7 @@ void ts_fsm_init(); void ts_fsm_alloc(struct gsm_bts_trx_ts *ts); +void ts_fsm_free(struct gsm_bts_trx_ts *ts); bool ts_is_capable_of_pchan(struct gsm_bts_trx_ts *ts, enum gsm_phys_chan_config pchan); bool ts_is_capable_of_lchant(struct gsm_bts_trx_ts *ts, enum gsm_chan_t type); diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c index 9f8837b..9b90c91 100644 --- a/src/osmo-bsc/bts_trx.c +++ b/src/osmo-bsc/bts_trx.c @@ -50,6 +50,7 @@ osmo_fsm_inst_free(ts->mo.fi); ts->mo.fi = NULL; } + ts_fsm_free(ts); } return 0; } diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index adca31d..8d256bb 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -66,6 +66,14 @@ ts_fsm_update_id(ts); } +void ts_fsm_free(struct gsm_bts_trx_ts *ts) +{ + if (ts->fi) { + osmo_fsm_inst_free(ts->fi); + ts->fi = NULL; + } +} + enum lchan_sanity { LCHAN_IS_INSANE = -1, LCHAN_IS_READY_TO_GO, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib0e5560efe518833f76f846d7269e82d85c186a1 Gerrit-Change-Number: 25693 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:25:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:25:48 +0000 Subject: Change in osmo-bsc[master]: Move global var bsc_gsmnet into libbsc [2/4] In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25707 ) Change subject: Move global var bsc_gsmnet into libbsc [2/4] ...................................................................... Move global var bsc_gsmnet into libbsc [2/4] This is used inside group of files forming libbsc (shared files used by several apps). Let's instantie only once inside a file from libbsc instead of doing so on each binary. This is one further step towards fixing interdependency mess of symbols and stubs. Change-Id: I9b287aa492ca6aae5fc56133e1510aff3146fe25 --- M src/ipaccess/ipaccess-config.c M src/osmo-bsc/bsc_init.c M src/osmo-bsc/osmo_bsc_main.c M tests/bsc/bsc_test.c M tests/gsm0408/gsm0408_test.c M tests/handover/handover_test.c 6 files changed, 2 insertions(+), 9 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved; Verified diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 02501bd..741a97e 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -58,8 +58,6 @@ #include #include -struct gsm_network *bsc_gsmnet; - static int net_listen_testnr; static int restart; static bool get_attr; diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c index a85e76f..bf150cb 100644 --- a/src/osmo-bsc/bsc_init.c +++ b/src/osmo-bsc/bsc_init.c @@ -47,6 +47,8 @@ #include #include +struct gsm_network *bsc_gsmnet; + int bsc_shutdown_net(struct gsm_network *net) { struct gsm_bts *bts; diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 0ed0033..8d6901d 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -87,7 +87,6 @@ #include "../../bscconfig.h" -struct gsm_network *bsc_gsmnet = 0; static const char *config_file = "osmo-bsc.cfg"; static const char *rf_ctrl = NULL; static int daemonize = 0; diff --git a/tests/bsc/bsc_test.c b/tests/bsc/bsc_test.c index dbb547e..0cf0bc2 100644 --- a/tests/bsc/bsc_test.c +++ b/tests/bsc/bsc_test.c @@ -39,7 +39,6 @@ #include void *ctx = NULL; -struct gsm_network *bsc_gsmnet = NULL; enum test { TEST_SCAN_TO_BTS, diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 4255ab2..4017293 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -57,9 +57,6 @@ __FILE__, __LINE__, (int) res, # cmp, (int) wanted); \ } - -struct gsm_network *bsc_gsmnet = NULL; - static inline void gen(struct gsm_bts *bts, const char *s) { int r; diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index a355d3b..bd65b2f 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -58,8 +58,6 @@ void *ctx; -struct gsm_network *bsc_gsmnet; - /* override, requires '-Wl,--wrap=osmo_mgcpc_ep_ci_request'. * Catch modification of an MGCP connection. */ void __real_osmo_mgcpc_ep_ci_request(struct osmo_mgcpc_ep_ci *ci, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25707 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9b287aa492ca6aae5fc56133e1510aff3146fe25 Gerrit-Change-Number: 25707 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:25:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:25:48 +0000 Subject: Change in osmo-bsc[master]: Move ts_fsm_init to static constructor [3/4] In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25708 ) Change subject: Move ts_fsm_init to static constructor [3/4] ...................................................................... Move ts_fsm_init to static constructor [3/4] This allows having it initialized automatically, as we usually do with this type of code. As a result, tests or other apps importing libbsc don't need to take care of calling it. NOTE: This fix is required by follow-up patches where some stubs are removed and hence some tests start using FSMs internally. Since tests were not using those FSMs before, there was no need to call ts_fsm_init(). This is one further step towards fixing interdependency mess of symbols and stubs. Change-Id: I0e4b95b5e73fbb3844d83ba33e66786831088e1f --- M include/osmocom/bsc/timeslot_fsm.h M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/timeslot_fsm.c M tests/handover/handover_test.c 4 files changed, 1 insertion(+), 5 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved; Verified diff --git a/include/osmocom/bsc/timeslot_fsm.h b/include/osmocom/bsc/timeslot_fsm.h index 1831537..5e62188 100644 --- a/include/osmocom/bsc/timeslot_fsm.h +++ b/include/osmocom/bsc/timeslot_fsm.h @@ -42,8 +42,6 @@ TS_EV_PDCH_DEACT_NACK, }; -void ts_fsm_init(); - void ts_fsm_alloc(struct gsm_bts_trx_ts *ts); void ts_fsm_free(struct gsm_bts_trx_ts *ts); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 8d6901d..e8a22fe 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -979,7 +979,6 @@ /* seed the PRNG */ srand(time(NULL)); - ts_fsm_init(); lchan_fsm_init(); bsc_subscr_conn_fsm_init(); assignment_fsm_init(); diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 8d256bb..76ac1af 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -52,7 +52,7 @@ gsm_pchan_id(ts->pchan_on_init)); } -void ts_fsm_init() +static __attribute__((constructor)) void ts_fsm_init(void) { OSMO_ASSERT(osmo_fsm_register(&ts_fsm) == 0); } diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index bd65b2f..1dc7c1f 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -1626,7 +1626,6 @@ bsc_vty_init(bsc_gsmnet); ho_test_vty_init(); - ts_fsm_init(); lchan_fsm_init(); bsc_subscr_conn_fsm_init(); handover_fsm_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25708 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0e4b95b5e73fbb3844d83ba33e66786831088e1f Gerrit-Change-Number: 25708 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:25:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:25:49 +0000 Subject: Change in osmo-bsc[master]: Get rid of lots of stubs [4/4] In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25709 ) Change subject: Get rid of lots of stubs [4/4] ...................................................................... Get rid of lots of stubs [4/4] These are not needed anymore since we re-introduced libbsc, specially to avoid all this churn. Some specific methods are explicitly required to be overwritten by tests, so we specificially mark those with __attribute__((weak)) in order to be able to overwrite them. This is the last step towards fixing interdependency mess of symbols and stubs, and requires previous patches in order to have tests apssing fine. Change-Id: Ic7401b8a6eb903882e30fda1cf091ac99a254ef0 --- M src/ipaccess/ipaccess-config.c M src/ipaccess/ipaccess-proxy.c M src/ipaccess/stubs.c M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/osmo_bsc_sigtran.c M src/osmo-bsc/pcu_sock.c M src/utils/bs11_config.c M src/utils/meas_json.c M tests/abis/abis_test.c M tests/acc/acc_test.c M tests/bsc/bsc_test.c M tests/gsm0408/gsm0408_test.c M tests/handover/handover_test.c M tests/nanobts_omlattr/nanobts_omlattr_test.c 14 files changed, 23 insertions(+), 284 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c index 741a97e..ada23ea 100644 --- a/src/ipaccess/ipaccess-config.c +++ b/src/ipaccess/ipaccess-config.c @@ -1129,15 +1129,3 @@ exit(0); } - -/* Stub */ -int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ return 0; } -int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ return 0; } -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/src/ipaccess/ipaccess-proxy.c b/src/ipaccess/ipaccess-proxy.c index d676038..7ede283 100644 --- a/src/ipaccess/ipaccess-proxy.c +++ b/src/ipaccess/ipaccess-proxy.c @@ -1253,11 +1253,3 @@ osmo_select_main(0); } } - -/* Stub */ -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/src/ipaccess/stubs.c b/src/ipaccess/stubs.c index cb56105..60fa626 100644 --- a/src/ipaccess/stubs.c +++ b/src/ipaccess/stubs.c @@ -30,17 +30,3 @@ /* No TS init required here. */ return true; } - -int abis_rsl_rcvmsg(struct msgb *msg) -{ - /* No RSL handling here */ - return 0; -} - -void paging_flush_bts(struct gsm_bts *bts, struct bsc_msc_data *msc) -{ - /* No paging flushing */ -} - -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) -{} diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index a7b267d..1d71c83 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -260,7 +260,9 @@ } /* Send a BCCH_INFO message as per Chapter 8.5.1 */ -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) +/* Allow test to overwrite it */ +__attribute__((weak)) int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, + const uint8_t *data, int len) { struct abis_rsl_dchan_hdr *dh; const struct gsm_bts *bts = trx->bts; @@ -294,7 +296,8 @@ return abis_rsl_sendmsg(msg); } -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, +/* Allow test to overwrite it */ +__attribute__((weak)) int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { struct abis_rsl_common_hdr *ch; diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index d3c636d..04c2e99 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -312,7 +312,8 @@ } /* Open a new connection oriented sigtran connection */ -int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) +/* Allow test to overwrite it */ +__attribute__((weak)) int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) { struct osmo_ss7_instance *ss7; struct bsc_msc_data *msc; diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 329bab0..6f7ee77 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -263,7 +263,8 @@ return pcu_sock_send(bts, msg); } -void pcu_info_update(struct gsm_bts *bts) +/* Allow test to overwrite it */ +__attribute__((weak)) void pcu_info_update(struct gsm_bts *bts) { if (pcu_connected(bts)) pcu_tx_info_ind(bts); diff --git a/src/utils/bs11_config.c b/src/utils/bs11_config.c index c279179..e795076 100644 --- a/src/utils/bs11_config.c +++ b/src/utils/bs11_config.c @@ -974,24 +974,3 @@ exit(0); } - -/* Stub */ -int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ - return 0; -} - -/* Stub */ -int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) -{ - return 0; -} - -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} -int abis_rsl_rcvmsg(struct msgb *msg) { return 0; } -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/src/utils/meas_json.c b/src/utils/meas_json.c index 82b1e57..00b90e8 100644 --- a/src/utils/meas_json.c +++ b/src/utils/meas_json.c @@ -201,12 +201,3 @@ exit(0); } - -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} -int abis_rsl_rcvmsg(struct msgb *msg) { return 0; } -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/tests/abis/abis_test.c b/tests/abis/abis_test.c index 9d26edd..a48154b 100644 --- a/tests/abis/abis_test.c +++ b/tests/abis/abis_test.c @@ -183,16 +183,3 @@ return EXIT_SUCCESS; } - -struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { - OSMO_ASSERT(0); -} - -bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts) { return true; } -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/tests/acc/acc_test.c b/tests/acc/acc_test.c index 759ff13..6357d4b 100644 --- a/tests/acc/acc_test.c +++ b/tests/acc/acc_test.c @@ -524,8 +524,8 @@ return EXIT_SUCCESS; } -/* Whenever ACC code changes the set of barred ACCs, gsm_bts_set_system_infos() - * is called which ends up calling pcu_info_update */ +/* stub: Whenever ACC code changes the set of barred ACCs, gsm_bts_set_system_infos() + * is called which ends up calling pcu_info_update. */ void pcu_info_update(struct gsm_bts *bts) { struct gsm48_rach_control rach_control = {0}; @@ -545,15 +545,15 @@ ); } - -struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { - OSMO_ASSERT(0); -} - -bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts) { return true; } -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } +/* stub: Whenever ACC code changes the set of barred ACCs, gsm_bts_set_system_infos() + * is called which ends up calling rsl_bcch_info. We need to return success to + * have pcu_info_update() called. */ int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) { return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } + +/* stub: Whenever ACC code changes the set of barred ACCs, gsm_bts_set_system_infos() + * is called which ends up calling rsl_sacch_filling. We need to return success to + * have pcu_info_update() called. */ +int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, + const uint8_t *data, int len) +{ return 0; } diff --git a/tests/bsc/bsc_test.c b/tests/bsc/bsc_test.c index 0cf0bc2..4a97b9f 100644 --- a/tests/bsc/bsc_test.c +++ b/tests/bsc/bsc_test.c @@ -221,30 +221,3 @@ talloc_free(ctx); return 0; } - -struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { - OSMO_ASSERT(0); -} - -void bsc_sapi_n_reject(struct gsm_subscriber_connection *conn, uint8_t dlci, enum gsm0808_cause cause) {} -void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t chosen_encr) {} -int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel) -{ return 0; } -void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg) {} -void bsc_assign_compl(struct gsm_subscriber_connection *conn, uint8_t rr_cause) {} -void bsc_assign_fail(struct gsm_subscriber_connection *conn, uint8_t cause, uint8_t *rr_cause) {} -void bsc_cm_update(struct gsm_subscriber_connection *conn, - const uint8_t *cm2, uint8_t cm2_len, - const uint8_t *cm3, uint8_t cm3_len) {} -void gscon_submit_rsl_dtap(struct gsm_subscriber_connection *conn, - struct msgb *msg, int link_id, int allow_sacch) {} -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} -void lchan_activate(struct gsm_lchan *lchan, void *info) {} -bool neighbor_ident_bts_entry_exists(uint8_t from_bts) { return false; } -const char *handover_status(struct gsm_subscriber_connection *conn) { return "x"; } -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 4017293..90b294e 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -595,60 +595,3 @@ return EXIT_SUCCESS; } - -struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { - OSMO_ASSERT(0); -} - -void gscon_release_lchans(struct gsm_subscriber_connection *conn, bool do_rr_release) { - OSMO_ASSERT(0); -} - -bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts) -{ - return true; -} - -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} - -void bsc_cm_update(struct gsm_subscriber_connection *conn, - const uint8_t *cm2, uint8_t cm2_len, - const uint8_t *cm3, uint8_t cm3_len) {} - -int rsl_siemens_mrpci(struct gsm_lchan *lchan, struct rsl_mrpci *mrpci) -{ return 0; } - -int rsl_chan_mode_modify_req(struct gsm_lchan *ts) { return 0; } - -int rsl_tx_ipacc_crcx(const struct gsm_lchan *lchan) { return 0; } - -void gscon_submit_rsl_dtap(struct gsm_subscriber_connection *conn, - struct msgb *msg, int link_id, int allow_sacch) {} - -bool lchan_may_receive_data(struct gsm_lchan *lchan) { return true; } - -int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel) -{ return 0; } - -void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, - struct msgb *msg) {} - -void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, - struct msgb *msg, uint8_t chosen_encr) {} - -const char *bsc_subscr_name(struct bsc_subscr *bsub) { return NULL; } - -void lchan_release(struct gsm_lchan *lchan, bool do_rr_release, - bool err, enum gsm48_rr_cause cause_rr) {} - -int rsl_data_request(struct msgb *msg, uint8_t link_id) { return 0; } - -int rsl_encryption_cmd(struct msgb *msg) { return 0; } - -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } - -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -struct e1inp_sign_link *rsl_chan_link(const struct gsm_lchan *lchan) { return NULL; } diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 1dc7c1f..17bc048 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -1682,31 +1682,17 @@ void trau_mux_map_lchan() {} void trau_recv_lchan() {} void trau_send_frame() {} -int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *msg) { return 0; } +/* Stub */ int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) { return 0; } void bsc_sapi_n_reject(struct gsm_subscriber_connection *conn, uint8_t dlci, enum gsm0808_cause cause) {} void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t chosen_encr) {} int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel) { return 0; } -int bsc_paging_start(struct bsc_paging_params *params) -{ return 0; } void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg) {} void bsc_assign_compl(struct gsm_subscriber_connection *conn, uint8_t rr_cause) {} void bsc_cm_update(struct gsm_subscriber_connection *conn, const uint8_t *cm2, uint8_t cm2_len, const uint8_t *cm3, uint8_t cm3_len) {} -struct gsm0808_handover_required; -int bsc_tx_bssmap_ho_required(struct gsm_lchan *lchan, const struct gsm0808_cell_id_list2 *target_cells) -{ return 0; } -int bsc_tx_bssmap_ho_request_ack(struct gsm_subscriber_connection *conn, struct msgb *rr_ho_command) -{ return 0; } -int bsc_tx_bssmap_ho_detect(struct gsm_subscriber_connection *conn) { return 0; } -enum handover_result bsc_tx_bssmap_ho_complete(struct gsm_subscriber_connection *conn, - struct gsm_lchan *lchan) { return HO_RESULT_OK; } -void bsc_tx_bssmap_ho_failure(struct gsm_subscriber_connection *conn) {} -void osmo_bsc_sigtran_tx_reset(void) {} -void osmo_bsc_sigtran_tx_reset_ack(void) {} -void osmo_bsc_sigtran_reset(void) {} const char *osmo_mgcpc_ep_name(const struct osmo_mgcpc_ep *ep) { return "fake-ep"; diff --git a/tests/nanobts_omlattr/nanobts_omlattr_test.c b/tests/nanobts_omlattr/nanobts_omlattr_test.c index 73ba869..0b9f6d9 100644 --- a/tests/nanobts_omlattr/nanobts_omlattr_test.c +++ b/tests/nanobts_omlattr/nanobts_omlattr_test.c @@ -32,76 +32,7 @@ #include #include -struct gsm_bts_model bts_model_nanobts = { - .type = GSM_BTS_TYPE_NANOBTS, - .name = "nanobts", - .start = NULL, - .oml_rcvmsg = NULL, - .e1line_bind_ops = NULL, - .nm_att_tlvdef = { - .def = { - /* ip.access specifics */ - [NM_ATT_IPACC_DST_IP] = {TLV_TYPE_FIXED, 4}, - [NM_ATT_IPACC_DST_IP_PORT] = - {TLV_TYPE_FIXED, 2}, - [NM_ATT_IPACC_STREAM_ID] = {TLV_TYPE_TV,}, - [NM_ATT_IPACC_SEC_OML_CFG] = - {TLV_TYPE_FIXED, 6}, - [NM_ATT_IPACC_IP_IF_CFG] = - {TLV_TYPE_FIXED, 8}, - [NM_ATT_IPACC_IP_GW_CFG] = - {TLV_TYPE_FIXED, 12}, - [NM_ATT_IPACC_IN_SERV_TIME] = - {TLV_TYPE_FIXED, 4}, - [NM_ATT_IPACC_LOCATION] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_PAGING_CFG] = - {TLV_TYPE_FIXED, 2}, - [NM_ATT_IPACC_UNIT_ID] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_UNIT_NAME] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_SNMP_CFG] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_PRIM_OML_CFG_LIST] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_NV_FLAGS] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_FREQ_CTRL] = - {TLV_TYPE_FIXED, 2}, - [NM_ATT_IPACC_PRIM_OML_FB_TOUT] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_CUR_SW_CFG] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_TIMING_BUS] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_CGI] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_RAC] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_OBJ_VERSION] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_GPRS_PAGING_CFG] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_NSEI] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_BVCI] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_NSVCI] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_NS_CFG] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_BSSGP_CFG] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_NS_LINK_CFG] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_RLC_CFG] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_ALM_THRESH_LIST] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_MONIT_VAL_LIST] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_TIB_CONTROL] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_SUPP_FEATURES] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_CODING_SCHEMES] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_RLC_CFG_2] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_HEARTB_TOUT] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_UPTIME] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_RLC_CFG_3] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_SSL_CFG] = {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_SEC_POSSIBLE] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_IML_SSL_STATE] = - {TLV_TYPE_TL16V}, - [NM_ATT_IPACC_REVOC_DATE] = {TLV_TYPE_TL16V}, - }, - }, -}; +extern struct gsm_bts_model bts_model_nanobts; static void test_nanobts_attr_bts_get(struct gsm_bts *bts, uint8_t *expected) { @@ -323,25 +254,3 @@ talloc_free(ctx); return 0; } - -/* stubs */ -struct osmo_prim_hdr; -int bssgp_prim_cb(struct osmo_prim_hdr *oph, void *ctx) -{ - abort(); -} - -struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) { - OSMO_ASSERT(0); -} - -bool on_gsm_ts_init(struct gsm_bts_trx_ts *ts) -{ return true; } - -void ts_fsm_alloc(struct gsm_bts_trx_ts *ts) {} -int rsl_chan_ms_power_ctrl(struct gsm_lchan *lchan) { return 0; } -void pcu_info_update(struct gsm_bts *bts) {}; -int rsl_sacch_filling(struct gsm_bts_trx *trx, uint8_t type, const uint8_t *data, int len) { return 0; } -int rsl_bcch_info(const struct gsm_bts_trx *trx, enum osmo_sysinfo_type si_type, const uint8_t *data, int len) -{ return 0; } -int gsm_generate_si(struct gsm_bts *bts, enum osmo_sysinfo_type si_type) { return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25709 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic7401b8a6eb903882e30fda1cf091ac99a254ef0 Gerrit-Change-Number: 25709 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:25:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:25:56 +0000 Subject: Change in osmo-bsc[master]: nm_channel_fsm: drop ipa link if SetChannelAttr fails In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25710 ) Change subject: nm_channel_fsm: drop ipa link if SetChannelAttr fails ...................................................................... nm_channel_fsm: drop ipa link if SetChannelAttr fails Now that we solved all the interdependency symbol mess, we can finally enable call to this function. Change-Id: Id4c724ef17beae4bb0918ebd1a809665b59e4861 --- M src/osmo-bsc/nm_channel_fsm.c 1 file changed, 2 insertions(+), 10 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/nm_channel_fsm.c b/src/osmo-bsc/nm_channel_fsm.c index 31b8c03..52ff437 100644 --- a/src/osmo-bsc/nm_channel_fsm.c +++ b/src/osmo-bsc/nm_channel_fsm.c @@ -95,16 +95,8 @@ if (!ts->mo.set_attr_sent && !ts->mo.set_attr_ack_received) { ts->mo.set_attr_sent = true; ccomb = abis_nm_chcomb4pchan(ts->pchan_from_config); - if (abis_nm_set_channel_attr(ts, ccomb) == -EINVAL) { - /* FIXME: using this here makes crazy lots of .o - dependencies be fulled in, ending up in - osmo_bsc_main.o which conficts due to containing its - own main() */ - LOGPFSML(ts->mo.fi, LOGL_ERROR, - "FIXME: Here OML link should br dropped, " - "something is wrong in your setup!\n"); - //ipaccess_drop_oml_deferred(trx->bts); - } + if (abis_nm_set_channel_attr(ts, ccomb) == -EINVAL) + ipaccess_drop_oml_deferred(trx->bts); } if (state->administrative != NM_STATE_UNLOCKED && !ts->mo.adm_unlock_sent) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id4c724ef17beae4bb0918ebd1a809665b59e4861 Gerrit-Change-Number: 25710 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:26:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:26:04 +0000 Subject: Change in osmo-bts[master]: nm_channel_fsm: Release lchans after BTS shutdown In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25701 ) Change subject: nm_channel_fsm: Release lchans after BTS shutdown ...................................................................... nm_channel_fsm: Release lchans after BTS shutdown This fixes some TTCN3 tests where some lchan resources were kept from previous tests. Change-Id: I78dca32cd061fba86cc88c4c4f323b33d51c58d0 --- M include/osmo-bts/gsm_data.h M src/common/gsm_data.c M src/common/nm_channel_fsm.c 3 files changed, 15 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 85f9089..ad0f78d 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -194,4 +194,6 @@ bool ts_is_pdch(const struct gsm_bts_trx_ts *ts); +void gsm_ts_release(struct gsm_bts_trx_ts *ts); + #endif /* _GSM_DATA_H */ diff --git a/src/common/gsm_data.c b/src/common/gsm_data.c index 2edeb4d..4446958 100644 --- a/src/common/gsm_data.c +++ b/src/common/gsm_data.c @@ -305,3 +305,13 @@ return false; } } + +void gsm_ts_release(struct gsm_bts_trx_ts *ts) +{ + unsigned int ln; + + for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) { + struct gsm_lchan *lchan = &ts->lchan[ln]; + gsm_lchan_release(lchan, LCHAN_REL_ACT_OML); + } +} diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index f933a16..6456005 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -193,6 +193,9 @@ oml_mo_state_chg(&ts->mo, -1, -1, NM_STATE_SHUTDOWN); break; case NM_EV_SHUTDOWN_FINISH: + gsm_ts_release(ts); + if (ts->vamos.peer) + gsm_ts_release(ts->vamos.peer); nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_NOTINSTALLED); break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25701 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I78dca32cd061fba86cc88c4c4f323b33d51c58d0 Gerrit-Change-Number: 25701 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:34:13 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 12:34:13 +0000 Subject: Change in osmo-bts[master]: rsl_tx_rf_res(): separate interference AVG / band calculation References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25712 ) Change subject: rsl_tx_rf_res(): separate interference AVG / band calculation ...................................................................... rsl_tx_rf_res(): separate interference AVG / band calculation It's cleaner from the architectural point of view to have the interference measurements processed in a separate function. Change-Id: I3981608e01a50585359cad673c38c8a305027d30 Related: SYS#5313 --- M include/osmo-bts/lchan.h M src/common/l1sap.c M src/common/lchan.c M src/common/rsl.c 4 files changed, 43 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/12/25712/1 diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 4cf957a..9f22ce1 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -226,8 +226,10 @@ uint16_t toa256_std_dev; } ext; /* Interference levels reported by PHY (in dBm) */ + int16_t interf_meas_avg_dbm; /* Average value */ int16_t interf_meas_dbm[31]; /* Intave max is 31 */ uint8_t interf_meas_num; + uint8_t interf_band; } meas; struct { struct amr_multirate_conf amr_mr; @@ -339,7 +341,7 @@ enum gsm_phys_chan_config as_pchan); void gsm_lchan_interf_meas_push(struct gsm_lchan *lchan, int dbm); -int gsm_lchan_interf_meas_calc_band(struct gsm_lchan *lchan); +void gsm_lchan_interf_meas_calc_avg(struct gsm_lchan *lchan); int lchan2ecu_codec(const struct gsm_lchan *lchan); diff --git a/src/common/l1sap.c b/src/common/l1sap.c index a48287c..5c58aff 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -591,6 +591,29 @@ return rach_frames_expired; } +static void l1sap_interf_meas_calc_avg(struct gsm_bts_trx *trx) +{ + unsigned int tn, ln; + + for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { + struct gsm_bts_trx_ts *ts = &trx->ts[tn]; + + for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) { + struct gsm_lchan *lchan = &ts->lchan[ln]; + + lchan->meas.interf_meas_avg_dbm = 0; + lchan->meas.interf_band = 0; + + /* There must be at least one sample */ + if (lchan->meas.interf_meas_num == 0) + continue; + + /* Average all collected samples */ + gsm_lchan_interf_meas_calc_avg(lchan); + } + } +} + static void l1sap_interf_meas_report(struct gsm_bts *bts) { const uint32_t period = bts->interference.intave * 104; @@ -601,8 +624,12 @@ if (bts->gsm_time.fn % period != 0) return; - llist_for_each_entry(trx, &bts->trx_list, list) + llist_for_each_entry(trx, &bts->trx_list, list) { + /* Calculate the average of all received samples */ + l1sap_interf_meas_calc_avg(trx); + /* Report to the BSC over the A-bis/RSL */ rsl_tx_rf_res(trx); + } } /* time information received from bts model */ diff --git a/src/common/lchan.c b/src/common/lchan.c index 10a375e..f7ee33b 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -348,15 +348,14 @@ } /* Called by the higher layers every Intave * 104 TDMA frames */ -int gsm_lchan_interf_meas_calc_band(struct gsm_lchan *lchan) +void gsm_lchan_interf_meas_calc_avg(struct gsm_lchan *lchan) { const uint8_t meas_num = lchan->meas.interf_meas_num; const struct gsm_bts *bts = lchan->ts->trx->bts; int b, meas_avg, meas_sum = 0; /* There must be at least one sample */ - if (meas_num == 0) - return -EAGAIN; + OSMO_ASSERT(meas_num > 0); /* Calculate the sum of all collected samples (in -x dBm) */ while (lchan->meas.interf_meas_num) { @@ -377,7 +376,8 @@ "Interference AVG: %ddBm (band %d, samples %u)\n", meas_avg, b, meas_num); - return b; + lchan->meas.interf_meas_avg_dbm = meas_avg; + lchan->meas.interf_band = b; } /* determine the ECU codec constant for the codec used by given lchan */ diff --git a/src/common/rsl.c b/src/common/rsl.c index f03d510..2e453d3 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -440,29 +440,25 @@ uint8_t *len = msgb_tl_put(nmsg, RSL_IE_RESOURCE_INFO); for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { - struct gsm_bts_trx_ts *ts = &trx->ts[tn]; + const struct gsm_bts_trx_ts *ts = &trx->ts[tn]; for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) { - struct gsm_lchan *lchan = &ts->lchan[ln]; + const struct gsm_lchan *lchan = &ts->lchan[ln]; + + /* No average interference value => no band */ + if (lchan->meas.interf_meas_avg_dbm == 0) + continue; /* We're not interested in active lchans */ - if (lchan->state == LCHAN_S_ACTIVE) { - /* Avoid potential buffer overflow */ - lchan->meas.interf_meas_num = 0; + if (lchan->state == LCHAN_S_ACTIVE) continue; - } /* Only for GSM_LCHAN_{SDCCH,TCH_F,TCH_H} */ if (!lchan_is_dcch(lchan)) continue; - /* Average all collected samples */ - int band = gsm_lchan_interf_meas_calc_band(lchan); - if (band < 0) - continue; - msgb_v_put(nmsg, gsm_lchan2chan_nr_rsl(lchan)); - msgb_v_put(nmsg, (band & 0x07) << 5); + msgb_v_put(nmsg, (lchan->meas.interf_band & 0x07) << 5); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3981608e01a50585359cad673c38c8a305027d30 Gerrit-Change-Number: 25712 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:34:13 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 12:34:13 +0000 Subject: Change in osmo-bts[master]: rsl_tx_rf_res(): also report noise levels for PTDCH References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25713 ) Change subject: rsl_tx_rf_res(): also report noise levels for PTDCH ...................................................................... rsl_tx_rf_res(): also report noise levels for PTDCH Change-Id: I5b4d1da0920e788ac8063cc765fe5b0223c76758 Related: SYS#5313 --- M src/common/rsl.c 1 file changed, 13 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/13/25713/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 2e453d3..df8c007 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -449,13 +449,20 @@ if (lchan->meas.interf_meas_avg_dbm == 0) continue; - /* We're not interested in active lchans */ - if (lchan->state == LCHAN_S_ACTIVE) + /* Only for GSM_LCHAN_{SDCCH,TCH_F,TCH_H,PDTCH} */ + switch (lchan->type) { + case GSM_LCHAN_SDCCH: + case GSM_LCHAN_TCH_F: + case GSM_LCHAN_TCH_H: + /* We're not interested in active CS lchans */ + if (lchan->state == LCHAN_S_ACTIVE) + continue; + break; + case GSM_LCHAN_PDTCH: + break; + default: continue; - - /* Only for GSM_LCHAN_{SDCCH,TCH_F,TCH_H} */ - if (!lchan_is_dcch(lchan)) - continue; + } msgb_v_put(nmsg, gsm_lchan2chan_nr_rsl(lchan)); msgb_v_put(nmsg, (lchan->meas.interf_band & 0x07) << 5); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5b4d1da0920e788ac8063cc765fe5b0223c76758 Gerrit-Change-Number: 25713 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:34:14 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 12:34:14 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: report PDCH interference levels to L1SAP References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25714 ) Change subject: osmo-bts-trx: report PDCH interference levels to L1SAP ...................................................................... osmo-bts-trx: report PDCH interference levels to L1SAP Starting from [1], interference levels on PDCH timeslots are also reported over the A-bis/RSL. They may be useful for the BSC to determine whether dynamic PDCH timeslots might be better used for new circuit switched connections, or whether alternative PDCH slots should be allocated for interference reasons. * Handle GSM_LCHAN_PDTCH in lchan_report_interf_meas(). * Rework pcu_tx_interf_ind() to accept 'struct gsm_bts_trx'. * Call pcu_tx_interf_ind() from l1sap_interf_meas_report(). Regarding pcu_tx_interf_ind(), it's better to call this function from the upper layers once, rather than calling it from various places in the model specific code. [1] I5b4d1da0920e788ac8063cc765fe5b0223c76758 Change-Id: I3fbaad5dbc3bbd305b3ad4cb4bfb431a42cfbffc Related: SYS#5313 --- M include/osmo-bts/pcu_if.h M src/common/l1sap.c M src/common/pcu_sock.c M src/osmo-bts-trx/scheduler_trx.c 4 files changed, 65 insertions(+), 71 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/14/25714/1 diff --git a/include/osmo-bts/pcu_if.h b/include/osmo-bts/pcu_if.h index 12a8abc..bc30f34 100644 --- a/include/osmo-bts/pcu_if.h +++ b/include/osmo-bts/pcu_if.h @@ -19,8 +19,7 @@ int16_t qta, uint16_t ra, uint32_t fn, uint8_t is_11bit, enum ph_burst_type burst_type, uint8_t sapi); int pcu_tx_time_ind(uint32_t fn); -int pcu_tx_interf_ind(uint8_t bts_nr, uint8_t trx_nr, uint32_t fn, - const uint8_t *pdch_interf); +int pcu_tx_interf_ind(const struct gsm_bts_trx *trx, uint32_t fn); int pcu_tx_pag_req(const uint8_t *identity_lv, uint8_t chan_needed); int pcu_tx_pch_data_cnf(uint32_t fn, uint8_t *data, uint8_t len); int pcu_tx_susp_req(struct gsm_lchan *lchan, uint32_t tlli, const uint8_t *ra_id, uint8_t cause); diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 5c58aff..2b539d7 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -629,6 +629,8 @@ l1sap_interf_meas_calc_avg(trx); /* Report to the BSC over the A-bis/RSL */ rsl_tx_rf_res(trx); + /* Report to the PCU over the PCUIF */ + pcu_tx_interf_ind(trx, bts->gsm_time.fn); } } diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 03f1a05..f8a0f55 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -559,23 +559,31 @@ return pcu_sock_send(&bts_gsmnet, msg); } -int pcu_tx_interf_ind(uint8_t bts_nr, uint8_t trx_nr, uint32_t fn, - const uint8_t *pdch_interf) +int pcu_tx_interf_ind(const struct gsm_bts_trx *trx, uint32_t fn) { struct gsm_pcu_if_interf_ind *interf_ind; struct gsm_pcu_if *pcu_prim; struct msgb *msg; + unsigned int tn; - msg = pcu_msgb_alloc(PCU_IF_MSG_INTERF_IND, bts_nr); + msg = pcu_msgb_alloc(PCU_IF_MSG_INTERF_IND, trx->bts->nr); if (!msg) return -ENOMEM; pcu_prim = (struct gsm_pcu_if *) msg->data; interf_ind = &pcu_prim->u.interf_ind; - interf_ind->trx_nr = trx_nr; + interf_ind->trx_nr = trx->nr; interf_ind->fn = fn; - memcpy(&interf_ind->interf[0], &pdch_interf[0], - sizeof(interf_ind->interf)); + + for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { + const struct gsm_bts_trx_ts *ts = &trx->ts[tn]; + const struct gsm_lchan *lchan = &ts->lchan[0]; + + if (ts_pchan(ts) != GSM_PCHAN_PDCH) + continue; + + interf_ind->interf[tn] = -1 * lchan->meas.interf_meas_avg_dbm; + } return pcu_sock_send(&bts_gsmnet, msg); } diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 0a907fb..6136b14 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -54,84 +54,69 @@ #define SCHED_FH_PARAMS_VALS(ts) \ (ts)->hopping.hsn, (ts)->hopping.maio, (ts)->hopping.arfcn_num -static void ts_report_interf_meas(const struct gsm_bts_trx_ts *ts) +static void lchan_report_interf_meas(const struct gsm_lchan *lchan) { + const struct gsm_bts_trx_ts *ts = lchan->ts; const struct l1sched_ts *l1ts = ts->priv; - unsigned int ln; + enum trx_chan_type dcch, acch; + int interf_avg; - for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) { - const struct gsm_lchan *lchan = &ts->lchan[ln]; - enum trx_chan_type dcch, acch; - int interf_avg; - - /* We're not interested in active channels */ - if (lchan->state == LCHAN_S_ACTIVE) - continue; - - switch (lchan->type) { - case GSM_LCHAN_SDCCH: - if (ts->pchan == GSM_PCHAN_CCCH_SDCCH4 || - ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) { - dcch = TRXC_SDCCH4_0 + ln; - acch = TRXC_SACCH4_0 + ln; - } else { /* SDCCH/8 otherwise */ - dcch = TRXC_SDCCH8_0 + ln; - acch = TRXC_SACCH8_0 + ln; - } - break; - case GSM_LCHAN_TCH_F: - dcch = TRXC_TCHF; - acch = TRXC_SACCHTF; - break; - case GSM_LCHAN_TCH_H: - dcch = TRXC_TCHH_0 + ln; - acch = TRXC_SACCHTH_0 + ln; - break; - default: - /* Skip other lchan types */ - continue; - } - - OSMO_ASSERT(dcch < ARRAY_SIZE(l1ts->chan_state)); - OSMO_ASSERT(acch < ARRAY_SIZE(l1ts->chan_state)); - - interf_avg = (l1ts->chan_state[dcch].meas.interf_avg + - l1ts->chan_state[acch].meas.interf_avg) / 2; - - gsm_lchan_interf_meas_push((struct gsm_lchan *) lchan, interf_avg); + /* We're not interested in active CS channels */ + if (lchan->state == LCHAN_S_ACTIVE) { + if (lchan->type != GSM_LCHAN_PDTCH) + return; } + + switch (lchan->type) { + case GSM_LCHAN_SDCCH: + if (ts->pchan == GSM_PCHAN_CCCH_SDCCH4 || + ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) { + dcch = TRXC_SDCCH4_0 + lchan->nr; + acch = TRXC_SACCH4_0 + lchan->nr; + } else { /* SDCCH/8 otherwise */ + dcch = TRXC_SDCCH8_0 + lchan->nr; + acch = TRXC_SACCH8_0 + lchan->nr; + } + break; + case GSM_LCHAN_TCH_F: + dcch = TRXC_TCHF; + acch = TRXC_SACCHTF; + break; + case GSM_LCHAN_TCH_H: + dcch = TRXC_TCHH_0 + lchan->nr; + acch = TRXC_SACCHTH_0 + lchan->nr; + break; + case GSM_LCHAN_PDTCH: + /* We use idle TDMA frames on PDCH */ + dcch = TRXC_IDLE; + acch = TRXC_IDLE; + break; + default: + /* Skip other lchan types */ + return; + } + + OSMO_ASSERT(dcch < ARRAY_SIZE(l1ts->chan_state)); + OSMO_ASSERT(acch < ARRAY_SIZE(l1ts->chan_state)); + + interf_avg = (l1ts->chan_state[dcch].meas.interf_avg + + l1ts->chan_state[acch].meas.interf_avg) / 2; + + gsm_lchan_interf_meas_push((struct gsm_lchan *) lchan, interf_avg); } static void bts_report_interf_meas(const struct gsm_bts *bts, const uint32_t fn) { const struct gsm_bts_trx *trx; + unsigned int tn, ln; llist_for_each_entry(trx, &bts->trx_list, list) { - uint8_t pdch_interf[8] = { 0 }; - unsigned int tn, pdch_num = 0; - for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { const struct gsm_bts_trx_ts *ts = &trx->ts[tn]; - const struct l1sched_ts *l1ts = ts->priv; - const struct l1sched_chan_state *l1cs; - - /* PS interference reports for the PCU */ - if (ts_pchan(ts) == GSM_PCHAN_PDCH) { - l1cs = &l1ts->chan_state[TRXC_IDLE]; - /* Interference value is encoded as -x dBm */ - pdch_interf[tn] = -1 * l1cs->meas.interf_avg; - pdch_num++; - continue; - } - - /* CS interference reports for the BSC */ - ts_report_interf_meas(ts); + for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) + lchan_report_interf_meas(&ts->lchan[ln]); } - - /* Report interference levels on PDCH to the PCU */ - if (pdch_num > 0) - pcu_tx_interf_ind(bts->nr, trx->nr, fn, pdch_interf); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3fbaad5dbc3bbd305b3ad4cb4bfb431a42cfbffc Gerrit-Change-Number: 25714 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:42:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:42:42 +0000 Subject: Change in osmo-bts[master]: rsl_tx_rf_res(): separate interference AVG / band calculation In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25712 ) Change subject: rsl_tx_rf_res(): separate interference AVG / band calculation ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3981608e01a50585359cad673c38c8a305027d30 Gerrit-Change-Number: 25712 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 07 Oct 2021 12:42:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:43:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 12:43:21 +0000 Subject: Change in osmo-bts[master]: rsl_tx_rf_res(): also report noise levels for PTDCH In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25713 ) Change subject: rsl_tx_rf_res(): also report noise levels for PTDCH ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5b4d1da0920e788ac8063cc765fe5b0223c76758 Gerrit-Change-Number: 25713 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 07 Oct 2021 12:43:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 12:45:31 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 7 Oct 2021 12:45:31 +0000 Subject: Change in osmo-ggsn[master]: Introduce program gtp-echo-responder In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 ) Change subject: Introduce program gtp-echo-responder ...................................................................... Patch Set 7: Code-Review+1 (3 comments) https://gerrit.osmocom.org/c/osmo-ggsn/+/25652/6/utils/gtp_echo_responder.c File utils/gtp_echo_responder.c: https://gerrit.osmocom.org/c/osmo-ggsn/+/25652/6/utils/gtp_echo_responder.c at 106 PS6, Line 106: " Some useful help...\n" How about: "arguments:\n" https://gerrit.osmocom.org/c/osmo-ggsn/+/25652/6/utils/gtp_echo_responder.c at 109 PS6, Line 109: " -l --listen-addr Listend address for GTPCv1 and GTPCv2\n" > "Listen" (typo). ... or maybe "Address to listen on for ... [?] (still unresolved) https://gerrit.osmocom.org/c/osmo-ggsn/+/25652/6/utils/gtp_echo_responder.c at 128 PS6, Line 128: arg == end) { > if arg should not contain trailing characters after the bitmask, you should also add '|| *end', i.e. [?] (still unresolved) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibdd6d8f6920571db0c60cf8b3b25d541b15ad3f1 Gerrit-Change-Number: 25652 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 12:45:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 14:30:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 14:30:10 +0000 Subject: Change in osmo-bts[master]: nm_bts_fsm: Reset si_valid bitmask when BTS is shut down References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25715 ) Change subject: nm_bts_fsm: Reset si_valid bitmask when BTS is shut down ...................................................................... nm_bts_fsm: Reset si_valid bitmask when BTS is shut down Otherwise after reconnecting some SI are still marked as valid despite the new BSC conn didn't set them. Change-Id: I71e2a5cdf4e2e287db7b05df1a165a1e32c958ca --- M src/common/nm_bts_fsm.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/15/25715/1 diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index 0ad7655..d2c48fb 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -150,6 +150,8 @@ case NM_EV_SHUTDOWN_FINISH: /* Propagate event to children: */ ev_dispatch_children(bts, event); + /* Reset state: */ + bts->si_valid = 0; nm_bts_fsm_state_chg(fi, NM_BTS_ST_OP_DISABLED_NOTINSTALLED); break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I71e2a5cdf4e2e287db7b05df1a165a1e32c958ca Gerrit-Change-Number: 25715 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 16:15:38 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 7 Oct 2021 16:15:38 +0000 Subject: Change in osmo-bts[master]: Power-Loop: Fix LOG when Keeping MS Power level at the same level. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25694 ) Change subject: Power-Loop: Fix LOG when Keeping MS Power level at the same level. ...................................................................... Patch Set 2: > Patch Set 2: > > > OK, I don't see how it makes sense to print the power level we "request", when we are not actually "requesting" anything. > > For sure we are. I don't get you. When we hit the code path that logs the message in question then we return and we DO NOT exec any of: /* store the resulting new MS power level in the lchan */ state->current = new_power_lvl; bts_model_adjst_ms_pwr(lchan); So nothing changes. the values -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I002b708cfda60371f57e32617e7ee33cb41c42f7 Gerrit-Change-Number: 25694 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 16:15:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 16:18:50 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 7 Oct 2021 16:18:50 +0000 Subject: Change in osmo-bts[master]: Power-Loop: Fix LOG when Keeping MS Power level at the same level. In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25694 ) Change subject: Power-Loop: Fix LOG when Keeping MS Power level at the same level. ...................................................................... Patch Set 2: Hit send too early. It's not so important. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I002b708cfda60371f57e32617e7ee33cb41c42f7 Gerrit-Change-Number: 25694 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 16:18:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 16:18:53 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 7 Oct 2021 16:18:53 +0000 Subject: Change in osmo-bts[master]: Power-Loop: Fix LOG when Keeping MS Power level at the same level. In-Reply-To: References: Message-ID: keith has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25694 ) Change subject: Power-Loop: Fix LOG when Keeping MS Power level at the same level. ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I002b708cfda60371f57e32617e7ee33cb41c42f7 Gerrit-Change-Number: 25694 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 16:33:24 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 16:33:24 +0000 Subject: Change in osmo-pcu[master]: tests: RLCMACTest: Add one more sample RA capabilities to suite In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25706 ) Change subject: tests: RLCMACTest: Add one more sample RA capabilities to suite ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5d986f68395326f894349446194090b1ddaecd69 Gerrit-Change-Number: 25706 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 07 Oct 2021 16:33:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 16:38:40 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 16:38:40 +0000 Subject: Change in osmo-bts[master]: Power-Loop: Fix LOG when Keeping MS Power level at the same level. In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25694 ) Change subject: Power-Loop: Fix LOG when Keeping MS Power level at the same level. ...................................................................... Patch Set 2: > Patch Set 2: > > > Patch Set 2: > > > > > OK, I don't see how it makes sense to print the power level we "request", when we are not actually "requesting" anything. > > > > For sure we are. > > I don't get you. When we hit the code path that logs the message in question then we return and we DO NOT exec any of: > > /* store the resulting new MS power level in the lchan */ > state->current = new_power_lvl; > bts_model_adjst_ms_pwr(lchan); > > So nothing changes. the values Nothing changes, hence we (the BTS does) keep requesting the same value to be applied by the MS (the same it used to request). In any case, I raised a possible improvement over the current state, feel free to submit the patch, otherwise I may do so whnever I find some time. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25694 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I002b708cfda60371f57e32617e7ee33cb41c42f7 Gerrit-Change-Number: 25694 Gerrit-PatchSet: 2 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 07 Oct 2021 16:38:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 16:42:00 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 16:42:00 +0000 Subject: Change in osmo-bts[master]: rsl: prevent race condition during timeslot re-configuration In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25674 to look at the new patch set (#4). Change subject: rsl: prevent race condition during timeslot re-configuration ...................................................................... rsl: prevent race condition during timeslot re-configuration It may happen that the BSC requests logical channel activation on a dynamic timeslot, which is in a process of switching from one pchan type to another due to a preceding channel activation request. In this case 'struct gsm_bts_trx_ts' already holds an msgb with the preceding RSL CHANnel ACTIVation message, that is normally handled once the PHY completes the process of timeslot re-configuration. On receipt of subsequent RSL CHANnel ACTIVation messages, in function dyn_ts_l1_reconnect() we overwrite the preceeding msgb (memleak), by the most recent one. And once the timeslot re-configuration is done, only the most recent CHANnel ACTIVation message gets ACKed. In order to avoid this, let's move the msgb ownership to 'struct gsm_lchan', so it cannot be overwritten by the CHANnel ACTIVation message that is related to a different lchan on the same timeslot. Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Related: I3b602ac9dbe0ab3e80eb30de573c9b48a79872d8 Fixes: OS#5245 --- M include/osmo-bts/gsm_data.h M include/osmo-bts/lchan.h M src/common/rsl.c 3 files changed, 22 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/74/25674/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Gerrit-Change-Number: 25674 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 17:05:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 17:05:56 +0000 Subject: Change in osmo-bts[master]: rsl: prevent race condition during timeslot re-configuration In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25674 ) Change subject: rsl: prevent race condition during timeslot re-configuration ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Gerrit-Change-Number: 25674 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Thu, 07 Oct 2021 17:05:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 17:26:26 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 17:26:26 +0000 Subject: Change in osmo-bts[master]: .gitignore: add tests/amr/amr_test References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25717 ) Change subject: .gitignore: add tests/amr/amr_test ...................................................................... .gitignore: add tests/amr/amr_test Change-Id: Id1f8710f0d6b7511fff6ab221e6ec974a94c6f8b Fixes: I94a934a6b3b397b4cd0e9da3577325de58814335 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/17/25717/1 diff --git a/.gitignore b/.gitignore index f76bdac..2e6351d 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ tests/atconfig tests/package.m4 +tests/amr/amr_test tests/agch/agch_test tests/paging/paging_test tests/cipher/cipher_test -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id1f8710f0d6b7511fff6ab221e6ec974a94c6f8b Gerrit-Change-Number: 25717 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 18:25:40 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 18:25:40 +0000 Subject: Change in osmo-bts[master]: nm_bts_fsm: Reset si_valid bitmask when BTS is shut down In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25715 ) Change subject: nm_bts_fsm: Reset si_valid bitmask when BTS is shut down ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I71e2a5cdf4e2e287db7b05df1a165a1e32c958ca Gerrit-Change-Number: 25715 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 18:25:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 18:27:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 18:27:55 +0000 Subject: Change in osmo-pcu[master]: rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25718 ) Change subject: rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in MS RA cap ...................................................................... rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in MS RA cap Related spec: 3GPP TS 24.008 Table 10.5.146 Change-Id: I61b41e06b54024254c71242ffa2206e4eada8559 --- M src/gsm_rlcmac.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/18/25718/1 diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c index a3342cb..e4ff0f8 100644 --- a/src/gsm_rlcmac.c +++ b/src/gsm_rlcmac.c @@ -842,8 +842,8 @@ static const CSN_DESCR_BEGIN (DownlinkDualCarrierCapability_r7_t) - M_NEXT_EXIST (DownlinkDualCarrierCapability_r7_t, MultislotCapabilityReductionForDL_DualCarrier, 1), - M_UINT (DownlinkDualCarrierCapability_r7_t, DL_DualCarrierForDTM, 3), + M_UINT (DownlinkDualCarrierCapability_r7_t, MultislotCapabilityReductionForDL_DualCarrier, 3), + M_UINT (DownlinkDualCarrierCapability_r7_t, DL_DualCarrierForDTM, 1), CSN_DESCR_END (DownlinkDualCarrierCapability_r7_t) static const -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I61b41e06b54024254c71242ffa2206e4eada8559 Gerrit-Change-Number: 25718 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 18:29:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 18:29:24 +0000 Subject: Change in osmo-pcu[master]: rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25718 ) Change subject: rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in MS RA cap ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I61b41e06b54024254c71242ffa2206e4eada8559 Gerrit-Change-Number: 25718 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 07 Oct 2021 18:29:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 18:38:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 7 Oct 2021 18:38:38 +0000 Subject: Change in osmo-pcu[master]: rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25718 ) Change subject: rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in MS RA cap ...................................................................... Patch Set 1: @osmith, the linter clearly doesn't apply to that file, since it has special formatting for the CSN1 enc/dec, and we inherited it from wireshark code base (and we still backport changed back and forth). -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I61b41e06b54024254c71242ffa2206e4eada8559 Gerrit-Change-Number: 25718 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 07 Oct 2021 18:38:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 19:00:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 19:00:20 +0000 Subject: Change in osmo-bsc[master]: rsl_rx_resource_indication(): check result of rsl_tlv_parse() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25719 ) Change subject: rsl_rx_resource_indication(): check result of rsl_tlv_parse() ...................................................................... rsl_rx_resource_indication(): check result of rsl_tlv_parse() Change-Id: I3b4758f80f2cd87e22bd3617e189f12403461ea3 Related: SYS#5313 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/19/25719/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 1d71c83..0e2ffc6 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1514,9 +1514,7 @@ struct gsm_bts_trx *trx = sign_link->trx; struct gsm_lchan *lchan; int ts_nr; - int i; - - rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)); + int rc, i; LOGP(DRSL, LOGL_DEBUG, "%s Rx Resource Indication\n", gsm_trx_name(trx)); @@ -1530,6 +1528,12 @@ } } + rc = rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)); + if (rc < 0) { + LOGP(DRSL, LOGL_ERROR, "Rx Resource Indication: failed to parse the message\n"); + return -EINVAL; + } + res_info_ie = TLVP_GET(&tp, RSL_IE_RESOURCE_INFO); if (!res_info_ie) { LOGP(DRSL, LOGL_ERROR, "Rx Resource Indication: missing Resource Info IE\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b4758f80f2cd87e22bd3617e189f12403461ea3 Gerrit-Change-Number: 25719 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 19:00:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 19:00:21 +0000 Subject: Change in osmo-bsc[master]: rsl_lchan_lookup(): fix handling of ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25720 ) Change subject: rsl_lchan_lookup(): fix handling of ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH ...................................................................... rsl_lchan_lookup(): fix handling of ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH If an RF Resource Indication message includes interference band(s) for 'pure' PDCH (i.e. not dynamic) timeslot(s), osmo-bsc logs: DRSL DEBUG abis_rsl.c:1515 (bts=0,trx=0) Rx Resource Indication DRSL ERROR bts_trx.c:236 (bts=0,trx=0) chan_nr 0xc7 cbits 0x18: (bts=0,trx=0,ts=7,pchan=PDCH,state=UNUSED) is not GSM_PCHAN_OSMO_DYN DRSL ERROR abis_rsl.c:141 (bts=0,trx=0,ts=7,pchan=PDCH,state=UNUSED) Abis RSL Rx Resource Indication: mismatching chan_nr=0xc7 Let's better check if a timeslot is capable of GSM_PCHAN_PDCH, rather than checking if it's GSM_PCHAN_OSMO_DYN. Change-Id: I2cac4acd4c5145c5c525c9952fdc754477ce0942 Related: SYS#5313 --- M src/osmo-bsc/bts_trx.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/20/25720/1 diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c index 9b90c91..f30c748 100644 --- a/src/osmo-bsc/bts_trx.c +++ b/src/osmo-bsc/bts_trx.c @@ -232,9 +232,9 @@ break; case ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH: lch_idx = 0; - ok = (ts->pchan_on_init == GSM_PCHAN_OSMO_DYN); + ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_PDCH); if (!ok) - LOG_TRX(trx, DRSL, LOGL_ERROR, "chan_nr 0x%x cbits 0x%x: %s is not GSM_PCHAN_OSMO_DYN\n", + LOG_TRX(trx, DRSL, LOGL_ERROR, "chan_nr 0x%x cbits 0x%x: %s is not capable of GSM_PCHAN_PDCH\n", chan_nr, cbits, gsm_ts_and_pchan_name(ts)); break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2cac4acd4c5145c5c525c9952fdc754477ce0942 Gerrit-Change-Number: 25720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 19:15:00 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 19:15:00 +0000 Subject: Change in osmo-bts[master]: rsl_tx_rf_res(): also report noise levels for PTDCH In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25713 to look at the new patch set (#2). Change subject: rsl_tx_rf_res(): also report noise levels for PTDCH ...................................................................... rsl_tx_rf_res(): also report noise levels for PTDCH This information may be useful for the BSC to determine whether dynamic PDCH timeslots might be better used for new circuit switched connections, or whether alternative PDCH slots should be allocated for interference reasons. Change-Id: I5b4d1da0920e788ac8063cc765fe5b0223c76758 Related: SYS#5313 --- M src/common/rsl.c 1 file changed, 13 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/13/25713/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5b4d1da0920e788ac8063cc765fe5b0223c76758 Gerrit-Change-Number: 25713 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 19:15:03 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 19:15:03 +0000 Subject: Change in osmo-bts[master]: l1sap: check if BTS model supports interference reporting References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25721 ) Change subject: l1sap: check if BTS model supports interference reporting ...................................................................... l1sap: check if BTS model supports interference reporting Currently, only osmo-bts-trx is capable of reporting the interference levels to L1SAP. Thus it does not make sense to trigger the averaging logic and send empty reports over the A-bis/RSL and the PCUIF. Change-Id: Ic17eb46bdca3c33ac4d6e560a093b635b75424a5 Related: SYS#5313 --- M include/osmo-bts/bts.h M src/common/l1sap.c M src/osmo-bts-trx/main.c 3 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/21/25721/1 diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index fab7f96..4683758 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -62,6 +62,8 @@ /* Whether the BTS model requires RadioCarrier MO to be in Enabled state * (OPSTARTed) before OPSTARTing the RadioChannel MOs. See OS#5157 */ #define BTS_INTERNAL_FLAG_NM_RCHANNEL_DEPENDS_RCARRIER (1 << 2) +/* Whether the BTS model reports interference measurements to L1SAP. */ +#define BTS_INTERNAL_FLAG_INTERF_MEAS (1 << 3) /* BTS implementation flags (internal use, not exposed via OML) */ #define bts_internal_flag_get(bts, flag) \ diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 2b539d7..f5d2364 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -667,7 +667,8 @@ } /* Report interference levels to the BSC */ - l1sap_interf_meas_report(bts); + if (bts_internal_flag_get(bts, BTS_INTERNAL_FLAG_INTERF_MEAS)) + l1sap_interf_meas_report(bts); return 0; } diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index e31597b..5d680f0 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -151,6 +151,7 @@ osmo_bts_set_feature(bts->features, BTS_FEAT_ACCH_TEMP_OVP); bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB); + bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_INTERF_MEAS); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic17eb46bdca3c33ac4d6e560a093b635b75424a5 Gerrit-Change-Number: 25721 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 19:15:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 19:15:04 +0000 Subject: Change in osmo-bts[master]: vty: show interference level / band in 'show lchan' References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25722 ) Change subject: vty: show interference level / band in 'show lchan' ...................................................................... vty: show interference level / band in 'show lchan' Change-Id: Ide45a0f7836bf35ffbe88070fa8367022311ca44 Related: SYS#5313 --- M src/common/vty.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/22/25722/1 diff --git a/src/common/vty.c b/src/common/vty.c index f99881a..576835b 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1830,6 +1830,14 @@ vty_out(vty, " RTP/PDCH Loopback Enabled%s", VTY_NEWLINE); vty_out(vty, " Radio Link Failure Counter 'S': %d%s", lchan->s, VTY_NEWLINE); + /* Interference levels */ + if (lchan->meas.interf_meas_avg_dbm != 0) { + vty_out(vty, " Interference: %d dBm (band %d)%s", + lchan->meas.interf_meas_avg_dbm, + lchan->meas.interf_band, + VTY_NEWLINE); + } + /* BS/MS Power Control state and parameters */ lchan_bs_power_ctrl_state_dump(vty, 2, lchan); lchan_ms_power_ctrl_state_dump(vty, 2, lchan); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ide45a0f7836bf35ffbe88070fa8367022311ca44 Gerrit-Change-Number: 25722 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 7 19:15:29 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 7 Oct 2021 19:15:29 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: report PDCH interference levels to L1SAP In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25714 ) Change subject: osmo-bts-trx: report PDCH interference levels to L1SAP ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3fbaad5dbc3bbd305b3ad4cb4bfb431a42cfbffc Gerrit-Change-Number: 25714 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 07 Oct 2021 19:15:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:14:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:14:48 +0000 Subject: Change in osmo-bts[master]: nm_bts_fsm: Reset si_valid bitmask when BTS is shut down In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25715 ) Change subject: nm_bts_fsm: Reset si_valid bitmask when BTS is shut down ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I71e2a5cdf4e2e287db7b05df1a165a1e32c958ca Gerrit-Change-Number: 25715 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 08 Oct 2021 05:14:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:14:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:14:51 +0000 Subject: Change in osmo-bts[master]: nm_bts_fsm: Reset si_valid bitmask when BTS is shut down In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25715 ) Change subject: nm_bts_fsm: Reset si_valid bitmask when BTS is shut down ...................................................................... nm_bts_fsm: Reset si_valid bitmask when BTS is shut down Otherwise after reconnecting some SI are still marked as valid despite the new BSC conn didn't set them. Change-Id: I71e2a5cdf4e2e287db7b05df1a165a1e32c958ca --- M src/common/nm_bts_fsm.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index 0ad7655..d2c48fb 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -150,6 +150,8 @@ case NM_EV_SHUTDOWN_FINISH: /* Propagate event to children: */ ev_dispatch_children(bts, event); + /* Reset state: */ + bts->si_valid = 0; nm_bts_fsm_state_chg(fi, NM_BTS_ST_OP_DISABLED_NOTINSTALLED); break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I71e2a5cdf4e2e287db7b05df1a165a1e32c958ca Gerrit-Change-Number: 25715 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:15:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:15:32 +0000 Subject: Change in osmo-bts[master]: rsl_tx_rf_res(): separate interference AVG / band calculation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25712 ) Change subject: rsl_tx_rf_res(): separate interference AVG / band calculation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3981608e01a50585359cad673c38c8a305027d30 Gerrit-Change-Number: 25712 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 05:15:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:16:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:16:47 +0000 Subject: Change in osmo-bts[master]: rsl_tx_rf_res(): also report noise levels for PTDCH In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25713 ) Change subject: rsl_tx_rf_res(): also report noise levels for PTDCH ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25713/2//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/25713/2//COMMIT_MSG at 7 PS2, Line 7: PTDCH PDTCH -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5b4d1da0920e788ac8063cc765fe5b0223c76758 Gerrit-Change-Number: 25713 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 05:16:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:17:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:17:27 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: report PDCH interference levels to L1SAP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25714 ) Change subject: osmo-bts-trx: report PDCH interference levels to L1SAP ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3fbaad5dbc3bbd305b3ad4cb4bfb431a42cfbffc Gerrit-Change-Number: 25714 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 08 Oct 2021 05:17:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:17:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:17:45 +0000 Subject: Change in osmo-bts[master]: l1sap: check if BTS model supports interference reporting In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25721 ) Change subject: l1sap: check if BTS model supports interference reporting ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic17eb46bdca3c33ac4d6e560a093b635b75424a5 Gerrit-Change-Number: 25721 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 08 Oct 2021 05:17:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:18:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:18:31 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: report PDCH interference levels to L1SAP In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25714 ) Change subject: osmo-bts-trx: report PDCH interference levels to L1SAP ...................................................................... Patch Set 2: what about other BTS models like osmo-bts-sysmo? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3fbaad5dbc3bbd305b3ad4cb4bfb431a42cfbffc Gerrit-Change-Number: 25714 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 08 Oct 2021 05:18:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:18:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:18:46 +0000 Subject: Change in osmo-bts[master]: vty: show interference level / band in 'show lchan' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25722 ) Change subject: vty: show interference level / band in 'show lchan' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ide45a0f7836bf35ffbe88070fa8367022311ca44 Gerrit-Change-Number: 25722 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 08 Oct 2021 05:18:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:19:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:19:32 +0000 Subject: Change in osmo-bsc[master]: rsl_rx_resource_indication(): check result of rsl_tlv_parse() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25719 ) Change subject: rsl_rx_resource_indication(): check result of rsl_tlv_parse() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b4758f80f2cd87e22bd3617e189f12403461ea3 Gerrit-Change-Number: 25719 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 08 Oct 2021 05:19:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:19:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:19:47 +0000 Subject: Change in osmo-bsc[master]: rsl_lchan_lookup(): fix handling of ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25720 ) Change subject: rsl_lchan_lookup(): fix handling of ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2cac4acd4c5145c5c525c9952fdc754477ce0942 Gerrit-Change-Number: 25720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 08 Oct 2021 05:19:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:20:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:20:12 +0000 Subject: Change in osmo-pcu[master]: tests: RLCMACTest: Add one more sample RA capabilities to suite In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25706 ) Change subject: tests: RLCMACTest: Add one more sample RA capabilities to suite ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5d986f68395326f894349446194090b1ddaecd69 Gerrit-Change-Number: 25706 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 08 Oct 2021 05:20:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:20:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:20:51 +0000 Subject: Change in osmo-pcu[master]: rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25718 ) Change subject: rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in MS RA cap ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I61b41e06b54024254c71242ffa2206e4eada8559 Gerrit-Change-Number: 25718 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 08 Oct 2021 05:20:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:20:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:20:53 +0000 Subject: Change in osmo-pcu[master]: rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in... In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25718 ) Change subject: rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in MS RA cap ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I61b41e06b54024254c71242ffa2206e4eada8559 Gerrit-Change-Number: 25718 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:21:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:21:30 +0000 Subject: Change in osmo-bts[master]: .gitignore: add tests/amr/amr_test In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25717 ) Change subject: .gitignore: add tests/amr/amr_test ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id1f8710f0d6b7511fff6ab221e6ec974a94c6f8b Gerrit-Change-Number: 25717 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 05:21:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:21:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:21:32 +0000 Subject: Change in osmo-bts[master]: .gitignore: add tests/amr/amr_test In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25717 ) Change subject: .gitignore: add tests/amr/amr_test ...................................................................... .gitignore: add tests/amr/amr_test Change-Id: Id1f8710f0d6b7511fff6ab221e6ec974a94c6f8b Fixes: I94a934a6b3b397b4cd0e9da3577325de58814335 --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index f76bdac..2e6351d 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ tests/atconfig tests/package.m4 +tests/amr/amr_test tests/agch/agch_test tests/paging/paging_test tests/cipher/cipher_test -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25717 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id1f8710f0d6b7511fff6ab221e6ec974a94c6f8b Gerrit-Change-Number: 25717 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:22:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:22:41 +0000 Subject: Change in osmo-bts[master]: rsl: prevent race condition during timeslot re-configuration In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25674 ) Change subject: rsl: prevent race condition during timeslot re-configuration ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Gerrit-Change-Number: 25674 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-CC: osmith Gerrit-Comment-Date: Fri, 08 Oct 2021 05:22:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:23:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:23:08 +0000 Subject: Change in osmo-bts[master]: rsl: prevent race condition during timeslot re-configuration In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25674 ) Change subject: rsl: prevent race condition during timeslot re-configuration ...................................................................... rsl: prevent race condition during timeslot re-configuration It may happen that the BSC requests logical channel activation on a dynamic timeslot, which is in a process of switching from one pchan type to another due to a preceding channel activation request. In this case 'struct gsm_bts_trx_ts' already holds an msgb with the preceding RSL CHANnel ACTIVation message, that is normally handled once the PHY completes the process of timeslot re-configuration. On receipt of subsequent RSL CHANnel ACTIVation messages, in function dyn_ts_l1_reconnect() we overwrite the preceeding msgb (memleak), by the most recent one. And once the timeslot re-configuration is done, only the most recent CHANnel ACTIVation message gets ACKed. In order to avoid this, let's move the msgb ownership to 'struct gsm_lchan', so it cannot be overwritten by the CHANnel ACTIVation message that is related to a different lchan on the same timeslot. Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Related: I3b602ac9dbe0ab3e80eb30de573c9b48a79872d8 Fixes: OS#5245 --- M include/osmo-bts/gsm_data.h M include/osmo-bts/lchan.h M src/common/rsl.c 3 files changed, 22 insertions(+), 19 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index ad0f78d..dcb357f 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -83,7 +83,6 @@ struct { enum gsm_phys_chan_config pchan_is; enum gsm_phys_chan_config pchan_want; - struct msgb *pending_chan_activ; } dyn; unsigned int flags; diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 4cf957a..fdb3144 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -278,6 +278,8 @@ int s; /* Kind of the release/activation. E.g. RSL or PCU */ enum lchan_rel_act_kind rel_act_kind; + /* Pending RSL CHANnel ACTIVation message */ + struct msgb *pending_chan_activ; /* RTP header Marker bit to indicate beginning of speech after pause */ bool rtp_tx_marker; diff --git a/src/common/rsl.c b/src/common/rsl.c index f03d510..229a2af 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1523,7 +1523,7 @@ * Store the CHAN_ACTIV msg, connect the L1 timeslot in the proper type and * then invoke rsl_rx_chan_activ() with msg. */ -static int dyn_ts_l1_reconnect(struct gsm_bts_trx_ts *ts, struct msgb *msg) +static int dyn_ts_l1_reconnect(struct gsm_bts_trx_ts *ts) { DEBUGP(DRSL, "%s dyn_ts_l1_reconnect\n", gsm_ts_and_pchan_name(ts)); @@ -1544,9 +1544,6 @@ return -EINVAL; } - /* We will feed this back to rsl_rx_chan_activ() later */ - ts->dyn.pending_chan_activ = msg; - /* Disconnect, continue connecting from cb_ts_disconnected(). */ DEBUGP(DRSL, "%s Disconnect\n", gsm_ts_and_pchan_name(ts)); return bts_model_ts_disconnect(ts); @@ -1652,9 +1649,12 @@ * mode than this activation needs it to be. * Re-connect, then come back to rsl_rx_chan_activ(). */ - rc = dyn_ts_l1_reconnect(ts, msg); + rc = dyn_ts_l1_reconnect(ts); if (rc) return rsl_tx_chan_act_nack(lchan, RSL_ERR_NORMAL_UNSPEC); + /* will be fed back to rsl_rx_chan_activ() later */ + OSMO_ASSERT(lchan->pending_chan_activ == NULL); + lchan->pending_chan_activ = msg; /* indicate that the msgb should not be freed. */ return 1; } @@ -3181,8 +3181,7 @@ static void osmo_dyn_ts_connected(struct gsm_bts_trx_ts *ts, int rc) { - struct msgb *msg = ts->dyn.pending_chan_activ; - ts->dyn.pending_chan_activ = NULL; + unsigned int ln; if (rc) { LOGP(DRSL, LOGL_NOTICE, "%s PDCH ACT OSMO operation failed (%d) in bts model\n", @@ -3191,20 +3190,23 @@ return; } - if (!msg) { - LOGP(DRSL, LOGL_ERROR, - "%s TS re-connected, but no chan activ msg pending\n", - gsm_ts_and_pchan_name(ts)); - return; - } - ts->dyn.pchan_is = ts->dyn.pchan_want; DEBUGP(DRSL, "%s Connected\n", gsm_ts_and_pchan_name(ts)); - /* continue where we left off before re-connecting the TS. */ - rc = rsl_rx_chan_activ(msg); - if (rc != 1) - msgb_free(msg); + /* Handle postponed RSL CHANnel ACTIVation messages (if any) */ + for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) { + struct gsm_lchan *lchan = &ts->lchan[ln]; + + if (lchan->pending_chan_activ == NULL) + continue; + + struct msgb *msg = lchan->pending_chan_activ; + lchan->pending_chan_activ = NULL; + + /* Continue where we left off before re-connecting the TS */ + if (rsl_rx_chan_activ(msg) != 1) + msgb_free(msg); + } } void cb_ts_connected(struct gsm_bts_trx_ts *ts, int rc) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia625c2827fca883ea712076706d5ef21ed793ba6 Gerrit-Change-Number: 25674 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-CC: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:25:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:25:15 +0000 Subject: Change in osmo-ggsn[master]: Introduce program gtp-echo-responder In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 ) Change subject: Introduce program gtp-echo-responder ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibdd6d8f6920571db0c60cf8b3b25d541b15ad3f1 Gerrit-Change-Number: 25652 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 08 Oct 2021 05:25:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:25:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:25:45 +0000 Subject: Change in osmo-ggsn[master]: Introduce program gtp-echo-responder In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 ) Change subject: Introduce program gtp-echo-responder ...................................................................... Patch Set 7: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibdd6d8f6920571db0c60cf8b3b25d541b15ad3f1 Gerrit-Change-Number: 25652 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 08 Oct 2021 05:25:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:25:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:25:48 +0000 Subject: Change in osmo-ggsn[master]: Introduce program gtp-echo-responder In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 ) Change subject: Introduce program gtp-echo-responder ...................................................................... Introduce program gtp-echo-responder This is a small standalone program (under MIT license, hence cannot make use of libosmocore) whose only purpose is to answer GTPC (v1 and v2) Echo Request messages with Echo Reply ones, with information provided from the command line. A small python script companion is provided to easily test the program. Related: SYS#5598 Change-Id: Ibdd6d8f6920571db0c60cf8b3b25d541b15ad3f1 --- M Makefile.am M configure.ac M contrib/osmo-ggsn.spec.in M debian/control M debian/copyright A debian/gtp-echo-responder.install A utils/Makefile.am A utils/gtp_echo_responder.c A utils/gtp_echo_responder_test.py 9 files changed, 619 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved; Verified osmith: Looks good to me, but someone else must approve diff --git a/Makefile.am b/Makefile.am index f431bd9..7fb2529 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = lib gtp ggsn sgsnemu doc contrib tests +SUBDIRS = lib gtp ggsn sgsnemu doc contrib utils tests pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libgtp.pc diff --git a/configure.ac b/configure.ac index 2cf44fc..cfc9f21 100644 --- a/configure.ac +++ b/configure.ac @@ -257,6 +257,7 @@ lib/Makefile intl/Makefile po/Makefile + utils/Makefile sgsnemu/Makefile doc/manuals/Makefile contrib/Makefile diff --git a/contrib/osmo-ggsn.spec.in b/contrib/osmo-ggsn.spec.in index 6d55af8..bee8fc1 100644 --- a/contrib/osmo-ggsn.spec.in +++ b/contrib/osmo-ggsn.spec.in @@ -61,6 +61,15 @@ This subpackage contains libraries and header files for developing applications that want to make use of libgtp. +%package -n gtp-echo-responder +Summary: Small program answering GTP ECHO Request with GTP ECHO Response +License: MIT +Group: System/Libraries + +%description -n gtp-echo-responder +Small program answering GTP ECHO Request with GTP ECHO Response for both GTPCv1 +and GTPCv2. + %prep %setup -q @@ -122,4 +131,7 @@ %{_libdir}/libgtp.so %{_libdir}/pkgconfig/libgtp.pc +%files -n gtp-echo-responder +%{_bindir}/gtp-echo-responder + %changelog diff --git a/debian/control b/debian/control index bbffd49..6d5cde5 100644 --- a/debian/control +++ b/debian/control @@ -38,6 +38,12 @@ This library is part of OsmoGGSN and implements the GTP protocol between SGSN (Serving GPRS support node) and GGSN. +Package: gtp-echo-responder +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Small program answering GTP ECHO Request with GTP ECHO Response + Package: libgtp-dev Architecture: any Multi-Arch: same @@ -63,6 +69,15 @@ operators as the interface between the Internet and the rest of the mobile network infrastructure. +Package: gtp-echo-responder-dbg +Section: debug +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, ${misc:Depends}, gtp-echo-responder (= ${binary:Version}) +Multi-Arch: same +Description: Debug symbols for gtp-echo-responder + Small program answering GTP ECHO Request with GTP ECHO Response. + Package: libgtp-dbg Section: debug Architecture: any diff --git a/debian/copyright b/debian/copyright index e2a4b2d..034c84d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -16,6 +16,11 @@ Copyright: 1987-2001 Free Software Foundation, Inc. License: LGPL-2.1+ +Files: utils/gtp_echo_responder.c + utils/gtp_echo_responder_test.py +Copyright: 2021 sysmocom - s.f.m.c. GmbH +License: MIT + Files: debian/* Copyright: 2010-2017 Harald Welte 2016 Ruben Undheim diff --git a/debian/gtp-echo-responder.install b/debian/gtp-echo-responder.install new file mode 100644 index 0000000..1d6d96f --- /dev/null +++ b/debian/gtp-echo-responder.install @@ -0,0 +1 @@ +/usr/bin/gtp-echo-responder diff --git a/utils/Makefile.am b/utils/Makefile.am new file mode 100644 index 0000000..7ba0ff4 --- /dev/null +++ b/utils/Makefile.am @@ -0,0 +1,3 @@ +bin_PROGRAMS = gtp-echo-responder + +gtp_echo_responder_SOURCES = gtp_echo_responder.c diff --git a/utils/gtp_echo_responder.c b/utils/gtp_echo_responder.c new file mode 100644 index 0000000..e077c81 --- /dev/null +++ b/utils/gtp_echo_responder.c @@ -0,0 +1,470 @@ +/* + * MIT License + * + * Copyright (c) 2021 by sysmocom - s.f.m.c. GmbH + * Author: Pau Espin Pedrol + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/* For more info see: + * 3GPP TS 29.060 (GTPv1 and GTPv0) + * 3GPP TS 29.274 (GTPv2C) + */ + +#include "../config.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define GTP1C_PORT 2123 +#define GTP_MSGTYPE_ECHO_REQ 1 +#define GTP_MSGTYPE_ECHO_RSP 2 +#define GTP1C_IE_RECOVERY 14 +#define GTP2C_IE_RECOVERY 3 +#define GTP2C_IE_NODE_FEATURES 152 + +struct gtp1_hdr { +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + uint8_t pn:1, s:1, e:1, spare:1, pt:1, version:3; +#else + uint8_t version:3, pt:1, spare:1, e:1, s:1, pn:1; +#endif + uint8_t type; + uint16_t length; + uint32_t tei; + uint16_t seq; + uint8_t npdu; + uint8_t next; +} __attribute__((packed)); + +struct gtp2_hdr { +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + uint8_t reserved:3, t:1, p:1, version:3; +#else + uint8_t version:3, p:1, t:1, reserved:1; +#endif + uint8_t type; + uint16_t length; +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + uint32_t reserved2:8, seq:24; +#else + uint8_t seq:24, reserved2:1; +#endif +} __attribute__((packed)); + +struct gtp_echo_resp_state { + struct { + char laddr[INET6_ADDRSTRLEN]; + uint8_t recovery_ctr; + uint8_t node_features; + } cfg; + struct sockaddr_storage laddr_gtpc; + int fd_gtpc; +}; + +struct gtp_echo_resp_state *g_st; + +static void print_usage(void) +{ + printf("Usage: gtp-echo-responder [-h] [-V] [-l listen_addr]\n"); +} + +static void print_help(void) +{ + printf(" Some useful help...\n" + " -h --help This help text\n" + " -V --version Print the version of gtp-echo-responder\n" + " -l --listen-addr Listend address for GTPCv1 and GTPCv2\n" + " -R --recovery-counter GTP Recovery Counter to transmit in GTP Echo Response message\n" + " -n --node-features GTPCv2 Node Features bitmask to transmit in GTP Echo Response message\n" + ); +} + +static void print_version(void) +{ + printf("gtp-echo-responder version %s\n", PACKAGE_VERSION); +} + +static uint8_t parse_node_features_mask(const char *arg) +{ + unsigned long res; + char *end; + errno = 0; + + res = strtoul(arg, &end, 0); + if ((errno == ERANGE && res == ULONG_MAX) || (errno && !res) || + arg == end) { + fprintf(stderr, "Failed parsing Node Features bitmask: '%s'\n", arg); + exit(1); + } + if (res > 0xff) { + fprintf(stderr, "Failed parsing Node Features bitmask: '%s' > 0xFF\n", arg); + exit(1); + } + return (uint8_t)res; +} +static void handle_options(int argc, char **argv) +{ + while (1) { + int option_index = 0, c; + static struct option long_options[] = { + { "help", 0, 0, 'h' }, + { "version", 0, 0, 'V' }, + { "listen-addr", 1, 0, 'l'}, + { "recovery-counter", 1, 0, 'R'}, + { "node-features", 1, 0, 'N'}, + { 0, 0, 0, 0 } + }; + + c = getopt_long(argc, argv, "hVl:R:N:", long_options, &option_index); + if (c == -1) + break; + + switch (c) { + case 'h': + print_usage(); + print_help(); + exit(0); + case 'V': + print_version(); + exit(0); + break; + case 'l': + strncpy(&g_st->cfg.laddr[0], optarg, sizeof(g_st->cfg.laddr)); + g_st->cfg.laddr[sizeof(g_st->cfg.laddr) - 1] = '\0'; + break; + case 'R': + g_st->cfg.recovery_ctr = (uint8_t)atoi(optarg); + break; + case 'N': + g_st->cfg.node_features = parse_node_features_mask(optarg); + break; + } + } +} + +static int init_socket(void) +{ + struct in_addr addr; + struct in6_addr addr6; + struct sockaddr_in *saddr; + struct sockaddr_in6 *saddr6; + int family; + + if (inet_pton(AF_INET6, g_st->cfg.laddr, &addr6) == 1) { + family = AF_INET6; + saddr6 = (struct sockaddr_in6 *)&g_st->laddr_gtpc; + saddr6->sin6_family = family; + saddr6->sin6_port = htons(GTP1C_PORT); + memcpy(&saddr6->sin6_addr, &addr6, sizeof(addr6)); + } else if (inet_pton(AF_INET, g_st->cfg.laddr, &addr) == 1) { + family = AF_INET; + saddr = (struct sockaddr_in *)&g_st->laddr_gtpc; + saddr->sin_family = family; + saddr->sin_port = htons(GTP1C_PORT); + memcpy(&saddr->sin_addr, &addr, sizeof(addr)); + } else { + fprintf(stderr, "Failed parsing address %s\n", g_st->cfg.laddr); + return -1; + } + + if ((g_st->fd_gtpc = socket(family, SOCK_DGRAM, 0)) < 0) { + fprintf(stderr, "socket() failed: %s\n", strerror(errno)); + return -2; + } + + if (bind(g_st->fd_gtpc, (struct sockaddr *)&g_st->laddr_gtpc, sizeof(g_st->laddr_gtpc)) < 0) { + fprintf(stderr, "bind() failed: %s\n", strerror(errno)); + return -3; + } + + return 0; +} + +static const char *sockaddr2str(const struct sockaddr *saddr) +{ + static char _rem_addr_str[INET6_ADDRSTRLEN]; + struct sockaddr_in *saddr4; + struct sockaddr_in6 *saddr6; + + switch (saddr->sa_family) { + case AF_INET6: + saddr6 = (struct sockaddr_in6 *)saddr; + if (!inet_ntop(saddr6->sin6_family, &saddr6->sin6_addr, _rem_addr_str, sizeof(_rem_addr_str))) + strcpy(_rem_addr_str, "unknown"); + return _rem_addr_str; + case AF_INET: + saddr4 = (struct sockaddr_in *)saddr; + if (!inet_ntop(saddr4->sin_family, &saddr4->sin_addr, _rem_addr_str, sizeof(_rem_addr_str))) + strcpy(_rem_addr_str, "unknown"); + return _rem_addr_str; + default: + strcpy(_rem_addr_str, "unknown-family"); + return _rem_addr_str; + } +} + +static int write_cb(int fd, const uint8_t *buf, size_t buf_len, const struct sockaddr *rem_saddr) +{ + ssize_t rc; + + rc = sendto(fd, buf, buf_len, 0, rem_saddr, sizeof(struct sockaddr_storage)); + if (rc < 0) { + fprintf(stderr, "sendto() failed: %s\n", strerror(errno)); + return -1; + } + if (rc != buf_len) { + fprintf(stderr, "sendto() short write: %zd vs exp %zu\n", rc, buf_len); + return -1; + } + return 0; +} + +static int gen_gtpc1_echo_rsp(uint8_t *buf, struct gtp1_hdr *echo_req) +{ + int offset = 0; + struct gtp1_hdr *echo_rsp = (struct gtp1_hdr *)buf; + unsigned exp_hdr_len = (echo_req->s || echo_req->pn || echo_req->e) ? 12 : 8; + + memcpy(echo_rsp, echo_req, exp_hdr_len); + echo_rsp->type = GTP_MSGTYPE_ECHO_RSP; + offset = exp_hdr_len; + buf[offset++] = GTP1C_IE_RECOVERY; + buf[offset++] = g_st->cfg.recovery_ctr; + + /* Update Length */ + echo_rsp->length = htons(offset - 8); + return offset; +} + +static int gen_gtpc2_echo_rsp(uint8_t *buf, struct gtp2_hdr *echo_req) +{ + int offset = 0; + struct gtp1_hdr *echo_rsp = (struct gtp1_hdr *)buf; + unsigned exp_hdr_len = 8; + + memcpy(echo_rsp, echo_req, exp_hdr_len); + echo_rsp->type = GTP_MSGTYPE_ECHO_RSP; + offset = exp_hdr_len; + + /* 3GPP TS 29.274 sec 8.5 Recovery (Restart Counter) */ + buf[offset++] = GTP2C_IE_RECOVERY; + buf[offset++] = 0; /* IE Length (high) */ + buf[offset++] = 1; /* IE Length (low) */ + buf[offset++] = 0; /* Spare=0 | Instance=0 (Table 7.1.1-1) */ + buf[offset++] = g_st->cfg.recovery_ctr; + + /* 3GPP TS 29.274 sec 8.83 Node Features */ + if (g_st->cfg.node_features > 0) { + buf[offset++] = GTP2C_IE_NODE_FEATURES; + buf[offset++] = 0; /* IE Length (high) */ + buf[offset++] = 1; /* IE Length (low) */ + buf[offset++] = 0; /* Spare=0 | Instance=0 (Table 7.1.1-1) */ + buf[offset++] = g_st->cfg.node_features; + } + + /* Update Length */ + echo_rsp->length = htons(offset - 4); + return offset; +} + +static int rx_gtpc1_echo_req(struct gtp1_hdr *echo_req, unsigned buf_len, const struct sockaddr *rem_saddr) +{ + int rc; + const size_t tx_buf_len = buf_len + 128; /* Leave some extra room */ + uint8_t *tx_buf = alloca(tx_buf_len); + + printf("Rx GTPCv1_ECHO_REQ from %s, Tx GTPCv1_ECHO_RSP\n", sockaddr2str(rem_saddr)); + + memset(tx_buf, 0, tx_buf_len); + rc = gen_gtpc1_echo_rsp(tx_buf, echo_req); + return write_cb(g_st->fd_gtpc, tx_buf, rc, rem_saddr); +} + +static int rx_gtpc1(struct gtp1_hdr *hdr, unsigned buf_len, const struct sockaddr *rem_saddr) +{ + unsigned exp_hdr_len = (hdr->s || hdr->pn || hdr->e) ? 12 : 8; + unsigned pdu_len; + + if (buf_len < exp_hdr_len) { + fprintf(stderr, "GTPCv1 packet size smaller than header! %u < exp %u\n", buf_len, exp_hdr_len); + return -1; + } + + pdu_len = ntohs(hdr->length); + if (buf_len < 8 + pdu_len) { + fprintf(stderr, "GTPCv1 packet size smaller than announced! %u < exp %u\n", buf_len, 8 + pdu_len); + return -1; + } + + if (hdr->pt != 1) { + fprintf(stderr, "GTPCv1 Protocol Type GTP' not supported!\n"); + return -1; + } + + switch (hdr->type) { + case GTP_MSGTYPE_ECHO_REQ: + return rx_gtpc1_echo_req(hdr, buf_len, rem_saddr); + default: + fprintf(stderr, "Silently ignoring unexpected packet of type %u\n", hdr->type); + return 0; + } +} + +static int rx_gtpc2_echo_req(struct gtp2_hdr *echo_req, unsigned buf_len, const struct sockaddr *rem_saddr) +{ + int rc; + const size_t tx_buf_len = buf_len + 128; /* Leave some extra room */ + uint8_t *tx_buf = alloca(tx_buf_len); + + if (echo_req->t) { + fprintf(stderr, "GTPCv2 ECHO message should contain T=0!\n"); + return -1; + } + + printf("Rx GTPCv2_ECHO_REQ from %s, Tx GTPCv2_ECHO_RSP\n", sockaddr2str(rem_saddr)); + + memset(tx_buf, 0, tx_buf_len); + rc = gen_gtpc2_echo_rsp(tx_buf, echo_req); + return write_cb(g_st->fd_gtpc, tx_buf, rc, rem_saddr); +} + +static int rx_gtpc2(struct gtp2_hdr *hdr, unsigned buf_len, const struct sockaddr *rem_saddr) +{ + unsigned exp_hdr_len = hdr->t ? 12 : 8; + unsigned pdu_len; + + if (hdr->p) { + fprintf(stderr, "GTPCv2 piggybacked message not supported!\n"); + return -1; + } + + if (buf_len < exp_hdr_len) { + fprintf(stderr, "GTPCv2 packet size smaller than header! %u < exp %u\n", buf_len, exp_hdr_len); + return -1; + } + + pdu_len = ntohs(hdr->length); + /* 3GPP TS 29.274 sec 5.5.1: "Octets 3 to 4 represent the Message Length + * field. This field shall indicate the length of the message in octets + * excluding the mandatory part of the GTP-C header (the first 4 + * octets). The TEID (if present) and the Sequence Number shall be + * included in the length count" */ + if (buf_len < 4 + pdu_len) { + fprintf(stderr, "GTPCv2 packet size smaller than announced! %u < exp %u\n", buf_len, 4 + pdu_len); + return -1; + } + + switch (hdr->type) { + case GTP_MSGTYPE_ECHO_REQ: + return rx_gtpc2_echo_req(hdr, buf_len, rem_saddr); + default: + fprintf(stderr, "Silently ignoring unexpected packet of type %u\n", hdr->type); + return 0; + } +} + +static int read_cb(int fd) +{ + ssize_t sz; + uint8_t buf[4096]; + struct sockaddr_storage rem_saddr; + socklen_t rem_saddr_len = sizeof(rem_saddr); + struct gtp1_hdr *hdr1; + + if ((sz = recvfrom(fd, buf, sizeof(buf), 0, (struct sockaddr *)&rem_saddr, &rem_saddr_len)) < 0) { + fprintf(stderr, "recvfrom() failed: %s\n", strerror(errno)); + return -1; + } + if (sz == 0) { + fprintf(stderr, "recvfrom() read zero bytes!\n"); + return -1; + } + + hdr1 = (struct gtp1_hdr *)&buf[0]; + switch (hdr1->version) { + case 1: + return rx_gtpc1(hdr1, sz, (const struct sockaddr *)&rem_saddr); + case 2: + return rx_gtpc2((struct gtp2_hdr *)&buf[0], sz, (const struct sockaddr *)&rem_saddr); + default: + fprintf(stderr, "Rx GTPv%u: not supported (flags=0x%x)\n", hdr1->version, buf[0]); + return -1; + } +} + +static int loop(void) +{ + int rc; + fd_set rfds; + int nfds; + + while (true) { + FD_ZERO(&rfds); + FD_SET(g_st->fd_gtpc, &rfds); + nfds = g_st->fd_gtpc + 1; + rc = select(nfds, &rfds, NULL, NULL, NULL); + if (rc == 0) + continue; + if (rc < 0) { + fprintf(stderr, "select() failed: %s\n", strerror(errno)); + return -1; + } + + if (FD_ISSET(g_st->fd_gtpc, &rfds)) + read_cb(g_st->fd_gtpc); + } +} + +int main(int argc, char **argv) +{ + g_st = calloc(1, sizeof(struct gtp_echo_resp_state)); + + strcpy(g_st->cfg.laddr, "::"); + + handle_options(argc, argv); + + printf("Listening on: %s\n", g_st->cfg.laddr); + + if (init_socket() < 0) + exit(1); + + printf("Socket bound successfully, listening for requests...\n"); + + if (loop() < 0) + exit(1); + + return 0; +} diff --git a/utils/gtp_echo_responder_test.py b/utils/gtp_echo_responder_test.py new file mode 100755 index 0000000..632d23b --- /dev/null +++ b/utils/gtp_echo_responder_test.py @@ -0,0 +1,111 @@ +#!/usr/bin/env python3 +# MIT License +# +# Copyright (c) 2021 by sysmocom - s.f.m.c. GmbH +# Author: Pau Espin Pedrol +# +# SPDX-License-Identifier: MIT +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + + +import socket +import argparse +import struct +from ipaddress import ip_address, IPv4Address + +GTP1C_PORT = 2123 +BUF_SIZE = 4096 + +GTP_HDRv1_FLAG_PN = (1<<0) +GTP_HDRv1_FLAG_S = (1<<1) +GTP_HDRv1_FLAG_E = (1<<2) +GTP_HDRv1_PT_GTP = (1<<4) +GTP_HDRv1_VER_GTP1 = (1<<5) + +GTP_HDRv2_FLAG_T = (1<<3) +GTP_HDRv2_FLAG_P = (1<<4) +GTP_HDRv2_VER_GTP2 = (2<<5) + +def gen_gtpc_v1_hdr(flags, type, length, tei, seq=0, npdu=0, next=0): + spare = 0 + if (flags & (GTP_HDRv1_FLAG_PN|GTP_HDRv1_FLAG_S|GTP_HDRv1_FLAG_E)): + #long format + length += 4 + d = struct.pack('!BBHIHBB', flags, type, length, tei, seq, npdu, next) + else: + #short format + d = struct.pack('!BBHI', flags, type, length, tei) + return d + +def gen_gtpc_v2_hdr(flags, type, length, tei=0, seq=0): + spare = 0 + if (flags & (GTP_HDRv2_FLAG_T)): + #long format, with TEI + length += 4 + 4 + d = struct.pack('!BBHIHBB', flags, type, length, tei, seq >> 8, seq & 0xff, spare) + else: + #short format + length += 4 + d = struct.pack('!BBHHBB', flags, type, length, seq >> 8, seq & 0xff, spare) + return d + +def gen_gtpc_v1_echo_req(tei=0, append_flags=0, seq=0, npdu=0, next=0): + return gen_gtpc_v1_hdr(GTP_HDRv1_VER_GTP1 | GTP_HDRv1_PT_GTP | append_flags, 1, 0, tei, seq, npdu, next) + +def gen_gtpc_v2_echo_req(append_flags=0, seq=0, recovery=0, node_features=-1): + length = 0 + payload = b'' + if (recovery > 0): + recovery_ie = struct.pack('!BHBB', 3, 1, 0, recovery) + payload += recovery_ie + length += len(recovery_ie) + if (node_features > 0): + node_features_ie = struct.pack('!BHBB', 152, 1, 0, node_features) + payload += node_features_ie + length += len(node_features_ie) + return gen_gtpc_v2_hdr(GTP_HDRv2_VER_GTP2 | append_flags, 1, length, 0, seq) + payload + +def tx_rx(sk, rem_addr, tx_buf, exp_rx = True): + print('Tx ECHO_REQ to %r: %r' % (repr(rem_addr), repr(tx_buf))) + sk.sendto(tx_buf, rem_addr) + if exp_rx: + rx_buf = sk.recvfrom(BUF_SIZE) + msg = "Message from Server {}".format(rx_buf) + print(msg) + +if __name__ == '__main__': + p = argparse.ArgumentParser(description='Tester for gtp-echo-recorder.') + p.add_argument('-l', '--local-address', default='127.0.0.2', help="Local GTP address") + p.add_argument('-r', '--remote-address', default='127.0.0.1', help="Remote GTP address") + args = p.parse_args() + + print('Binding socket on %r...' % repr((args.local_address, GTP1C_PORT))) + family = socket.AF_INET if type(ip_address(args.local_address)) is IPv4Address else socket.AF_INET6 + sk = socket.socket(family=family, type=socket.SOCK_DGRAM) + sk.bind((args.local_address, GTP1C_PORT)); + + rem_addr = (args.remote_address, GTP1C_PORT) + + tx_rx(sk, rem_addr, gen_gtpc_v1_echo_req()) + tx_rx(sk, rem_addr, gen_gtpc_v1_echo_req(1, GTP_HDRv1_FLAG_S, seq=67)) + tx_rx(sk, rem_addr, gen_gtpc_v2_echo_req(0, seq=300, recovery=-1, node_features=-1)) + tx_rx(sk, rem_addr, gen_gtpc_v2_echo_req(0, seq=20, recovery=99, node_features=-1)) + tx_rx(sk, rem_addr, gen_gtpc_v2_echo_req(0, seq=20, recovery=100, node_features=0xbb)) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibdd6d8f6920571db0c60cf8b3b25d541b15ad3f1 Gerrit-Change-Number: 25652 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:26:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:26:35 +0000 Subject: Change in osmo-ggsn[master]: Introduce program gtp-echo-responder In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 ) Change subject: Introduce program gtp-echo-responder ...................................................................... Patch Set 7: (1 comment) https://gerrit.osmocom.org/c/osmo-ggsn/+/25652/6/utils/gtp_echo_responder.c File utils/gtp_echo_responder.c: https://gerrit.osmocom.org/c/osmo-ggsn/+/25652/6/utils/gtp_echo_responder.c at 128 PS6, Line 128: arg == end) { > (still unresolved) sorry, I merged it too fast. Please resolve in follow-up commits -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ibdd6d8f6920571db0c60cf8b3b25d541b15ad3f1 Gerrit-Change-Number: 25652 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 08 Oct 2021 05:26:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Comment-In-Reply-To: neels Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:28:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:28:00 +0000 Subject: Change in osmo-bts[master]: osmo-trx: fix maxdly In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25619 ) Change subject: osmo-trx: fix maxdly ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25619/3/src/osmo-bts-trx/trx_vty.c File src/osmo-bts-trx/trx_vty.c: https://gerrit.osmocom.org/c/osmo-bts/+/25619/3/src/osmo-bts-trx/trx_vty.c at 293 PS3, Line 293: why does this remain 31? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Gerrit-Change-Number: 25619 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 08 Oct 2021 05:28:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:28:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:28:53 +0000 Subject: Change in pysim[master]: pySim-shell: refactor __main__ section In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25484 ) Change subject: pySim-shell: refactor __main__ section ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id2a0f2012b84ce61f5c0c14404df559fca4ddfcd Gerrit-Change-Number: 25484 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 08 Oct 2021 05:28:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:31:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:31:49 +0000 Subject: Change in pysim[master]: pySim-shell: allow card insertion at runtime In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25549 ) Change subject: pySim-shell: allow card insertion at runtime ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/pysim/+/25549/3/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/25549/3/pySim-shell.py at a109 PS3, Line 109: self.ad why is this setting removed here? What ist he logic behind it? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 Gerrit-Change-Number: 25549 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 05:31:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:34:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:34:00 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25552 ) Change subject: pySim-shell: add bulk provisioning support ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/pysim/+/25552/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/pysim/+/25552/3//COMMIT_MSG at 1 PS3, Line 1: Parent: b8b87fbe (pySim-shell: add echo command) is there a specific reason to use print directly rather than the poutput function of cmd2? cmd2 also has the ability to output color sequences, so it would be possible to print the good/bad ascii-art in green/red. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 08 Oct 2021 05:34:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:35:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:35:22 +0000 Subject: Change in osmo-sip-connector[master]: MNCC v8: Implement Basic Support for Global Call Reference. In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 ) Change subject: MNCC v8: Implement Basic Support for Global Call Reference. ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Id40d7e0fed9356f801b3627c118150055e7232b1 Gerrit-Change-Number: 25675 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 05:35:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:37:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:37:22 +0000 Subject: Change in pysim[master]: cards: remove unused function card_autodetect() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25686 ) Change subject: cards: remove unused function card_autodetect() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic188e1fffb4a40e89ad276941d20f94cf35e1538 Gerrit-Change-Number: 25686 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 08 Oct 2021 05:37:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:38:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:38:41 +0000 Subject: Change in osmocom-bb[master]: logging: use meaningful default loglevels In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16892 ) Change subject: logging: use meaningful default loglevels ...................................................................... Patch Set 2: > Patch Set 2: > > Do we still have useful logging, such as the state of network selection and RR/MM connection establishment? Yes, currently the logging may look like Tank's screen in "The Matrix"... However it's easy to see if (and sometimes why) something goes wrong, given the instability of some layer23 apps. I am afraid with the new "meaningful" defaults we may end up with meaningless emptiness in the output... I guess one has to give the patch a try and see what happens. The default logging definitely is way too much so far. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 05:38:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:39:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:39:07 +0000 Subject: Change in osmo-bsc[master]: stat: add bts.N.num_trx:rsl_connected In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25507 ) Change subject: stat: add bts.N.num_trx:rsl_connected ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I55b55159fe13d937e441d8c2ed915734463e1154 Gerrit-Change-Number: 25507 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 05:39:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:40:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:40:00 +0000 Subject: Change in simtrace2[master]: jenkins.sh: Build 'trace' firmware for ngff_cardem In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25604 ) Change subject: jenkins.sh: Build 'trace' firmware for ngff_cardem ...................................................................... Patch Set 2: Code-Review+2 > Patch Set 1: Code-Review+1 > > Add to "fw:" in Makefile too? > > (Why is there a different list in the first place?) to be honest, I don't think I ever knew there was such a makefile target, and I never used it. Can be cleaned up in another patch. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I8a98002ef5aa58e5a3d49627323fe11505508bc8 Gerrit-Change-Number: 25604 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 08 Oct 2021 05:40:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:40:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:40:02 +0000 Subject: Change in simtrace2[master]: jenkins.sh: Build 'trace' firmware for ngff_cardem In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25604 ) Change subject: jenkins.sh: Build 'trace' firmware for ngff_cardem ...................................................................... jenkins.sh: Build 'trace' firmware for ngff_cardem Let's create and publish binary builds for 'trace' on BOARD=ngff_carde. According to SYS#5525 this is verified working since two months ago, so there's no reason to withhold the binary builds for it. Change-Id: I8a98002ef5aa58e5a3d49627323fe11505508bc8 Related: SYS#5525 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index ac0e419..40015f7 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -32,7 +32,7 @@ BUILDS+="qmod/dfu qmod/cardem " BUILDS+="owhw/dfu owhw/cardem " BUILDS+="octsimtest/cardem " -BUILDS+="ngff_cardem/dfu ngff_cardem/cardem " +BUILDS+="ngff_cardem/dfu ngff_cardem/cardem ngff_cardem/trace " cd $TOPDIR/firmware for build in $BUILDS; do -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25604 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I8a98002ef5aa58e5a3d49627323fe11505508bc8 Gerrit-Change-Number: 25604 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:40:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:40:18 +0000 Subject: Change in simtrace2[master]: Use osmo_libusb_{init, exit}() instead of libusb_{init, exit}() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25703 ) Change subject: Use osmo_libusb_{init,exit}() instead of libusb_{init,exit}() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2fd981935e1420e529f5dd8a98edd347c317284c Gerrit-Change-Number: 25703 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 05:40:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:40:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:40:30 +0000 Subject: Change in simtrace2[master]: simtrace2-cardem-pcsc: Remove double libusb initialization In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25704 ) Change subject: simtrace2-cardem-pcsc: Remove double libusb initialization ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2e0c7446aaa644c5aae1059ce91ff9f729903cbc Gerrit-Change-Number: 25704 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 05:40:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:40:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:40:37 +0000 Subject: Change in simtrace2[master]: simtrace2-tool: Initialize logging to avoid error on first log output In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25705 ) Change subject: simtrace2-tool: Initialize logging to avoid error on first log output ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id355ef33e10164f8e8eb40c2fd0b606bc8e9b6f7 Gerrit-Change-Number: 25705 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 05:40:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:40:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:40:39 +0000 Subject: Change in simtrace2[master]: Use osmo_libusb_{init, exit}() instead of libusb_{init, exit}() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25703 ) Change subject: Use osmo_libusb_{init,exit}() instead of libusb_{init,exit}() ...................................................................... Use osmo_libusb_{init,exit}() instead of libusb_{init,exit}() We use other osmo_libusb_* functions later in the code, so it is best to initialize the library via libosmousb, and not directly. Change-Id: I2fd981935e1420e529f5dd8a98edd347c317284c --- M host/src/simtrace2-cardem-pcsc.c M host/src/simtrace2-sniff.c M host/src/simtrace2-tool.c M host/src/simtrace2_usb.c 4 files changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 8e143ba..510a371 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -633,7 +633,7 @@ if (transp->usb_devh) libusb_close(transp->usb_devh); - libusb_exit(NULL); + osmo_libusb_exit(NULL); do_exit: return ret; } diff --git a/host/src/simtrace2-sniff.c b/host/src/simtrace2-sniff.c index c44029a..653508d 100644 --- a/host/src/simtrace2-sniff.c +++ b/host/src/simtrace2-sniff.c @@ -379,7 +379,7 @@ } /* Scan for available SIMtrace USB devices supporting sniffing */ - rc = libusb_init(NULL); + rc = osmo_libusb_init(NULL); if (rc < 0) { fprintf(stderr, "libusb initialization failed\n"); goto do_exit; @@ -505,7 +505,7 @@ sleep(1); } while (keep_running); - libusb_exit(NULL); + osmo_libusb_exit(NULL); do_exit: return ret; } diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index 658f84a..f1423b0 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -265,7 +265,7 @@ transp->udp_fd = -1; - rc = libusb_init(NULL); + rc = osmo_libusb_init(NULL); if (rc < 0) { fprintf(stderr, "libusb initialization failed\n"); goto do_exit; @@ -326,7 +326,7 @@ libusb_close(transp->usb_devh); } while (0); - libusb_exit(NULL); + osmo_libusb_exit(NULL); do_exit: return ret; } diff --git a/host/src/simtrace2_usb.c b/host/src/simtrace2_usb.c index 8fa41fc..be1ba6e 100644 --- a/host/src/simtrace2_usb.c +++ b/host/src/simtrace2_usb.c @@ -77,7 +77,7 @@ int main(int argc, char **argv) { - libusb_init(NULL); + osmo_libusb_init(NULL); find_devices(); return 0; } -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2fd981935e1420e529f5dd8a98edd347c317284c Gerrit-Change-Number: 25703 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:40:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:40:41 +0000 Subject: Change in simtrace2[master]: simtrace2-cardem-pcsc: Remove double libusb initialization In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25704 ) Change subject: simtrace2-cardem-pcsc: Remove double libusb initialization ...................................................................... simtrace2-cardem-pcsc: Remove double libusb initialization This code already calls osmo_libusb_init further above in the top of the main() function, so there's no use of calling libusb_init() directly in the same function lines below. Change-Id: I2e0c7446aaa644c5aae1059ce91ff9f729903cbc --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index 510a371..df191df 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -524,12 +524,6 @@ ci->card_prof = &osim_uicc_sim_cic_profile; - rc = libusb_init(NULL); - if (rc < 0) { - fprintf(stderr, "libusb initialization failed\n"); - goto do_exit; - } - rc = osmo_st2_gsmtap_init(gsmtap_host); if (rc < 0) { perror("unable to open GSMTAP"); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I2e0c7446aaa644c5aae1059ce91ff9f729903cbc Gerrit-Change-Number: 25704 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:40:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:40:41 +0000 Subject: Change in simtrace2[master]: simtrace2-tool: Initialize logging to avoid error on first log output In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25705 ) Change subject: simtrace2-tool: Initialize logging to avoid error on first log output ...................................................................... simtrace2-tool: Initialize logging to avoid error on first log output This avoids ERROR: osmo_log_info == NULL! You must call log_init() before using logging in log_check_level() Change-Id: Id355ef33e10164f8e8eb40c2fd0b606bc8e9b6f7 --- M host/src/simtrace2-tool.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/host/src/simtrace2-tool.c b/host/src/simtrace2-tool.c index f1423b0..97d7706 100644 --- a/host/src/simtrace2-tool.c +++ b/host/src/simtrace2-tool.c @@ -39,6 +39,8 @@ #include #include +#include +#include /*********************************************************************** * Incoming Messages @@ -213,6 +215,7 @@ return rc; } +static struct log_info log_info = {}; int main(int argc, char **argv) { @@ -265,6 +268,8 @@ transp->udp_fd = -1; + osmo_init_logging2(NULL, &log_info); + rc = osmo_libusb_init(NULL); if (rc < 0) { fprintf(stderr, "libusb initialization failed\n"); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Id355ef33e10164f8e8eb40c2fd0b606bc8e9b6f7 Gerrit-Change-Number: 25705 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:41:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:41:13 +0000 Subject: Change in libosmocore[master]: ns2: message: BLOCK/BLOCK ACK allow to use a given NSVCI instead of u... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25554 ) Change subject: ns2: message: BLOCK/BLOCK ACK allow to use a given NSVCI instead of using the nsvc nsvci ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6189229fdc1f054e86811bc60cb7646e1f758a78 Gerrit-Change-Number: 25554 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 05:41:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:41:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:41:47 +0000 Subject: Change in libosmocore[master]: ns2: message: allow to pass a foreign NSVCI to STATUS PDU In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25562 ) Change subject: ns2: message: allow to pass a foreign NSVCI to STATUS PDU ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I373eb48697097cdfa45748a091c11f7b3f0345fa Gerrit-Change-Number: 25562 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 05:41:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:42:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:42:25 +0000 Subject: Change in libosmocore[master]: ns2: correct parse a STATUS PDU which was received over a different NSVC In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25557 ) Change subject: ns2: correct parse a STATUS PDU which was received over a different NSVC ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5c9e9de10c669c1226da67bb9e2663c5cfe828a8 Gerrit-Change-Number: 25557 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 05:42:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:43:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:43:46 +0000 Subject: Change in libosmocore[master]: ns2: message: BLOCK/BLOCK ACK allow to use a given NSVCI instead of u... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25554 ) Change subject: ns2: message: BLOCK/BLOCK ACK allow to use a given NSVCI instead of using the nsvc nsvci ...................................................................... ns2: message: BLOCK/BLOCK ACK allow to use a given NSVCI instead of using the nsvc nsvci The BLOCK and BLOCK ACK PDUs can be send over a working NSVC to inform the NSE that a NSVC is blocked. Change-Id: I6189229fdc1f054e86811bc60cb7646e1f758a78 --- M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_message.c M src/gb/gprs_ns2_vc_fsm.c M tests/gb/gprs_ns2_test.c 4 files changed, 27 insertions(+), 15 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index bfb12d9..a5d78d4 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -422,8 +422,8 @@ unsigned int num_ip6_elems); /* transmit message over a VC */ -int ns2_tx_block(struct gprs_ns2_vc *nsvc, uint8_t cause); -int ns2_tx_block_ack(struct gprs_ns2_vc *nsvc); +int ns2_tx_block(struct gprs_ns2_vc *nsvc, uint8_t cause, uint16_t *nsvci); +int ns2_tx_block_ack(struct gprs_ns2_vc *nsvc, uint16_t *nsvci); int ns2_tx_reset(struct gprs_ns2_vc *nsvc, uint8_t cause); int ns2_tx_reset_ack(struct gprs_ns2_vc *nsvc); diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index 5e3e025..90873ed 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -206,12 +206,18 @@ /*! Transmit a NS-BLOCK on a given NS-VC. * \param[in] vc NS-VC on which the NS-BLOCK is to be transmitted * \param[in] cause Numeric NS Cause value + * \param[in] nsvci if given this NSVCI will be encoded. If NULL the nsvc->nsvci will be used. * \returns 0 in case of success */ -int ns2_tx_block(struct gprs_ns2_vc *nsvc, uint8_t cause) +int ns2_tx_block(struct gprs_ns2_vc *nsvc, uint8_t cause, uint16_t *nsvci) { struct msgb *msg; struct gprs_ns_hdr *nsh; - uint16_t nsvci = osmo_htons(nsvc->nsvci); + uint16_t encoded_nsvci; + + if (nsvci) + encoded_nsvci = osmo_htons(*nsvci); + else + encoded_nsvci = osmo_htons(nsvc->nsvci); log_set_context(LOG_CTX_GB_NSE, nsvc->nse); log_set_context(LOG_CTX_GB_NSVC, nsvc); @@ -229,7 +235,7 @@ nsh->pdu_type = NS_PDUT_BLOCK; msgb_tvlv_put(msg, NS_IE_CAUSE, 1, &cause); - msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *) &nsvci); + msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *) &encoded_nsvci); LOG_NS_SIGNAL(nsvc, "Tx", nsh->pdu_type, LOGL_INFO, " cause=%s\n", gprs_ns2_cause_str(cause)); return ns_vc_tx(nsvc, msg); @@ -237,12 +243,18 @@ /*! Transmit a NS-BLOCK-ACK on a given NS-VC. * \param[in] nsvc NS-VC on which the NS-BLOCK is to be transmitted + * \param[in] nsvci if given this NSVCI will be encoded. If NULL the nsvc->nsvci will be used. * \returns 0 in case of success */ -int ns2_tx_block_ack(struct gprs_ns2_vc *nsvc) +int ns2_tx_block_ack(struct gprs_ns2_vc *nsvc, uint16_t *nsvci) { struct msgb *msg; struct gprs_ns_hdr *nsh; - uint16_t nsvci = osmo_htons(nsvc->nsvci); + uint16_t encoded_nsvci; + + if (nsvci) + encoded_nsvci = osmo_htons(*nsvci); + else + encoded_nsvci = osmo_htons(nsvc->nsvci); log_set_context(LOG_CTX_GB_NSE, nsvc->nse); log_set_context(LOG_CTX_GB_NSVC, nsvc); @@ -257,7 +269,7 @@ nsh = (struct gprs_ns_hdr *) msg->l2h; nsh->pdu_type = NS_PDUT_BLOCK_ACK; - msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *) &nsvci); + msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *) &encoded_nsvci); LOG_NS_TX_SIGNAL(nsvc, nsh->pdu_type); return ns_vc_tx(nsvc, msg); diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index fa8cec2..a366c93 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -348,7 +348,7 @@ if (old_state == GPRS_NS2_ST_RESET) { osmo_timer_del(&fi->timer); } else { - ns2_tx_block(priv->nsvc, NS_CAUSE_OM_INTERVENTION); + ns2_tx_block(priv->nsvc, NS_CAUSE_OM_INTERVENTION, NULL); } } else if (priv->initiate_block) { ns2_tx_unblock(priv->nsvc); @@ -369,12 +369,12 @@ break; case GPRS_NS2_EV_RX_BLOCK: priv->accept_unitdata = false; - ns2_tx_block_ack(priv->nsvc); + ns2_tx_block_ack(priv->nsvc, NULL); osmo_timer_del(&fi->timer); break; case GPRS_NS2_EV_RX_UNBLOCK: priv->accept_unitdata = false; - ns2_tx_block(priv->nsvc, NS_CAUSE_OM_INTERVENTION); + ns2_tx_block(priv->nsvc, NS_CAUSE_OM_INTERVENTION, NULL); osmo_timer_add(&fi->timer); break; } @@ -382,7 +382,7 @@ switch (event) { case GPRS_NS2_EV_RX_BLOCK: /* TODO: BLOCK is a UNBLOCK_NACK */ - ns2_tx_block_ack(priv->nsvc); + ns2_tx_block_ack(priv->nsvc, NULL); break; case GPRS_NS2_EV_RX_UNBLOCK: ns2_tx_unblock_ack(priv->nsvc); @@ -397,7 +397,7 @@ /* we are on the receiving end. The initiator who sent RESET is responsible to UNBLOCK! */ switch (event) { case GPRS_NS2_EV_RX_BLOCK: - ns2_tx_block_ack(priv->nsvc); + ns2_tx_block_ack(priv->nsvc, NULL); break; case GPRS_NS2_EV_RX_UNBLOCK: ns2_tx_unblock_ack(priv->nsvc); @@ -441,7 +441,7 @@ case GPRS_NS2_EV_RX_BLOCK: priv->initiate_block = false; priv->accept_unitdata = false; - ns2_tx_block_ack(priv->nsvc); + ns2_tx_block_ack(priv->nsvc, NULL); osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED, 0, 2); break; diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c index ad78a62..0221a8d 100644 --- a/tests/gb/gprs_ns2_test.c +++ b/tests/gb/gprs_ns2_test.c @@ -439,7 +439,7 @@ printf("---- Send Block NSVC[0]\n"); ns2_vc_block(nsvc[0]); - ns2_tx_block_ack(loop[0]); + ns2_tx_block_ack(loop[0], NULL); /* try to receive a unitdata - this should be dropped & freed by NS */ printf("---- Try to receive over blocked NSVC[0]\n"); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25554 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6189229fdc1f054e86811bc60cb7646e1f758a78 Gerrit-Change-Number: 25554 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:43:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:43:47 +0000 Subject: Change in libosmocore[master]: ns2: ensure the NSVC is in the correct mode for NSVC UNKNOWN/NSVC BLO... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25555 ) Change subject: ns2: ensure the NSVC is in the correct mode for NSVC UNKNOWN/NSVC BLOCKED cause codes ...................................................................... ns2: ensure the NSVC is in the correct mode for NSVC UNKNOWN/NSVC BLOCKED cause codes Those cause codes are only valid for BLOCK/RESET NSVCs. Change-Id: I560f1c8c2826befd03641bebffe156ac070061c2 --- M src/gb/gprs_ns2_message.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index 90873ed..de30470 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -103,6 +103,11 @@ *cause = NS_CAUSE_MISSING_ESSENT_IE; return -1; } + + if (nsvc->mode != GPRS_NS2_VC_MODE_BLOCKRESET) { + *cause = NS_CAUSE_PDU_INCOMP_PSTATE; + return -1; + } break; case NS_CAUSE_SEM_INCORR_PDU: case NS_CAUSE_PDU_INCOMP_PSTATE: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25555 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I560f1c8c2826befd03641bebffe156ac070061c2 Gerrit-Change-Number: 25555 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:43:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:43:48 +0000 Subject: Change in libosmocore[master]: ns2: fsm: add comment don't answer on a STATUS with a STATUS In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25556 ) Change subject: ns2: fsm: add comment don't answer on a STATUS with a STATUS ...................................................................... ns2: fsm: add comment don't answer on a STATUS with a STATUS Change-Id: Ib8f700f9193a96a7bada3b0293dcecf6a05d6efc --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index a366c93..d09c31a 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -861,6 +861,7 @@ /* TODO: handle BLOCK/UNBLOCK/ALIVE with different VCI */ if (ns2_validate(nsvc, nsh->pdu_type, msg, tp, &cause)) { + /* don't answer on a STATUS with a STATUS */ if (nsh->pdu_type != NS_PDUT_STATUS) { rc = ns2_tx_status(nsvc, cause, 0, msg); goto out; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25556 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib8f700f9193a96a7bada3b0293dcecf6a05d6efc Gerrit-Change-Number: 25556 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:43:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:43:48 +0000 Subject: Change in libosmocore[master]: ns2: message: allow to pass a foreign NSVCI to STATUS PDU In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25562 ) Change subject: ns2: message: allow to pass a foreign NSVCI to STATUS PDU ...................................................................... ns2: message: allow to pass a foreign NSVCI to STATUS PDU To answer correct on a BLOCK PDU with a different NSVCI, the STATUS PDU needs also a NSVCI parameter. Change-Id: I373eb48697097cdfa45748a091c11f7b3f0345fa --- M src/gb/gprs_ns2.c M src/gb/gprs_ns2_internal.h M src/gb/gprs_ns2_message.c M src/gb/gprs_ns2_vc_fsm.c 4 files changed, 12 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2.c b/src/gb/gprs_ns2.c index 6bccf65..3bb04ae 100644 --- a/src/gb/gprs_ns2.c +++ b/src/gb/gprs_ns2.c @@ -1356,7 +1356,7 @@ if (rc < 0) { LOGP(DLNS, LOGL_NOTICE, "Error during TLV Parse\n"); if (nsh->pdu_type != NS_PDUT_STATUS) - ns2_tx_status(nsvc, NS_CAUSE_PROTO_ERR_UNSPEC, 0, msg); + ns2_tx_status(nsvc, NS_CAUSE_PROTO_ERR_UNSPEC, 0, msg, NULL); return rc; } return ns2_vc_rx(nsvc, msg, &tp); diff --git a/src/gb/gprs_ns2_internal.h b/src/gb/gprs_ns2_internal.h index a5d78d4..0959d2b 100644 --- a/src/gb/gprs_ns2_internal.h +++ b/src/gb/gprs_ns2_internal.h @@ -439,7 +439,7 @@ struct msgb *msg); int ns2_tx_status(struct gprs_ns2_vc *nsvc, uint8_t cause, - uint16_t bvci, struct msgb *orig_msg); + uint16_t bvci, struct msgb *orig_msg, uint16_t *nsvci); /* driver */ struct gprs_ns2_vc *ns2_ip_bind_connect(struct gprs_ns2_vc_bind *bind, diff --git a/src/gb/gprs_ns2_message.c b/src/gb/gprs_ns2_message.c index de30470..cc95334 100644 --- a/src/gb/gprs_ns2_message.c +++ b/src/gb/gprs_ns2_message.c @@ -432,13 +432,14 @@ * \param[in] cause Numeric NS cause value * \param[in] bvci BVCI to be reset within NSVC * \param[in] orig_msg message causing the STATUS + * \param[in] nsvci if given this NSVCI will be encoded. If NULL the nsvc->nsvci will be used. * \returns 0 in case of success */ int ns2_tx_status(struct gprs_ns2_vc *nsvc, uint8_t cause, - uint16_t bvci, struct msgb *orig_msg) + uint16_t bvci, struct msgb *orig_msg, uint16_t *nsvci) { struct msgb *msg = ns2_msgb_alloc(); struct gprs_ns_hdr *nsh; - uint16_t nsvci = osmo_htons(nsvc->nsvci); + uint16_t encoded_nsvci; unsigned int orig_len, max_orig_len; log_set_context(LOG_CTX_GB_NSE, nsvc->nse); @@ -459,7 +460,11 @@ case NS_CAUSE_NSVC_BLOCKED: case NS_CAUSE_NSVC_UNKNOWN: /* Section 9.2.7.1: Static conditions for NS-VCI */ - msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *)&nsvci); + if (nsvci) + encoded_nsvci = osmo_htons(*nsvci); + else + encoded_nsvci = osmo_htons(nsvc->nsvci); + msgb_tvlv_put(msg, NS_IE_VCI, 2, (uint8_t *)&encoded_nsvci); break; case NS_CAUSE_SEM_INCORR_PDU: case NS_CAUSE_PDU_INCOMP_PSTATE: diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index d09c31a..1a632b1 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -679,7 +679,7 @@ ns2_tx_status(priv->nsvc, NS_CAUSE_NSVC_BLOCKED, - 0, msg); + 0, msg, NULL); break; /* ALIVE can receive UNITDATA if the ALIVE_ACK is lost */ case GPRS_NS2_ST_RECOVERING: @@ -863,7 +863,7 @@ if (ns2_validate(nsvc, nsh->pdu_type, msg, tp, &cause)) { /* don't answer on a STATUS with a STATUS */ if (nsh->pdu_type != NS_PDUT_STATUS) { - rc = ns2_tx_status(nsvc, cause, 0, msg); + rc = ns2_tx_status(nsvc, cause, 0, msg, NULL); goto out; } } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25562 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I373eb48697097cdfa45748a091c11f7b3f0345fa Gerrit-Change-Number: 25562 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:43:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:43:57 +0000 Subject: Change in libosmocore[master]: ns2: correct parse a STATUS PDU which was received over a different NSVC In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25557 ) Change subject: ns2: correct parse a STATUS PDU which was received over a different NSVC ...................................................................... ns2: correct parse a STATUS PDU which was received over a different NSVC STATUS PDU can be send over a different NSVC than the NSVC which generated the STATUS PDU. E.g. informing a NSVC got blocked in case of a lower-layer failure. Change-Id: I5c9e9de10c669c1226da67bb9e2663c5cfe828a8 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 20 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 1a632b1..aa6613b 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -851,6 +851,7 @@ int ns2_vc_rx(struct gprs_ns2_vc *nsvc, struct msgb *msg, struct tlv_parsed *tp) { struct gprs_ns_hdr *nsh = (struct gprs_ns_hdr *) msg->l2h; + struct gprs_ns2_vc *target_nsvc = nsvc; struct osmo_fsm_inst *fi = nsvc->fi; int rc = 0; uint8_t cause; @@ -884,11 +885,26 @@ nsvci = tlvp_val16be(tp, NS_IE_VCI); if (nsvci != nsvc->nsvci) { /* 48.016 ? 7.3.1 send RESET_ACK to wrong NSVCI + ignore */ - if (nsh->pdu_type == NS_PDUT_RESET) + if (nsh->pdu_type == NS_PDUT_RESET) { ns2_tx_reset_ack(nsvc); + } else if (nsh->pdu_type == NS_PDUT_STATUS) { + /* this is a PDU received over a NSVC and reports a status for another NSVC */ + target_nsvc = gprs_ns2_nsvc_by_nsvci(nsvc->nse->nsi, nsvci); + if (!target_nsvc) { + LOGPFSML(fi, LOGL_ERROR, "Received a STATUS PDU for unknown NSVC (NSVCI %d)\n", nsvci); + goto out; + } - LOG_NS_SIGNAL(nsvc, "Rx", nsh->pdu_type, LOGL_ERROR, " with wrong NSVCI=%05u. Ignoring PDU.\n", nsvci); - goto out; + if (target_nsvc->nse != nsvc->nse) { + LOGPFSML(fi, LOGL_ERROR, "Received a STATUS PDU for a NSVC (NSVCI %d) but it belongs to a different NSE!\n", nsvci); + goto out; + } + + /* the status will be passed to the nsvc/target nsvc in the switch */ + } else { + LOG_NS_SIGNAL(nsvc, "Rx", nsh->pdu_type, LOGL_ERROR, " with wrong NSVCI=%05u. Ignoring PDU.\n", nsvci); + goto out; + } } } @@ -922,7 +938,7 @@ osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_UNITDATA, msg); return 0; case NS_PDUT_STATUS: - osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_STATUS, tp); + osmo_fsm_inst_dispatch(target_nsvc->fi, GPRS_NS2_EV_RX_STATUS, tp); break; default: LOGPFSML(fi, LOGL_ERROR, "NSEI=%u Rx unknown NS PDU type %s\n", nsvc->nse->nsei, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25557 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5c9e9de10c669c1226da67bb9e2663c5cfe828a8 Gerrit-Change-Number: 25557 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:44:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:44:14 +0000 Subject: Change in osmo-ccid-firmware[master]: internal ul32k instead of external 32k osc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25613 ) Change subject: internal ul32k instead of external 32k osc ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I257b8854e1860ed698c4007efeb5d16e842b519a Gerrit-Change-Number: 25613 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 08 Oct 2021 05:44:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:45:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:45:03 +0000 Subject: Change in osmo-ccid-firmware[master]: sychronize atmel start config with the headers In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25612 ) Change subject: sychronize atmel start config with the headers ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ib21847f6726920e3f97600a347f2a16f957a5e8e Gerrit-Change-Number: 25612 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 08 Oct 2021 05:45:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:45:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:45:07 +0000 Subject: Change in osmo-ccid-firmware[master]: sychronize atmel start config with the headers In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25612 ) Change subject: sychronize atmel start config with the headers ...................................................................... sychronize atmel start config with the headers Change-Id: Ib21847f6726920e3f97600a347f2a16f957a5e8e --- M sysmoOCTSIM/atmel_start_config.atstart M sysmoOCTSIM/config/hpl_oscctrl_config.h M sysmoOCTSIM/config/hpl_rtc_config.h M sysmoOCTSIM/config/peripheral_clk_config.h M sysmoOCTSIM/hpl/core/hpl_init.c 5 files changed, 105 insertions(+), 56 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sysmoOCTSIM/atmel_start_config.atstart b/sysmoOCTSIM/atmel_start_config.atstart index 73ad9bd..92ef0bb 100644 --- a/sysmoOCTSIM/atmel_start_config.atstart +++ b/sysmoOCTSIM/atmel_start_config.atstart @@ -2,12 +2,17 @@ name: sysmoOCTSIM versions: api: '1.0' - backend: 1.5.122 - commit: 820baecf7dd115d94b0d42ee3b0b9d6ba2da7113 - content: 1.0.1507 - content_pack_name: acme-packs-all + backend: 1.8.580 + commit: f3d8d96e294de8dee688333bbbe8d8458a4f6b4c + content: unknown + content_pack_name: unknown format: '2' - frontend: 1.5.1877 + frontend: 1.8.580 + packs_version_avr8: 1.0.1463 + packs_version_qtouch: unknown + packs_version_sam: 1.0.1726 + version_backend: 1.8.580 + version_frontend: '' board: identifier: CustomBoard device: SAME54N19A-AF @@ -658,18 +663,46 @@ functionality: System api: HAL:HPL:GCLK configuration: + $input: 100000000 + $input_id: Digital Phase Locked Loop (DPLL1) + RESERVED_InputFreq: 100000000 + RESERVED_InputFreq_id: Digital Phase Locked Loop (DPLL1) + _$freq_output_Generic clock generator 0: 120000000 + _$freq_output_Generic clock generator 1: 48000000 + _$freq_output_Generic clock generator 10: 12000000 + _$freq_output_Generic clock generator 11: 2000000 + _$freq_output_Generic clock generator 2: 12500000 + _$freq_output_Generic clock generator 3: 32768 + _$freq_output_Generic clock generator 4: 50000000 + _$freq_output_Generic clock generator 5: 20000000 + _$freq_output_Generic clock generator 6: 7058823.529411765 + _$freq_output_Generic clock generator 7: 12000000 + _$freq_output_Generic clock generator 8: 12000000 + _$freq_output_Generic clock generator 9: 12000000 enable_gclk_gen_0: true + enable_gclk_gen_0__externalclock: 1000000 enable_gclk_gen_1: true enable_gclk_gen_10: false - enable_gclk_gen_11: true + enable_gclk_gen_10__externalclock: 1000000 + enable_gclk_gen_11: false + enable_gclk_gen_11__externalclock: 1000000 + enable_gclk_gen_1__externalclock: 1000000 enable_gclk_gen_2: true + enable_gclk_gen_2__externalclock: 1000000 enable_gclk_gen_3: true + enable_gclk_gen_3__externalclock: 1000000 enable_gclk_gen_4: true + enable_gclk_gen_4__externalclock: 1000000 enable_gclk_gen_5: true + enable_gclk_gen_5__externalclock: 1000000 enable_gclk_gen_6: true + enable_gclk_gen_6__externalclock: 1000000 enable_gclk_gen_7: false + enable_gclk_gen_7__externalclock: 1000000 enable_gclk_gen_8: false + enable_gclk_gen_8__externalclock: 1000000 enable_gclk_gen_9: false + enable_gclk_gen_9__externalclock: 1000000 gclk_arch_gen_0_enable: true gclk_arch_gen_0_idc: false gclk_arch_gen_0_oe: false @@ -680,7 +713,7 @@ gclk_arch_gen_10_oe: false gclk_arch_gen_10_oov: false gclk_arch_gen_10_runstdby: false - gclk_arch_gen_11_enable: true + gclk_arch_gen_11_enable: false gclk_arch_gen_11_idc: false gclk_arch_gen_11_oe: false gclk_arch_gen_11_oov: false @@ -776,6 +809,11 @@ functionality: System api: HAL:HPL:MCLK configuration: + $input: 120000000 + $input_id: Generic clock generator 0 + RESERVED_InputFreq: 120000000 + RESERVED_InputFreq_id: Generic clock generator 0 + _$freq_output_CPU: 120000000 cpu_clock_source: Generic clock generator 0 cpu_div: '1' enable_cpu_clock: true @@ -799,6 +837,11 @@ functionality: System api: HAL:HPL:OSC32KCTRL configuration: + $input: 32768 + $input_id: 32kHz External Crystal Oscillator (XOSC32K) + RESERVED_InputFreq: 32768 + RESERVED_InputFreq_id: 32kHz External Crystal Oscillator (XOSC32K) + _$freq_output_RTC source: 32768 enable_osculp32k: true enable_rtc_source: false enable_xosc32k: true @@ -809,11 +852,11 @@ xosc32k_arch_cfden: false xosc32k_arch_cfdeo: false xosc32k_arch_cgm: Standard mode - xosc32k_arch_en1k: false + xosc32k_arch_en1k: true xosc32k_arch_en32k: true xosc32k_arch_enable: true - xosc32k_arch_ondemand: true - xosc32k_arch_runstdby: false + xosc32k_arch_ondemand: false + xosc32k_arch_runstdby: true xosc32k_arch_startup: 62592us xosc32k_arch_swben: false xosc32k_arch_xtalen: true @@ -827,19 +870,28 @@ functionality: System api: HAL:HPL:OSCCTRL configuration: - dfll_arch_bplckc: false + $input: 32768 + $input_id: Generic clock generator 3 + RESERVED_InputFreq: 32768 + RESERVED_InputFreq_id: Generic clock generator 3 + _$freq_output_Digital Frequency Locked Loop (DFLL48M): 48000000 + _$freq_output_Digital Phase Locked Loop (DPLL0): 120000000 + _$freq_output_Digital Phase Locked Loop (DPLL1): 100000000 + _$freq_output_External Crystal Oscillator 8-48MHz (XOSC0): 12000000 + _$freq_output_External Crystal Oscillator 8-48MHz (XOSC1): 12000000 + dfll_arch_bplckc: true dfll_arch_calibration: false dfll_arch_ccdis: true dfll_arch_coarse: 31 dfll_arch_cstep: 1 dfll_arch_enable: true dfll_arch_fine: 128 - dfll_arch_fstep: 1 + dfll_arch_fstep: 10 dfll_arch_llaw: false dfll_arch_ondemand: false dfll_arch_qldis: false dfll_arch_runstdby: false - dfll_arch_stable: false + dfll_arch_stable: true dfll_arch_usbcrm: true dfll_arch_waitlock: false dfll_mode: Closed Loop Mode @@ -863,7 +915,7 @@ fdpll0_clock_div: 2 fdpll0_ldr: 59 fdpll0_ldrfrac: 0 - fdpll0_ref_clock: Generic clock generator 11 + fdpll0_ref_clock: External Crystal Oscillator 8-48MHz (XOSC1) fdpll1_arch_dcoen: false fdpll1_arch_enable: true fdpll1_arch_filter: 0 @@ -877,7 +929,7 @@ fdpll1_clock_div: 2 fdpll1_ldr: 49 fdpll1_ldrfrac: 0 - fdpll1_ref_clock: Generic clock generator 11 + fdpll1_ref_clock: External Crystal Oscillator 8-48MHz (XOSC1) xosc0_arch_cfden: false xosc0_arch_enable: false xosc0_arch_enalc: false @@ -969,7 +1021,7 @@ api: HAL:Driver:Calendar configuration: rtc_arch_init_reset: true - rtc_arch_prescaler: Peripheral clock divided by 1 + rtc_arch_prescaler: Peripheral clock divided by 1024 rtc_cmpeo0: false rtc_cmpeo1: false rtc_event_control: false @@ -1037,11 +1089,11 @@ usart_gtime: 2-bit times usart_inack: NACK is transmitted when a parity error is received. usart_inverse_enabled: false - usart_iso7816_type: T=0 + usart_iso7816_type: T=1 usart_maxiter: 7 usart_parity: Even parity usart_rx_enable: true - usart_stop_bit: One stop bit + usart_stop_bit: Two stop bits usart_tx_enable: true optional_signals: [] variant: @@ -1084,11 +1136,11 @@ usart_gtime: 2-bit times usart_inack: NACK is transmitted when a parity error is received. usart_inverse_enabled: false - usart_iso7816_type: T=0 + usart_iso7816_type: T=1 usart_maxiter: 7 usart_parity: Even parity usart_rx_enable: true - usart_stop_bit: One stop bit + usart_stop_bit: Two stop bits usart_tx_enable: true optional_signals: [] variant: @@ -1131,11 +1183,11 @@ usart_gtime: 2-bit times usart_inack: NACK is transmitted when a parity error is received. usart_inverse_enabled: false - usart_iso7816_type: T=0 + usart_iso7816_type: T=1 usart_maxiter: 7 usart_parity: Even parity usart_rx_enable: true - usart_stop_bit: One stop bit + usart_stop_bit: Two stop bits usart_tx_enable: true optional_signals: [] variant: @@ -1178,11 +1230,11 @@ usart_gtime: 2-bit times usart_inack: NACK is transmitted when a parity error is received. usart_inverse_enabled: false - usart_iso7816_type: T=0 + usart_iso7816_type: T=1 usart_maxiter: 7 usart_parity: Even parity usart_rx_enable: true - usart_stop_bit: One stop bit + usart_stop_bit: Two stop bits usart_tx_enable: true optional_signals: [] variant: @@ -1225,11 +1277,11 @@ usart_gtime: 2-bit times usart_inack: NACK is transmitted when a parity error is received. usart_inverse_enabled: false - usart_iso7816_type: T=0 + usart_iso7816_type: T=1 usart_maxiter: 7 usart_parity: Even parity usart_rx_enable: true - usart_stop_bit: One stop bit + usart_stop_bit: Two stop bits usart_tx_enable: true optional_signals: [] variant: @@ -1272,11 +1324,11 @@ usart_gtime: 2-bit times usart_inack: NACK is transmitted when a parity error is received. usart_inverse_enabled: false - usart_iso7816_type: T=0 + usart_iso7816_type: T=1 usart_maxiter: 7 usart_parity: Even parity usart_rx_enable: true - usart_stop_bit: One stop bit + usart_stop_bit: Two stop bits usart_tx_enable: true optional_signals: [] variant: @@ -1319,11 +1371,11 @@ usart_gtime: 2-bit times usart_inack: NACK is transmitted when a parity error is received. usart_inverse_enabled: false - usart_iso7816_type: T=0 + usart_iso7816_type: T=1 usart_maxiter: 7 usart_parity: Even parity usart_rx_enable: true - usart_stop_bit: One stop bit + usart_stop_bit: Two stop bits usart_tx_enable: true optional_signals: [] variant: @@ -1416,9 +1468,9 @@ usb_ep5_I_CACHE: No cache usb_ep6_I_CACHE: No cache usb_ep7_I_CACHE: No cache - usbd_arch_max_ep_n: 2 (EP 0x82 or 0x02) + usbd_arch_max_ep_n: 4 (EP 0x84 or 0x04) usbd_arch_speed: Full speed - usbd_num_ep_sp: 4 (EP0 + 3 endpoints) + usbd_num_ep_sp: 7 (EP0 + 6 endpoints) optional_signals: [] variant: specification: default @@ -1664,3 +1716,4 @@ user_label: SDA2 configuration: null toolchain_options: [] +static_files: [] diff --git a/sysmoOCTSIM/config/hpl_oscctrl_config.h b/sysmoOCTSIM/config/hpl_oscctrl_config.h index a7bc9b9..d27c869 100644 --- a/sysmoOCTSIM/config/hpl_oscctrl_config.h +++ b/sysmoOCTSIM/config/hpl_oscctrl_config.h @@ -404,7 +404,6 @@ // Select the clock source. // fdpll0_ref_clock #ifndef CONF_FDPLL0_GCLK -// directly use XOSC1 as clock input (no need to use an additional GCLK) #define CONF_FDPLL0_GCLK GCLK_GENCTRL_SRC_XOSC1 #endif @@ -431,23 +430,24 @@ #endif // Loop Divider Ratio Fractional Part <0x0-0x1F> +// Value of LDRFRAC is calculated using Fclk_dpll=Fckr*(LDR+1+LDRFRAC/32) formula as given in datasheet. This value is directly written in to DPLLRATIO register // fdpll0_ldrfrac #ifndef CONF_FDPLL0_LDRFRAC #define CONF_FDPLL0_LDRFRAC 0x0 #endif // Loop Divider Ratio Integer Part <0x0-0x1FFF> +// Value of LDR is calculated using Fclk_dpll=Fckr*(LDR+1+LDRFRAC/32) formula as given in datasheet. This value is directly written in to DPLLRATIO register // fdpll0_ldr #ifndef CONF_FDPLL0_LDR -// 2 MHz input clock * ( <59> + 1 = 60 ) = 120 MHz output clock -#define CONF_FDPLL0_LDR 59 +#define CONF_FDPLL0_LDR 0x3b #endif // Clock Divider <0x0-0x7FF> +// This Clock divider is only for XOSC clock input to DPLL // fdpll0_clock_div #ifndef CONF_FDPLL0_DIV -// XOSC1 = 12 MHz, divide by 2 * ( <2> + 1 ) = 6 to have a 2 MHz clock input (maximum is 3.4 MHz) -#define CONF_FDPLL0_DIV 2 +#define CONF_FDPLL0_DIV 0x2 #endif // DCO Filter Enable @@ -488,7 +488,6 @@ // <0x3=>XOSC1 clock reference // fdpll0_arch_refclk #ifndef CONF_FDPLL0_REFCLK -// XOSC1 is used as input signal, thus also use it as reference #define CONF_FDPLL0_REFCLK 0x3 #endif @@ -533,7 +532,6 @@ // Select the clock source. // fdpll1_ref_clock #ifndef CONF_FDPLL1_GCLK -// directly use XOSC1 as clock input (no need to use an additional GCLK) #define CONF_FDPLL1_GCLK GCLK_GENCTRL_SRC_XOSC1 #endif @@ -560,23 +558,24 @@ #endif // Loop Divider Ratio Fractional Part <0x0-0x1F> +// Value of LDRFRAC is calculated using Fclk_dpll=Fckr*(LDR+1+LDRFRAC/32) formula as given in datasheet. This value is directly written in to DPLLRATIO register // fdpll1_ldrfrac #ifndef CONF_FDPLL1_LDRFRAC #define CONF_FDPLL1_LDRFRAC 0x0 #endif // Loop Divider Ratio Integer Part <0x0-0x1FFF> +// Value of LDR is calculated using Fclk_dpll=Fckr*(LDR+1+LDRFRAC/32) formula as given in datasheet. This value is directly written in to DPLLRATIO register // fdpll1_ldr #ifndef CONF_FDPLL1_LDR -// 2 MHz input clock * ( <49> + 1 = 50 ) = 100 MHz output clock -#define CONF_FDPLL1_LDR 49 +#define CONF_FDPLL1_LDR 0x31 #endif // Clock Divider <0x0-0x7FF> +// This Clock divider is only for XOSC clock input to DPLL // fdpll1_clock_div #ifndef CONF_FDPLL1_DIV -// XOSC1 = 12 MHz, divide by 2 * ( <2> + 1 ) = 6 to have a 2 MHz clock input (maximum is 3.4 MHz) -#define CONF_FDPLL1_DIV 2 +#define CONF_FDPLL1_DIV 0x2 #endif // DCO Filter Enable @@ -617,7 +616,6 @@ // <0x3=>XOSC1 clock reference // fdpll1_arch_refclk #ifndef CONF_FDPLL1_REFCLK -// XOSC1 is used as input signal, thus also use it as reference #define CONF_FDPLL1_REFCLK 0x3 #endif diff --git a/sysmoOCTSIM/config/hpl_rtc_config.h b/sysmoOCTSIM/config/hpl_rtc_config.h index 3961d40..0e795ba 100644 --- a/sysmoOCTSIM/config/hpl_rtc_config.h +++ b/sysmoOCTSIM/config/hpl_rtc_config.h @@ -35,7 +35,7 @@ // rtc_arch_prescaler #ifndef CONF_RTC_PRESCALER -#define CONF_RTC_PRESCALER 0xB +#define CONF_RTC_PRESCALER 0xb #endif diff --git a/sysmoOCTSIM/config/peripheral_clk_config.h b/sysmoOCTSIM/config/peripheral_clk_config.h index 6d8ba10..205e33e 100644 --- a/sysmoOCTSIM/config/peripheral_clk_config.h +++ b/sysmoOCTSIM/config/peripheral_clk_config.h @@ -97,7 +97,7 @@ * \brief SERCOM0's Core Clock frequency */ #ifndef CONF_GCLK_SERCOM0_CORE_FREQUENCY -#define CONF_GCLK_SERCOM0_CORE_FREQUENCY 500000 +#define CONF_GCLK_SERCOM0_CORE_FREQUENCY 12500000 #endif /** @@ -177,7 +177,7 @@ * \brief SERCOM1's Core Clock frequency */ #ifndef CONF_GCLK_SERCOM1_CORE_FREQUENCY -#define CONF_GCLK_SERCOM1_CORE_FREQUENCY 500000 +#define CONF_GCLK_SERCOM1_CORE_FREQUENCY 12500000 #endif /** @@ -257,7 +257,7 @@ * \brief SERCOM2's Core Clock frequency */ #ifndef CONF_GCLK_SERCOM2_CORE_FREQUENCY -#define CONF_GCLK_SERCOM2_CORE_FREQUENCY 500000 +#define CONF_GCLK_SERCOM2_CORE_FREQUENCY 12500000 #endif /** @@ -337,7 +337,7 @@ * \brief SERCOM3's Core Clock frequency */ #ifndef CONF_GCLK_SERCOM3_CORE_FREQUENCY -#define CONF_GCLK_SERCOM3_CORE_FREQUENCY 500000 +#define CONF_GCLK_SERCOM3_CORE_FREQUENCY 12500000 #endif /** @@ -417,7 +417,7 @@ * \brief SERCOM4's Core Clock frequency */ #ifndef CONF_GCLK_SERCOM4_CORE_FREQUENCY -#define CONF_GCLK_SERCOM4_CORE_FREQUENCY 500000 +#define CONF_GCLK_SERCOM4_CORE_FREQUENCY 12500000 #endif /** @@ -497,7 +497,7 @@ * \brief SERCOM5's Core Clock frequency */ #ifndef CONF_GCLK_SERCOM5_CORE_FREQUENCY -#define CONF_GCLK_SERCOM5_CORE_FREQUENCY 500000 +#define CONF_GCLK_SERCOM5_CORE_FREQUENCY 12500000 #endif /** @@ -577,7 +577,7 @@ * \brief SERCOM6's Core Clock frequency */ #ifndef CONF_GCLK_SERCOM6_CORE_FREQUENCY -#define CONF_GCLK_SERCOM6_CORE_FREQUENCY 500000 +#define CONF_GCLK_SERCOM6_CORE_FREQUENCY 12500000 #endif /** diff --git a/sysmoOCTSIM/hpl/core/hpl_init.c b/sysmoOCTSIM/hpl/core/hpl_init.c index bb8425c..be0db93 100644 --- a/sysmoOCTSIM/hpl/core/hpl_init.c +++ b/sysmoOCTSIM/hpl/core/hpl_init.c @@ -42,12 +42,10 @@ #include /* Referenced GCLKs (out of 0~11), should be initialized firstly - * - GCLK 11 for FDPLL1 - * - GCLK 11 for FDPLL0 */ -#define _GCLK_INIT_1ST 0x00000800 +#define _GCLK_INIT_1ST 0x00000000 /* Not referenced GCLKs, initialized last */ -#define _GCLK_INIT_LAST 0x000007FF +#define _GCLK_INIT_LAST 0x00000FFF /** * \brief Initialize the hardware abstraction layer -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Ib21847f6726920e3f97600a347f2a16f957a5e8e Gerrit-Change-Number: 25612 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:45:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:45:07 +0000 Subject: Change in osmo-ccid-firmware[master]: internal ul32k instead of external 32k osc In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25613 ) Change subject: internal ul32k instead of external 32k osc ...................................................................... internal ul32k instead of external 32k osc This should be fine, the slow clock for the uarts is not used for the modes we're interested in, and the usb clock is derived from the usb sof anyway, so it's not used as a reference there either. This will most likely drift, but so did the external one, and a free-running rtc without any external input was going to drift anyway, considering the octsim is supposed to just run without being powered down for a very long time. Change-Id: I257b8854e1860ed698c4007efeb5d16e842b519a --- M sysmoOCTSIM/atmel_start_config.atstart M sysmoOCTSIM/config/hpl_gclk_config.h M sysmoOCTSIM/config/hpl_osc32kctrl_config.h M sysmoOCTSIM/config/peripheral_clk_config.h 4 files changed, 18 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sysmoOCTSIM/atmel_start_config.atstart b/sysmoOCTSIM/atmel_start_config.atstart index 92ef0bb..74d73e0 100644 --- a/sysmoOCTSIM/atmel_start_config.atstart +++ b/sysmoOCTSIM/atmel_start_config.atstart @@ -663,10 +663,10 @@ functionality: System api: HAL:HPL:GCLK configuration: - $input: 100000000 - $input_id: Digital Phase Locked Loop (DPLL1) - RESERVED_InputFreq: 100000000 - RESERVED_InputFreq_id: Digital Phase Locked Loop (DPLL1) + $input: 32768 + $input_id: 32kHz Ultra Low Power Internal Oscillator (OSCULP32K) + RESERVED_InputFreq: 32768 + RESERVED_InputFreq_id: 32kHz Ultra Low Power Internal Oscillator (OSCULP32K) _$freq_output_Generic clock generator 0: 120000000 _$freq_output_Generic clock generator 1: 48000000 _$freq_output_Generic clock generator 10: 12000000 @@ -780,7 +780,7 @@ gclk_gen_2_oscillator: Digital Phase Locked Loop (DPLL1) gclk_gen_3_div: 1 gclk_gen_3_div_sel: false - gclk_gen_3_oscillator: 32kHz External Crystal Oscillator (XOSC32K) + gclk_gen_3_oscillator: 32kHz Ultra Low Power Internal Oscillator (OSCULP32K) gclk_gen_4_div: 2 gclk_gen_4_div_sel: false gclk_gen_4_oscillator: Digital Phase Locked Loop (DPLL1) @@ -838,23 +838,23 @@ api: HAL:HPL:OSC32KCTRL configuration: $input: 32768 - $input_id: 32kHz External Crystal Oscillator (XOSC32K) + $input_id: 32kHz Ultra Low Power Internal Oscillator (OSCULP32K) RESERVED_InputFreq: 32768 - RESERVED_InputFreq_id: 32kHz External Crystal Oscillator (XOSC32K) - _$freq_output_RTC source: 32768 + RESERVED_InputFreq_id: 32kHz Ultra Low Power Internal Oscillator (OSCULP32K) + _$freq_output_RTC source: 1024 enable_osculp32k: true enable_rtc_source: false - enable_xosc32k: true + enable_xosc32k: false osculp32k_calib: 0 osculp32k_calib_enable: false - rtc_1khz_selection: false - rtc_source_oscillator: 32kHz External Crystal Oscillator (XOSC32K) + rtc_1khz_selection: true + rtc_source_oscillator: 32kHz Ultra Low Power Internal Oscillator (OSCULP32K) xosc32k_arch_cfden: false xosc32k_arch_cfdeo: false xosc32k_arch_cgm: Standard mode xosc32k_arch_en1k: true xosc32k_arch_en32k: true - xosc32k_arch_enable: true + xosc32k_arch_enable: false xosc32k_arch_ondemand: false xosc32k_arch_runstdby: true xosc32k_arch_startup: 62592us diff --git a/sysmoOCTSIM/config/hpl_gclk_config.h b/sysmoOCTSIM/config/hpl_gclk_config.h index 158fc93..f2b75bf 100644 --- a/sysmoOCTSIM/config/hpl_gclk_config.h +++ b/sysmoOCTSIM/config/hpl_gclk_config.h @@ -252,7 +252,7 @@ // This defines the clock source for generic clock generator 3 // gclk_gen_3_oscillator #ifndef CONF_GCLK_GEN_3_SOURCE -#define CONF_GCLK_GEN_3_SOURCE GCLK_GENCTRL_SRC_XOSC32K +#define CONF_GCLK_GEN_3_SOURCE GCLK_GENCTRL_SRC_OSCULP32K #endif // Run in Standby diff --git a/sysmoOCTSIM/config/hpl_osc32kctrl_config.h b/sysmoOCTSIM/config/hpl_osc32kctrl_config.h index f41861e..7bcb41b 100644 --- a/sysmoOCTSIM/config/hpl_osc32kctrl_config.h +++ b/sysmoOCTSIM/config/hpl_osc32kctrl_config.h @@ -7,7 +7,7 @@ // RTC Source configuration // enable_rtc_source #ifndef CONF_RTCCTRL_CONFIG -#define CONF_RTCCTRL_CONFIG 1 +#define CONF_RTCCTRL_CONFIG 0 #endif // RTC source control @@ -17,7 +17,7 @@ // This defines the clock source for RTC // rtc_source_oscillator #ifndef CONF_RTCCTRL_SRC -#define CONF_RTCCTRL_SRC GCLK_GENCTRL_SRC_XOSC32K +#define CONF_RTCCTRL_SRC GCLK_GENCTRL_SRC_OSCULP32K #endif // Use 1 kHz output @@ -43,7 +43,7 @@ // Indicates whether configuration for External 32K Osc is enabled or not // enable_xosc32k #ifndef CONF_XOSC32K_CONFIG -#define CONF_XOSC32K_CONFIG 1 +#define CONF_XOSC32K_CONFIG 0 #endif // 32kHz External Crystal Oscillator Control @@ -51,7 +51,7 @@ // Indicates whether 32kHz External Crystal Oscillator is enabled or not // xosc32k_arch_enable #ifndef CONF_XOSC32K_ENABLE -#define CONF_XOSC32K_ENABLE 1 +#define CONF_XOSC32K_ENABLE 0 #endif // Start-Up Time diff --git a/sysmoOCTSIM/config/peripheral_clk_config.h b/sysmoOCTSIM/config/peripheral_clk_config.h index 205e33e..0231d7d 100644 --- a/sysmoOCTSIM/config/peripheral_clk_config.h +++ b/sysmoOCTSIM/config/peripheral_clk_config.h @@ -25,7 +25,7 @@ * \brief RTC's Clock frequency */ #ifndef CONF_GCLK_RTC_FREQUENCY -#define CONF_GCLK_RTC_FREQUENCY 32768 +#define CONF_GCLK_RTC_FREQUENCY 1024 #endif // Core Clock Source -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I257b8854e1860ed698c4007efeb5d16e842b519a Gerrit-Change-Number: 25613 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:45:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:45:08 +0000 Subject: Change in osmo-ccid-firmware[master]: proper xosc startup delay In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25614 ) Change subject: proper xosc startup delay ...................................................................... proper xosc startup delay Change-Id: I5063b43cd3973b66963fc946c019f32a0281d1a6 --- M sysmoOCTSIM/config/hpl_oscctrl_config.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sysmoOCTSIM/config/hpl_oscctrl_config.h b/sysmoOCTSIM/config/hpl_oscctrl_config.h index d27c869..3f27598 100644 --- a/sysmoOCTSIM/config/hpl_oscctrl_config.h +++ b/sysmoOCTSIM/config/hpl_oscctrl_config.h @@ -158,7 +158,7 @@ // <0xF=>1000000us // xosc1_arch_startup #ifndef CONF_XOSC1_STARTUP -#define CONF_XOSC1_STARTUP 0 +#define CONF_XOSC1_STARTUP 0xB #endif // Clock Switch Back -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I5063b43cd3973b66963fc946c019f32a0281d1a6 Gerrit-Change-Number: 25614 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:45:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:45:09 +0000 Subject: Change in osmo-ccid-firmware[master]: remove unused dmac In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25615 ) Change subject: remove unused dmac ...................................................................... remove unused dmac Change-Id: I9646220d9864fd8ddc133da58151227c24546cc6 --- M sysmoOCTSIM/atmel_start.c M sysmoOCTSIM/config/hpl_dmac_config.h 2 files changed, 4 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sysmoOCTSIM/atmel_start.c b/sysmoOCTSIM/atmel_start.c index 931a09a..d6304fa 100644 --- a/sysmoOCTSIM/atmel_start.c +++ b/sysmoOCTSIM/atmel_start.c @@ -1,19 +1,11 @@ #include -/** Memory to memory DMA callback */ -static void M2M_DMA_complete_cb(void) -{ - dma_m2m_complete_flag = true; -} - /** * Initializes MCU, drivers and middleware in the project **/ void atmel_start_init(void) { system_init(); - dma_memory_init(); - dma_memory_register_callback(DMA_MEMORY_COMPLETE_CB, M2M_DMA_complete_cb); #ifdef ENABLE_DBG_UART7 stdio_redirect_init(); #endif diff --git a/sysmoOCTSIM/config/hpl_dmac_config.h b/sysmoOCTSIM/config/hpl_dmac_config.h index c736778..90499fc 100644 --- a/sysmoOCTSIM/config/hpl_dmac_config.h +++ b/sysmoOCTSIM/config/hpl_dmac_config.h @@ -8,7 +8,7 @@ // Indicates whether dmac is enabled or not // dmac_enable #ifndef CONF_DMAC_ENABLE -#define CONF_DMAC_ENABLE 1 +#define CONF_DMAC_ENABLE 0 #endif // Priority Level 0 @@ -105,7 +105,7 @@ // Channel 0 settings // dmac_channel_0_settings #ifndef CONF_DMAC_CHANNEL_0_SETTINGS -#define CONF_DMAC_CHANNEL_0_SETTINGS 1 +#define CONF_DMAC_CHANNEL_0_SETTINGS 0 #endif // Channel Run in Standby @@ -284,14 +284,14 @@ // Indicates whether the source address incrementation is enabled or not // dmac_srcinc_0 #ifndef CONF_DMAC_SRCINC_0 -#define CONF_DMAC_SRCINC_0 1 +#define CONF_DMAC_SRCINC_0 0 #endif // Destination Address Increment // Indicates whether the destination address incrementation is enabled or not // dmac_dstinc_0 #ifndef CONF_DMAC_DSTINC_0 -#define CONF_DMAC_DSTINC_0 1 +#define CONF_DMAC_DSTINC_0 0 #endif // Beat Size -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I9646220d9864fd8ddc133da58151227c24546cc6 Gerrit-Change-Number: 25615 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:45:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:45:30 +0000 Subject: Change in osmo-pcu[master]: pcuif: Submit data_req with len=0 as idle frames In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25535 ) Change subject: pcuif: Submit data_req with len=0 as idle frames ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ife718eeed2af011479c03099ea109518f04567bc Gerrit-Change-Number: 25535 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 08 Oct 2021 05:45:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:46:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:46:09 +0000 Subject: Change in docker-playground[master]: ttcn3-ns-test: add second NSVC to allow TC_tx_blocked_foreign_nsvc to... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/25561 ) Change subject: ttcn3-ns-test: add second NSVC to allow TC_tx_blocked_foreign_nsvc to work ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/25561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3a4baaacdbaab245ba10a1857f0183e56defcdf4 Gerrit-Change-Number: 25561 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 05:46:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:46:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:46:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ns: add test case TC_tx_blocked_foreign_nsvc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25560 ) Change subject: ns: add test case TC_tx_blocked_foreign_nsvc ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2b37a712bd70037b35b9deb8dab4a72d1e1d29fb Gerrit-Change-Number: 25560 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 05:46:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 05:46:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 8 Oct 2021 05:46:57 +0000 Subject: Change in osmocom-bb[master]: 262-10 is "DB Netz AG" and not "DB Systel" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/25655 ) Change subject: 262-10 is "DB Netz AG" and not "DB Systel" ...................................................................... 262-10 is "DB Netz AG" and not "DB Systel" Change-Id: Idbce4bade4305fabbedcf15c5bd9253fbb371744 --- M src/host/layer23/src/common/networks.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved dexter: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/networks.c b/src/host/layer23/src/common/networks.c index b4757e9..0cc0d94 100644 --- a/src/host/layer23/src/common/networks.c +++ b/src/host/layer23/src/common/networks.c @@ -470,7 +470,7 @@ { 0x262, 0x07f, "O2" }, { 0x262, 0x08f, "O2" }, { 0x262, 0x09f, "Vodafone" }, - { 0x262, 0x10f, "DB Systel GSM-R" }, + { 0x262, 0x10f, "DB Netz AG GSM-R" }, { 0x262, 0x11f, "O2" }, { 0x262, 0x12f, "Dolphin Telecom" }, { 0x262, 0x13f, "Mobilcom Multimedia" }, -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/25655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idbce4bade4305fabbedcf15c5bd9253fbb371744 Gerrit-Change-Number: 25655 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 08:31:34 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 8 Oct 2021 08:31:34 +0000 Subject: Change in pysim[master]: pySim-shell: refactor __main__ section In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25484 ) Change subject: pySim-shell: refactor __main__ section ...................................................................... pySim-shell: refactor __main__ section The code in __main__ which initalizes the reader and the card and runtime state is not so well structured. Lets put the generation of the card and rs (RuntimeState) object into a separate function. Also do not wait indefinetly for a card. 3 seconds should be enough. If the card or reader did not respond until then, then there will be a problem in any case. Change-Id: Id2a0f2012b84ce61f5c0c14404df559fca4ddfcd Related: SYS#5617 --- M pySim-shell.py 1 file changed, 52 insertions(+), 32 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pySim-shell.py b/pySim-shell.py index 6699c6f..f821e41 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -50,6 +50,44 @@ from pySim.card_key_provider import CardKeyProviderCsv, card_key_provider_register, card_key_provider_get_field +def init_card(sl): + """ + Detect card in reader and setup card profile and runtime state. This + function must be called at least once on startup. The card and runtime + state object (rs) is required for all pySim-shell commands. + """ + + # Wait up to three seconds for a card in reader and try to detect + # the card type. + print("Waiting for card...") + try: + sl.wait_for_card(3) + except NoCardError: + print("No card detected!") + return None, None; + except: + print("Card not readable!") + return None, None; + + card = card_detect("auto", scc) + if card is None: + print("Could not detect card type!") + return None, None; + + # Create runtime state with card profile + profile = CardProfileUICC() + profile.add_application(CardApplicationUSIM) + profile.add_application(CardApplicationISIM) + rs = RuntimeState(card, profile) + + # FIXME: do this dynamically + rs.mf.add_file(DF_TELECOM()) + rs.mf.add_file(DF_GSM()) + + # inform the transport that we can do context-specific SW interpretation + sl.set_sw_interpreter(rs) + + return rs, card class PysimApp(cmd2.Cmd): CUSTOM_CATEGORY = 'pySim Commands' @@ -471,44 +509,12 @@ # Parse options opts = option_parser.parse_args() - # Init card reader driver - sl = init_reader(opts) - if (sl == None): - exit(1) - - # Create command layer - scc = SimCardCommands(transport=sl) - - sl.wait_for_card(); - - card_handler = CardHandler(sl) - - card = card_detect("auto", scc) - if card is None: - print("No card detected!") - sys.exit(2) - - profile = CardProfileUICC() - profile.add_application(CardApplicationUSIM) - profile.add_application(CardApplicationISIM) - - rs = RuntimeState(card, profile) - # inform the transport that we can do context-specific SW interpretation - sl.set_sw_interpreter(rs) - - # FIXME: do this dynamically - rs.mf.add_file(DF_TELECOM()) - rs.mf.add_file(DF_GSM()) - # If a script file is specified, be sure that it actually exists if opts.script: if not os.access(opts.script, os.R_OK): print("Invalid script file!") sys.exit(2) - app = PysimApp(card, rs, opts.script) - rs.select('MF', app) - # Register csv-file as card data provider, either from specified CSV # or from CSV file in home directory csv_default = str(Path.home()) + "/.osmocom/pysim/card_data.csv" @@ -517,6 +523,20 @@ if os.path.isfile(csv_default): card_key_provider_register(CardKeyProviderCsv(csv_default)) + # Init card reader driver + sl = init_reader(opts) + if sl is None: + exit(1) + + # Create command layer + scc = SimCardCommands(transport=sl) + + rs, card = init_card(sl) + if (rs is None or card is None): + exit(1) + app = PysimApp(card, rs, opts.script) + rs.select('MF', app) + # If the user supplies an ADM PIN at via commandline args authenticate # immediately so that the user does not have to use the shell commands pin_adm = sanitize_pin_adm(opts.pin_adm, opts.pin_adm_hex) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id2a0f2012b84ce61f5c0c14404df559fca4ddfcd Gerrit-Change-Number: 25484 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 08:34:06 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 8 Oct 2021 08:34:06 +0000 Subject: Change in pysim[master]: cards: remove "auto_once" from possible ctype options References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25723 ) Change subject: cards: remove "auto_once" from possible ctype options ...................................................................... cards: remove "auto_once" from possible ctype options The card_detect function in cards.py allows to specify the card type or use the hints "auto" and "auto_once" to trigger autodetection of the card. However, "auto_once" has no effect and is not used by any caller, so lets remove it. Change-Id: Iea726f51e5ddb43d8a4da2672552fff38e29b006 --- M pySim/cards.py 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/23/25723/1 diff --git a/pySim/cards.py b/pySim/cards.py index 5e2e9fe..2ca9831 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -1572,7 +1572,7 @@ card = None ctypes = dict([(kls.name, kls) for kls in _cards_classes]) - if ctype in ("auto", "auto_once"): + if ctype in ("auto"): for kls in _cards_classes: card = kls.autodetect(scc) if card: @@ -1584,9 +1584,6 @@ print("Autodetection failed") return None - if ctype == "auto_once": - ctype = card.name - elif ctype in ctypes: card = ctypes[ctype](scc) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iea726f51e5ddb43d8a4da2672552fff38e29b006 Gerrit-Change-Number: 25723 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 09:18:49 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 8 Oct 2021 09:18:49 +0000 Subject: Change in pysim[master]: pySim-shell: allow card insertion at runtime In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, laforge, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25549 to look at the new patch set (#5). Change subject: pySim-shell: allow card insertion at runtime ...................................................................... pySim-shell: allow card insertion at runtime Currently a card must be present in the reader until the user can enter pySim-shell. Removing and plugging another card is in theory already possible, but then the new card will operate on the old card and runtime state object. It might also be useful to enter pySim-shell before the card is plugged to execute some other commands for preperation before. So lets allow to "equip" pySim-shell with a card and rs object at runtime. Related: SYS#5617 Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 --- M pySim-shell.py M pySim/filesystem.py 2 files changed, 75 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/49/25549/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 Gerrit-Change-Number: 25549 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 09:20:49 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 8 Oct 2021 09:20:49 +0000 Subject: Change in pysim[master]: pySim-shell: allow card insertion at runtime In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25549 ) Change subject: pySim-shell: allow card insertion at runtime ...................................................................... Patch Set 5: (3 comments) https://gerrit.osmocom.org/c/pysim/+/25549/3/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/25549/3/pySim-shell.py at a109 PS3, Line 109: self.ad > why is this setting removed here? What ist he logic behind it? It is not entirely removed. Its only added later with the equip() function. The reason for this is that conserve_write flag is in the runtime state, which might not exist (None) in this code path yet. https://gerrit.osmocom.org/c/pysim/+/25549/3/pySim-shell.py at 127 PS3, Line 127: if (cmd_set != []): > A more elegant solution would be: [?] Done https://gerrit.osmocom.org/c/pysim/+/25549/3/pySim-shell.py at 130 PS3, Line 130: if (cmd_set != []): > Same here. See https://stackoverflow.com/questions/53513/how-do-i-check-if-a-list-is-empty. Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 Gerrit-Change-Number: 25549 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 09:20:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 09:33:16 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 8 Oct 2021 09:33:16 +0000 Subject: Change in pysim[master]: cards: remove unused function card_autodetect() In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25686 ) Change subject: cards: remove unused function card_autodetect() ...................................................................... cards: remove unused function card_autodetect() The function card_autodetect() is not used, lets remove it. Change-Id: Ic188e1fffb4a40e89ad276941d20f94cf35e1538 --- M pySim/cards.py 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pySim/cards.py b/pySim/cards.py index 5e2e9fe..2f96ee1 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -1559,14 +1559,6 @@ SysmoSIMgr1, SysmoSIMgr2, SysmoUSIMgr1, SysmoUSIMSJS1, FairwavesSIM, OpenCellsSim, WavemobileSim, SysmoISIMSJA2 ] -def card_autodetect(scc): - for kls in _cards_classes: - card = kls.autodetect(scc) - if card is not None: - card.reset() - return card - return None - def card_detect(ctype, scc): # Detect type if needed card = None -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic188e1fffb4a40e89ad276941d20f94cf35e1538 Gerrit-Change-Number: 25686 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 10:44:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 10:44:57 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: report PDCH interference levels to L1SAP In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25714 ) Change subject: osmo-bts-trx: report PDCH interference levels to L1SAP ...................................................................... Patch Set 2: > Patch Set 2: > > what about other BTS models like osmo-bts-sysmo? I did not investigate because this is not part of SYS#5313. Just had a very quick look at the DSP's API headers and could not find anything interference/noise related in there. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3fbaad5dbc3bbd305b3ad4cb4bfb431a42cfbffc Gerrit-Change-Number: 25714 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 08 Oct 2021 10:44:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 10:47:05 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 10:47:05 +0000 Subject: Change in osmo-bts[master]: rsl_tx_rf_res(): also report noise levels for PDTCH In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25713 to look at the new patch set (#3). Change subject: rsl_tx_rf_res(): also report noise levels for PDTCH ...................................................................... rsl_tx_rf_res(): also report noise levels for PDTCH This information may be useful for the BSC to determine whether dynamic PDCH timeslots might be better used for new circuit switched connections, or whether alternative PDCH slots should be allocated for interference reasons. Change-Id: I5b4d1da0920e788ac8063cc765fe5b0223c76758 Related: SYS#5313 --- M src/common/rsl.c 1 file changed, 13 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/13/25713/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5b4d1da0920e788ac8063cc765fe5b0223c76758 Gerrit-Change-Number: 25713 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 10:47:05 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 10:47:05 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: report PDCH interference levels to L1SAP In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25714 to look at the new patch set (#3). Change subject: osmo-bts-trx: report PDCH interference levels to L1SAP ...................................................................... osmo-bts-trx: report PDCH interference levels to L1SAP Starting from [1], interference levels on PDCH timeslots are also reported over the A-bis/RSL. They may be useful for the BSC to determine whether dynamic PDCH timeslots might be better used for new circuit switched connections, or whether alternative PDCH slots should be allocated for interference reasons. * Handle GSM_LCHAN_PDTCH in lchan_report_interf_meas(). * Rework pcu_tx_interf_ind() to accept 'struct gsm_bts_trx'. * Call pcu_tx_interf_ind() from l1sap_interf_meas_report(). Regarding pcu_tx_interf_ind(), it's better to call this function from the upper layers once, rather than calling it from various places in the model specific code. [1] I5b4d1da0920e788ac8063cc765fe5b0223c76758 Change-Id: I3fbaad5dbc3bbd305b3ad4cb4bfb431a42cfbffc Related: SYS#5313 --- M include/osmo-bts/pcu_if.h M src/common/l1sap.c M src/common/pcu_sock.c M src/osmo-bts-trx/scheduler_trx.c 4 files changed, 65 insertions(+), 71 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/14/25714/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3fbaad5dbc3bbd305b3ad4cb4bfb431a42cfbffc Gerrit-Change-Number: 25714 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 10:47:05 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 10:47:05 +0000 Subject: Change in osmo-bts[master]: l1sap: check if BTS model supports interference reporting In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25721 to look at the new patch set (#2). Change subject: l1sap: check if BTS model supports interference reporting ...................................................................... l1sap: check if BTS model supports interference reporting Currently, only osmo-bts-trx is capable of reporting the interference levels to L1SAP. Thus it does not make sense to trigger the averaging logic and send empty reports over the A-bis/RSL and the PCUIF. Change-Id: Ic17eb46bdca3c33ac4d6e560a093b635b75424a5 Related: SYS#5313 --- M include/osmo-bts/bts.h M src/common/l1sap.c M src/osmo-bts-trx/main.c 3 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/21/25721/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic17eb46bdca3c33ac4d6e560a093b635b75424a5 Gerrit-Change-Number: 25721 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 10:47:05 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 10:47:05 +0000 Subject: Change in osmo-bts[master]: vty: show interference level / band in 'show lchan' In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25722 to look at the new patch set (#2). Change subject: vty: show interference level / band in 'show lchan' ...................................................................... vty: show interference level / band in 'show lchan' Change-Id: Ide45a0f7836bf35ffbe88070fa8367022311ca44 Related: SYS#5313 --- M src/common/vty.c 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/22/25722/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ide45a0f7836bf35ffbe88070fa8367022311ca44 Gerrit-Change-Number: 25722 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 10:48:31 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 10:48:31 +0000 Subject: Change in osmo-bts[master]: rsl_tx_rf_res(): also report noise levels for PDTCH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25713 ) Change subject: rsl_tx_rf_res(): also report noise levels for PDTCH ...................................................................... Patch Set 3: Code-Review+2 Re-applying CR+1 by Pau and CR+1 by Harald after the commit message changes. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5b4d1da0920e788ac8063cc765fe5b0223c76758 Gerrit-Change-Number: 25713 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 10:48:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 10:48:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 10:48:51 +0000 Subject: Change in osmo-bts[master]: rsl_tx_rf_res(): separate interference AVG / band calculation In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25712 ) Change subject: rsl_tx_rf_res(): separate interference AVG / band calculation ...................................................................... rsl_tx_rf_res(): separate interference AVG / band calculation It's cleaner from the architectural point of view to have the interference measurements processed in a separate function. Change-Id: I3981608e01a50585359cad673c38c8a305027d30 Related: SYS#5313 --- M include/osmo-bts/lchan.h M src/common/l1sap.c M src/common/lchan.c M src/common/rsl.c 4 files changed, 43 insertions(+), 18 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index fdb3144..8fcf36a 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -226,8 +226,10 @@ uint16_t toa256_std_dev; } ext; /* Interference levels reported by PHY (in dBm) */ + int16_t interf_meas_avg_dbm; /* Average value */ int16_t interf_meas_dbm[31]; /* Intave max is 31 */ uint8_t interf_meas_num; + uint8_t interf_band; } meas; struct { struct amr_multirate_conf amr_mr; @@ -341,7 +343,7 @@ enum gsm_phys_chan_config as_pchan); void gsm_lchan_interf_meas_push(struct gsm_lchan *lchan, int dbm); -int gsm_lchan_interf_meas_calc_band(struct gsm_lchan *lchan); +void gsm_lchan_interf_meas_calc_avg(struct gsm_lchan *lchan); int lchan2ecu_codec(const struct gsm_lchan *lchan); diff --git a/src/common/l1sap.c b/src/common/l1sap.c index a48287c..5c58aff 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -591,6 +591,29 @@ return rach_frames_expired; } +static void l1sap_interf_meas_calc_avg(struct gsm_bts_trx *trx) +{ + unsigned int tn, ln; + + for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { + struct gsm_bts_trx_ts *ts = &trx->ts[tn]; + + for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) { + struct gsm_lchan *lchan = &ts->lchan[ln]; + + lchan->meas.interf_meas_avg_dbm = 0; + lchan->meas.interf_band = 0; + + /* There must be at least one sample */ + if (lchan->meas.interf_meas_num == 0) + continue; + + /* Average all collected samples */ + gsm_lchan_interf_meas_calc_avg(lchan); + } + } +} + static void l1sap_interf_meas_report(struct gsm_bts *bts) { const uint32_t period = bts->interference.intave * 104; @@ -601,8 +624,12 @@ if (bts->gsm_time.fn % period != 0) return; - llist_for_each_entry(trx, &bts->trx_list, list) + llist_for_each_entry(trx, &bts->trx_list, list) { + /* Calculate the average of all received samples */ + l1sap_interf_meas_calc_avg(trx); + /* Report to the BSC over the A-bis/RSL */ rsl_tx_rf_res(trx); + } } /* time information received from bts model */ diff --git a/src/common/lchan.c b/src/common/lchan.c index 10a375e..f7ee33b 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -348,15 +348,14 @@ } /* Called by the higher layers every Intave * 104 TDMA frames */ -int gsm_lchan_interf_meas_calc_band(struct gsm_lchan *lchan) +void gsm_lchan_interf_meas_calc_avg(struct gsm_lchan *lchan) { const uint8_t meas_num = lchan->meas.interf_meas_num; const struct gsm_bts *bts = lchan->ts->trx->bts; int b, meas_avg, meas_sum = 0; /* There must be at least one sample */ - if (meas_num == 0) - return -EAGAIN; + OSMO_ASSERT(meas_num > 0); /* Calculate the sum of all collected samples (in -x dBm) */ while (lchan->meas.interf_meas_num) { @@ -377,7 +376,8 @@ "Interference AVG: %ddBm (band %d, samples %u)\n", meas_avg, b, meas_num); - return b; + lchan->meas.interf_meas_avg_dbm = meas_avg; + lchan->meas.interf_band = b; } /* determine the ECU codec constant for the codec used by given lchan */ diff --git a/src/common/rsl.c b/src/common/rsl.c index 229a2af..e4531aa 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -440,29 +440,25 @@ uint8_t *len = msgb_tl_put(nmsg, RSL_IE_RESOURCE_INFO); for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { - struct gsm_bts_trx_ts *ts = &trx->ts[tn]; + const struct gsm_bts_trx_ts *ts = &trx->ts[tn]; for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) { - struct gsm_lchan *lchan = &ts->lchan[ln]; + const struct gsm_lchan *lchan = &ts->lchan[ln]; + + /* No average interference value => no band */ + if (lchan->meas.interf_meas_avg_dbm == 0) + continue; /* We're not interested in active lchans */ - if (lchan->state == LCHAN_S_ACTIVE) { - /* Avoid potential buffer overflow */ - lchan->meas.interf_meas_num = 0; + if (lchan->state == LCHAN_S_ACTIVE) continue; - } /* Only for GSM_LCHAN_{SDCCH,TCH_F,TCH_H} */ if (!lchan_is_dcch(lchan)) continue; - /* Average all collected samples */ - int band = gsm_lchan_interf_meas_calc_band(lchan); - if (band < 0) - continue; - msgb_v_put(nmsg, gsm_lchan2chan_nr_rsl(lchan)); - msgb_v_put(nmsg, (band & 0x07) << 5); + msgb_v_put(nmsg, (lchan->meas.interf_band & 0x07) << 5); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3981608e01a50585359cad673c38c8a305027d30 Gerrit-Change-Number: 25712 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 10:48:52 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 10:48:52 +0000 Subject: Change in osmo-bts[master]: rsl_tx_rf_res(): also report noise levels for PDTCH In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25713 ) Change subject: rsl_tx_rf_res(): also report noise levels for PDTCH ...................................................................... rsl_tx_rf_res(): also report noise levels for PDTCH This information may be useful for the BSC to determine whether dynamic PDCH timeslots might be better used for new circuit switched connections, or whether alternative PDCH slots should be allocated for interference reasons. Change-Id: I5b4d1da0920e788ac8063cc765fe5b0223c76758 Related: SYS#5313 --- M src/common/rsl.c 1 file changed, 13 insertions(+), 6 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index e4531aa..638caf8 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -449,13 +449,20 @@ if (lchan->meas.interf_meas_avg_dbm == 0) continue; - /* We're not interested in active lchans */ - if (lchan->state == LCHAN_S_ACTIVE) + /* Only for GSM_LCHAN_{SDCCH,TCH_F,TCH_H,PDTCH} */ + switch (lchan->type) { + case GSM_LCHAN_SDCCH: + case GSM_LCHAN_TCH_F: + case GSM_LCHAN_TCH_H: + /* We're not interested in active CS lchans */ + if (lchan->state == LCHAN_S_ACTIVE) + continue; + break; + case GSM_LCHAN_PDTCH: + break; + default: continue; - - /* Only for GSM_LCHAN_{SDCCH,TCH_F,TCH_H} */ - if (!lchan_is_dcch(lchan)) - continue; + } msgb_v_put(nmsg, gsm_lchan2chan_nr_rsl(lchan)); msgb_v_put(nmsg, (lchan->meas.interf_band & 0x07) << 5); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5b4d1da0920e788ac8063cc765fe5b0223c76758 Gerrit-Change-Number: 25713 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 11:35:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 11:35:12 +0000 Subject: Change in osmo-bsc[master]: rsl_rx_resource_indication(): check result of rsl_tlv_parse() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25719 ) Change subject: rsl_rx_resource_indication(): check result of rsl_tlv_parse() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b4758f80f2cd87e22bd3617e189f12403461ea3 Gerrit-Change-Number: 25719 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 11:35:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 11:35:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 11:35:51 +0000 Subject: Change in osmo-bsc[master]: rsl_lchan_lookup(): fix handling of ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25720 ) Change subject: rsl_lchan_lookup(): fix handling of ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2cac4acd4c5145c5c525c9952fdc754477ce0942 Gerrit-Change-Number: 25720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 11:35:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 11:36:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 11:36:13 +0000 Subject: Change in osmo-pcu[master]: tests: RLCMACTest: Add one more sample RA capabilities to suite In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25706 ) Change subject: tests: RLCMACTest: Add one more sample RA capabilities to suite ...................................................................... tests: RLCMACTest: Add one more sample RA capabilities to suite This one is larger than some of the other already available. The decoder is wroking as expected here. Change-Id: I5d986f68395326f894349446194090b1ddaecd69 --- M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.err M tests/rlcmac/RLCMACTest.ok 3 files changed, 204 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 4bde5bf..f763b95 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -479,6 +479,203 @@ bitvec_free(bv_dec); } +/* RAcap larger than 23 bytes */ +void testRAcap3(void *test_ctx) +{ + printf("*** %s ***\n", __func__); + MS_Radio_Access_capability_t data; + memset(&data, 0, sizeof(data)); + bitvec *bv_dec = bitvec_alloc(31, test_ctx); + int rc; +/* +MS Radio Access Capability + Element ID: 0x13 + 1... .... = ext: 1 + Length: 31 + ------------------------------------------- Hex bitstream starts here: + MS RA capability 1 + 0001 .... = Access Technology Type: GSM E --note that GSM E covers GSM P (1) + .... 1010 111. .... = Length in bits: 0x57 (87) + ...1 00.. RF Power Capability, GMSK Power Class: 2 W (33 dBm) (4) + A5 Bits: A5 bits follow (1) + A5/1: encryption algorithm available (1) + A5/2: encryption algorithm not available (0) + A5/3: encryption algorithm available (1) + A5/4: encryption algorithm not available (0) + A5/5: encryption algorithm not available (0) + A5/6: encryption algorithm not available (0) + A5/7: encryption algorithm not available (0) + .... ..1. = Controlled early Classmark Sending: Implemented + .... ...1 = Pseudo Synchronisation: Present + 0... .... = Voice Group Call Service: no VGCS capability or no notifications wanted + .0.. .... = Voice Broadcast Service: no VBS capability or no notifications wanted + ..1. .... = Multislot capability struct: Present + HSCSD multislot class: Bits are not available (0) + SMS_VALUE (Switch-Measure-Switch): Bits are not available (0) + ECSD multislot class: Bits are not available (0) + DTM GPRS Multi Slot Class: Bits are not available (0) + .... .011 00.. .... = GPRS multislot class: Max Rx-Slot/TDMA:4 Max Tx-Slot/TDMA:4 Max-Sum-Slot/TDMA:5 Tta:2 Ttb:1 Tra:2 Trb:1 Type:1 (12) + ..1. .... = GPRS Extended Dynamic Allocation Capability: Implemented + .... ..01 100. .... = EGPRS multislot class: Max Rx-Slot/TDMA:4 Max Tx-Slot/TDMA:4 Max-Sum-Slot/TDMA:5 Tta:2 Ttb:1 Tra:2 Trb:1 Type:1 (12) + ...1 .... = EGPRS Extended Dynamic Allocation Capability: Implemented + .... .1.. = 8PSK Power Capability Bits: Present + 8PSK Power Capability: Power class E2 (2) + 0... .... = COMPACT Interference Measurement Capability: Not Implemented + .1.. .... = Revision Level Indicator: The ME is Release '99 onwards + ..0. .... = UMTS FDD Radio Access Technology Capability: Not supported + ...0 .... = UMTS 3.84 Mcps TDD Radio Access Technology Capability: Not supported + .... 0... = CDMA 2000 Radio Access Technology Capability: Not supported + .... .0.. = UMTS 1.28 Mcps TDD Radio Access Technology Capability: Not supported + .... ..1. = GERAN Feature Package 1: Supported + Extended DTM EGPRS Multi Slot Class: Bits are not available (0) + 0... .... = Modulation based multislot class support: Not supported + High Multislot Capability: 0x00 (0) - This field effect all other multislot fields. To understand the value please read TS 24.008 5.6.0 Release 5 Chap 10.5.5.12 Page 406 + .... 0... = GERAN Iu mode: Not supported + GMSK Multislot Power Profile: GMSK_MULTISLOT_POWER_PROFILE 0 (0) + 8-PSK Multislot Power Profile: 8-PSK_MULTISLOT_POWER_PROFILE 0 (0) + .0.. .... = Multiple TBF Capability: Not supported + ..01 .... = Downlink Advanced Receiver Performance: Downlink Advanced Receiver Performance - phase I supported (1) + .... 0... = Extended RLC/MAC Control Message Segmentation Capability: Not supported + .... .0.. = DTM Enhancements Capability: The mobile station does not support enhanced DTM CS establishment and enhanced DTM CS release procedures + .... ...0 = PS Handover Capability: Not supported + 0... .... = DTM Handover Capability: Not supported + ..0. .... = Flexible Timeslot Assignment: Not supported + ...0 .... = GAN PS Handover Capability: Not supported + .... 0... = RLC Non-persistent Mode: Not supported + .... .0.. = Reduced Latency Capability: Not supported + .... ..00 = Uplink EGPRS2: The mobile station does not support either EGPRS2-A or EGPRS2-B in the uplink (0) + 00.. .... = Downlink EGPRS2: The mobile station does not support either EGPRS2-A or EGPRS2-B in the downlink (0) + ..0. .... = E-UTRA FDD support: Not supported + ...0 .... = E-UTRA TDD support: Not supported + .... 00.. = GERAN to E-UTRA support in GERAN packet transfer mode: None (0) + .... ..0. = Priority-based reselection support: Not supported + 0... .... = Indication of Upper Layer PDU Start Capability for RLC UM: Not supported + .0.. .... = Enhanced Multiplexing for Single TBF Capability: Not supported + ..0. .... = Multiple TTI Capability: Not supported + ...0 .... = Reporting of UTRAN CSG cells in packet transfer mode: Not supported + .... 0... = Reporting of E-UTRAN CSG cells in packet transfer mode: Not supported + .... .0.. = Dynamic Timeslot Reduction Capability: Not supported + .... ..0. = Enhanced Multiplexing for Single RLC Entity Capability: Not supported + .... ...0 = Fast Downlink Frequency Switching Capability: Not supported + 01.. .... = TIGHTER Capability: TIGHTER supported for speech and signalling channels only (1) + MS RA capability 2 + ...0 111. = Access Technology Type: GSM 850 (7) + .... ...0 1111 10.. = Length in bits: 0x3e (62) + .... ..10 0... .... RF Power Capability, GMSK Power Class: 2 W (33 dBm) (4) + A5 Bits: Same values apply for parameters as in the immediately preceding Access capabilities field within this IE (0) + ..1. .... = Controlled early Classmark Sending: Implemented + ...1 .... = Pseudo Synchronisation: Present + .... 0... = Voice Group Call Service: no VGCS capability or no notifications wanted + .... .0.. = Voice Broadcast Service: no VBS capability or no notifications wanted + .... ..0. = Multislot capability struct: Not Present + .... ...1 = 8PSK Power Capability Bits: Present + 8PSK Power Capability: Power class E2 (2) + ..0. .... = COMPACT Interference Measurement Capability: Not Implemented + ...1 .... = Revision Level Indicator: The ME is Release '99 onwards + .... 0... = UMTS FDD Radio Access Technology Capability: Not supported + .... .0.. = UMTS 3.84 Mcps TDD Radio Access Technology Capability: Not supported + .... ..0. = CDMA 2000 Radio Access Technology Capability: Not supported + .... ...0 = UMTS 1.28 Mcps TDD Radio Access Technology Capability: Not supported + 1... .... = GERAN Feature Package 1: Supported + Extended DTM EGPRS Multi Slot Class: Bits are not available (0) + ..0. .... = Modulation based multislot class support: Not supported + High Multislot Capability: 0x00 (0) - This field effect all other multislot fields. To understand the value please read TS 24.008 5.6.0 Release 5 Chap 10.5.5.12 Page 406 + .... ..0. = GERAN Iu mode: Not supported + GMSK Multislot Power Profile: GMSK_MULTISLOT_POWER_PROFILE 0 (0) + 8-PSK Multislot Power Profile: 8-PSK_MULTISLOT_POWER_PROFILE 0 (0) + ...0 .... = Multiple TBF Capability: Not supported + .... 01.. = Downlink Advanced Receiver Performance: Downlink Advanced Receiver Performance - phase I supported (1) + .... ..0. = Extended RLC/MAC Control Message Segmentation Capability: Not supported + .... ...0 = DTM Enhancements Capability: The mobile station does not support enhanced DTM CS establishment and enhanced DTM CS release procedures + .0.. .... = PS Handover Capability: Not supported + ..0. .... = DTM Handover Capability: Not supported + .... 0... = Flexible Timeslot Assignment: Not supported + .... .0.. = GAN PS Handover Capability: Not supported + .... ..0. = RLC Non-persistent Mode: Not supported + .... ...0 = Reduced Latency Capability: Not supported + 00.. .... = Uplink EGPRS2: The mobile station does not support either EGPRS2-A or EGPRS2-B in the uplink (0) + ..00 .... = Downlink EGPRS2: The mobile station does not support either EGPRS2-A or EGPRS2-B in the downlink (0) + .... 0... = E-UTRA FDD support: Not supported + .... .0.. = E-UTRA TDD support: Not supported + .... ..00 = GERAN to E-UTRA support in GERAN packet transfer mode: None (0) + 0... .... = Priority-based reselection support: Not supported + ..0. .... = Indication of Upper Layer PDU Start Capability for RLC UM: Not supported + ...0 .... = Enhanced Multiplexing for Single TBF Capability: Not supported + .... 0... = Multiple TTI Capability: Not supported + .... .0.. = Reporting of UTRAN CSG cells in packet transfer mode: Not supported + .... ..0. = Reporting of E-UTRAN CSG cells in packet transfer mode: Not supported + .... ...0 = Dynamic Timeslot Reduction Capability: Not supported + 0... .... = Enhanced Multiplexing for Single RLC Entity Capability: Not supported + .0.. .... = Fast Downlink Frequency Switching Capability: Not supported + ..01 .... = TIGHTER Capability: TIGHTER supported for speech and signalling channels only (1) + MS RA capability 3 + .... .010 0... .... = Access Technology Type: GSM 1900 (4) + .011 1110 = Length in bits: 0x3e (62) + 001. .... RF Power Capability, GMSK Power Class: 1 W (30 dBm) (1) + A5 Bits: Same values apply for parameters as in the immediately preceding Access capabilities field within this IE (0) + .... 1... = Controlled early Classmark Sending: Implemented + .... .1.. = Pseudo Synchronisation: Present + .... ..0. = Voice Group Call Service: no VGCS capability or no notifications wanted + .... ...0 = Voice Broadcast Service: no VBS capability or no notifications wanted + 0... .... = Multislot capability struct: Not Present + .1.. .... = 8PSK Power Capability Bits: Present + 8PSK Power Capability: Power class E2 (2) + .... 0... = COMPACT Interference Measurement Capability: Not Implemented + .... .1.. = Revision Level Indicator: The ME is Release '99 onwards + .... ..0. = UMTS FDD Radio Access Technology Capability: Not supported + .... ...0 = UMTS 3.84 Mcps TDD Radio Access Technology Capability: Not supported + 0... .... = CDMA 2000 Radio Access Technology Capability: Not supported + .0.. .... = UMTS 1.28 Mcps TDD Radio Access Technology Capability: Not supported + ..1. .... = GERAN Feature Package 1: Supported + Extended DTM EGPRS Multi Slot Class: Bits are not available (0) + .... 0... = Modulation based multislot class support: Not supported + High Multislot Capability: 0x00 (0) - This field effect all other multislot fields. To understand the value please read TS 24.008 5.6.0 Release 5 Chap 10.5.5.12 Page 406 + 0... .... = GERAN Iu mode: Not supported + GMSK Multislot Power Profile: GMSK_MULTISLOT_POWER_PROFILE 0 (0) + 8-PSK Multislot Power Profile: 8-PSK_MULTISLOT_POWER_PROFILE 0 (0) + .... .0.. = Multiple TBF Capability: Not supported + .... ..01 = Downlink Advanced Receiver Performance: Downlink Advanced Receiver Performance - phase I supported (1) + 0... .... = Extended RLC/MAC Control Message Segmentation Capability: Not supported + .0.. .... = DTM Enhancements Capability: The mobile station does not support enhanced DTM CS establishment and enhanced DTM CS release procedures + ...0 .... = PS Handover Capability: Not supported + .... 0... = DTM Handover Capability: Not supported + .... ..0. = Flexible Timeslot Assignment: Not supported + .... ...0 = GAN PS Handover Capability: Not supported + 0... .... = RLC Non-persistent Mode: Not supported + .0.. .... = Reduced Latency Capability: Not supported + ..00 .... = Uplink EGPRS2: The mobile station does not support either EGPRS2-A or EGPRS2-B in the uplink (0) + .... 00.. = Downlink EGPRS2: The mobile station does not support either EGPRS2-A or EGPRS2-B in the downlink (0) + .... ..0. = E-UTRA FDD support: Not supported + .... ...0 = E-UTRA TDD support: Not supported + 00.. .... = GERAN to E-UTRA support in GERAN packet transfer mode: None (0) + ..0. .... = Priority-based reselection support: Not supported + .... 0... = Indication of Upper Layer PDU Start Capability for RLC UM: Not supported + .... .0.. = Enhanced Multiplexing for Single TBF Capability: Not supported + .... ..0. = Multiple TTI Capability: Not supported + .... ...0 = Reporting of UTRAN CSG cells in packet transfer mode: Not supported + 0... .... = Reporting of E-UTRAN CSG cells in packet transfer mode: Not supported + .0.. .... = Dynamic Timeslot Reduction Capability: Not supported + ..0. .... = Enhanced Multiplexing for Single RLC Entity Capability: Not supported + ...0 .... = Fast Downlink Frequency Switching Capability: Not supported + .... 01.. = TIGHTER Capability: TIGHTER supported for speech and signalling channels only (1) +*/ + bitvec_unhex(bv_dec, "1af3432b25964240100000006efa319090040000001a3e2c64240100000004"); + + printf("=== Test decoding of MS RA Capability 3===\n"); + rc = decode_gsm_ra_cap(bv_dec, &data); + printf("decode_gsm_ra_cap() returns %d\n", rc); + OSMO_ASSERT(rc == 0); + + /* Make sure there's 3 values */ + OSMO_ASSERT(data.Count_MS_RA_capability_value == 3); + + /* Make sure GPRS / EGPRS multislot class is parsed correctly */ + printf("GPRS multislot class = %u\n", get_ms_class_by_capability(&data)); + printf("EGPRS multislot class = %u\n", get_egprs_ms_class_by_capability(&data)); + + bitvec_free(bv_dec); +} + void testEGPRSPktChReq(void *test_ctx) { EGPRS_PacketChannelRequest_t req; @@ -551,6 +748,7 @@ testRAcap(ctx); testMalformedRAcap(ctx); testRAcap2(ctx); + testRAcap3(ctx); testEGPRSPktChReq(ctx); diff --git a/tests/rlcmac/RLCMACTest.err b/tests/rlcmac/RLCMACTest.err index fc2889f..d36f248 100644 --- a/tests/rlcmac/RLCMACTest.err +++ b/tests/rlcmac/RLCMACTest.err @@ -48,6 +48,7 @@ DCSN1 INFO csnStreamDecoder (RAcap): MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 1 | u.Content length = 21 | offset = 1 | RF_Power_Capability = 1 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 0 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 1 | : Multislot_capability | Exist_HSCSD_multislot_class = 0 | Exist_GPRS_multislot_class = 1 | GPRS_multislot_class = 3 | GPRS_Extended_Dynamic_Allocation_Capability = 0 | Exist_SM = 0 | Exist_ECSD_multislot_class = 0 | Exist_EGPRS_multislot_class = 1 | DCSN1 ERROR csnStreamDecoder: error NEED_MORE BITS TO UNPACK (-5) at EGPRS_multislot_class (idx 31): End Multislot_capability | DCSN1 INFO csnStreamDecoder (RAcap): MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 1 | u.Content length = 29 | offset = 1 | RF_Power_Capability = 1 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 0 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 1 | : Multislot_capability | Exist_HSCSD_multislot_class = 0 | Exist_GPRS_multislot_class = 1 | GPRS_multislot_class = 3 | GPRS_Extended_Dynamic_Allocation_Capability = 0 | Exist_SM = 0 | Exist_ECSD_multislot_class = 0 | Exist_EGPRS_multislot_class = 1 | EGPRS_multislot_class = 0 | EGPRS_Extended_Dynamic_Allocation_Capability = 0 | Exist_DTM_GPRS_multislot_class = 0 | : End Multislot_capability | Exist_Eight_PSK_Power_Capability = 0 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = NULL | UMTS_FDD_Radio_Access_Technology_Capability = NULL | UMTS_384_TDD_Radio_Access_Technology_Capability = NULL | CDMA2000_Radio_Access_Technology_Capability = NULL | UMTS_128_TDD_Radio_Access_Technology_Capability = NULL | GERAN_Feature_Package_1 = NULL | Modulation_based_multislot_class_support = NULL | GMSK_MultislotPowerProfile = NULL | EightPSK_MultislotProfile = NULL | MultipleTBF_Capability = NULL | DownlinkAdvancedReceiverPerformance = NULL | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = NULL | DTM_EnhancementsCapability = NULL | PS_HandoverCapability = NULL | DTM_Handover_Capability = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | Padding = 0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0| DCSN1 INFO csnStreamDecoder (RAcap): MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 1 | u.Content length = 73 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 1 | A5_bits = 80 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 1 | : Multislot_capability | Exist_HSCSD_multislot_class = 0 | Exist_GPRS_multislot_class = 1 | GPRS_multislot_class = 12 | GPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_SM = 1 | SMS_VALUE = 7 | SM_VALUE = 1 | Exist_ECSD_multislot_class = 0 | Exist_EGPRS_multislot_class = 1 | EGPRS_multislot_class = 12 | EGPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_DTM_GPRS_multislot_class = 1 | DTM_GPRS_multislot_class = 3 | Single_Slot_DTM = 0 | : DTM_EGPRS_Params | Exist_DTM_EGPRS_multislot_class = 1 | DTM_EGPRS_multislot_class = 3 | : End DTM_EGPRS_Params | : End Multislot_capability | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 0 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 3 | EightPSK_MultislotProfile = 3 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 1 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 1 | DTM_EnhancementsCapability = 1 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 7 | u.Content length = 34 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 0 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 3 | EightPSK_MultislotProfile = 3 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 1 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 1 | DTM_EnhancementsCapability = 1 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 3 | u.Content length = 34 | offset = 1 | RF_Power_Capability = 1 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 0 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 3 | EightPSK_MultislotProfile = 3 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 1 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 1 | DTM_EnhancementsCapability = 1 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | Padding = 0| +DCSN1 INFO csnStreamDecoder (RAcap): MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 1 | u.Content length = 87 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 1 | A5_bits = 80 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 1 | : Multislot_capability | Exist_HSCSD_multislot_class = 0 | Exist_GPRS_multislot_class = 1 | GPRS_multislot_class = 12 | GPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_SM = 0 | Exist_ECSD_multislot_class = 0 | Exist_EGPRS_multislot_class = 1 | EGPRS_multislot_class = 12 | EGPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_DTM_GPRS_multislot_class = 0 | : End Multislot_capability | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 0 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 1 | HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 1 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 0 | FlexibleTimeslotAssignment = 0 | GAN_PS_HandoverCapability = 0 | RLC_Non_persistentMode = 0 | ReducedLatencyCapability = 0 | UplinkEGPRS2 = 0 | DownlinkEGPRS2 = 0 | EUTRA_FDD_Support = 0 | EUTRA_TDD_Support = 0 | GERAN_To_EUTRAN_supportInGERAN_PTM = 0 | PriorityBasedReselectionSupport = 0 | skipped = 11 | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 7 | u.Content length = 62 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 0 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 1 | HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 1 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 0 | FlexibleTimeslotAssignment = 0 | GAN_PS_HandoverCapability = 0 | RLC_Non_persistentMode = 0 | ReducedLatencyCapability = 0 | UplinkEGPRS2 = 0 | DownlinkEGPRS2 = 0 | EUTRA_FDD_Support = 0 | EUTRA_TDD_Support = 0 | GERAN_To_EUTRAN_supportInGERAN_PTM = 0 | PriorityBasedReselectionSupport = 0 | skipped = 11 | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 4 | u.Content length = 62 | offset = 1 | RF_Power_Capability = 1 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 0 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 1 | HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 1 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 0 | FlexibleTimeslotAssignment = 0 | GAN_PS_HandoverCapability = 0 | RLC_Non_persistentMode = 0 | ReducedLatencyCapability = 0 | UplinkEGPRS2 = 0 | DownlinkEGPRS2 = 0 | EUTRA_FDD_Support = 0 | EUTRA_TDD_Support = 0 | GERAN_To_EUTRAN_supportInGERAN_PTM = 0 | PriorityBasedReselectionSupport = 0 | skipped = 11 | MS_RA_capability_value } | Padding = 0| DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): Choice EGPRS_PacketChannelRequest_Choice = 0 | : Content | MultislotClass = 21 | Priority = 2 | RandomBits = 5 | : End Content | DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): Choice EGPRS_PacketChannelRequest_Choice = 0 | : Content | MultislotClass = 10 | Priority = 1 | RandomBits = 2 | : End Content | DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): Choice EGPRS_PacketChannelRequest_Choice = 4 | : Content | NumberOfBlocks = 1 | Priority = 1 | RandomBits = 0 | : End Content | diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 54b5e31..5bf38a2 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -189,6 +189,11 @@ decode_gsm_ra_cap() returns 0 GPRS multislot class = 12 EGPRS multislot class = 12 +*** testRAcap3 *** +=== Test decoding of MS RA Capability 3=== +decode_gsm_ra_cap() returns 0 +GPRS multislot class = 12 +EGPRS multislot class = 12 *** testEGPRSPktChReq *** decode_egprs_pkt_ch_req(0x2b5) returns 0 ==> One Phase Access -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25706 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5d986f68395326f894349446194090b1ddaecd69 Gerrit-Change-Number: 25706 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 11:36:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 11:36:15 +0000 Subject: Change in osmo-pcu[master]: rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25718 ) Change subject: rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in MS RA cap ...................................................................... rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in MS RA cap Related spec: 3GPP TS 24.008 Table 10.5.146 Change-Id: I61b41e06b54024254c71242ffa2206e4eada8559 --- M src/gsm_rlcmac.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved; Verified diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c index a3342cb..e4ff0f8 100644 --- a/src/gsm_rlcmac.c +++ b/src/gsm_rlcmac.c @@ -842,8 +842,8 @@ static const CSN_DESCR_BEGIN (DownlinkDualCarrierCapability_r7_t) - M_NEXT_EXIST (DownlinkDualCarrierCapability_r7_t, MultislotCapabilityReductionForDL_DualCarrier, 1), - M_UINT (DownlinkDualCarrierCapability_r7_t, DL_DualCarrierForDTM, 3), + M_UINT (DownlinkDualCarrierCapability_r7_t, MultislotCapabilityReductionForDL_DualCarrier, 3), + M_UINT (DownlinkDualCarrierCapability_r7_t, DL_DualCarrierForDTM, 1), CSN_DESCR_END (DownlinkDualCarrierCapability_r7_t) static const -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I61b41e06b54024254c71242ffa2206e4eada8559 Gerrit-Change-Number: 25718 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 11:40:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 11:40:35 +0000 Subject: Change in osmo-bts[master]: l1sap: check if BTS model supports interference reporting In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25721 ) Change subject: l1sap: check if BTS model supports interference reporting ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic17eb46bdca3c33ac4d6e560a093b635b75424a5 Gerrit-Change-Number: 25721 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 11:40:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 11:44:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 11:44:57 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: report PDCH interference levels to L1SAP In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25714 ) Change subject: osmo-bts-trx: report PDCH interference levels to L1SAP ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3fbaad5dbc3bbd305b3ad4cb4bfb431a42cfbffc Gerrit-Change-Number: 25714 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 11:44:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 12:16:26 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 8 Oct 2021 12:16:26 +0000 Subject: Change in osmo-ci[master]: lint: support project-specific exclude paths References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25724 ) Change subject: lint: support project-specific exclude paths ...................................................................... lint: support project-specific exclude paths While at it, put in the exact path to spelling.txt in osmo-ci.git. Related: OS#5087 Change-Id: Ib23f9c65da1916ebf4654c5e641eaffe6c75315c --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 23 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/24/25724/1 diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh index 4710b7b..fd0e10a 100755 --- a/lint/checkpatch/checkpatch_osmo.sh +++ b/lint/checkpatch/checkpatch_osmo.sh @@ -1,12 +1,27 @@ #!/bin/sh -e SCRIPT_DIR="$(dirname "$(realpath "$0")")" +PROJECT="$(basename "$(git rev-parse --show-toplevel)")" -# Excluded paths: -# * \.(ok|err)$: stdout and stderr of regression tests -# * ^debian/changelog$: generated from commit log, which may contain spelling errors (OS#5232) -# * ^lint/checkpatch/: so it does not warn about spelling errors in spelling.txt :) -# * ^src/gsm/kdf/: libosmocore: imported code -# * ^src/gsm/milenage/: libosmocore: imported code +exclude_paths_common() { + # Stdout and stderr of regression tests + echo '--exclude \.(ok|err)$' + # Generated from commit log, which may contain spelling errors (OS#5232) + echo '--exclude ^debian/changelog$' +} + +exclude_paths_project() { + case "$PROJECT" in + libosmocore) + # Imported code + echo '--exclude ^src/gsm/kdf/' + echo '--exclude ^src/gsm/milenage/' + ;; + osmo-ci) + # Do not warn about spelling errors in spelling.txt :) + echo '--exclude ^lint/checkpatch/spelling.txt$' + ;; + esac +} # Ignored checks: # * ASSIGN_IN_IF: not followed (e.g. 'if ((u8 = gsup_msg->cause))') @@ -36,11 +51,8 @@ # * UNSPECIFIED_INT: not followed (doesn't seem useful for us) $SCRIPT_DIR/checkpatch.pl \ - --exclude '\.(ok|err)$' \ - --exclude '^debian/changelog$' \ - --exclude '^lint/checkpatch/' \ - --exclude '^src/gsm/kdf/' \ - --exclude '^src/gsm/milenage/' \ + $(exclude_paths_common) \ + $(exclude_paths_project) \ --ignore ASSIGN_IN_IF \ --ignore AVOID_EXTERNS \ --ignore BLOCK_COMMENT_STYLE \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib23f9c65da1916ebf4654c5e641eaffe6c75315c Gerrit-Change-Number: 25724 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 12:16:26 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 8 Oct 2021 12:16:26 +0000 Subject: Change in osmo-ci[master]: lint: osmo-pcu: exclude imported wireshark code References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25725 ) Change subject: lint: osmo-pcu: exclude imported wireshark code ...................................................................... lint: osmo-pcu: exclude imported wireshark code Related: OS#5087 Change-Id: I70814512bdba50363edd4195b5b073698ea6532c --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/25/25725/1 diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh index fd0e10a..568f9b2 100755 --- a/lint/checkpatch/checkpatch_osmo.sh +++ b/lint/checkpatch/checkpatch_osmo.sh @@ -20,6 +20,11 @@ # Do not warn about spelling errors in spelling.txt :) echo '--exclude ^lint/checkpatch/spelling.txt$' ;; + osmo-pcu) + # Imported code + echo '--exclude ^src/csn1.(c|h)$' + echo '--exclude ^src/gsm_rlcmac.(c|h)$' + ;; esac } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I70814512bdba50363edd4195b5b073698ea6532c Gerrit-Change-Number: 25725 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 12:17:31 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 8 Oct 2021 12:17:31 +0000 Subject: Change in osmo-pcu[master]: rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in... In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25718 ) Change subject: rlcmac: Fix CSN1 definition for DownlinkDualCarrierCapability_r7_t in MS RA cap ...................................................................... Patch Set 1: > Patch Set 1: > > @osmith, the linter clearly doesn't apply to that file, since it has special formatting for the CSN1 enc/dec, and we inherited it from wireshark code base (and we still backport changed back and forth). * https://gerrit.osmocom.org/c/osmo-ci/+/25724 * https://gerrit.osmocom.org/c/osmo-ci/+/25725 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I61b41e06b54024254c71242ffa2206e4eada8559 Gerrit-Change-Number: 25718 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 12:17:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 12:23:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 12:23:53 +0000 Subject: Change in osmo-ci[master]: lint: osmo-pcu: exclude imported wireshark code In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25725 ) Change subject: lint: osmo-pcu: exclude imported wireshark code ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I70814512bdba50363edd4195b5b073698ea6532c Gerrit-Change-Number: 25725 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 12:23:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 12:24:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 12:24:09 +0000 Subject: Change in osmo-ci[master]: lint: support project-specific exclude paths In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25724 ) Change subject: lint: support project-specific exclude paths ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib23f9c65da1916ebf4654c5e641eaffe6c75315c Gerrit-Change-Number: 25724 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 12:24:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 13:20:47 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 8 Oct 2021 13:20:47 +0000 Subject: Change in osmo-bts[master]: osmo-trx: fix maxdly In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, pespin, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 to look at the new patch set (#4). Change subject: osmo-trx: fix maxdly ...................................................................... osmo-trx: fix maxdly - one gsm symbol is 0,00000369 seconds - 2*550m/c = 0,00000366 seconds -> one ta symbol is a DISTANCE of 550m (or a RTT of 550m*2) between bts and ue. -> no idea why this was constrained to TA/2. Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Related: OS#5140 --- M src/osmo-bts-trx/trx_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/19/25619/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Gerrit-Change-Number: 25619 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 13:21:08 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 8 Oct 2021 13:21:08 +0000 Subject: Change in osmo-bts[master]: osmo-trx: fix maxdly In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25619 ) Change subject: osmo-trx: fix maxdly ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/osmo-bts/+/25619/3/src/osmo-bts-trx/trx_vty.c File src/osmo-bts-trx/trx_vty.c: https://gerrit.osmocom.org/c/osmo-bts/+/25619/3/src/osmo-bts-trx/trx_vty.c at 269 PS3, Line 269: 62 > 3GPP TS 45.010, 5. [?] Done https://gerrit.osmocom.org/c/osmo-bts/+/25619/3/src/osmo-bts-trx/trx_vty.c at 293 PS3, Line 293: > why does this remain 31? because it's a debug command related to a arcane tester we don't have and the default correlation window is currently +-5 symbols anyway so I don't know if that command is even necessary considering how much code changed during the past 10 years. it should not have been part of osmotrx to begin with. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Gerrit-Change-Number: 25619 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 08 Oct 2021 13:21:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: fixeria Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 15:03:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 15:03:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25726 ) Change subject: WIP ...................................................................... WIP Change-Id: I918c9af9ca5b1049ef5b59637a198d7aa8345176 --- M bts/BTS_Tests.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/26/25726/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index cf47d33..6e37650 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -1211,6 +1211,8 @@ /* First, configure both SI5 and SI6 to be transmitted */ RSL.send(ts_RSL_SACCH_FILL(RSL_SYSTEM_INFO_5, si5)); + RSL.send(ts_RSL_SACCH_FILL(RSL_SYSTEM_INFO_5bis, ''O)); + RSL.send(ts_RSL_SACCH_FILL(RSL_SYSTEM_INFO_5ter, ''O)); RSL.send(ts_RSL_SACCH_FILL(RSL_SYSTEM_INFO_6, si6)); f_l1_tune(L1CTL); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I918c9af9ca5b1049ef5b59637a198d7aa8345176 Gerrit-Change-Number: 25726 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 15:03:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 15:03:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: TC_meas_res_sign_*: Properly configure supp-meas-info References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25727 ) Change subject: bts: TC_meas_res_sign_*: Properly configure supp-meas-info ...................................................................... bts: TC_meas_res_sign_*: Properly configure supp-meas-info Since recently, osmo-bts may not be restarting after each test. Which means the supp-meas-info is not reset when test starts. Hence, some of these tests started failing because a previous test set a value different than the default one. Change-Id: Iaa16b33781a8f490fc1cdbafda407755371dbe7f --- M bts/BTS_Tests.ttcn 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/27/25727/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 6e37650..ec239da 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3249,6 +3249,7 @@ var ConnHdlr vc_conn; var ConnHdlrPars pars; f_init(); + f_vty_config(BTSVTY, "bts 0", "no supp-meas-info toa256"); for (var integer tn := 1; tn <= 4; tn := tn+1) { pars := valueof(t_Pars(t_RslChanNr_Bm(tn), ts_RSL_ChanMode_SIGN(RSL_CHRT_TCH_F))); vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars, @@ -3261,6 +3262,7 @@ var ConnHdlr vc_conn; var ConnHdlrPars pars; f_init(); + f_vty_config(BTSVTY, "bts 0", "no supp-meas-info toa256"); for (var integer ss := 0; ss <= 1; ss := ss+1) { pars := valueof(t_Pars(t_RslChanNr_Lm(5, ss), ts_RSL_ChanMode_SIGN(RSL_CHRT_TCH_H))); vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars, @@ -3273,6 +3275,7 @@ var ConnHdlr vc_conn; var ConnHdlrPars pars; f_init(); + f_vty_config(BTSVTY, "bts 0", "no supp-meas-info toa256"); for (var integer ss := 0; ss <= 3; ss := ss+1) { pars := valueof(t_Pars(t_RslChanNr_SDCCH4(0, ss), ts_RSL_ChanMode_SIGN)); vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars, @@ -3285,6 +3288,7 @@ var ConnHdlr vc_conn; var ConnHdlrPars pars; f_init(); + f_vty_config(BTSVTY, "bts 0", "no supp-meas-info toa256"); for (var integer ss := 0; ss <= 7; ss := ss+1) { pars := valueof(t_Pars(t_RslChanNr_SDCCH8(6, ss), ts_RSL_ChanMode_SIGN)); vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaa16b33781a8f490fc1cdbafda407755371dbe7f Gerrit-Change-Number: 25727 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 15:04:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 15:04:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: WIP In-Reply-To: References: Message-ID: pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25726 ) Change subject: WIP ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I918c9af9ca5b1049ef5b59637a198d7aa8345176 Gerrit-Change-Number: 25726 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 15:29:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 15:29:28 +0000 Subject: Change in osmo-ggsn[master]: gtp_echo_responder: report invalid chars present in node-feautres cmd... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/25728 ) Change subject: gtp_echo_responder: report invalid chars present in node-feautres cmdline arg as error ...................................................................... gtp_echo_responder: report invalid chars present in node-feautres cmdline arg as error from "man strtoul": """ If endptr is not NULL, strtoul() stores the address of the first invalid character in *endptr. In particular, if *nptr is not '\0' but **endptr is '\0' on return, the entire string is valid. """ Fixes: ae81195418ebed5280d0753d037df483bb914a0b Change-Id: I89d26a575ef81ee17483db035924354588d9d094 --- M utils/gtp_echo_responder.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/28/25728/1 diff --git a/utils/gtp_echo_responder.c b/utils/gtp_echo_responder.c index e077c81..390fa25 100644 --- a/utils/gtp_echo_responder.c +++ b/utils/gtp_echo_responder.c @@ -125,7 +125,7 @@ res = strtoul(arg, &end, 0); if ((errno == ERANGE && res == ULONG_MAX) || (errno && !res) || - arg == end) { + arg == end || *end != '\0') { fprintf(stderr, "Failed parsing Node Features bitmask: '%s'\n", arg); exit(1); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I89d26a575ef81ee17483db035924354588d9d094 Gerrit-Change-Number: 25728 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 15:54:24 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 15:54:24 +0000 Subject: Change in osmo-bts[master]: nm_*_fsm: Move reset state code to st_op_disabled_notinstalled_on_enter References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25729 ) Change subject: nm_*_fsm: Move reset state code to st_op_disabled_notinstalled_on_enter ...................................................................... nm_*_fsm: Move reset state code to st_op_disabled_notinstalled_on_enter Let's rather put it there instead of the shutdown code path, since we'll be adding more and more reset coe there. Change-Id: I43a136ade731a2c58c0a29d97875088e9b6d4414 --- M src/common/nm_bts_fsm.c M src/common/nm_channel_fsm.c 2 files changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/29/25729/1 diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index d2c48fb..c825ab5 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -57,6 +57,9 @@ static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_bts *bts = (struct gsm_bts *)fi->priv; + /* Reset state: */ + bts->si_valid = 0; + bts->mo.setattr_success = false; bts->mo.opstart_success = false; oml_mo_state_chg(&bts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED, NM_STATE_LOCKED); @@ -150,8 +153,6 @@ case NM_EV_SHUTDOWN_FINISH: /* Propagate event to children: */ ev_dispatch_children(bts, event); - /* Reset state: */ - bts->si_valid = 0; nm_bts_fsm_state_chg(fi, NM_BTS_ST_OP_DISABLED_NOTINSTALLED); break; default: diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index 6456005..8ffddae 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -55,6 +55,11 @@ static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; + /* Reset state: */ + gsm_ts_release(ts); + if (ts->vamos.peer) + gsm_ts_release(ts->vamos.peer); + ts->mo.setattr_success = false; ts->mo.opstart_success = false; oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED, NM_STATE_LOCKED); @@ -193,9 +198,6 @@ oml_mo_state_chg(&ts->mo, -1, -1, NM_STATE_SHUTDOWN); break; case NM_EV_SHUTDOWN_FINISH: - gsm_ts_release(ts); - if (ts->vamos.peer) - gsm_ts_release(ts->vamos.peer); nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_NOTINSTALLED); break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I43a136ade731a2c58c0a29d97875088e9b6d4414 Gerrit-Change-Number: 25729 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 15:54:25 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 15:54:25 +0000 Subject: Change in osmo-bts[master]: nm_*_fsm: reset mo.nm_attr from previous runs when entering state NOT... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25730 ) Change subject: nm_*_fsm: reset mo.nm_attr from previous runs when entering state NOT_INSTALLED ...................................................................... nm_*_fsm: reset mo.nm_attr from previous runs when entering state NOT_INSTALLED Code in oml.c, upon receiving net attributes, merges the new attributes with old ones (for some reason I don't really know). Hence, if we disconnect from a BSC and go to NOT_INSTALLED state, we must free previous nm_attr in order to avoid mixing them once we connect to a new (potentially different) BSC upon reconnect. Related: OS#5248 Change-Id: I45cc22dd68121a7930301581bfd0a8db37879c77 --- M src/common/nm_bb_transc_fsm.c M src/common/nm_bts_fsm.c M src/common/nm_channel_fsm.c M src/common/nm_radio_carrier_fsm.c 4 files changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/30/25730/1 diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c index 40d5134..ca78256 100644 --- a/src/common/nm_bb_transc_fsm.c +++ b/src/common/nm_bb_transc_fsm.c @@ -59,6 +59,9 @@ static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv; + /* Reset state: */ + TALLOC_FREE(bb_transc->mo.nm_attr); + bb_transc->mo.setattr_success = false; bb_transc->mo.opstart_success = false; oml_mo_state_chg(&bb_transc->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED, NM_STATE_LOCKED); diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index c825ab5..c9dcd4c 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -59,6 +59,7 @@ struct gsm_bts *bts = (struct gsm_bts *)fi->priv; /* Reset state: */ bts->si_valid = 0; + TALLOC_FREE(bts->mo.nm_attr); bts->mo.setattr_success = false; bts->mo.opstart_success = false; diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index 8ffddae..503ddfb 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -59,6 +59,7 @@ gsm_ts_release(ts); if (ts->vamos.peer) gsm_ts_release(ts->vamos.peer); + TALLOC_FREE(ts->mo.nm_attr); ts->mo.setattr_success = false; ts->mo.opstart_success = false; diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c index be03d1d..88930dd 100644 --- a/src/common/nm_radio_carrier_fsm.c +++ b/src/common/nm_radio_carrier_fsm.c @@ -48,6 +48,9 @@ static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + /* Reset state: */ + TALLOC_FREE(trx->mo.nm_attr); + trx->mo.setattr_success = false; trx->mo.opstart_success = false; oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED, NM_STATE_LOCKED); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I45cc22dd68121a7930301581bfd0a8db37879c77 Gerrit-Change-Number: 25730 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 16:13:31 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 16:13:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: TC_meas_res_sign_*: Properly configure supp-meas-info In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25727 ) Change subject: bts: TC_meas_res_sign_*: Properly configure supp-meas-info ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaa16b33781a8f490fc1cdbafda407755371dbe7f Gerrit-Change-Number: 25727 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 08 Oct 2021 16:13:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 16:14:34 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 16:14:34 +0000 Subject: Change in osmo-bts[master]: nm_*_fsm: Move reset state code to st_op_disabled_notinstalled_on_enter In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25729 ) Change subject: nm_*_fsm: Move reset state code to st_op_disabled_notinstalled_on_enter ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I43a136ade731a2c58c0a29d97875088e9b6d4414 Gerrit-Change-Number: 25729 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 08 Oct 2021 16:14:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 16:16:15 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 16:16:15 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: report PDCH interference levels to L1SAP In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25714 ) Change subject: osmo-bts-trx: report PDCH interference levels to L1SAP ...................................................................... osmo-bts-trx: report PDCH interference levels to L1SAP Starting from [1], interference levels on PDCH timeslots are also reported over the A-bis/RSL. They may be useful for the BSC to determine whether dynamic PDCH timeslots might be better used for new circuit switched connections, or whether alternative PDCH slots should be allocated for interference reasons. * Handle GSM_LCHAN_PDTCH in lchan_report_interf_meas(). * Rework pcu_tx_interf_ind() to accept 'struct gsm_bts_trx'. * Call pcu_tx_interf_ind() from l1sap_interf_meas_report(). Regarding pcu_tx_interf_ind(), it's better to call this function from the upper layers once, rather than calling it from various places in the model specific code. [1] I5b4d1da0920e788ac8063cc765fe5b0223c76758 Change-Id: I3fbaad5dbc3bbd305b3ad4cb4bfb431a42cfbffc Related: SYS#5313 --- M include/osmo-bts/pcu_if.h M src/common/l1sap.c M src/common/pcu_sock.c M src/osmo-bts-trx/scheduler_trx.c 4 files changed, 65 insertions(+), 71 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmo-bts/pcu_if.h b/include/osmo-bts/pcu_if.h index 12a8abc..bc30f34 100644 --- a/include/osmo-bts/pcu_if.h +++ b/include/osmo-bts/pcu_if.h @@ -19,8 +19,7 @@ int16_t qta, uint16_t ra, uint32_t fn, uint8_t is_11bit, enum ph_burst_type burst_type, uint8_t sapi); int pcu_tx_time_ind(uint32_t fn); -int pcu_tx_interf_ind(uint8_t bts_nr, uint8_t trx_nr, uint32_t fn, - const uint8_t *pdch_interf); +int pcu_tx_interf_ind(const struct gsm_bts_trx *trx, uint32_t fn); int pcu_tx_pag_req(const uint8_t *identity_lv, uint8_t chan_needed); int pcu_tx_pch_data_cnf(uint32_t fn, uint8_t *data, uint8_t len); int pcu_tx_susp_req(struct gsm_lchan *lchan, uint32_t tlli, const uint8_t *ra_id, uint8_t cause); diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 5c58aff..2b539d7 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -629,6 +629,8 @@ l1sap_interf_meas_calc_avg(trx); /* Report to the BSC over the A-bis/RSL */ rsl_tx_rf_res(trx); + /* Report to the PCU over the PCUIF */ + pcu_tx_interf_ind(trx, bts->gsm_time.fn); } } diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 03f1a05..f8a0f55 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -559,23 +559,31 @@ return pcu_sock_send(&bts_gsmnet, msg); } -int pcu_tx_interf_ind(uint8_t bts_nr, uint8_t trx_nr, uint32_t fn, - const uint8_t *pdch_interf) +int pcu_tx_interf_ind(const struct gsm_bts_trx *trx, uint32_t fn) { struct gsm_pcu_if_interf_ind *interf_ind; struct gsm_pcu_if *pcu_prim; struct msgb *msg; + unsigned int tn; - msg = pcu_msgb_alloc(PCU_IF_MSG_INTERF_IND, bts_nr); + msg = pcu_msgb_alloc(PCU_IF_MSG_INTERF_IND, trx->bts->nr); if (!msg) return -ENOMEM; pcu_prim = (struct gsm_pcu_if *) msg->data; interf_ind = &pcu_prim->u.interf_ind; - interf_ind->trx_nr = trx_nr; + interf_ind->trx_nr = trx->nr; interf_ind->fn = fn; - memcpy(&interf_ind->interf[0], &pdch_interf[0], - sizeof(interf_ind->interf)); + + for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { + const struct gsm_bts_trx_ts *ts = &trx->ts[tn]; + const struct gsm_lchan *lchan = &ts->lchan[0]; + + if (ts_pchan(ts) != GSM_PCHAN_PDCH) + continue; + + interf_ind->interf[tn] = -1 * lchan->meas.interf_meas_avg_dbm; + } return pcu_sock_send(&bts_gsmnet, msg); } diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 0a907fb..6136b14 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -54,84 +54,69 @@ #define SCHED_FH_PARAMS_VALS(ts) \ (ts)->hopping.hsn, (ts)->hopping.maio, (ts)->hopping.arfcn_num -static void ts_report_interf_meas(const struct gsm_bts_trx_ts *ts) +static void lchan_report_interf_meas(const struct gsm_lchan *lchan) { + const struct gsm_bts_trx_ts *ts = lchan->ts; const struct l1sched_ts *l1ts = ts->priv; - unsigned int ln; + enum trx_chan_type dcch, acch; + int interf_avg; - for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) { - const struct gsm_lchan *lchan = &ts->lchan[ln]; - enum trx_chan_type dcch, acch; - int interf_avg; - - /* We're not interested in active channels */ - if (lchan->state == LCHAN_S_ACTIVE) - continue; - - switch (lchan->type) { - case GSM_LCHAN_SDCCH: - if (ts->pchan == GSM_PCHAN_CCCH_SDCCH4 || - ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) { - dcch = TRXC_SDCCH4_0 + ln; - acch = TRXC_SACCH4_0 + ln; - } else { /* SDCCH/8 otherwise */ - dcch = TRXC_SDCCH8_0 + ln; - acch = TRXC_SACCH8_0 + ln; - } - break; - case GSM_LCHAN_TCH_F: - dcch = TRXC_TCHF; - acch = TRXC_SACCHTF; - break; - case GSM_LCHAN_TCH_H: - dcch = TRXC_TCHH_0 + ln; - acch = TRXC_SACCHTH_0 + ln; - break; - default: - /* Skip other lchan types */ - continue; - } - - OSMO_ASSERT(dcch < ARRAY_SIZE(l1ts->chan_state)); - OSMO_ASSERT(acch < ARRAY_SIZE(l1ts->chan_state)); - - interf_avg = (l1ts->chan_state[dcch].meas.interf_avg + - l1ts->chan_state[acch].meas.interf_avg) / 2; - - gsm_lchan_interf_meas_push((struct gsm_lchan *) lchan, interf_avg); + /* We're not interested in active CS channels */ + if (lchan->state == LCHAN_S_ACTIVE) { + if (lchan->type != GSM_LCHAN_PDTCH) + return; } + + switch (lchan->type) { + case GSM_LCHAN_SDCCH: + if (ts->pchan == GSM_PCHAN_CCCH_SDCCH4 || + ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH) { + dcch = TRXC_SDCCH4_0 + lchan->nr; + acch = TRXC_SACCH4_0 + lchan->nr; + } else { /* SDCCH/8 otherwise */ + dcch = TRXC_SDCCH8_0 + lchan->nr; + acch = TRXC_SACCH8_0 + lchan->nr; + } + break; + case GSM_LCHAN_TCH_F: + dcch = TRXC_TCHF; + acch = TRXC_SACCHTF; + break; + case GSM_LCHAN_TCH_H: + dcch = TRXC_TCHH_0 + lchan->nr; + acch = TRXC_SACCHTH_0 + lchan->nr; + break; + case GSM_LCHAN_PDTCH: + /* We use idle TDMA frames on PDCH */ + dcch = TRXC_IDLE; + acch = TRXC_IDLE; + break; + default: + /* Skip other lchan types */ + return; + } + + OSMO_ASSERT(dcch < ARRAY_SIZE(l1ts->chan_state)); + OSMO_ASSERT(acch < ARRAY_SIZE(l1ts->chan_state)); + + interf_avg = (l1ts->chan_state[dcch].meas.interf_avg + + l1ts->chan_state[acch].meas.interf_avg) / 2; + + gsm_lchan_interf_meas_push((struct gsm_lchan *) lchan, interf_avg); } static void bts_report_interf_meas(const struct gsm_bts *bts, const uint32_t fn) { const struct gsm_bts_trx *trx; + unsigned int tn, ln; llist_for_each_entry(trx, &bts->trx_list, list) { - uint8_t pdch_interf[8] = { 0 }; - unsigned int tn, pdch_num = 0; - for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { const struct gsm_bts_trx_ts *ts = &trx->ts[tn]; - const struct l1sched_ts *l1ts = ts->priv; - const struct l1sched_chan_state *l1cs; - - /* PS interference reports for the PCU */ - if (ts_pchan(ts) == GSM_PCHAN_PDCH) { - l1cs = &l1ts->chan_state[TRXC_IDLE]; - /* Interference value is encoded as -x dBm */ - pdch_interf[tn] = -1 * l1cs->meas.interf_avg; - pdch_num++; - continue; - } - - /* CS interference reports for the BSC */ - ts_report_interf_meas(ts); + for (ln = 0; ln < ARRAY_SIZE(ts->lchan); ln++) + lchan_report_interf_meas(&ts->lchan[ln]); } - - /* Report interference levels on PDCH to the PCU */ - if (pdch_num > 0) - pcu_tx_interf_ind(bts->nr, trx->nr, fn, pdch_interf); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3fbaad5dbc3bbd305b3ad4cb4bfb431a42cfbffc Gerrit-Change-Number: 25714 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 16:16:16 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 16:16:16 +0000 Subject: Change in osmo-bts[master]: l1sap: check if BTS model supports interference reporting In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25721 ) Change subject: l1sap: check if BTS model supports interference reporting ...................................................................... l1sap: check if BTS model supports interference reporting Currently, only osmo-bts-trx is capable of reporting the interference levels to L1SAP. Thus it does not make sense to trigger the averaging logic and send empty reports over the A-bis/RSL and the PCUIF. Change-Id: Ic17eb46bdca3c33ac4d6e560a093b635b75424a5 Related: SYS#5313 --- M include/osmo-bts/bts.h M src/common/l1sap.c M src/osmo-bts-trx/main.c 3 files changed, 5 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index fab7f96..4683758 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -62,6 +62,8 @@ /* Whether the BTS model requires RadioCarrier MO to be in Enabled state * (OPSTARTed) before OPSTARTing the RadioChannel MOs. See OS#5157 */ #define BTS_INTERNAL_FLAG_NM_RCHANNEL_DEPENDS_RCARRIER (1 << 2) +/* Whether the BTS model reports interference measurements to L1SAP. */ +#define BTS_INTERNAL_FLAG_INTERF_MEAS (1 << 3) /* BTS implementation flags (internal use, not exposed via OML) */ #define bts_internal_flag_get(bts, flag) \ diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 2b539d7..f5d2364 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -667,7 +667,8 @@ } /* Report interference levels to the BSC */ - l1sap_interf_meas_report(bts); + if (bts_internal_flag_get(bts, BTS_INTERNAL_FLAG_INTERF_MEAS)) + l1sap_interf_meas_report(bts); return 0; } diff --git a/src/osmo-bts-trx/main.c b/src/osmo-bts-trx/main.c index e31597b..5d680f0 100644 --- a/src/osmo-bts-trx/main.c +++ b/src/osmo-bts-trx/main.c @@ -151,6 +151,7 @@ osmo_bts_set_feature(bts->features, BTS_FEAT_ACCH_TEMP_OVP); bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB); + bts_internal_flag_set(bts, BTS_INTERNAL_FLAG_INTERF_MEAS); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25721 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic17eb46bdca3c33ac4d6e560a093b635b75424a5 Gerrit-Change-Number: 25721 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 16:16:17 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 16:16:17 +0000 Subject: Change in osmo-bts[master]: vty: show interference level / band in 'show lchan' In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25722 ) Change subject: vty: show interference level / band in 'show lchan' ...................................................................... vty: show interference level / band in 'show lchan' Change-Id: Ide45a0f7836bf35ffbe88070fa8367022311ca44 Related: SYS#5313 --- M src/common/vty.c 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/vty.c b/src/common/vty.c index f99881a..576835b 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1830,6 +1830,14 @@ vty_out(vty, " RTP/PDCH Loopback Enabled%s", VTY_NEWLINE); vty_out(vty, " Radio Link Failure Counter 'S': %d%s", lchan->s, VTY_NEWLINE); + /* Interference levels */ + if (lchan->meas.interf_meas_avg_dbm != 0) { + vty_out(vty, " Interference: %d dBm (band %d)%s", + lchan->meas.interf_meas_avg_dbm, + lchan->meas.interf_band, + VTY_NEWLINE); + } + /* BS/MS Power Control state and parameters */ lchan_bs_power_ctrl_state_dump(vty, 2, lchan); lchan_ms_power_ctrl_state_dump(vty, 2, lchan); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ide45a0f7836bf35ffbe88070fa8367022311ca44 Gerrit-Change-Number: 25722 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 16:17:00 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 16:17:00 +0000 Subject: Change in osmo-bsc[master]: rsl_rx_resource_indication(): check result of rsl_tlv_parse() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25719 ) Change subject: rsl_rx_resource_indication(): check result of rsl_tlv_parse() ...................................................................... rsl_rx_resource_indication(): check result of rsl_tlv_parse() Change-Id: I3b4758f80f2cd87e22bd3617e189f12403461ea3 Related: SYS#5313 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 1d71c83..0e2ffc6 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1514,9 +1514,7 @@ struct gsm_bts_trx *trx = sign_link->trx; struct gsm_lchan *lchan; int ts_nr; - int i; - - rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)); + int rc, i; LOGP(DRSL, LOGL_DEBUG, "%s Rx Resource Indication\n", gsm_trx_name(trx)); @@ -1530,6 +1528,12 @@ } } + rc = rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg) - sizeof(*rslh)); + if (rc < 0) { + LOGP(DRSL, LOGL_ERROR, "Rx Resource Indication: failed to parse the message\n"); + return -EINVAL; + } + res_info_ie = TLVP_GET(&tp, RSL_IE_RESOURCE_INFO); if (!res_info_ie) { LOGP(DRSL, LOGL_ERROR, "Rx Resource Indication: missing Resource Info IE\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25719 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3b4758f80f2cd87e22bd3617e189f12403461ea3 Gerrit-Change-Number: 25719 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 16:17:01 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 16:17:01 +0000 Subject: Change in osmo-bsc[master]: rsl_lchan_lookup(): fix handling of ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25720 ) Change subject: rsl_lchan_lookup(): fix handling of ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH ...................................................................... rsl_lchan_lookup(): fix handling of ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH If an RF Resource Indication message includes interference band(s) for 'pure' PDCH (i.e. not dynamic) timeslot(s), osmo-bsc logs: DRSL DEBUG abis_rsl.c:1515 (bts=0,trx=0) Rx Resource Indication DRSL ERROR bts_trx.c:236 (bts=0,trx=0) chan_nr 0xc7 cbits 0x18: (bts=0,trx=0,ts=7,pchan=PDCH,state=UNUSED) is not GSM_PCHAN_OSMO_DYN DRSL ERROR abis_rsl.c:141 (bts=0,trx=0,ts=7,pchan=PDCH,state=UNUSED) Abis RSL Rx Resource Indication: mismatching chan_nr=0xc7 Let's better check if a timeslot is capable of GSM_PCHAN_PDCH, rather than checking if it's GSM_PCHAN_OSMO_DYN. Change-Id: I2cac4acd4c5145c5c525c9952fdc754477ce0942 Related: SYS#5313 --- M src/osmo-bsc/bts_trx.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c index 9b90c91..f30c748 100644 --- a/src/osmo-bsc/bts_trx.c +++ b/src/osmo-bsc/bts_trx.c @@ -232,9 +232,9 @@ break; case ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH: lch_idx = 0; - ok = (ts->pchan_on_init == GSM_PCHAN_OSMO_DYN); + ok = ts_is_capable_of_pchan(ts, GSM_PCHAN_PDCH); if (!ok) - LOG_TRX(trx, DRSL, LOGL_ERROR, "chan_nr 0x%x cbits 0x%x: %s is not GSM_PCHAN_OSMO_DYN\n", + LOG_TRX(trx, DRSL, LOGL_ERROR, "chan_nr 0x%x cbits 0x%x: %s is not capable of GSM_PCHAN_PDCH\n", chan_nr, cbits, gsm_ts_and_pchan_name(ts)); break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2cac4acd4c5145c5c525c9952fdc754477ce0942 Gerrit-Change-Number: 25720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 16:17:49 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 16:17:49 +0000 Subject: Change in osmo-bsc[master]: power_control: parametrize BS power reduction for BCCH carriers In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/24739 ) Change subject: power_control: parametrize BS power reduction for BCCH carriers ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/24739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id7c2cf80309532f57621342826acc0e9639733cd Gerrit-Change-Number: 24739 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 16:24:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 16:24:51 +0000 Subject: Change in osmo-ci[master]: lint: support project-specific exclude paths In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25724 ) Change subject: lint: support project-specific exclude paths ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib23f9c65da1916ebf4654c5e641eaffe6c75315c Gerrit-Change-Number: 25724 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 16:24:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 16:25:14 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 16:25:14 +0000 Subject: Change in osmo-ci[master]: lint: osmo-pcu: exclude imported wireshark code In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25725 ) Change subject: lint: osmo-pcu: exclude imported wireshark code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I70814512bdba50363edd4195b5b073698ea6532c Gerrit-Change-Number: 25725 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 16:25:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 16:29:19 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 16:29:19 +0000 Subject: Change in osmo-bts[master]: nm_*_fsm: reset mo.nm_attr from previous runs when entering state NOT... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25730 ) Change subject: nm_*_fsm: reset mo.nm_attr from previous runs when entering state NOT_INSTALLED ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I45cc22dd68121a7930301581bfd0a8db37879c77 Gerrit-Change-Number: 25730 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 08 Oct 2021 16:29:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 16:47:46 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 16:47:46 +0000 Subject: Change in osmo-bts[master]: trx_sched_clean_ts(): also free() the associated 'struct l1sched_ts' References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25731 ) Change subject: trx_sched_clean_ts(): also free() the associated 'struct l1sched_ts' ...................................................................... trx_sched_clean_ts(): also free() the associated 'struct l1sched_ts' Change-Id: I44a8f18c81dd8bc76ca07dfaae7bcdb2fedc9261 Related: OS#5248 --- M src/common/scheduler.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/31/25731/1 diff --git a/src/common/scheduler.c b/src/common/scheduler.c index e7d17d0..17fb537 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -677,6 +677,9 @@ /* clear lchan channel states */ for (i = 0; i < ARRAY_SIZE(ts->lchan); i++) lchan_set_state(&ts->lchan[i], LCHAN_S_NONE); + + talloc_free(l1ts); + ts->priv = NULL; } void trx_sched_clean(struct gsm_bts_trx *trx) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I44a8f18c81dd8bc76ca07dfaae7bcdb2fedc9261 Gerrit-Change-Number: 25731 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 16:47:47 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 16:47:47 +0000 Subject: Change in osmo-bts[master]: trx_sched_clean(): also free() the shadow timeslot References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25732 ) Change subject: trx_sched_clean(): also free() the shadow timeslot ...................................................................... trx_sched_clean(): also free() the shadow timeslot Change-Id: Ic14e9de7487ba8152ffb1aa1bab508a2b9a11ea0 Related: OS#5248 --- M src/common/scheduler.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/32/25732/1 diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 17fb537..5118904 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -694,6 +694,9 @@ /* Clean primary and shadow timeslots */ trx_sched_clean_ts(ts); trx_sched_clean_ts(ts->vamos.peer); + + talloc_free(ts->vamos.peer); + ts->vamos.peer = NULL; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic14e9de7487ba8152ffb1aa1bab508a2b9a11ea0 Gerrit-Change-Number: 25732 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 17:25:32 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 17:25:32 +0000 Subject: Change in osmo-bts[master]: gsm_lchan_name_update(): use shadow timeslot as talloc context References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25733 ) Change subject: gsm_lchan_name_update(): use shadow timeslot as talloc context ...................................................................... gsm_lchan_name_update(): use shadow timeslot as talloc context This way if a shadow timeslot gets free()d, the associated name also gets freed. This does not apply to the primary timeslots, because they're not talloc chunks but part of 'struct gsm_bts_trx'. Change-Id: Ie449f931db5431e8aa4ab9b232b19d22cbd330aa Related: OS#5248 --- M src/common/lchan.c 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/33/25733/1 diff --git a/src/common/lchan.c b/src/common/lchan.c index f7ee33b..8115df7 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -67,9 +67,15 @@ { const struct gsm_bts_trx_ts *ts = lchan->ts; const struct gsm_bts_trx *trx = ts->trx; + void *talloc_ctx; char *name; - name = talloc_asprintf(trx, "(" GSM_TS_NAME_FMT ",ss=%u)", + if (ts->vamos.is_shadow) + talloc_ctx = (void *)ts; + else + talloc_ctx = (void *)trx; + + name = talloc_asprintf(talloc_ctx, "(" GSM_TS_NAME_FMT ",ss=%u)", GSM_TS_NAME_ARGS(ts), lchan->nr); if (lchan->name != NULL) talloc_free(lchan->name); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie449f931db5431e8aa4ab9b232b19d22cbd330aa Gerrit-Change-Number: 25733 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 19:49:27 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 19:49:27 +0000 Subject: Change in osmo-bts[master]: gsm_lchan_interf_meas_calc_avg(): adapt to the ordering of boundaries References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25734 ) Change subject: gsm_lchan_interf_meas_calc_avg(): adapt to the ordering of boundaries ...................................................................... gsm_lchan_interf_meas_calc_avg(): adapt to the ordering of boundaries Change-Id: I88d841d8d835bde8392c7b606b28c9070b7adc6e Related: SYS#5313 --- M src/common/lchan.c 1 file changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/34/25734/1 diff --git a/src/common/lchan.c b/src/common/lchan.c index f7ee33b..af408a5 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -366,10 +366,18 @@ /* Calculate the average of all collected samples */ meas_avg = meas_sum / (int) meas_num; - /* Determine the band using interference boundaries from BSC */ - for (b = 0; b < ARRAY_SIZE(bts->interference.boundary); b++) { - if (meas_avg >= bts->interference.boundary[b]) - break; /* Current 'b' is the band value */ + /* Determine the band using interference boundaries from BSC + * FIXME: maybe rather inverse bts->interference.boundary in oml.c? */ + if (bts->interference.boundary[0] >= bts->interference.boundary[1]) { + for (b = 0; b < ARRAY_SIZE(bts->interference.boundary); b++) { + if (meas_avg >= bts->interference.boundary[b]) + break; /* Current 'b' is the band value */ + } + } else { + for (b = 0; b < ARRAY_SIZE(bts->interference.boundary); b++) { + if (meas_avg >= bts->interference.boundary[b]) + break; /* Current 'b' is the band value */ + } } LOGPLCHAN(lchan, DL1C, LOGL_DEBUG, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I88d841d8d835bde8392c7b606b28c9070b7adc6e Gerrit-Change-Number: 25734 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 19:58:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 8 Oct 2021 19:58:28 +0000 Subject: Change in osmo-bts[master]: rsl: NACK Chan Activation for lchans on disabled TS In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25702 ) Change subject: rsl: NACK Chan Activation for lchans on disabled TS ...................................................................... Patch Set 2: Unfortunately, this change breaks VAMOS related test cases in ttcn3-bts-test... I see: (bts=0,trx=0,ts=1,shadow,pchan=TCH/F) rx chan activ but TS not in nm_state oper=ENABLED avail=OK, nack! Indeed, shadow timeslots do not reflect the OML states of primary timeslots. This was not required so far... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9c3b68487c12efc412a057728a561e061560c544 Gerrit-Change-Number: 25702 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 19:58:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 20:58:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 20:58:46 +0000 Subject: Change in osmo-bts[master]: nm_*_fsm: Move reset state code to st_op_disabled_notinstalled_on_enter In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25729 ) Change subject: nm_*_fsm: Move reset state code to st_op_disabled_notinstalled_on_enter ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I43a136ade731a2c58c0a29d97875088e9b6d4414 Gerrit-Change-Number: 25729 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 20:58:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 20:58:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 20:58:50 +0000 Subject: Change in osmo-bts[master]: nm_*_fsm: Move reset state code to st_op_disabled_notinstalled_on_enter In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25729 ) Change subject: nm_*_fsm: Move reset state code to st_op_disabled_notinstalled_on_enter ...................................................................... nm_*_fsm: Move reset state code to st_op_disabled_notinstalled_on_enter Let's rather put it there instead of the shutdown code path, since we'll be adding more and more reset coe there. Change-Id: I43a136ade731a2c58c0a29d97875088e9b6d4414 --- M src/common/nm_bts_fsm.c M src/common/nm_channel_fsm.c 2 files changed, 8 insertions(+), 5 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index d2c48fb..c825ab5 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -57,6 +57,9 @@ static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_bts *bts = (struct gsm_bts *)fi->priv; + /* Reset state: */ + bts->si_valid = 0; + bts->mo.setattr_success = false; bts->mo.opstart_success = false; oml_mo_state_chg(&bts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED, NM_STATE_LOCKED); @@ -150,8 +153,6 @@ case NM_EV_SHUTDOWN_FINISH: /* Propagate event to children: */ ev_dispatch_children(bts, event); - /* Reset state: */ - bts->si_valid = 0; nm_bts_fsm_state_chg(fi, NM_BTS_ST_OP_DISABLED_NOTINSTALLED); break; default: diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index 6456005..8ffddae 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -55,6 +55,11 @@ static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_bts_trx_ts *ts = (struct gsm_bts_trx_ts *)fi->priv; + /* Reset state: */ + gsm_ts_release(ts); + if (ts->vamos.peer) + gsm_ts_release(ts->vamos.peer); + ts->mo.setattr_success = false; ts->mo.opstart_success = false; oml_mo_state_chg(&ts->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED, NM_STATE_LOCKED); @@ -193,9 +198,6 @@ oml_mo_state_chg(&ts->mo, -1, -1, NM_STATE_SHUTDOWN); break; case NM_EV_SHUTDOWN_FINISH: - gsm_ts_release(ts); - if (ts->vamos.peer) - gsm_ts_release(ts->vamos.peer); nm_chan_fsm_state_chg(fi, NM_CHAN_ST_OP_DISABLED_NOTINSTALLED); break; default: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I43a136ade731a2c58c0a29d97875088e9b6d4414 Gerrit-Change-Number: 25729 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 20:58:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 20:58:50 +0000 Subject: Change in osmo-bts[master]: nm_*_fsm: reset mo.nm_attr from previous runs when entering state NOT... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25730 ) Change subject: nm_*_fsm: reset mo.nm_attr from previous runs when entering state NOT_INSTALLED ...................................................................... nm_*_fsm: reset mo.nm_attr from previous runs when entering state NOT_INSTALLED Code in oml.c, upon receiving net attributes, merges the new attributes with old ones (for some reason I don't really know). Hence, if we disconnect from a BSC and go to NOT_INSTALLED state, we must free previous nm_attr in order to avoid mixing them once we connect to a new (potentially different) BSC upon reconnect. Related: OS#5248 Change-Id: I45cc22dd68121a7930301581bfd0a8db37879c77 --- M src/common/nm_bb_transc_fsm.c M src/common/nm_bts_fsm.c M src/common/nm_channel_fsm.c M src/common/nm_radio_carrier_fsm.c 4 files changed, 8 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/nm_bb_transc_fsm.c b/src/common/nm_bb_transc_fsm.c index 40d5134..ca78256 100644 --- a/src/common/nm_bb_transc_fsm.c +++ b/src/common/nm_bb_transc_fsm.c @@ -59,6 +59,9 @@ static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_bts_bb_trx *bb_transc = (struct gsm_bts_bb_trx *)fi->priv; + /* Reset state: */ + TALLOC_FREE(bb_transc->mo.nm_attr); + bb_transc->mo.setattr_success = false; bb_transc->mo.opstart_success = false; oml_mo_state_chg(&bb_transc->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED, NM_STATE_LOCKED); diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index c825ab5..c9dcd4c 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -59,6 +59,7 @@ struct gsm_bts *bts = (struct gsm_bts *)fi->priv; /* Reset state: */ bts->si_valid = 0; + TALLOC_FREE(bts->mo.nm_attr); bts->mo.setattr_success = false; bts->mo.opstart_success = false; diff --git a/src/common/nm_channel_fsm.c b/src/common/nm_channel_fsm.c index 8ffddae..503ddfb 100644 --- a/src/common/nm_channel_fsm.c +++ b/src/common/nm_channel_fsm.c @@ -59,6 +59,7 @@ gsm_ts_release(ts); if (ts->vamos.peer) gsm_ts_release(ts->vamos.peer); + TALLOC_FREE(ts->mo.nm_attr); ts->mo.setattr_success = false; ts->mo.opstart_success = false; diff --git a/src/common/nm_radio_carrier_fsm.c b/src/common/nm_radio_carrier_fsm.c index be03d1d..88930dd 100644 --- a/src/common/nm_radio_carrier_fsm.c +++ b/src/common/nm_radio_carrier_fsm.c @@ -48,6 +48,9 @@ static void st_op_disabled_notinstalled_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct gsm_bts_trx *trx = (struct gsm_bts_trx *)fi->priv; + /* Reset state: */ + TALLOC_FREE(trx->mo.nm_attr); + trx->mo.setattr_success = false; trx->mo.opstart_success = false; oml_mo_state_chg(&trx->mo, NM_OPSTATE_DISABLED, NM_AVSTATE_NOT_INSTALLED, NM_STATE_LOCKED); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25730 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I45cc22dd68121a7930301581bfd0a8db37879c77 Gerrit-Change-Number: 25730 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 21:00:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 21:00:04 +0000 Subject: Change in osmo-bts[master]: trx_sched_clean_ts(): also free() the associated 'struct l1sched_ts' In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25731 ) Change subject: trx_sched_clean_ts(): also free() the associated 'struct l1sched_ts' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I44a8f18c81dd8bc76ca07dfaae7bcdb2fedc9261 Gerrit-Change-Number: 25731 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 21:00:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 21:01:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 21:01:41 +0000 Subject: Change in osmo-bts[master]: trx_sched_clean(): also free() the shadow timeslot In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25732 ) Change subject: trx_sched_clean(): also free() the shadow timeslot ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic14e9de7487ba8152ffb1aa1bab508a2b9a11ea0 Gerrit-Change-Number: 25732 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 21:01:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 8 21:04:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 8 Oct 2021 21:04:07 +0000 Subject: Change in osmo-bts[master]: rsl: NACK Chan Activation for lchans on disabled TS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25702 ) Change subject: rsl: NACK Chan Activation for lchans on disabled TS ...................................................................... Patch Set 2: So we need to get the primary TS then when checking that? Feel free to submit a patch then, you and neels worked on the vamos stuff and the shadow TS thing, so you probably know better. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25702 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9c3b68487c12efc412a057728a561e061560c544 Gerrit-Change-Number: 25702 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 08 Oct 2021 21:04:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 9 15:04:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Sat, 9 Oct 2021 15:04:01 +0000 Subject: Change in osmo-pcu[master]: tbf: Assert if FSM allocation fails References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25735 ) Change subject: tbf: Assert if FSM allocation fails ...................................................................... tbf: Assert if FSM allocation fails Change-Id: Ib3db7a554a4467814785df08e3772455bf00b7d5 --- M src/tbf.cpp 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/35/25735/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index bda96af..7ebd268 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -122,13 +122,16 @@ memset(&state_fsm, 0, sizeof(state_fsm)); state_fsm.tbf = this; state_fsm.fi = osmo_fsm_inst_alloc(&tbf_fsm, this, &state_fsm, LOGL_INFO, NULL); + OSMO_ASSERT(state_fsm.fi); memset(&ul_ass_fsm, 0, sizeof(ul_ass_fsm)); ul_ass_fsm.tbf = this; ul_ass_fsm.fi = osmo_fsm_inst_alloc(&tbf_ul_ass_fsm, this, &ul_ass_fsm, LOGL_INFO, NULL); + OSMO_ASSERT(ul_ass_fsm.fi); memset(&dl_ass_fsm, 0, sizeof(dl_ass_fsm)); dl_ass_fsm.tbf = this; dl_ass_fsm.fi = osmo_fsm_inst_alloc(&tbf_dl_ass_fsm, this, &dl_ass_fsm, LOGL_INFO, NULL); + OSMO_ASSERT(dl_ass_fsm.fi); m_rlc.init(); m_llc.init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib3db7a554a4467814785df08e3772455bf00b7d5 Gerrit-Change-Number: 25735 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Sun Oct 10 21:04:30 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 10 Oct 2021 21:04:30 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <6163557133aef_35c62b0195c745f4123747d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/Debian_Unstable/x86_64 Package network:osmocom:latest/eclipse-titan failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 169s] (dep) Path2.cc [ 169s] (dep) Quadruple.cc [ 169s] (dep) config_preproc.cc [ 169s] (dep) path.c [ 169s] (dep) userinfo.c [ 169s] (dep) new.cc [ 169s] (dep) memory.c [ 169s] gcc -c -Wdate-time -D_FORTIFY_SOURCE=2 -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -D_REENTRANT -Wall -std=gnu9x -O2 -fPIC memory.c -o memory.o [ 169s] g++ -c -Wdate-time -D_FORTIFY_SOURCE=2 -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -D_REENTRANT -g -O2 -ffile-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wno-long-long -O2 -fPIC -Wall -Wno-long-long -O2 -fPIC new.cc -o new.o [ 169s] new.cc:21:33: error: ISO C++17 does not allow dynamic exception specifications [ 169s] 21 | void *operator new(size_t size) throw (std::bad_alloc) [ 169s] | ^~~~~ [ 169s] new.cc:26:35: error: ISO C++17 does not allow dynamic exception specifications [ 169s] 26 | void *operator new[](size_t size) throw (std::bad_alloc) [ 169s] | ^~~~~ [ 169s] make[2]: *** [../Makefile.genrules:97: new.o] Error 1 [ 169s] make[2]: Leaving directory '/usr/src/packages/BUILD/common' [ 169s] make[1]: *** [Makefile:65: all] Error 2 [ 169s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 169s] dh_auto_build: error: make -j1 returned exit code 2 [ 169s] make: *** [debian/rules:6: build] Error 25 [ 169s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 169s] ### VM INTERACTION START ### [ 173s] [ 154.451497] sysrq: Power Off [ 173s] [ 154.457266] reboot: Power down [ 173s] ### VM INTERACTION END ### [ 173s] [ 173s] lamb05 failed "build eclipse-titan_6.6.1-1.dsc" at Sun Oct 10 21:04:23 UTC 2021. [ 173s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 11 03:05:23 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 11 Oct 2021 03:05:23 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <6163aa0cc83ba_35c62b0195c745f41253953@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/Debian_Unstable/x86_64 Package network:osmocom:latest/eclipse-titan failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 160s] (dep) Path2.cc [ 161s] (dep) Quadruple.cc [ 161s] (dep) config_preproc.cc [ 161s] (dep) path.c [ 161s] (dep) userinfo.c [ 161s] (dep) new.cc [ 161s] (dep) memory.c [ 161s] gcc -c -Wdate-time -D_FORTIFY_SOURCE=2 -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -D_REENTRANT -Wall -std=gnu9x -O2 -fPIC memory.c -o memory.o [ 161s] g++ -c -Wdate-time -D_FORTIFY_SOURCE=2 -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -D_REENTRANT -g -O2 -ffile-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wno-long-long -O2 -fPIC -Wall -Wno-long-long -O2 -fPIC new.cc -o new.o [ 161s] new.cc:21:33: error: ISO C++17 does not allow dynamic exception specifications [ 161s] 21 | void *operator new(size_t size) throw (std::bad_alloc) [ 161s] | ^~~~~ [ 161s] new.cc:26:35: error: ISO C++17 does not allow dynamic exception specifications [ 161s] 26 | void *operator new[](size_t size) throw (std::bad_alloc) [ 161s] | ^~~~~ [ 161s] make[2]: *** [../Makefile.genrules:97: new.o] Error 1 [ 161s] make[2]: Leaving directory '/usr/src/packages/BUILD/common' [ 161s] make[1]: *** [Makefile:65: all] Error 2 [ 161s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 161s] dh_auto_build: error: make -j1 returned exit code 2 [ 161s] make: *** [debian/rules:6: build] Error 25 [ 161s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 161s] ### VM INTERACTION START ### [ 164s] [ 148.051639] sysrq: Power Off [ 164s] [ 148.060567] reboot: Power down [ 164s] ### VM INTERACTION END ### [ 164s] [ 164s] lamb67 failed "build eclipse-titan_6.6.1-1.dsc" at Mon Oct 11 03:05:21 UTC 2021. [ 164s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Oct 11 06:06:46 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 11 Oct 2021 06:06:46 +0000 Subject: Change in osmo-ci[master]: lint: support project-specific exclude paths In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25724 ) Change subject: lint: support project-specific exclude paths ...................................................................... lint: support project-specific exclude paths While at it, put in the exact path to spelling.txt in osmo-ci.git. Related: OS#5087 Change-Id: Ib23f9c65da1916ebf4654c5e641eaffe6c75315c --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 23 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh index 4710b7b..fd0e10a 100755 --- a/lint/checkpatch/checkpatch_osmo.sh +++ b/lint/checkpatch/checkpatch_osmo.sh @@ -1,12 +1,27 @@ #!/bin/sh -e SCRIPT_DIR="$(dirname "$(realpath "$0")")" +PROJECT="$(basename "$(git rev-parse --show-toplevel)")" -# Excluded paths: -# * \.(ok|err)$: stdout and stderr of regression tests -# * ^debian/changelog$: generated from commit log, which may contain spelling errors (OS#5232) -# * ^lint/checkpatch/: so it does not warn about spelling errors in spelling.txt :) -# * ^src/gsm/kdf/: libosmocore: imported code -# * ^src/gsm/milenage/: libosmocore: imported code +exclude_paths_common() { + # Stdout and stderr of regression tests + echo '--exclude \.(ok|err)$' + # Generated from commit log, which may contain spelling errors (OS#5232) + echo '--exclude ^debian/changelog$' +} + +exclude_paths_project() { + case "$PROJECT" in + libosmocore) + # Imported code + echo '--exclude ^src/gsm/kdf/' + echo '--exclude ^src/gsm/milenage/' + ;; + osmo-ci) + # Do not warn about spelling errors in spelling.txt :) + echo '--exclude ^lint/checkpatch/spelling.txt$' + ;; + esac +} # Ignored checks: # * ASSIGN_IN_IF: not followed (e.g. 'if ((u8 = gsup_msg->cause))') @@ -36,11 +51,8 @@ # * UNSPECIFIED_INT: not followed (doesn't seem useful for us) $SCRIPT_DIR/checkpatch.pl \ - --exclude '\.(ok|err)$' \ - --exclude '^debian/changelog$' \ - --exclude '^lint/checkpatch/' \ - --exclude '^src/gsm/kdf/' \ - --exclude '^src/gsm/milenage/' \ + $(exclude_paths_common) \ + $(exclude_paths_project) \ --ignore ASSIGN_IN_IF \ --ignore AVOID_EXTERNS \ --ignore BLOCK_COMMENT_STYLE \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25724 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib23f9c65da1916ebf4654c5e641eaffe6c75315c Gerrit-Change-Number: 25724 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 06:06:46 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 11 Oct 2021 06:06:46 +0000 Subject: Change in osmo-ci[master]: lint: osmo-pcu: exclude imported wireshark code In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25725 ) Change subject: lint: osmo-pcu: exclude imported wireshark code ...................................................................... lint: osmo-pcu: exclude imported wireshark code Related: OS#5087 Change-Id: I70814512bdba50363edd4195b5b073698ea6532c --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh index fd0e10a..568f9b2 100755 --- a/lint/checkpatch/checkpatch_osmo.sh +++ b/lint/checkpatch/checkpatch_osmo.sh @@ -20,6 +20,11 @@ # Do not warn about spelling errors in spelling.txt :) echo '--exclude ^lint/checkpatch/spelling.txt$' ;; + osmo-pcu) + # Imported code + echo '--exclude ^src/csn1.(c|h)$' + echo '--exclude ^src/gsm_rlcmac.(c|h)$' + ;; esac } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I70814512bdba50363edd4195b5b073698ea6532c Gerrit-Change-Number: 25725 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 06:14:53 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 11 Oct 2021 06:14:53 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: reformat find cmds in Makefile References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/25736 ) Change subject: gen_makefile.py: reformat find cmds in Makefile ...................................................................... gen_makefile.py: reformat find cmds in Makefile Change-Id: Ic2fad22fdbf0fec4abfaeae60b4ebd74563a9392 --- M gen_makefile.py 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/36/25736/1 diff --git a/gen_makefile.py b/gen_makefile.py index c08ca4e..e6a9480 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -167,8 +167,17 @@ return r''' ### {proj} ### -{proj}_configure_files := $(shell find {src_proj} -name "Makefile.am" -or -name "*.in" -and -not -name "Makefile.in" -and -not -name "config.h.in" ) -{proj}_files := $(shell find {src_proj} -name "*.[hc]" -or -name "*.py" -or -name "*.cpp" -or -name "*.tpl" -or -name "*.map") +{proj}_configure_files := $(shell find {src_proj} \ + -name "Makefile.am" \ + -or -name "*.in" \ + -and -not -name "Makefile.in" \ + -and -not -name "config.h.in" ) +{proj}_files := $(shell find {src_proj} \ + -name "*.[hc]" \ + -or -name "*.py" \ + -or -name "*.cpp" \ + -or -name "*.tpl" \ + -or -name "*.map") .make.{proj}.clone: @echo -e "\n\n\n===== $@\n" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/25736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ic2fad22fdbf0fec4abfaeae60b4ebd74563a9392 Gerrit-Change-Number: 25736 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 06:14:54 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 11 Oct 2021 06:14:54 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: proj_files: ignore config.h References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/25737 ) Change subject: gen_makefile.py: proj_files: ignore config.h ...................................................................... gen_makefile.py: proj_files: ignore config.h Do not consider config.h inside the source tree as modified source file. This file gets generated when running ./configure to build in-tree, whereas osmo-dev always builds out-of-tree. Having config.h inside proj_files causes problems with the next patch, where conflicting in-tree builds will be automatically be cleaned with "make distclean". For example: * "make libosmocore" runs with a previously configured in-tree build * proj_files contains config.h. * Before attempting to build libosmocore out-of-tree, with the next patch, "make distclean" gets executed. * config.h is now removed * .make.libosmocore.build target expects all proj_files to exist and fails with: make: *** No rule to make target '../src/libosmocore/config.h', needed by '.make.libosmocore.build'. Stop. Change-Id: I10d970f2cadacb5071dcde975c76b15404038a3c --- M gen_makefile.py 1 file changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/37/25737/1 diff --git a/gen_makefile.py b/gen_makefile.py index e6a9480..5fa3e26 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -173,11 +173,14 @@ -and -not -name "Makefile.in" \ -and -not -name "config.h.in" ) {proj}_files := $(shell find {src_proj} \ - -name "*.[hc]" \ - -or -name "*.py" \ - -or -name "*.cpp" \ - -or -name "*.tpl" \ - -or -name "*.map") + \( \ + -name "*.[hc]" \ + -or -name "*.py" \ + -or -name "*.cpp" \ + -or -name "*.tpl" \ + -or -name "*.map" \ + \) \ + -and -not -name "config.h") .make.{proj}.clone: @echo -e "\n\n\n===== $@\n" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/25737 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I10d970f2cadacb5071dcde975c76b15404038a3c Gerrit-Change-Number: 25737 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 06:14:54 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 11 Oct 2021 06:14:54 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: add --auto-distclean References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/25738 ) Change subject: gen_makefile.py: add --auto-distclean ...................................................................... gen_makefile.py: add --auto-distclean Add a new option that avoids stopping the build with: configure: error: source directory already configured; run "make distclean" there first I run into this frequently, when e.g. running './configure; make release' inside Osmocom repositories and then attempting to build them with osmo-dev. It is annoying as it does not fail immediatelly, and I need to manually go to the source directories where it failed, run 'make distclean' and then attempt to build again. Then it may fail on another directory with the same problem. Check for config.status, as that is also what ./configure checks for before printing the error. Change-Id: Iac71333e8c5da8dee4e8f34e2af8db12d2c08021 --- M gen_makefile.py 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/38/25738/1 diff --git a/gen_makefile.py b/gen_makefile.py index 5fa3e26..58d6024 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -107,6 +107,9 @@ parser.add_argument('--docker-cmd', help='''prefix configure/make/make install calls with this command (used by ttcn3.sh)''') +parser.add_argument('-a', '--auto-distclean', action='store_true', + help='''run "make distclean" automatically if source directory already configured''') + args = parser.parse_args() class listdict(dict): @@ -190,6 +193,7 @@ touch $@ .make.{proj}.autoconf: .make.{proj}.clone {src_proj}/configure.ac + if {distclean_cond}; then $(MAKE) {proj}-distclean; fi @echo -e "\n\n\n===== $@\n" -rm -f {src_proj}/.version cd {src_proj}; autoreconf -fi @@ -197,6 +201,7 @@ touch $@ .make.{proj}.configure: .make.{proj}.autoconf {deps_installed} $({proj}_configure_files) + if {distclean_cond}; then $(MAKE) {proj}-distclean .make.{proj}.autoconf; fi @echo -e "\n\n\n===== $@\n" -chmod -R ug+w {build_proj} -rm -rf {build_proj} @@ -206,6 +211,7 @@ touch $@ .make.{proj}.build: .make.{proj}.configure $({proj}_files) + if {distclean_cond}; then $(MAKE) {proj}-distclean .make.{proj}.configure; fi @echo -e "\n\n\n===== $@\n" {docker_cmd}$(MAKE) -C {build_proj} -j {jobs} {check} sync @@ -231,6 +237,12 @@ -chmod -R ug+w {build_proj} -rm -rf {build_proj} -rm -rf .make.{proj}.* + +.PHONY: {proj}-distclean +{proj}-distclean: {proj}-clean + @echo -e "\n\n\n===== $@\n" + $(MAKE) -C {src_proj} distclean + '''.format( url=url, push_url=push_url or url, @@ -248,6 +260,7 @@ sudo_ldconfig='' if ldconfig_without_sudo else 'sudo ', check='check' if make_check else '', docker_cmd=f'{args.docker_cmd} ' if args.docker_cmd else '', + distclean_cond=f'[ -e {make_to_src_proj}/config.status ]' if args.auto_distclean else 'false' ) @@ -324,7 +337,7 @@ -o {makefile} \ -s {src_dir} \ -b {build_dir} \ - -u "{url}"{push_url}{sudo_make_install}{no_ldconfig}{ldconfig_without_sudo}{make_check}{docker_cmd} + -u "{url}"{push_url}{sudo_make_install}{no_ldconfig}{ldconfig_without_sudo}{make_check}{docker_cmd}{auto_distclean} '''.format( script=os.path.relpath(sys.argv[0], make_dir), @@ -339,7 +352,8 @@ no_ldconfig=' \\\n\t\t-L' if args.no_ldconfig else '', ldconfig_without_sudo=' \\\n\t\t--ldconfig-without-sudo' if args.ldconfig_without_sudo else '', make_check='' if args.make_check else " \\\n\t\t--no-make-check", - docker_cmd=f' \\\n\t\t--docker-cmd "{args.docker_cmd}"' if args.docker_cmd else '' + docker_cmd=f' \\\n\t\t--docker-cmd "{args.docker_cmd}"' if args.docker_cmd else '', + auto_distclean=' \\\n\t\t--auto-distclean' if args.auto_distclean else '' )) # convenience target: clone all repositories first -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/25738 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Iac71333e8c5da8dee4e8f34e2af8db12d2c08021 Gerrit-Change-Number: 25738 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 06:14:55 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 11 Oct 2021 06:14:55 +0000 Subject: Change in osmo-dev[master]: ttcn3.sh: use --auto-distclean References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-dev/+/25739 ) Change subject: ttcn3.sh: use --auto-distclean ...................................................................... ttcn3.sh: use --auto-distclean Change-Id: I7d61405dc989eed4935bc6de00e36c1f3b18a428 --- M ttcn3/ttcn3.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-dev refs/changes/39/25739/1 diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index 2cb4b3a..ab82fc7 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -110,7 +110,8 @@ --docker-cmd "$docker_cmd" \ --make-dir "$DIR_MAKE" \ --no-ldconfig \ - --no-make-check + --no-make-check \ + --auto-distclean } # $1: name of repository (e.g. osmo-ttcn3-hacks) -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/25739 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: I7d61405dc989eed4935bc6de00e36c1f3b18a428 Gerrit-Change-Number: 25739 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 07:10:40 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 11 Oct 2021 07:10:40 +0000 Subject: Change in osmo-ggsn[master]: gtp_echo_responder: report invalid chars present in node-feautres cmd... In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/25728 ) Change subject: gtp_echo_responder: report invalid chars present in node-feautres cmdline arg as error ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I89d26a575ef81ee17483db035924354588d9d094 Gerrit-Change-Number: 25728 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 11 Oct 2021 07:10:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 08:03:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 08:03:27 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: reformat find cmds in Makefile In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/25736 ) Change subject: gen_makefile.py: reformat find cmds in Makefile ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/25736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ic2fad22fdbf0fec4abfaeae60b4ebd74563a9392 Gerrit-Change-Number: 25736 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 11 Oct 2021 08:03:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 08:11:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 11 Oct 2021 08:11:03 +0000 Subject: Change in osmo-ggsn[master]: gtp_echo_responder: report invalid chars present in node-feautres cmd... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/25728 ) Change subject: gtp_echo_responder: report invalid chars present in node-feautres cmdline arg as error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I89d26a575ef81ee17483db035924354588d9d094 Gerrit-Change-Number: 25728 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 11 Oct 2021 08:11:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 08:11:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 11 Oct 2021 08:11:05 +0000 Subject: Change in osmo-ggsn[master]: gtp_echo_responder: report invalid chars present in node-feautres cmd... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/25728 ) Change subject: gtp_echo_responder: report invalid chars present in node-feautres cmdline arg as error ...................................................................... gtp_echo_responder: report invalid chars present in node-feautres cmdline arg as error from "man strtoul": """ If endptr is not NULL, strtoul() stores the address of the first invalid character in *endptr. In particular, if *nptr is not '\0' but **endptr is '\0' on return, the entire string is valid. """ Fixes: ae81195418ebed5280d0753d037df483bb914a0b Change-Id: I89d26a575ef81ee17483db035924354588d9d094 --- M utils/gtp_echo_responder.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/utils/gtp_echo_responder.c b/utils/gtp_echo_responder.c index e077c81..390fa25 100644 --- a/utils/gtp_echo_responder.c +++ b/utils/gtp_echo_responder.c @@ -125,7 +125,7 @@ res = strtoul(arg, &end, 0); if ((errno == ERANGE && res == ULONG_MAX) || (errno && !res) || - arg == end) { + arg == end || *end != '\0') { fprintf(stderr, "Failed parsing Node Features bitmask: '%s'\n", arg); exit(1); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/25728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I89d26a575ef81ee17483db035924354588d9d094 Gerrit-Change-Number: 25728 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 08:41:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 08:41:51 +0000 Subject: Change in osmo-bts[master]: trx_sched_clean_ts(): also free() the associated 'struct l1sched_ts' In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25731 ) Change subject: trx_sched_clean_ts(): also free() the associated 'struct l1sched_ts' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I44a8f18c81dd8bc76ca07dfaae7bcdb2fedc9261 Gerrit-Change-Number: 25731 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 11 Oct 2021 08:41:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 08:41:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 08:41:54 +0000 Subject: Change in osmo-bts[master]: trx_sched_clean(): also free() the shadow timeslot In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25732 ) Change subject: trx_sched_clean(): also free() the shadow timeslot ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic14e9de7487ba8152ffb1aa1bab508a2b9a11ea0 Gerrit-Change-Number: 25732 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 11 Oct 2021 08:41:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 08:41:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 08:41:56 +0000 Subject: Change in osmo-bts[master]: trx_sched_clean_ts(): also free() the associated 'struct l1sched_ts' In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25731 ) Change subject: trx_sched_clean_ts(): also free() the associated 'struct l1sched_ts' ...................................................................... trx_sched_clean_ts(): also free() the associated 'struct l1sched_ts' Change-Id: I44a8f18c81dd8bc76ca07dfaae7bcdb2fedc9261 Related: OS#5248 --- M src/common/scheduler.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/scheduler.c b/src/common/scheduler.c index e7d17d0..17fb537 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -677,6 +677,9 @@ /* clear lchan channel states */ for (i = 0; i < ARRAY_SIZE(ts->lchan); i++) lchan_set_state(&ts->lchan[i], LCHAN_S_NONE); + + talloc_free(l1ts); + ts->priv = NULL; } void trx_sched_clean(struct gsm_bts_trx *trx) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25731 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I44a8f18c81dd8bc76ca07dfaae7bcdb2fedc9261 Gerrit-Change-Number: 25731 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 08:41:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 08:41:56 +0000 Subject: Change in osmo-bts[master]: trx_sched_clean(): also free() the shadow timeslot In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25732 ) Change subject: trx_sched_clean(): also free() the shadow timeslot ...................................................................... trx_sched_clean(): also free() the shadow timeslot Change-Id: Ic14e9de7487ba8152ffb1aa1bab508a2b9a11ea0 Related: OS#5248 --- M src/common/scheduler.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 17fb537..5118904 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -694,6 +694,9 @@ /* Clean primary and shadow timeslots */ trx_sched_clean_ts(ts); trx_sched_clean_ts(ts->vamos.peer); + + talloc_free(ts->vamos.peer); + ts->vamos.peer = NULL; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic14e9de7487ba8152ffb1aa1bab508a2b9a11ea0 Gerrit-Change-Number: 25732 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 08:57:32 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 11 Oct 2021 08:57:32 +0000 Subject: Change in pysim[master]: card_handler: clean-up In-Reply-To: References: Message-ID: dexter has uploaded a new patch set (#5) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/pysim/+/23595 ) Change subject: card_handler: clean-up ...................................................................... card_handler: clean-up * introduce type annotations * introduce + derive implementations from base class * move shared code to base class Change-Id: I7168506cbebb1ebb67f47453419b860824912051 --- M pySim/card_handler.py 1 file changed, 63 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/95/23595/5 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7168506cbebb1ebb67f47453419b860824912051 Gerrit-Change-Number: 23595 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 09:06:53 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 11 Oct 2021 09:06:53 +0000 Subject: Change in pysim[master]: card_handler: clean-up In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23595 ) Change subject: card_handler: clean-up ...................................................................... Patch Set 5: I have rebased this patch so that it fits again into the current master. I have also verified that it still works. With manual card handling and with the automated card reader. From my perspective this is ready to get merged. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7168506cbebb1ebb67f47453419b860824912051 Gerrit-Change-Number: 23595 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 11 Oct 2021 09:06:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 09:28:55 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 11 Oct 2021 09:28:55 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: reformat find cmds in Makefile In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/25736 ) Change subject: gen_makefile.py: reformat find cmds in Makefile ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/25736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ic2fad22fdbf0fec4abfaeae60b4ebd74563a9392 Gerrit-Change-Number: 25736 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 11 Oct 2021 09:28:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 09:29:53 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 11 Oct 2021 09:29:53 +0000 Subject: Change in osmo-pcu[master]: tbf: Assert if FSM allocation fails In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25735 ) Change subject: tbf: Assert if FSM allocation fails ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib3db7a554a4467814785df08e3772455bf00b7d5 Gerrit-Change-Number: 25735 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 11 Oct 2021 09:29:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 09:35:41 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 11 Oct 2021 09:35:41 +0000 Subject: Change in docker-playground[master]: ttcn3-ns-test: add second NSVC to allow TC_tx_blocked_foreign_nsvc to... In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/25561 ) Change subject: ttcn3-ns-test: add second NSVC to allow TC_tx_blocked_foreign_nsvc to work ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/25561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3a4baaacdbaab245ba10a1857f0183e56defcdf4 Gerrit-Change-Number: 25561 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 11 Oct 2021 09:35:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 09:37:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 09:37:36 +0000 Subject: Change in osmo-pcu[master]: tbf: Assert if FSM allocation fails In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25735 ) Change subject: tbf: Assert if FSM allocation fails ...................................................................... tbf: Assert if FSM allocation fails Change-Id: Ib3db7a554a4467814785df08e3772455bf00b7d5 --- M src/tbf.cpp 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved diff --git a/src/tbf.cpp b/src/tbf.cpp index bda96af..7ebd268 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -122,13 +122,16 @@ memset(&state_fsm, 0, sizeof(state_fsm)); state_fsm.tbf = this; state_fsm.fi = osmo_fsm_inst_alloc(&tbf_fsm, this, &state_fsm, LOGL_INFO, NULL); + OSMO_ASSERT(state_fsm.fi); memset(&ul_ass_fsm, 0, sizeof(ul_ass_fsm)); ul_ass_fsm.tbf = this; ul_ass_fsm.fi = osmo_fsm_inst_alloc(&tbf_ul_ass_fsm, this, &ul_ass_fsm, LOGL_INFO, NULL); + OSMO_ASSERT(ul_ass_fsm.fi); memset(&dl_ass_fsm, 0, sizeof(dl_ass_fsm)); dl_ass_fsm.tbf = this; dl_ass_fsm.fi = osmo_fsm_inst_alloc(&tbf_dl_ass_fsm, this, &dl_ass_fsm, LOGL_INFO, NULL); + OSMO_ASSERT(dl_ass_fsm.fi); m_rlc.init(); m_llc.init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25735 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib3db7a554a4467814785df08e3772455bf00b7d5 Gerrit-Change-Number: 25735 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 09:38:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 09:38:53 +0000 Subject: Change in osmo-bts[master]: Add new gsm_bts_trx_free_shadow_ts() function References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25740 ) Change subject: Add new gsm_bts_trx_free_shadow_ts() function ...................................................................... Add new gsm_bts_trx_free_shadow_ts() function Use it as a counterpart of gsm_bts_trx_init_shadow_ts() Change-Id: I38baa2b2cfcf6221325d45860b3c7dd53235b8ff --- M include/osmo-bts/bts_trx.h M src/common/bts_trx.c M src/common/scheduler.c 3 files changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/40/25740/1 diff --git a/include/osmo-bts/bts_trx.h b/include/osmo-bts/bts_trx.h index e1959c8..c0dcb1c 100644 --- a/include/osmo-bts/bts_trx.h +++ b/include/osmo-bts/bts_trx.h @@ -50,6 +50,7 @@ struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); void gsm_bts_trx_init_shadow_ts(struct gsm_bts_trx *trx); +void gsm_bts_trx_free_shadow_ts(struct gsm_bts_trx *trx); char *gsm_trx_name(const struct gsm_bts_trx *trx); const char *gsm_trx_unit_id(struct gsm_bts_trx *trx); diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c index 7ef5b52..b16a31c 100644 --- a/src/common/bts_trx.c +++ b/src/common/bts_trx.c @@ -112,6 +112,20 @@ } } +void gsm_bts_trx_free_shadow_ts(struct gsm_bts_trx *trx) +{ + unsigned int tn; + + for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { + struct gsm_bts_trx_ts *shadow_ts = trx->ts[tn].vamos.peer; + if (!shadow_ts) + continue; + + talloc_free(shadow_ts); + trx->ts[tn].vamos.peer = NULL; + } +} + struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) { struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx); diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 5118904..2a729e4 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -694,10 +694,10 @@ /* Clean primary and shadow timeslots */ trx_sched_clean_ts(ts); trx_sched_clean_ts(ts->vamos.peer); - - talloc_free(ts->vamos.peer); - ts->vamos.peer = NULL; } + + /* Free previously allocated shadow timeslots */ + gsm_bts_trx_free_shadow_ts(trx); } struct msgb *_sched_dequeue_prim(struct l1sched_ts *l1ts, const struct trx_dl_burst_req *br) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I38baa2b2cfcf6221325d45860b3c7dd53235b8ff Gerrit-Change-Number: 25740 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 09:38:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 09:38:54 +0000 Subject: Change in osmo-bts[master]: Make sure lchan allocated memory from shadow_ts is properly freed References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25741 ) Change subject: Make sure lchan allocated memory from shadow_ts is properly freed ...................................................................... Make sure lchan allocated memory from shadow_ts is properly freed Since non-shadow TS are currently not allocated as talloc contexts, lchan objects tend to allocate their own memory on trx talloc ctx instead. That's fine for non-shadow TS, since the TS follow trx lifecycle since they are part of the same talloc context. However, shadow TS are recreated (re-allocated) each time the BTS reconnects, hence when htey are freed we need to free substructs (lchan) memory in order to avoid it being kept in trx talloc ctx. Related: OS#5248 Change-Id: I73742535eb3c40a6866731acbff782940dab06c3 --- M src/common/bts_trx.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/25741/1 diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c index b16a31c..ff5c618 100644 --- a/src/common/bts_trx.c +++ b/src/common/bts_trx.c @@ -115,12 +115,19 @@ void gsm_bts_trx_free_shadow_ts(struct gsm_bts_trx *trx) { unsigned int tn; + unsigned int ln; for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { struct gsm_bts_trx_ts *shadow_ts = trx->ts[tn].vamos.peer; if (!shadow_ts) continue; + /* free lchan related mem allocated on the trx object: */ + for (ln = 0; ln < ARRAY_SIZE(shadow_ts->lchan); ln++) { + struct gsm_lchan *lchan = &shadow_ts->lchan[ln]; + TALLOC_FREE(lchan->name); + } + talloc_free(shadow_ts); trx->ts[tn].vamos.peer = NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I73742535eb3c40a6866731acbff782940dab06c3 Gerrit-Change-Number: 25741 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 10:19:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 10:19:20 +0000 Subject: Change in libosmo-abis[master]: ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_clien... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/25742 ) Change subject: ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_client_conn ...................................................................... ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_client_conn If BTS, using this app, tried to use it in order to re-create the connection, it would leak the previous strut ipa_client_conn. A similar fix was already put in place recently for OML, but it was not applied for RSL. The leak was spotted by having a BTS connecting fine over OMl but then failing each time to connect on RSL. Related: OS#5248 Change-Id: I4ee1ae318b446490783c8b910fca10ba5f72dd5a --- M src/input/ipaccess.c 1 file changed, 19 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/42/25742/1 diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 63461a2..04b4474 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -1005,7 +1005,7 @@ struct ipaccess_line { bool line_already_initialized; - struct ipa_client_conn *ipa_cli; + struct ipa_client_conn *ipa_cli[NUM_E1_TS]; /* 0=OML, 1+N=TRX_N */ }; static int ipaccess_line_update(struct e1inp_line *line) @@ -1078,10 +1078,10 @@ IPA_TCP_PORT_OML); /* Drop previous line */ - if (il->ipa_cli) { - ipa_client_conn_close(il->ipa_cli); - ipa_client_conn_destroy(il->ipa_cli); - il->ipa_cli = NULL; + if (il->ipa_cli[0]) { + ipa_client_conn_close(il->ipa_cli[0]); + ipa_client_conn_destroy(il->ipa_cli[0]); + il->ipa_cli[0] = NULL; } link = ipa_client_conn_create2(tall_ipa_ctx, @@ -1111,7 +1111,7 @@ e1i_ts = e1inp_line_ipa_oml_ts(line); ipaccess_bts_keepalive_fsm_alloc(e1i_ts, link, "oml_bts_to_bsc"); - il->ipa_cli = link; + il->ipa_cli[0] = link; ret = 0; break; } @@ -1137,6 +1137,7 @@ { struct ipa_client_conn *rsl_link; struct e1inp_ts *e1i_ts = e1inp_line_ipa_rsl_ts(line, trx_nr); + struct ipaccess_line *il; if (E1INP_SIGN_RSL+trx_nr-1 >= NUM_E1_TS) { LOGP(DLINP, LOGL_ERROR, "cannot create RSL BTS link: " @@ -1144,6 +1145,17 @@ return -EINVAL; } + if (!line->driver_data) + line->driver_data = talloc_zero(line, struct ipaccess_line); + il = line->driver_data; + + /* Drop previous line */ + if (il->ipa_cli[1 + trx_nr]) { + ipa_client_conn_close(il->ipa_cli[1 + trx_nr]); + ipa_client_conn_destroy(il->ipa_cli[1 + trx_nr]); + il->ipa_cli[1 + trx_nr] = NULL; + } + rsl_link = ipa_client_conn_create2(tall_ipa_ctx, e1inp_line_ipa_rsl_ts(line, trx_nr), E1INP_SIGN_RSL+trx_nr, @@ -1167,8 +1179,8 @@ ipa_client_conn_destroy(rsl_link); return -EIO; } - ipaccess_bts_keepalive_fsm_alloc(e1i_ts, rsl_link, "rsl_bts_to_bsc"); + il->ipa_cli[1 + trx_nr] = rsl_link; return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/25742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4ee1ae318b446490783c8b910fca10ba5f72dd5a Gerrit-Change-Number: 25742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 11:59:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 11:59:09 +0000 Subject: Change in osmo-bts[master]: rsl: Fix all shadow TS being Chan Act NACKed References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25743 ) Change subject: rsl: Fix all shadow TS being Chan Act NACKed ...................................................................... rsl: Fix all shadow TS being Chan Act NACKed The OML NM Channel FSM state only apply to primary timeslots, hence we need to make sure we pick the primary TS (the non-shadow one). Due to this bug, all channels on shadow TS where NACKed because the related state was never "Enabled Ok". Fixes: c97a7f51e1b15d40e39df4b7d07b3c6534540186 Related: OS#5249 Related: OS#5251 Change-Id: If47e4bdd45a05ed1b5709b6e3d541f2830723e37 --- M src/common/rsl.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/43/25743/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index 638caf8..b186adf 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1624,6 +1624,7 @@ struct abis_rsl_dchan_hdr *dch = msgb_l2(msg); struct gsm_lchan *lchan = msg->lchan; struct gsm_bts_trx_ts *ts = lchan->ts; + struct gsm_bts_trx_ts *primary_ts; struct tlv_parsed tp; const struct tlv_p_entry *ie; uint8_t type, cause; @@ -1635,8 +1636,10 @@ return rsl_tx_chan_act_nack(lchan, RSL_ERR_EQUIPMENT_FAIL); } - if (ts->mo.nm_state.operational != NM_OPSTATE_ENABLED || - ts->mo.nm_state.availability != NM_AVSTATE_OK) { + /* We need to pick the real TS here to check NM state: */ + primary_ts = ts->vamos.is_shadow ? ts->vamos.peer : ts; + if (primary_ts->mo.nm_state.operational != NM_OPSTATE_ENABLED || + primary_ts->mo.nm_state.availability != NM_AVSTATE_OK) { LOGP(DRSL, LOGL_ERROR, "%s rx chan activ but TS not in nm_state oper=ENABLED avail=OK, nack!\n", gsm_ts_and_pchan_name(ts)); return rsl_tx_chan_act_nack(lchan, RSL_ERR_RR_UNAVAIL); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If47e4bdd45a05ed1b5709b6e3d541f2830723e37 Gerrit-Change-Number: 25743 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 12:54:27 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 11 Oct 2021 12:54:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: TC_meas_res_sign_*: Properly configure supp-meas-info In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25727 ) Change subject: bts: TC_meas_res_sign_*: Properly configure supp-meas-info ...................................................................... Patch Set 2: Why not run "f_vty_config(BTSVTY, "bts 0", "no supp-meas-info toa256");" at the end of TC_meas_res_speech_tchh_toa256() and TC_meas_res_sign_tchh_toa256() instead? It's only used in these two tests. $ git grep "supp-meas-info" bts/BTS_Tests.ttcn: f_vty_config(BTSVTY, "bts 0", "supp-meas-info toa256"); bts/BTS_Tests.ttcn: f_vty_config(BTSVTY, "bts 0", "supp-meas-info toa256"); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaa16b33781a8f490fc1cdbafda407755371dbe7f Gerrit-Change-Number: 25727 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 11 Oct 2021 12:54:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 13:01:28 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 11 Oct 2021 13:01:28 +0000 Subject: Change in libosmo-abis[master]: ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_clien... In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/25742 ) Change subject: ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_client_conn ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/25742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4ee1ae318b446490783c8b910fca10ba5f72dd5a Gerrit-Change-Number: 25742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 11 Oct 2021 13:01:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 13:05:37 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 11 Oct 2021 13:05:37 +0000 Subject: Change in osmo-bts[master]: Add new gsm_bts_trx_free_shadow_ts() function In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25740 ) Change subject: Add new gsm_bts_trx_free_shadow_ts() function ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I38baa2b2cfcf6221325d45860b3c7dd53235b8ff Gerrit-Change-Number: 25740 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 11 Oct 2021 13:05:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 13:05:42 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 11 Oct 2021 13:05:42 +0000 Subject: Change in osmo-bts[master]: Make sure lchan allocated memory from shadow_ts is properly freed In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25741 ) Change subject: Make sure lchan allocated memory from shadow_ts is properly freed ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I73742535eb3c40a6866731acbff782940dab06c3 Gerrit-Change-Number: 25741 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 11 Oct 2021 13:05:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 13:07:16 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 11 Oct 2021 13:07:16 +0000 Subject: Change in osmo-bts[master]: rsl: Fix all shadow TS being Chan Act NACKed In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25743 ) Change subject: rsl: Fix all shadow TS being Chan Act NACKed ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If47e4bdd45a05ed1b5709b6e3d541f2830723e37 Gerrit-Change-Number: 25743 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 11 Oct 2021 13:07:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 14:14:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 14:14:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: TC_meas_res_sign_*: Properly configure supp-meas-info In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25727 ) Change subject: bts: TC_meas_res_sign_*: Properly configure supp-meas-info ...................................................................... Patch Set 2: > Patch Set 2: > > Why not run "f_vty_config(BTSVTY, "bts 0", "no supp-meas-info toa256");" at the end of TC_meas_res_speech_tchh_toa256() and TC_meas_res_sign_tchh_toa256() instead? It's only used in these two tests. because you cannot garantee that test will pass and hence end of test will run. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaa16b33781a8f490fc1cdbafda407755371dbe7f Gerrit-Change-Number: 25727 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 11 Oct 2021 14:14:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 15:18:48 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Mon, 11 Oct 2021 15:18:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ns: add test case TC_tx_blocked_foreign_nsvc In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25560 ) Change subject: ns: add test case TC_tx_blocked_foreign_nsvc ...................................................................... ns: add test case TC_tx_blocked_foreign_nsvc Check if a BLOCK PDU over a different/foreign connection is parsed. * 2x initialize NSVC (RESET/UNBLOCK) * TTCN 0-> NS: block (nsvci 1) * TTCN <-0 NS: block ack (nsvci 1) * TTCN 1-> NS: unit data (nsvci 1) * TTCN <-1 NS: status (blocked) Change-Id: I2b37a712bd70037b35b9deb8dab4a72d1e1d29fb --- M ns/NS_Tests.ttcn M ns/NS_Tests.udp.cfg M ns/osmo-ns.udp.cfg 3 files changed, 54 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/ns/NS_Tests.ttcn b/ns/NS_Tests.ttcn index b57d686..722f8ec 100644 --- a/ns/NS_Tests.ttcn +++ b/ns/NS_Tests.ttcn @@ -992,6 +992,43 @@ f_clean_ns_codec(); } +/* 48.016 7.2 ensure tx status (blocked) is correctly parsed over a foreign NSVC + * + * 2x initialize NSVC (RESET/UNBLOCK) + * TTCN 0-> NS: block (nsvci 1) + * TTCN <-0 NS: block ack (nsvci 1) + * TTCN 1-> NS: unit data (nsvci 1) + * TTCN <-1 NS: status (blocked) + */ +testcase TC_tx_blocked_foreign_nsvc() runs on RAW_Test_CT { + f_init_vty(); + f_vty_config2(NSVTY, {}, "mirror-mode enable"); + f_init_ns_codec(mp_nsconfig, idx := 0); + f_init_ns_codec(mp_nsconfig, idx := 1); + + /* do a NS Reset procedure */ + f_outgoing_ns_reset(idx := 0); + f_outgoing_ns_reset(idx := 1); + + /* send alive acks */ + activate(as_rx_alive_tx_ack(idx := 0)); + activate(as_rx_alive_tx_ack(idx := 1)); + + f_outgoing_ns_unblock(idx := 0); + f_outgoing_ns_unblock(idx := 1); + + /* both NSVC are alive and unblocked */ + NSCP[0].send(ts_NS_BLOCK(NS_CAUSE_TRANSIT_NETWORK_FAILURE, g_nsconfig.nsvc[1].nsvci)); + f_ns_exp(tr_NS_BLOCK_ACK(g_nsconfig.nsvc[1].nsvci)); + + NSCP[1].send(ts_NS_UNITDATA(t_SduCtrlB, 42, '0011234242230101'O)); + f_ns_exp(tr_NS_STATUS(NS_CAUSE_NSVC_BLOCKED), idx := 1); + + setverdict(pass); + f_clean_ns_codec(); +} + + control { if (mp_dialect == NS2_DIALECT_STATIC_RESETBLOCK or mp_dialect == NS2_DIALECT_IPACCESS) { execute( TC_tx_reset() ); @@ -1003,6 +1040,7 @@ execute( TC_tx_block_unitdata_over_blocked() ); execute( TC_rx_block_unitdata_over_blocked() ); execute( TC_mirror_unitdata_tx_status_blocked() ); + execute( TC_tx_blocked_foreign_nsvc() ); // execute( TC_block_other_nsvc() ); // reset, unblock, sleep(1), block over another nsvci /* 48.016 7.2 Unblock procedure */ execute( TC_tx_unblock() ); diff --git a/ns/NS_Tests.udp.cfg b/ns/NS_Tests.udp.cfg index f040998..cdb071d 100644 --- a/ns/NS_Tests.udp.cfg +++ b/ns/NS_Tests.udp.cfg @@ -21,6 +21,18 @@ } }, nsvci := 1234 + }, + { + provider := { + ip := { + address_family := AF_INET, + local_ip := "127.0.0.1", + local_udp_port := 22001, + remote_ip := "127.0.0.1", + remote_udp_port := 23001 + } + }, + nsvci := 1235 } } } diff --git a/ns/osmo-ns.udp.cfg b/ns/osmo-ns.udp.cfg index 9591427..b327c32 100644 --- a/ns/osmo-ns.udp.cfg +++ b/ns/osmo-ns.udp.cfg @@ -91,5 +91,9 @@ bind udp local listen 127.0.0.1 23000 accept-ipaccess + bind udp local2 + listen 127.0.0.1 23001 + accept-ipaccess nse 1234 nsvc ipa local 127.0.0.1 22000 nsvci 1234 + nsvc ipa local2 127.0.0.1 22001 nsvci 1235 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25560 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I2b37a712bd70037b35b9deb8dab4a72d1e1d29fb Gerrit-Change-Number: 25560 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 15:42:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 15:42:57 +0000 Subject: Change in osmo-pcu[master]: sched: Rename function References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25744 ) Change subject: sched: Rename function ...................................................................... sched: Rename function Properly describe that function is aimed at selecting a DL data block. Change-Id: Ic0680d15edf70449e66f40eab1ead97313631cbb --- M src/gprs_rlcmac_sched.cpp 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/44/25744/1 diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 405b7db..cdbf70d 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -282,8 +282,9 @@ } } -static struct msgb *sched_select_downlink(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_pdch *pdch, uint32_t fn, - uint8_t block_nr, enum mcs_kind req_mcs_kind, bool *is_egprs) +static struct msgb *sched_select_dl_data_msg(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_pdch *pdch, + uint32_t fn, uint8_t block_nr, enum mcs_kind req_mcs_kind, + bool *is_egprs) { struct msgb *msg = NULL; struct gprs_rlcmac_dl_tbf *tbf, *prio_tbf = NULL; @@ -480,7 +481,7 @@ gsmtap_cat = PCU_GSMTAP_C_DL_CTRL; } /* Prio 2: select data message for downlink */ - else if((msg = sched_select_downlink(bts, pdch, fn, block_nr, req_mcs_kind, &tx_is_egprs))) { + else if((msg = sched_select_dl_data_msg(bts, pdch, fn, block_nr, req_mcs_kind, &tx_is_egprs))) { gsmtap_cat = tx_is_egprs ? PCU_GSMTAP_C_DL_DATA_EGPRS : PCU_GSMTAP_C_DL_DATA_GPRS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic0680d15edf70449e66f40eab1ead97313631cbb Gerrit-Change-Number: 25744 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 15:45:40 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 11 Oct 2021 15:45:40 +0000 Subject: Change in libosmo-abis[master]: ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_clien... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/25742 ) Change subject: ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_client_conn ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/libosmo-abis/+/25742/1/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/25742/1/src/input/ipaccess.c at a1170 PS1, Line 1170: unrelated ws removal https://gerrit.osmocom.org/c/libosmo-abis/+/25742/1/src/input/ipaccess.c at 1008 PS1, Line 1008: struct ipa_client_conn *ipa_cli[NUM_E1_TS]; /* 0=OML, 1+N=TRX_N */ I would simply have a separate pointer for the OML, and an array for the RSL: struct ipa_client_conn *ipa_oml_cli; struct ipa_client_conn *ipa_rsl_cli[NUM_E1_TS]; Currently it looks like a complication for no reason. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/25742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4ee1ae318b446490783c8b910fca10ba5f72dd5a Gerrit-Change-Number: 25742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 11 Oct 2021 15:45:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 16:01:38 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 11 Oct 2021 16:01:38 +0000 Subject: Change in osmo-bts[master]: rsl: Fix all shadow TS being Chan Act NACKed In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25743 ) Change subject: rsl: Fix all shadow TS being Chan Act NACKed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If47e4bdd45a05ed1b5709b6e3d541f2830723e37 Gerrit-Change-Number: 25743 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 11 Oct 2021 16:01:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 16:02:22 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 11 Oct 2021 16:02:22 +0000 Subject: Change in osmo-bts[master]: Add new gsm_bts_trx_free_shadow_ts() function In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25740 ) Change subject: Add new gsm_bts_trx_free_shadow_ts() function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I38baa2b2cfcf6221325d45860b3c7dd53235b8ff Gerrit-Change-Number: 25740 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 11 Oct 2021 16:02:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 16:03:36 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 11 Oct 2021 16:03:36 +0000 Subject: Change in osmo-bts[master]: Make sure lchan allocated memory from shadow_ts is properly freed In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25741 ) Change subject: Make sure lchan allocated memory from shadow_ts is properly freed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I73742535eb3c40a6866731acbff782940dab06c3 Gerrit-Change-Number: 25741 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 11 Oct 2021 16:03:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 16:37:28 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 11 Oct 2021 16:37:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen-makefile.sh: remove titan < 6.5.1 code path References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25745 ) Change subject: regen-makefile.sh: remove titan < 6.5.1 code path ...................................................................... regen-makefile.sh: remove titan < 6.5.1 code path Prepare to make osmo-ttcn3-hacks.git work with eclipse-titan 8.0.0, where "ttcn3_makefilegen -v" does not have a "Product number" anymore. Fix for: ../regen-makefile.sh: 54: ../regen-makefile.sh: arithmetic expression: expecting primary: " >= 65" Related: OS#5252 Related: If9fef29ce243be112d3735f0236335197f8f140f Change-Id: Iec26eafc1ddfa19bc1224f6f2abb7fb35cfc188d --- M regen-makefile.sh 1 file changed, 1 insertion(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/25745/1 diff --git a/regen-makefile.sh b/regen-makefile.sh index 086c124..b53129f 100755 --- a/regen-makefile.sh +++ b/regen-makefile.sh @@ -24,9 +24,6 @@ # # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884303 for details. # -# The regexes below patch the generated Makefile to work on Debian 9 and -# unstable, so far tested with TITAN 6.1.0, 6.2.0 and 6.3.0 -# test -x "$(which ttcn3_makefilegen 2>/dev/null)" || { echo "ERROR: ttcn3_makefilegen not in PATH"; exit 1; } @@ -42,8 +39,6 @@ ttcn3_makefilegen -g -p -l -U 5 -f $* -TITAN_VERSION=$(ttcn3_makefilegen -v 2>&1 |grep "Product number" |cut --delimiter="/" -f 2-| sed -e "s/[A-Z ]//g") - sed -i -e 's/# TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile sed -i -e 's/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan/' Makefile sed -i -e 's/LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lsctp/' Makefile @@ -51,11 +46,7 @@ # The -DMAKEDEPEND_RUN is a workaround for Debian packaging issue, # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=879816 for details -if [ $(($TITAN_VERSION >= 65)) = 1 ]; then - sed -i -e 's/CPPFLAGS = -D$(PLATFORM)/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -DLKSCTP_MULTIHOMING_ENABLED/' Makefile -else - sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile -fi +sed -i -e 's/CPPFLAGS = -D$(PLATFORM)/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -DLKSCTP_MULTIHOMING_ENABLED/' Makefile #remove -Wall from CXXFLAGS: we're not interested in generic warnings for autogenerated code cluttering the logs sed -i -e 's/-Wall//' Makefile -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec26eafc1ddfa19bc1224f6f2abb7fb35cfc188d Gerrit-Change-Number: 25745 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 17:22:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 17:22:07 +0000 Subject: Change in libosmo-abis[master]: ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_clien... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/25742 ) Change subject: ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_client_conn ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/25742/1/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/25742/1/src/input/ipaccess.c at 1008 PS1, Line 1008: struct ipa_client_conn *ipa_cli[NUM_E1_TS]; /* 0=OML, 1+N=TRX_N */ > I would simply have a separate pointer for the OML, and an array for the RSL: [?] I'm following same convention used in e1inp_line, so I prefer keeping it this way. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/25742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4ee1ae318b446490783c8b910fca10ba5f72dd5a Gerrit-Change-Number: 25742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 11 Oct 2021 17:22:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 17:22:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 17:22:47 +0000 Subject: Change in libosmo-abis[master]: ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_clien... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/25742 ) Change subject: ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_client_conn ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmo-abis/+/25742/1/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/25742/1/src/input/ipaccess.c at a1170 PS1, Line 1170: > unrelated ws removal It would be unrelated if I wasn't changing half of the function around it ;) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/25742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4ee1ae318b446490783c8b910fca10ba5f72dd5a Gerrit-Change-Number: 25742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 11 Oct 2021 17:22:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 17:23:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 17:23:20 +0000 Subject: Change in osmo-bts[master]: Add new gsm_bts_trx_free_shadow_ts() function In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25740 ) Change subject: Add new gsm_bts_trx_free_shadow_ts() function ...................................................................... Add new gsm_bts_trx_free_shadow_ts() function Use it as a counterpart of gsm_bts_trx_init_shadow_ts() Change-Id: I38baa2b2cfcf6221325d45860b3c7dd53235b8ff --- M include/osmo-bts/bts_trx.h M src/common/bts_trx.c M src/common/scheduler.c 3 files changed, 18 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmo-bts/bts_trx.h b/include/osmo-bts/bts_trx.h index e1959c8..c0dcb1c 100644 --- a/include/osmo-bts/bts_trx.h +++ b/include/osmo-bts/bts_trx.h @@ -50,6 +50,7 @@ struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts); struct gsm_bts_trx *gsm_bts_trx_num(const struct gsm_bts *bts, int num); void gsm_bts_trx_init_shadow_ts(struct gsm_bts_trx *trx); +void gsm_bts_trx_free_shadow_ts(struct gsm_bts_trx *trx); char *gsm_trx_name(const struct gsm_bts_trx *trx); const char *gsm_trx_unit_id(struct gsm_bts_trx *trx); diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c index 7ef5b52..b16a31c 100644 --- a/src/common/bts_trx.c +++ b/src/common/bts_trx.c @@ -112,6 +112,20 @@ } } +void gsm_bts_trx_free_shadow_ts(struct gsm_bts_trx *trx) +{ + unsigned int tn; + + for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { + struct gsm_bts_trx_ts *shadow_ts = trx->ts[tn].vamos.peer; + if (!shadow_ts) + continue; + + talloc_free(shadow_ts); + trx->ts[tn].vamos.peer = NULL; + } +} + struct gsm_bts_trx *gsm_bts_trx_alloc(struct gsm_bts *bts) { struct gsm_bts_trx *trx = talloc_zero(bts, struct gsm_bts_trx); diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 5118904..2a729e4 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -694,10 +694,10 @@ /* Clean primary and shadow timeslots */ trx_sched_clean_ts(ts); trx_sched_clean_ts(ts->vamos.peer); - - talloc_free(ts->vamos.peer); - ts->vamos.peer = NULL; } + + /* Free previously allocated shadow timeslots */ + gsm_bts_trx_free_shadow_ts(trx); } struct msgb *_sched_dequeue_prim(struct l1sched_ts *l1ts, const struct trx_dl_burst_req *br) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25740 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I38baa2b2cfcf6221325d45860b3c7dd53235b8ff Gerrit-Change-Number: 25740 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 17:23:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 17:23:20 +0000 Subject: Change in osmo-bts[master]: Make sure lchan allocated memory from shadow_ts is properly freed In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25741 ) Change subject: Make sure lchan allocated memory from shadow_ts is properly freed ...................................................................... Make sure lchan allocated memory from shadow_ts is properly freed Since non-shadow TS are currently not allocated as talloc contexts, lchan objects tend to allocate their own memory on trx talloc ctx instead. That's fine for non-shadow TS, since the TS follow trx lifecycle since they are part of the same talloc context. However, shadow TS are recreated (re-allocated) each time the BTS reconnects, hence when htey are freed we need to free substructs (lchan) memory in order to avoid it being kept in trx talloc ctx. Related: OS#5248 Change-Id: I73742535eb3c40a6866731acbff782940dab06c3 --- M src/common/bts_trx.c 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/common/bts_trx.c b/src/common/bts_trx.c index b16a31c..ff5c618 100644 --- a/src/common/bts_trx.c +++ b/src/common/bts_trx.c @@ -115,12 +115,19 @@ void gsm_bts_trx_free_shadow_ts(struct gsm_bts_trx *trx) { unsigned int tn; + unsigned int ln; for (tn = 0; tn < ARRAY_SIZE(trx->ts); tn++) { struct gsm_bts_trx_ts *shadow_ts = trx->ts[tn].vamos.peer; if (!shadow_ts) continue; + /* free lchan related mem allocated on the trx object: */ + for (ln = 0; ln < ARRAY_SIZE(shadow_ts->lchan); ln++) { + struct gsm_lchan *lchan = &shadow_ts->lchan[ln]; + TALLOC_FREE(lchan->name); + } + talloc_free(shadow_ts); trx->ts[tn].vamos.peer = NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I73742535eb3c40a6866731acbff782940dab06c3 Gerrit-Change-Number: 25741 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 17:23:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 17:23:20 +0000 Subject: Change in osmo-bts[master]: rsl: Fix all shadow TS being Chan Act NACKed In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25743 ) Change subject: rsl: Fix all shadow TS being Chan Act NACKed ...................................................................... rsl: Fix all shadow TS being Chan Act NACKed The OML NM Channel FSM state only apply to primary timeslots, hence we need to make sure we pick the primary TS (the non-shadow one). Due to this bug, all channels on shadow TS where NACKed because the related state was never "Enabled Ok". Fixes: c97a7f51e1b15d40e39df4b7d07b3c6534540186 Related: OS#5249 Related: OS#5251 Change-Id: If47e4bdd45a05ed1b5709b6e3d541f2830723e37 --- M src/common/rsl.c 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index 638caf8..b186adf 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1624,6 +1624,7 @@ struct abis_rsl_dchan_hdr *dch = msgb_l2(msg); struct gsm_lchan *lchan = msg->lchan; struct gsm_bts_trx_ts *ts = lchan->ts; + struct gsm_bts_trx_ts *primary_ts; struct tlv_parsed tp; const struct tlv_p_entry *ie; uint8_t type, cause; @@ -1635,8 +1636,10 @@ return rsl_tx_chan_act_nack(lchan, RSL_ERR_EQUIPMENT_FAIL); } - if (ts->mo.nm_state.operational != NM_OPSTATE_ENABLED || - ts->mo.nm_state.availability != NM_AVSTATE_OK) { + /* We need to pick the real TS here to check NM state: */ + primary_ts = ts->vamos.is_shadow ? ts->vamos.peer : ts; + if (primary_ts->mo.nm_state.operational != NM_OPSTATE_ENABLED || + primary_ts->mo.nm_state.availability != NM_AVSTATE_OK) { LOGP(DRSL, LOGL_ERROR, "%s rx chan activ but TS not in nm_state oper=ENABLED avail=OK, nack!\n", gsm_ts_and_pchan_name(ts)); return rsl_tx_chan_act_nack(lchan, RSL_ERR_RR_UNAVAIL); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If47e4bdd45a05ed1b5709b6e3d541f2830723e37 Gerrit-Change-Number: 25743 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 17:29:38 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 11 Oct 2021 17:29:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen-makefile.sh: remove titan < 6.5.1 code path In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25745 ) Change subject: regen-makefile.sh: remove titan < 6.5.1 code path ...................................................................... Patch Set 1: Code-Review+1 Oh, finally I don't need to keep this in my stash ;) LGTM! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec26eafc1ddfa19bc1224f6f2abb7fb35cfc188d Gerrit-Change-Number: 25745 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 11 Oct 2021 17:29:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 17:56:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 17:56:52 +0000 Subject: Change in osmo-pcu[master]: pdch: Only release ULC entry if rx ul block matches the expected one References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25746 ) Change subject: pdch: Only release ULC entry if rx ul block matches the expected one ...................................................................... pdch: Only release ULC entry if rx ul block matches the expected one If it doesn't match out expectancies, it means we early return and hence don't push forward / update whatever state was requested upon receival of the UL message for the expected TBF. Hence, we shall not remove the allocated ULC entry: in this scenario we need to keep it so that timeout procedure times out and the tbf applies whatever measures are required, be it retransmission, releasing itself, etc. Change-Id: Ia69a7d92c4b5c98ec71a75605c8dc3a755e63a35 --- M src/pdch.cpp 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/46/25746/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index 25e7ff5..cfec71e 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -343,7 +343,6 @@ LOGPTBF(tbf, LOGL_DEBUG, "FN=%" PRIu32 " Rx Packet Control Ack (reason=%s)\n", fn, get_value_string(pdch_ulc_tbf_poll_reason_names, reason)); - pdch_ulc_release_fn(ulc, fn); switch (reason) { case PDCH_ULC_POLL_UL_ACK: @@ -354,6 +353,7 @@ fn, ts_no, bts_current_frame_number(tbf->bts)); return; } + pdch_ulc_release_fn(ulc, fn); osmo_fsm_inst_dispatch(ul_tbf->ul_ack_fsm.fi, TBF_UL_ACK_EV_RX_CTRL_ACK, NULL); /* We can free since we only set polling on final UL ACK/NACK */ LOGPTBF(tbf, LOGL_DEBUG, "[UPLINK] END\n"); @@ -368,6 +368,7 @@ return; } LOGPTBF(tbf, LOGL_DEBUG, "[DOWNLINK] UPLINK ASSIGNED\n"); + pdch_ulc_release_fn(ulc, fn); /* reset N3105 */ tbf->n_reset(N3105); osmo_fsm_inst_dispatch(tbf->ul_ass_fsm.fi, TBF_UL_ASS_EV_RX_ASS_CTRL_ACK, NULL); @@ -400,6 +401,7 @@ return; } LOGPTBF(tbf, LOGL_DEBUG, "[UPLINK] DOWNLINK ASSIGNED\n"); + pdch_ulc_release_fn(ulc, fn); /* reset N3105 */ tbf->n_reset(N3105); osmo_fsm_inst_dispatch(tbf->dl_ass_fsm.fi, TBF_DL_ASS_EV_RX_ASS_CTRL_ACK, NULL); @@ -425,6 +427,7 @@ fn, ts_no, bts_current_frame_number(tbf->bts)); return; } + pdch_ulc_release_fn(ulc, fn); osmo_fsm_inst_dispatch(ms->nacc->fi, NACC_EV_RX_CELL_CHG_CONTINUE_ACK, NULL); /* Don't assume MS is no longer reachable (hence don't free) after this: TS 44.060 * "When the mobile station receives the PACKET CELL CHANGE ORDER -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia69a7d92c4b5c98ec71a75605c8dc3a755e63a35 Gerrit-Change-Number: 25746 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 17:56:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 17:56:53 +0000 Subject: Change in osmo-pcu[master]: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25747 ) Change subject: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() ...................................................................... pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() If we didn't expect this kind of UL messages according to pdch ULC, then we shouldn't allow going forward and releasing the ULC entry: let it time out instead so that TBF runs whatever appopiate action is needed in this case, be it retransamission, releasing itself, etc. Change-Id: I8ab3f5e4f2f802944269453db13a80c9ede67714 --- M src/pdch.cpp 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/47/25747/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index cfec71e..807ce45 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -463,7 +463,8 @@ tfi = ack_nack->DOWNLINK_TFI; poll = pdch_ulc_get_node(ulc, fn); - if (!poll || poll->type != PDCH_ULC_NODE_TBF_POLL) { + if (!poll || poll->type != PDCH_ULC_NODE_TBF_POLL || + poll->tbf_poll.reason != PDCH_ULC_POLL_DL_ACK) { LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "PACKET DOWNLINK ACK with " "unknown FN=%u TFI=%d (TRX %d TS %d)\n", fn, tfi, trx_no(), ts_no); @@ -532,7 +533,8 @@ tfi = ack_nack->DOWNLINK_TFI; poll = pdch_ulc_get_node(ulc, fn); - if (!poll || poll->type != PDCH_ULC_NODE_TBF_POLL) { + if (!poll || poll->type != PDCH_ULC_NODE_TBF_POLL || + poll->tbf_poll.reason != PDCH_ULC_POLL_DL_ACK) { LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "EGPRS PACKET DOWNLINK ACK with " "unknown FN=%u TFI=%d (TRX %d TS %d)\n", fn, tfi, trx_no(), ts_no); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8ab3f5e4f2f802944269453db13a80c9ede67714 Gerrit-Change-Number: 25747 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 17:56:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 17:56:53 +0000 Subject: Change in osmo-pcu[master]: pdch: PktResReq: Avoid releasing ULC entry if expecting something els... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25748 ) Change subject: pdch: PktResReq: Avoid releasing ULC entry if expecting something else on UL ...................................................................... pdch: PktResReq: Avoid releasing ULC entry if expecting something else on UL Let's only release PDCH ULC entry if it was indeed what we expected. In other case, time it out. Move the case in the switch statement to the start to easy function readibility (early return style). Change-Id: I3d8749acca8e7859295d73cce556b2083169f726 --- M src/pdch.cpp 1 file changed, 7 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/48/25748/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index 807ce45..a64fb85 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -638,6 +638,13 @@ } switch (item->type) { + case PDCH_ULC_NODE_TBF_USF: + /* Is it actually valid for an MS to send a PKT Res Req during USF? */ + ul_tbf = item->tbf_usf.ul_tbf; + LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "FN=%u PKT RESOURCE REQ: " + "Unexpectedly received, waiting USF of %s\n", + fn, tbf_name(item->tbf_usf.ul_tbf)); + return; /* Ignore it */ case PDCH_ULC_NODE_SBA: sba = item->sba.sba; LOGPDCH(this, DRLCMAC, LOGL_DEBUG, "FN=%u PKT RESOURCE REQ: " @@ -665,7 +672,6 @@ LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "FN=%u PKT RESOURCE REQ: " "Unexpected TLLI 0x%08x received vs exp 0x%08x\n", fn, tlli, ul_tbf->tlli()); - /* let common path expire the poll */ goto return_unref; } /* 3GPP TS 44.060 $ 9.3.3.3 */ @@ -675,14 +681,6 @@ ul_tbf->n_reset(N3103); pdch_ulc_release_node(ulc, item); break; - case PDCH_ULC_NODE_TBF_USF: - /* Is it actually valid for an MS to send a PKT Res Req during USF? */ - ul_tbf = item->tbf_usf.ul_tbf; - LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "FN=%u PKT RESOURCE REQ: " - "Unexpectedly received, waiting USF of %s\n", - fn, tbf_name(item->tbf_usf.ul_tbf)); - pdch_ulc_release_node(ulc, item); - break; default: OSMO_ASSERT(0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3d8749acca8e7859295d73cce556b2083169f726 Gerrit-Change-Number: 25748 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 17:56:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 17:56:53 +0000 Subject: Change in osmo-pcu[master]: Handle Final UL ACK/NACK Confirmation in tbf_fsm References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25749 ) Change subject: Handle Final UL ACK/NACK Confirmation in tbf_fsm ...................................................................... Handle Final UL ACK/NACK Confirmation in tbf_fsm Pass the event over the FSM for better understading of the entire lifecycle of the TBF. Change-Id: If30d881037209d33b2b41ecf8bb8419caf36e367 --- M src/pdch.cpp M src/tbf_fsm.c M src/tbf_fsm.h 3 files changed, 23 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/49/25749/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index a64fb85..8032862 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -355,9 +355,9 @@ } pdch_ulc_release_fn(ulc, fn); osmo_fsm_inst_dispatch(ul_tbf->ul_ack_fsm.fi, TBF_UL_ACK_EV_RX_CTRL_ACK, NULL); - /* We can free since we only set polling on final UL ACK/NACK */ + /* We only set polling on final UL ACK/NACK */ LOGPTBF(tbf, LOGL_DEBUG, "[UPLINK] END\n"); - tbf_free(tbf); + osmo_fsm_inst_dispatch(ul_tbf->state_fsm.fi, TBF_EV_FINAL_UL_ACK_CONFIRMED, NULL); return; case PDCH_ULC_POLL_UL_ASS: @@ -616,6 +616,7 @@ void gprs_rlcmac_pdch::rcv_resource_request(Packet_Resource_Request_t *request, uint32_t fn, struct pcu_l1_meas *meas) { struct gprs_rlcmac_sba *sba; + int rc; if (request->ID.UnionType) { struct gprs_rlcmac_ul_tbf *ul_tbf = NULL; @@ -680,12 +681,23 @@ "block of final UL ACK/NACK\n", fn); ul_tbf->n_reset(N3103); pdch_ulc_release_node(ulc, item); + rc = osmo_fsm_inst_dispatch(ul_tbf->state_fsm.fi, TBF_EV_FINAL_UL_ACK_CONFIRMED, NULL); + if (rc) { + /* FSM failed andling, get rid of previous finished UL TBF before providing a new one */ + LOGPTBFUL(ul_tbf, LOGL_NOTICE, + "Got PACKET RESOURCE REQ while TBF not finished, killing pending UL TBF\n"); + tbf_free(ul_tbf); + } /* else: ul_tbf has ben freed by state_fsm */ + ul_tbf = NULL; break; default: OSMO_ASSERT(0); } - /* here ul_tbf may be NULL in SBA case (no previous TBF) */ + /* Here ul_tbf is NULL: + * - SBA case: no previous TBF) and in + * - POLL case: PktResReq is a final ACk confirmation and ul_tbf was freed + */ if (request->Exist_MS_Radio_Access_capability2) { uint8_t ms_class, egprs_ms_class; @@ -697,14 +709,6 @@ ms_set_egprs_ms_class(ms, egprs_ms_class); } - /* Get rid of previous finished UL TBF before providing a new one */ - if (ul_tbf) { - if (!ul_tbf->state_is(TBF_ST_FINISHED)) - LOGPTBFUL(ul_tbf, LOGL_NOTICE, - "Got PACKET RESOURCE REQ while TBF not finished, killing pending UL TBF\n"); - tbf_free(ul_tbf); - } - ul_tbf = tbf_alloc_ul_pacch(bts(), ms, trx_no(), tlli); if (!ul_tbf) { handle_tbf_reject(bts(), ms, trx_no(), ts_no); diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c index 4202a0c..0b6a2a3 100644 --- a/src/tbf_fsm.c +++ b/src/tbf_fsm.c @@ -50,6 +50,7 @@ { TBF_EV_LAST_DL_DATA_SENT, "LAST_DL_DATA_SENT" }, { TBF_EV_LAST_UL_DATA_RECVD, "LAST_UL_DATA_RECVD" }, { TBF_EV_FINAL_ACK_RECVD, "FINAL_ACK_RECVD" }, + { TBF_EV_FINAL_UL_ACK_CONFIRMED, "FINAL_UL_ACK_CONFIRMED" }, { TBF_EV_MAX_N3101 , "MAX_N3101" }, { TBF_EV_MAX_N3103 , "MAX_N3103" }, { TBF_EV_MAX_N3105 , "MAX_N3105" }, @@ -253,6 +254,11 @@ case we receive more DL data to tx */ tbf_fsm_state_chg(fi, TBF_ST_WAIT_RELEASE); break; + case TBF_EV_FINAL_UL_ACK_CONFIRMED: + /* UL TBF ACKed our transmitted UL ACK/NACK with final Ack + * Indicator set to '1' t. We can free the TBF right away. */ + tbf_free(ctx->tbf); + break; case TBF_EV_MAX_N3103: ctx->T_release = 3169; tbf_fsm_state_chg(fi, TBF_ST_RELEASING); @@ -432,6 +438,7 @@ .in_event_mask = X(TBF_EV_DL_ACKNACK_MISS) | X(TBF_EV_FINAL_ACK_RECVD) | + X(TBF_EV_FINAL_UL_ACK_CONFIRMED) | X(TBF_EV_MAX_N3103) | X(TBF_EV_MAX_N3105), .out_state_mask = diff --git a/src/tbf_fsm.h b/src/tbf_fsm.h index d6fe41f..d62e091 100644 --- a/src/tbf_fsm.h +++ b/src/tbf_fsm.h @@ -36,6 +36,7 @@ TBF_EV_LAST_DL_DATA_SENT, /* DL TBF sends RLCMAC block containing last DL avilable data buffered */ TBF_EV_LAST_UL_DATA_RECVD, /* UL TBF sends RLCMAC block containing last UL data (cv=0) */ TBF_EV_FINAL_ACK_RECVD, /* DL ACK/NACK with FINAL_ACK=1 received from MS */ + TBF_EV_FINAL_UL_ACK_CONFIRMED, /* UL TBF: MS ACKs (CtrlAck or PktResReq) our UL ACK/NACK w/ FinalAckInd=1 */ TBF_EV_MAX_N3101, /* MAX N3101 (max usf timeout) reached (UL TBF) */ TBF_EV_MAX_N3103, /* MAX N3103 (max Pkt Ctrl Ack for last UL ACK/NACK timeout) reached (UL TBF) */ TBF_EV_MAX_N3105, /* MAX N3105 (max poll timeout) reached (UL/DL TBF) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If30d881037209d33b2b41ecf8bb8419caf36e367 Gerrit-Change-Number: 25749 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 11 18:09:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 11 Oct 2021 18:09:56 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen-makefile.sh: remove titan < 6.5.1 code path In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25745 ) Change subject: regen-makefile.sh: remove titan < 6.5.1 code path ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec26eafc1ddfa19bc1224f6f2abb7fb35cfc188d Gerrit-Change-Number: 25745 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 11 Oct 2021 18:09:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Mon Oct 11 23:29:58 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 11 Oct 2021 23:29:58 +0000 Subject: Build failure of network:osmocom:latest/eclipse-titan in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <6164c8fbd5fb4_35c62b0195c745f416698e9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/eclipse-titan/Debian_Unstable/x86_64 Package network:osmocom:latest/eclipse-titan failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest eclipse-titan Last lines of build log: [ 258s] (dep) Path2.cc [ 258s] (dep) Quadruple.cc [ 258s] (dep) config_preproc.cc [ 259s] (dep) path.c [ 259s] (dep) userinfo.c [ 259s] (dep) new.cc [ 259s] (dep) memory.c [ 259s] gcc -c -Wdate-time -D_FORTIFY_SOURCE=2 -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -D_REENTRANT -Wall -std=gnu9x -O2 -fPIC memory.c -o memory.o [ 259s] g++ -c -Wdate-time -D_FORTIFY_SOURCE=2 -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -DYY_NO_INPUT -DNDEBUG -DLINUX -DUSE_EPOLL -D_REENTRANT -g -O2 -ffile-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wno-long-long -O2 -fPIC -Wall -Wno-long-long -O2 -fPIC new.cc -o new.o [ 259s] new.cc:21:33: error: ISO C++17 does not allow dynamic exception specifications [ 259s] 21 | void *operator new(size_t size) throw (std::bad_alloc) [ 259s] | ^~~~~ [ 259s] new.cc:26:35: error: ISO C++17 does not allow dynamic exception specifications [ 259s] 26 | void *operator new[](size_t size) throw (std::bad_alloc) [ 259s] | ^~~~~ [ 259s] make[2]: *** [../Makefile.genrules:97: new.o] Error 1 [ 259s] make[2]: Leaving directory '/usr/src/packages/BUILD/common' [ 259s] make[1]: *** [Makefile:65: all] Error 2 [ 259s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 259s] dh_auto_build: error: make -j1 returned exit code 2 [ 259s] make: *** [debian/rules:6: build] Error 25 [ 259s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 259s] ### VM INTERACTION START ### [ 262s] [ 228.525913] sysrq: Power Off [ 262s] [ 228.530910] reboot: Power down [ 262s] ### VM INTERACTION END ### [ 263s] [ 263s] hci-cnode2-m0 failed "build eclipse-titan_6.6.1-1.dsc" at Mon Oct 11 23:29:56 UTC 2021. [ 263s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Oct 12 07:07:57 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 07:07:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: TC_meas_res_sign_*: Properly configure supp-meas-info In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25727 ) Change subject: bts: TC_meas_res_sign_*: Properly configure supp-meas-info ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaa16b33781a8f490fc1cdbafda407755371dbe7f Gerrit-Change-Number: 25727 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 12 Oct 2021 07:07:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 07:15:33 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 07:15:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen-makefile.sh: remove titan < 6.5.1 code path In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25745 ) Change subject: regen-makefile.sh: remove titan < 6.5.1 code path ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec26eafc1ddfa19bc1224f6f2abb7fb35cfc188d Gerrit-Change-Number: 25745 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 07:15:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 07:15:38 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 07:15:38 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen-makefile.sh: remove titan < 6.5.1 code path In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25745 ) Change subject: regen-makefile.sh: remove titan < 6.5.1 code path ...................................................................... regen-makefile.sh: remove titan < 6.5.1 code path Prepare to make osmo-ttcn3-hacks.git work with eclipse-titan 8.0.0, where "ttcn3_makefilegen -v" does not have a "Product number" anymore. Fix for: ../regen-makefile.sh: 54: ../regen-makefile.sh: arithmetic expression: expecting primary: " >= 65" Related: OS#5252 Related: If9fef29ce243be112d3735f0236335197f8f140f Change-Id: Iec26eafc1ddfa19bc1224f6f2abb7fb35cfc188d --- M regen-makefile.sh 1 file changed, 1 insertion(+), 10 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/regen-makefile.sh b/regen-makefile.sh index 086c124..b53129f 100755 --- a/regen-makefile.sh +++ b/regen-makefile.sh @@ -24,9 +24,6 @@ # # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=884303 for details. # -# The regexes below patch the generated Makefile to work on Debian 9 and -# unstable, so far tested with TITAN 6.1.0, 6.2.0 and 6.3.0 -# test -x "$(which ttcn3_makefilegen 2>/dev/null)" || { echo "ERROR: ttcn3_makefilegen not in PATH"; exit 1; } @@ -42,8 +39,6 @@ ttcn3_makefilegen -g -p -l -U 5 -f $* -TITAN_VERSION=$(ttcn3_makefilegen -v 2>&1 |grep "Product number" |cut --delimiter="/" -f 2-| sed -e "s/[A-Z ]//g") - sed -i -e 's/# TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile sed -i -e 's/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan/' Makefile sed -i -e 's/LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lsctp/' Makefile @@ -51,11 +46,7 @@ # The -DMAKEDEPEND_RUN is a workaround for Debian packaging issue, # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=879816 for details -if [ $(($TITAN_VERSION >= 65)) = 1 ]; then - sed -i -e 's/CPPFLAGS = -D$(PLATFORM)/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -DLKSCTP_MULTIHOMING_ENABLED/' Makefile -else - sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile -fi +sed -i -e 's/CPPFLAGS = -D$(PLATFORM)/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -DLKSCTP_MULTIHOMING_ENABLED/' Makefile #remove -Wall from CXXFLAGS: we're not interested in generic warnings for autogenerated code cluttering the logs sed -i -e 's/-Wall//' Makefile -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iec26eafc1ddfa19bc1224f6f2abb7fb35cfc188d Gerrit-Change-Number: 25745 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 07:20:30 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 07:20:30 +0000 Subject: Change in osmo-pcu[master]: sched: Rename function In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25744 ) Change subject: sched: Rename function ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic0680d15edf70449e66f40eab1ead97313631cbb Gerrit-Change-Number: 25744 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 12 Oct 2021 07:20:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 07:30:56 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 07:30:56 +0000 Subject: Change in osmo-pcu[master]: pdch: Only release ULC entry if rx ul block matches the expected one In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25746 ) Change subject: pdch: Only release ULC entry if rx ul block matches the expected one ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25746/1/src/pdch.cpp File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25746/1/src/pdch.cpp at 443 PS1, Line 443: /* Handled in rcv_control_dl_ack_nack() upon receival of DL ACK/NACK as a response to our POLL. */ (I thought it is missing here, but rcv_control_dl_ack_nack() already calls pdch_ulc_release_fn(ulc, fn).) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia69a7d92c4b5c98ec71a75605c8dc3a755e63a35 Gerrit-Change-Number: 25746 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 12 Oct 2021 07:30:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 07:42:01 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 07:42:01 +0000 Subject: Change in osmo-pcu[master]: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25747 ) Change subject: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/25747/1/src/pdch.cpp File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25747/1/src/pdch.cpp at 467 PS1, Line 467: PDCH_ULC_POLL_DL_ACK (This is a bit confusing IMHO since it's called _ACK and not _ACK_NACK. But according to the comment for the enum value it expects ACK/NACK.) /* Expect DL ACK/NACK requested by RRBP */ https://gerrit.osmocom.org/c/osmo-pcu/+/25747/1/src/pdch.cpp at 468 PS1, Line 468: LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "PACKET DOWNLINK ACK with " The log message is not accurate anymore since it's also printing it now if it is not ACK/NACK. Maybe change the message, or do a separate check with its own log message? While at it, maybe change ACK to ACK/NACK in the log message? Same below with the other log msg. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8ab3f5e4f2f802944269453db13a80c9ede67714 Gerrit-Change-Number: 25747 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: osmith Gerrit-Comment-Date: Tue, 12 Oct 2021 07:42:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 08:08:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 08:08:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bts: TC_meas_res_sign_*: Properly configure supp-meas-info In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25727 ) Change subject: bts: TC_meas_res_sign_*: Properly configure supp-meas-info ...................................................................... bts: TC_meas_res_sign_*: Properly configure supp-meas-info Since recently, osmo-bts may not be restarting after each test. Which means the supp-meas-info is not reset when test starts. Hence, some of these tests started failing because a previous test set a value different than the default one. Change-Id: Iaa16b33781a8f490fc1cdbafda407755371dbe7f --- M bts/BTS_Tests.ttcn 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index cf47d33..03519d9 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3247,6 +3247,7 @@ var ConnHdlr vc_conn; var ConnHdlrPars pars; f_init(); + f_vty_config(BTSVTY, "bts 0", "no supp-meas-info toa256"); for (var integer tn := 1; tn <= 4; tn := tn+1) { pars := valueof(t_Pars(t_RslChanNr_Bm(tn), ts_RSL_ChanMode_SIGN(RSL_CHRT_TCH_F))); vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars, @@ -3259,6 +3260,7 @@ var ConnHdlr vc_conn; var ConnHdlrPars pars; f_init(); + f_vty_config(BTSVTY, "bts 0", "no supp-meas-info toa256"); for (var integer ss := 0; ss <= 1; ss := ss+1) { pars := valueof(t_Pars(t_RslChanNr_Lm(5, ss), ts_RSL_ChanMode_SIGN(RSL_CHRT_TCH_H))); vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars, @@ -3271,6 +3273,7 @@ var ConnHdlr vc_conn; var ConnHdlrPars pars; f_init(); + f_vty_config(BTSVTY, "bts 0", "no supp-meas-info toa256"); for (var integer ss := 0; ss <= 3; ss := ss+1) { pars := valueof(t_Pars(t_RslChanNr_SDCCH4(0, ss), ts_RSL_ChanMode_SIGN)); vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars, @@ -3283,6 +3286,7 @@ var ConnHdlr vc_conn; var ConnHdlrPars pars; f_init(); + f_vty_config(BTSVTY, "bts 0", "no supp-meas-info toa256"); for (var integer ss := 0; ss <= 7; ss := ss+1) { pars := valueof(t_Pars(t_RslChanNr_SDCCH8(6, ss), ts_RSL_ChanMode_SIGN)); vc_conn := f_start_handler(refers(f_TC_meas_res_periodic), pars, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iaa16b33781a8f490fc1cdbafda407755371dbe7f Gerrit-Change-Number: 25727 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 09:05:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 09:05:41 +0000 Subject: Change in osmo-pcu[master]: pdch: Only release ULC entry if rx ul block matches the expected one In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25746 ) Change subject: pdch: Only release ULC entry if rx ul block matches the expected one ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25746/1/src/pdch.cpp File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25746/1/src/pdch.cpp at 443 PS1, Line 443: /* Handled in rcv_control_dl_ack_nack() upon receival of DL ACK/NACK as a response to our POLL. */ > (I thought it is missing here, but rcv_control_dl_ack_nack() already calls pdch_ulc_release_fn(ulc, [?] Indeed. It would probably be unexpected to receive a CTRL ACK here actually,so we ignore it. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia69a7d92c4b5c98ec71a75605c8dc3a755e63a35 Gerrit-Change-Number: 25746 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 12 Oct 2021 09:05:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 09:07:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 09:07:59 +0000 Subject: Change in osmo-pcu[master]: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25747 ) Change subject: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25747/1/src/pdch.cpp File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25747/1/src/pdch.cpp at 468 PS1, Line 468: LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "PACKET DOWNLINK ACK with " > The log message is not accurate anymore since it's also printing it now if it is not ACK/NACK. [?] It is accurate enough (most of these log messages are really old and I agree should be updated, but not high prio and not really related to this patch). We are receiving a PKT DL ACK/NACK, regardless of what we expected to receive according to our scheduler. This can well happen for different reasons, for instance due to MS broken implementation or our wrong understanding of the specs at some point. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8ab3f5e4f2f802944269453db13a80c9ede67714 Gerrit-Change-Number: 25747 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: osmith Gerrit-Comment-Date: Tue, 12 Oct 2021 09:07:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 09:11:03 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 09:11:03 +0000 Subject: Change in osmo-pcu[master]: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25747 ) Change subject: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8ab3f5e4f2f802944269453db13a80c9ede67714 Gerrit-Change-Number: 25747 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 12 Oct 2021 09:11:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 09:18:05 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 09:18:05 +0000 Subject: Change in osmo-pcu[master]: pdch: PktResReq: Avoid releasing ULC entry if expecting something els... In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25748 ) Change subject: pdch: PktResReq: Avoid releasing ULC entry if expecting something else on UL ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3d8749acca8e7859295d73cce556b2083169f726 Gerrit-Change-Number: 25748 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 12 Oct 2021 09:18:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 09:23:58 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 09:23:58 +0000 Subject: Change in osmo-pcu[master]: Handle Final UL ACK/NACK Confirmation in tbf_fsm In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25749 ) Change subject: Handle Final UL ACK/NACK Confirmation in tbf_fsm ...................................................................... Patch Set 1: (2 comments) LGTM besides typos https://gerrit.osmocom.org/c/osmo-pcu/+/25749/1/src/pdch.cpp File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25749/1/src/pdch.cpp at 686 PS1, Line 686: andling handling https://gerrit.osmocom.org/c/osmo-pcu/+/25749/1/src/pdch.cpp at 690 PS1, Line 690: ben been -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If30d881037209d33b2b41ecf8bb8419caf36e367 Gerrit-Change-Number: 25749 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: osmith Gerrit-Comment-Date: Tue, 12 Oct 2021 09:23:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 09:30:24 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 09:30:24 +0000 Subject: Change in pysim[master]: pySim-shell: allow card insertion at runtime In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25549 ) Change subject: pySim-shell: allow card insertion at runtime ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 Gerrit-Change-Number: 25549 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 09:30:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 09:31:54 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 09:31:54 +0000 Subject: Change in pysim[master]: cards: remove "auto_once" from possible ctype options In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25723 ) Change subject: cards: remove "auto_once" from possible ctype options ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/pysim/+/25723/2/pySim/cards.py File pySim/cards.py: https://gerrit.osmocom.org/c/pysim/+/25723/2/pySim/cards.py at 1567 PS2, Line 1567: if ctype in ("auto"): How about: if ctype == "auto": -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iea726f51e5ddb43d8a4da2672552fff38e29b006 Gerrit-Change-Number: 25723 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Comment-Date: Tue, 12 Oct 2021 09:31:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 09:34:05 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 09:34:05 +0000 Subject: Change in osmocom-bb[master]: logging: use meaningful default loglevels In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/16892 ) Change subject: logging: use meaningful default loglevels ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/16892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3faefccae2218b17bd942bc2afac7d8e515897b7 Gerrit-Change-Number: 16892 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 09:34:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 09:35:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 09:35:50 +0000 Subject: Change in osmo-pcu[master]: Handle Final UL ACK/NACK Confirmation in tbf_fsm In-Reply-To: References: Message-ID: Hello Jenkins Builder, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25749 to look at the new patch set (#2). Change subject: Handle Final UL ACK/NACK Confirmation in tbf_fsm ...................................................................... Handle Final UL ACK/NACK Confirmation in tbf_fsm Pass the event over the FSM for better understading of the entire lifecycle of the TBF. Change-Id: If30d881037209d33b2b41ecf8bb8419caf36e367 --- M src/pdch.cpp M src/tbf_fsm.c M src/tbf_fsm.h 3 files changed, 23 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/49/25749/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If30d881037209d33b2b41ecf8bb8419caf36e367 Gerrit-Change-Number: 25749 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 09:36:43 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 09:36:43 +0000 Subject: Change in osmo-pcu[master]: Handle Final UL ACK/NACK Confirmation in tbf_fsm In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25749 ) Change subject: Handle Final UL ACK/NACK Confirmation in tbf_fsm ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If30d881037209d33b2b41ecf8bb8419caf36e367 Gerrit-Change-Number: 25749 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 12 Oct 2021 09:36:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 12:21:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 12:21:38 +0000 Subject: Change in osmo-pcu[master]: tbf_fsm: rename state NULL -> NEW References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25750 ) Change subject: tbf_fsm: rename state NULL -> NEW ...................................................................... tbf_fsm: rename state NULL -> NEW This helps distinguishing the case where a TBF is in the initial state and the unexpected case where osmo_fsm_inst_state_name reports "NULL" due to fi pointer being NULL. Change-Id: Ieaabfc9fa0dedb299bcf4541783cf80e366a88c3 --- M src/tbf_fsm.c M src/tbf_fsm.h M tests/alloc/AllocTest.err M tests/app_info/AppInfoTest.err M tests/ms/MsTest.err M tests/tbf/TbfTest.err M tests/types/TypesTest.err M tests/ulc/PdchUlcTest.err 8 files changed, 490,442 insertions(+), 490,442 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/50/25750/1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ieaabfc9fa0dedb299bcf4541783cf80e366a88c3 Gerrit-Change-Number: 25750 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:54:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 10:54:05 +0000 Subject: Change in osmo-pcu[master]: tbf_fsm: rename state NULL -> NEW In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25750 ) Change subject: tbf_fsm: rename state NULL -> NEW ...................................................................... Removed Code-Review+2 by pespin -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ieaabfc9fa0dedb299bcf4541783cf80e366a88c3 Gerrit-Change-Number: 25750 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 21:08:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 21:08:46 +0000 Subject: Change in osmo-pcu[master]: pdch_ulc: Log POLL reason upon timeout References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25751 ) Change subject: pdch_ulc: Log POLL reason upon timeout ...................................................................... pdch_ulc: Log POLL reason upon timeout Change-Id: I7cd59b60fe0af0bfdfcdf8a91e4cf8bd3f25b2f7 --- M src/pdch_ul_controller.c M tests/tbf/TbfTest.err M tests/ulc/PdchUlcTest.err 3 files changed, 54 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/51/25751/1 diff --git a/src/pdch_ul_controller.c b/src/pdch_ul_controller.c index e7a721c..79a0339 100644 --- a/src/pdch_ul_controller.c +++ b/src/pdch_ul_controller.c @@ -325,8 +325,9 @@ break; case PDCH_ULC_NODE_TBF_POLL: LOGPDCH(ulc->pdch, DRLCMAC, LOGL_NOTICE, - "Timeout for registered POLL (FN=%u): %s\n", - item->fn, tbf_name(item->tbf_poll.poll_tbf)); + "Timeout for registered POLL (FN=%u, reason=%s): %s\n", + item->fn, get_value_string(pdch_ulc_tbf_poll_reason_names, item->tbf_poll.reason), + tbf_name(item->tbf_poll.poll_tbf)); tbf_poll_timeout(item->tbf_poll.poll_tbf, ulc->pdch, item->fn, item->tbf_poll.reason); break; case PDCH_ULC_NODE_SBA: diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 8d93f59..26ba446 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -2044,7 +2044,7 @@ PDCH(bts=0,trx=0,ts=7) Expiring FN=2654292 but previous FN=2654283 is still reserved! PDCH(bts=0,trx=0,ts=7) Timeout for registered USF (FN=2654283): TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) N3101 1 => 2 (< MAX 10) -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654292): TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654292, reason=DL_ACK): TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) poll timeout for FN=2654292, TS=7 (curr FN 2654292) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) N3105 0 => 1 (< MAX 8) @@ -2106,7 +2106,7 @@ PDCH(bts=0,trx=0,ts=7) Timeout for registered USF (FN=2654301): TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) N3101 2 => 3 (< MAX 10) PDCH(bts=0,trx=0,ts=7) Expiring FN=2654348 but previous FN=2654309 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654309): TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654309, reason=DL_ACK): TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) poll timeout for FN=2654309, TS=7 (curr FN 2654348) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) N3105 1 => 2 (< MAX 8) @@ -3284,7 +3284,7 @@ PDCH(bts=0,trx=0,ts=7) Expiring FN=2654379 but previous FN=2654374 is still reserved! PDCH(bts=0,trx=0,ts=7) Timeout for registered USF (FN=2654374): TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=RELEASING) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=RELEASING) N3101 22 => 23 (< MAX 10) -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654379): TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654379, reason=DL_ACK): TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) poll timeout for FN=2654379, TS=7 (curr FN 2654379) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) N3105 0 => 1 (< MAX 8) @@ -4295,20 +4295,20 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 24, MCS-1): 0f 00 06 16 18 fe 03 02 02 02 02 02 56 56 56 56 56 56 56 56 56 56 56 56 56 56 00 Detected FN jump! 8 -> 112 PDCH(bts=0,trx=0,ts=4) Expiring FN=112 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 112) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=112 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 112) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) TBF(DL-TFI_0){FLOW}: Received Event DL_ACKNACK_MISS PDCH(bts=0,trx=0,ts=4) Expiring FN=112 but previous FN=104 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=104): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=104, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=104, TS=4 (curr FN 112) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 2 => 3 (< MAX 8) TBF(DL-TFI_0){FLOW}: Received Event DL_ACKNACK_MISS @@ -4558,14 +4558,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 19, MCS-2): 0f c0 04 12 20 fe 03 02 02 02 02 02 02 02 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 00 Detected FN jump! 8 -> 91 PDCH(bts=0,trx=0,ts=4) Expiring FN=91 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 91) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=91 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 91) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -4776,14 +4776,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 14, MCS-3): 0f 80 03 06 7c fe 03 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 56 56 56 56 00 Detected FN jump! 8 -> 69 PDCH(bts=0,trx=0,ts=4) Expiring FN=69 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 69) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=69 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 69) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -4978,14 +4978,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 12, MCS-4): 0f 00 03 00 70 fe 03 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 56 56 56 56 56 56 56 56 56 56 56 56 56 56 00 Detected FN jump! 8 -> 60 PDCH(bts=0,trx=0,ts=4) Expiring FN=60 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 60) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=60 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 60) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -5164,14 +5164,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-5): 0f 80 02 08 c4 7f 40 40 40 40 40 40 40 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a Detected FN jump! 8 -> 52 PDCH(bts=0,trx=0,ts=4) Expiring FN=52 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 52) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=52 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 52) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -5326,14 +5326,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 7, MCS-6): 0f c0 01 00 e2 7f 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 c0 ca ca ca 0a Detected FN jump! 8 -> 39 PDCH(bts=0,trx=0,ts=4) Expiring FN=39 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 39) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=39 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 39) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -5497,14 +5497,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-5): 0f 80 02 08 c4 7f 40 40 40 40 40 40 40 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a Detected FN jump! 8 -> 34 PDCH(bts=0,trx=0,ts=4) Expiring FN=34 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 34) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=34 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 34) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -5659,14 +5659,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-8): 0f 00 02 00 60 20 fd 07 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac 80 f4 1f 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 b0 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 02 Detected FN jump! 8 -> 30 PDCH(bts=0,trx=0,ts=4) Expiring FN=30 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 30) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=30 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 30) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -5810,14 +5810,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-9): 0f 80 01 02 00 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 80 f8 1f 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 b0 b2 b2 b2 02 Detected FN jump! 8 -> 26 PDCH(bts=0,trx=0,ts=4) Expiring FN=26 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 26) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=26 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 26) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -6124,7 +6124,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-7): 07 00 00 02 c0 01 04 08 0c 10 14 18 1c 20 24 28 2c 30 34 38 3c 40 44 48 4c 50 54 58 5c 60 64 68 6c 70 74 78 7c 80 84 88 8c 90 94 98 9c a0 a4 a8 ac b0 b4 b8 bc c0 c4 c8 cc d0 d4 d8 dc 80 f5 8f 93 a3 b3 c3 d3 e3 f3 03 14 24 34 44 54 64 74 84 94 a4 b4 c4 d4 e4 f4 04 15 25 35 45 55 65 75 85 95 a5 b5 c5 d5 e5 f5 05 16 26 36 b6 b2 b2 b2 b2 b2 b2 b2 b2 b2 02 Detected FN jump! 58 -> 63 PDCH(bts=0,trx=0,ts=4) Expiring FN=63 but previous FN=21 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=21): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=21, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=21, TS=4 (curr FN 63) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) @@ -6217,7 +6217,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-9): 07 00 00 02 28 01 04 08 0c 10 14 18 1c 20 24 28 2c 30 34 38 3c 40 44 48 4c 50 54 58 5c 60 64 68 6c 70 74 78 7c 80 84 88 8c 90 94 98 9c a0 a4 a8 ac b0 b4 b8 bc c0 c4 c8 cc d0 d4 d8 dc e0 e4 e8 ec f0 f4 f8 fc 00 05 09 0d 11 15 19 1d 21 25 41 f3 af b4 c4 d4 e4 f4 04 15 25 35 45 55 65 75 85 95 a5 b5 c5 d5 e5 f5 05 16 26 36 b6 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 02 PDCH(bts=0,trx=0,ts=4) Expiring FN=63 but previous FN=21 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=21): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=21, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=21, TS=4 (curr FN 63) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) @@ -6310,7 +6310,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-5): 07 40 00 08 d6 3f 4e 8e ce 0e 4f 8f cf 0f 50 90 d0 10 51 91 d1 11 52 92 d2 12 53 93 d3 13 54 94 d4 14 55 95 d5 15 56 96 d6 16 57 97 d7 17 58 98 d8 d8 ca ca ca ca ca ca ca ca ca 0a PDCH(bts=0,trx=0,ts=4) Expiring FN=63 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 63) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) @@ -6403,7 +6403,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-6): 07 40 00 02 cd bf d2 12 53 93 d3 13 54 94 d4 14 55 95 d5 15 56 96 d6 16 57 97 d7 17 58 98 d8 d8 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a PDCH(bts=0,trx=0,ts=4) Expiring FN=63 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 63) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) @@ -8752,7 +8752,7 @@ UL_ASS_TBF(UL-TFI_1){NONE}: state_chg to SEND_ASS MS(TLLI=0xffeeddcd, IMSI=, TA=7, 11/11, UL) Link quality 12dB (old 12dB) left window [-256, 6], modifying uplink CS level: MCS-1 -> MCS-2 PDCH(bts=0,trx=0,ts=7) Expiring FN=56 but previous FN=2654231 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231): TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN EGPRS) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=2654231, TS=7 (curr FN 56) TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN EGPRS) N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT @@ -8805,7 +8805,7 @@ UL_ASS_TBF(UL-TFI_2){NONE}: state_chg to SEND_ASS MS(TLLI=0xffeeddce, IMSI=, TA=7, 11/11, UL) Link quality 12dB (old 12dB) left window [-256, 6], modifying uplink CS level: MCS-1 -> MCS-2 PDCH(bts=0,trx=0,ts=7) Expiring FN=60 but previous FN=2654231 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231): TBF(TFI=1 TLLI=0xffeeddcd DIR=UL STATE=ASSIGN EGPRS) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(TFI=1 TLLI=0xffeeddcd DIR=UL STATE=ASSIGN EGPRS) TBF(TFI=1 TLLI=0xffeeddcd DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=2654231, TS=7 (curr FN 60) TBF(TFI=1 TLLI=0xffeeddcd DIR=UL STATE=ASSIGN EGPRS) N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL-TFI_1){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT @@ -8858,7 +8858,7 @@ UL_ASS_TBF(UL-TFI_3){NONE}: state_chg to SEND_ASS MS(TLLI=0xffeeddcf, IMSI=, TA=7, 11/11, UL) Link quality 12dB (old 12dB) left window [-256, 6], modifying uplink CS level: MCS-1 -> MCS-2 PDCH(bts=0,trx=0,ts=7) Expiring FN=65 but previous FN=2654231 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231): TBF(TFI=2 TLLI=0xffeeddce DIR=UL STATE=ASSIGN EGPRS) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(TFI=2 TLLI=0xffeeddce DIR=UL STATE=ASSIGN EGPRS) TBF(TFI=2 TLLI=0xffeeddce DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=2654231, TS=7 (curr FN 65) TBF(TFI=2 TLLI=0xffeeddce DIR=UL STATE=ASSIGN EGPRS) N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL-TFI_2){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT @@ -8911,7 +8911,7 @@ UL_ASS_TBF(UL-TFI_4){NONE}: state_chg to SEND_ASS MS(TLLI=0xffeeddd0, IMSI=, TA=7, 11/11, UL) Link quality 12dB (old 12dB) left window [-256, 6], modifying uplink CS level: MCS-1 -> MCS-2 PDCH(bts=0,trx=0,ts=7) Expiring FN=69 but previous FN=2654231 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231): TBF(TFI=3 TLLI=0xffeeddcf DIR=UL STATE=ASSIGN EGPRS) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(TFI=3 TLLI=0xffeeddcf DIR=UL STATE=ASSIGN EGPRS) TBF(TFI=3 TLLI=0xffeeddcf DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=2654231, TS=7 (curr FN 69) TBF(TFI=3 TLLI=0xffeeddcf DIR=UL STATE=ASSIGN EGPRS) N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL-TFI_3){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT @@ -8964,7 +8964,7 @@ UL_ASS_TBF(UL-TFI_5){NONE}: state_chg to SEND_ASS MS(TLLI=0xffeeddd1, IMSI=, TA=7, 11/11, UL) Link quality 12dB (old 12dB) left window [-256, 6], modifying uplink CS level: MCS-1 -> MCS-2 PDCH(bts=0,trx=0,ts=7) Expiring FN=73 but previous FN=2654231 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231): TBF(TFI=4 TLLI=0xffeeddd0 DIR=UL STATE=ASSIGN EGPRS) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(TFI=4 TLLI=0xffeeddd0 DIR=UL STATE=ASSIGN EGPRS) TBF(TFI=4 TLLI=0xffeeddd0 DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=2654231, TS=7 (curr FN 73) TBF(TFI=4 TLLI=0xffeeddd0 DIR=UL STATE=ASSIGN EGPRS) N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL-TFI_4){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT @@ -9017,7 +9017,7 @@ UL_ASS_TBF(UL-TFI_6){NONE}: state_chg to SEND_ASS MS(TLLI=0xffeeddd2, IMSI=, TA=7, 11/11, UL) Link quality 12dB (old 12dB) left window [-256, 6], modifying uplink CS level: MCS-1 -> MCS-2 PDCH(bts=0,trx=0,ts=7) Expiring FN=78 but previous FN=2654231 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231): TBF(TFI=5 TLLI=0xffeeddd1 DIR=UL STATE=ASSIGN EGPRS) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(TFI=5 TLLI=0xffeeddd1 DIR=UL STATE=ASSIGN EGPRS) TBF(TFI=5 TLLI=0xffeeddd1 DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=2654231, TS=7 (curr FN 78) TBF(TFI=5 TLLI=0xffeeddd1 DIR=UL STATE=ASSIGN EGPRS) N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL-TFI_5){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT @@ -9074,7 +9074,7 @@ UL_ASS_TBF{NONE}: Received Event SCHED_ASS_REJ UL_ASS_TBF{NONE}: state_chg to SEND_ASS_REJ PDCH(bts=0,trx=0,ts=7) Expiring FN=82 but previous FN=2654231 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231): TBF(TFI=6 TLLI=0xffeeddd2 DIR=UL STATE=ASSIGN EGPRS) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(TFI=6 TLLI=0xffeeddd2 DIR=UL STATE=ASSIGN EGPRS) TBF(TFI=6 TLLI=0xffeeddd2 DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=2654231, TS=7 (curr FN 82) TBF(TFI=6 TLLI=0xffeeddd2 DIR=UL STATE=ASSIGN EGPRS) N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL-TFI_6){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT diff --git a/tests/ulc/PdchUlcTest.err b/tests/ulc/PdchUlcTest.err index e4a79a6..d122f31 100644 --- a/tests/ulc/PdchUlcTest.err +++ b/tests/ulc/PdchUlcTest.err @@ -7,40 +7,40 @@ Creating MS object, TLLI = 0x12345678 MS(TLLI=0x12345678, IMSI=, TA=220, 0/0,) Attaching DL TBF: TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=2715613 but previous FN=2715608 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715608): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715613): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715608, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715613, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715617 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715617): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715617, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715622 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715622): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715622, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715626 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715626): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715626, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715630 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715630): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715630, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715635 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715635): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715635, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715639 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715639): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715639, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715643 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715643): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715643, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=4 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=4): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=4, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=8 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=8): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=8, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=13, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=17, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=21 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=21): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=21, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=26 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=26): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=26, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=30 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=30): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=30, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=34 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=34): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=34, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=39 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=39): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=39, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) POLL scheduled at FN 26 + 13 = 39 PDCH(bts=0,trx=0,ts=0) UL block already scheduled at FN 91 + 13 = 104 PDCH(bts=0,trx=0,ts=0) POLL scheduled at FN 91 + 17 = 108 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7cd59b60fe0af0bfdfcdf8a91e4cf8bd3f25b2f7 Gerrit-Change-Number: 25751 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:17:40 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 12 Oct 2021 10:17:40 +0000 Subject: Change in osmo-pcu[master]: sched: Rename function In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25744 ) Change subject: sched: Rename function ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25744/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/25744/1//COMMIT_MSG at 9 PS1, Line 9: data So AFAIU, the point is that it selects a DATA block, not CTRL. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic0680d15edf70449e66f40eab1ead97313631cbb Gerrit-Change-Number: 25744 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:17:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:18:47 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 12 Oct 2021 10:18:47 +0000 Subject: Change in osmo-pcu[master]: pdch: Only release ULC entry if rx ul block matches the expected one In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25746 ) Change subject: pdch: Only release ULC entry if rx ul block matches the expected one ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia69a7d92c4b5c98ec71a75605c8dc3a755e63a35 Gerrit-Change-Number: 25746 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:18:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:29:50 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 12 Oct 2021 10:29:50 +0000 Subject: Change in osmo-pcu[master]: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25747 ) Change subject: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8ab3f5e4f2f802944269453db13a80c9ede67714 Gerrit-Change-Number: 25747 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:29:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:31:41 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 12 Oct 2021 10:31:41 +0000 Subject: Change in osmo-pcu[master]: pdch: PktResReq: Avoid releasing ULC entry if expecting something els... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25748 ) Change subject: pdch: PktResReq: Avoid releasing ULC entry if expecting something else on UL ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25748/1/src/pdch.cpp File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25748/1/src/pdch.cpp at a668 PS1, Line 668: /* let common path expire the poll */ Why are you removing this comment? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3d8749acca8e7859295d73cce556b2083169f726 Gerrit-Change-Number: 25748 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:31:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:32:55 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 12 Oct 2021 10:32:55 +0000 Subject: Change in osmo-pcu[master]: pdch: Only release ULC entry if rx ul block matches the expected one In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25746 ) Change subject: pdch: Only release ULC entry if rx ul block matches the expected one ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia69a7d92c4b5c98ec71a75605c8dc3a755e63a35 Gerrit-Change-Number: 25746 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:32:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:33:44 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 12 Oct 2021 10:33:44 +0000 Subject: Change in osmo-pcu[master]: Handle Final UL ACK/NACK Confirmation in tbf_fsm In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25749 ) Change subject: Handle Final UL ACK/NACK Confirmation in tbf_fsm ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If30d881037209d33b2b41ecf8bb8419caf36e367 Gerrit-Change-Number: 25749 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:33:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:35:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 10:35:13 +0000 Subject: Change in osmo-pcu[master]: sched: Rename function In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25744 ) Change subject: sched: Rename function ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25744/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/25744/1//COMMIT_MSG at 9 PS1, Line 9: data > So AFAIU, the point is that it selects a DATA block, not CTRL. yes. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic0680d15edf70449e66f40eab1ead97313631cbb Gerrit-Change-Number: 25744 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:35:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:35:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 10:35:18 +0000 Subject: Change in osmo-pcu[master]: pdch: Only release ULC entry if rx ul block matches the expected one In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25746 ) Change subject: pdch: Only release ULC entry if rx ul block matches the expected one ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia69a7d92c4b5c98ec71a75605c8dc3a755e63a35 Gerrit-Change-Number: 25746 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:35:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:35:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 10:35:23 +0000 Subject: Change in osmo-pcu[master]: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25747 ) Change subject: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8ab3f5e4f2f802944269453db13a80c9ede67714 Gerrit-Change-Number: 25747 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:35:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:37:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 10:37:54 +0000 Subject: Change in osmo-pcu[master]: pdch: PktResReq: Avoid releasing ULC entry if expecting something els... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25748 ) Change subject: pdch: PktResReq: Avoid releasing ULC entry if expecting something else on UL ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25748/1/src/pdch.cpp File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25748/1/src/pdch.cpp at a668 PS1, Line 668: /* let common path expire the poll */ > Why are you removing this comment? Oh I actually just realized the comment is right. I first nudnerstood it meant "let common path release the poll", but letting common path expire the poll makes sense here ;) I'll change it. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3d8749acca8e7859295d73cce556b2083169f726 Gerrit-Change-Number: 25748 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:37:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 21:08:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 21:08:51 +0000 Subject: Change in osmo-pcu[master]: sched: Rename function In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25744 ) Change subject: sched: Rename function ...................................................................... sched: Rename function Properly describe that function is aimed at selecting a DL data block. Change-Id: Ic0680d15edf70449e66f40eab1ead97313631cbb --- M src/gprs_rlcmac_sched.cpp 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index 405b7db..cdbf70d 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -282,8 +282,9 @@ } } -static struct msgb *sched_select_downlink(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_pdch *pdch, uint32_t fn, - uint8_t block_nr, enum mcs_kind req_mcs_kind, bool *is_egprs) +static struct msgb *sched_select_dl_data_msg(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_pdch *pdch, + uint32_t fn, uint8_t block_nr, enum mcs_kind req_mcs_kind, + bool *is_egprs) { struct msgb *msg = NULL; struct gprs_rlcmac_dl_tbf *tbf, *prio_tbf = NULL; @@ -480,7 +481,7 @@ gsmtap_cat = PCU_GSMTAP_C_DL_CTRL; } /* Prio 2: select data message for downlink */ - else if((msg = sched_select_downlink(bts, pdch, fn, block_nr, req_mcs_kind, &tx_is_egprs))) { + else if((msg = sched_select_dl_data_msg(bts, pdch, fn, block_nr, req_mcs_kind, &tx_is_egprs))) { gsmtap_cat = tx_is_egprs ? PCU_GSMTAP_C_DL_DATA_EGPRS : PCU_GSMTAP_C_DL_DATA_GPRS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic0680d15edf70449e66f40eab1ead97313631cbb Gerrit-Change-Number: 25744 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 21:08:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 21:08:51 +0000 Subject: Change in osmo-pcu[master]: pdch: Only release ULC entry if rx ul block matches the expected one In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25746 ) Change subject: pdch: Only release ULC entry if rx ul block matches the expected one ...................................................................... pdch: Only release ULC entry if rx ul block matches the expected one If it doesn't match out expectancies, it means we early return and hence don't push forward / update whatever state was requested upon receival of the UL message for the expected TBF. Hence, we shall not remove the allocated ULC entry: in this scenario we need to keep it so that timeout procedure times out and the tbf applies whatever measures are required, be it retransmission, releasing itself, etc. Change-Id: Ia69a7d92c4b5c98ec71a75605c8dc3a755e63a35 --- M src/pdch.cpp 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/pdch.cpp b/src/pdch.cpp index 25e7ff5..cfec71e 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -343,7 +343,6 @@ LOGPTBF(tbf, LOGL_DEBUG, "FN=%" PRIu32 " Rx Packet Control Ack (reason=%s)\n", fn, get_value_string(pdch_ulc_tbf_poll_reason_names, reason)); - pdch_ulc_release_fn(ulc, fn); switch (reason) { case PDCH_ULC_POLL_UL_ACK: @@ -354,6 +353,7 @@ fn, ts_no, bts_current_frame_number(tbf->bts)); return; } + pdch_ulc_release_fn(ulc, fn); osmo_fsm_inst_dispatch(ul_tbf->ul_ack_fsm.fi, TBF_UL_ACK_EV_RX_CTRL_ACK, NULL); /* We can free since we only set polling on final UL ACK/NACK */ LOGPTBF(tbf, LOGL_DEBUG, "[UPLINK] END\n"); @@ -368,6 +368,7 @@ return; } LOGPTBF(tbf, LOGL_DEBUG, "[DOWNLINK] UPLINK ASSIGNED\n"); + pdch_ulc_release_fn(ulc, fn); /* reset N3105 */ tbf->n_reset(N3105); osmo_fsm_inst_dispatch(tbf->ul_ass_fsm.fi, TBF_UL_ASS_EV_RX_ASS_CTRL_ACK, NULL); @@ -400,6 +401,7 @@ return; } LOGPTBF(tbf, LOGL_DEBUG, "[UPLINK] DOWNLINK ASSIGNED\n"); + pdch_ulc_release_fn(ulc, fn); /* reset N3105 */ tbf->n_reset(N3105); osmo_fsm_inst_dispatch(tbf->dl_ass_fsm.fi, TBF_DL_ASS_EV_RX_ASS_CTRL_ACK, NULL); @@ -425,6 +427,7 @@ fn, ts_no, bts_current_frame_number(tbf->bts)); return; } + pdch_ulc_release_fn(ulc, fn); osmo_fsm_inst_dispatch(ms->nacc->fi, NACC_EV_RX_CELL_CHG_CONTINUE_ACK, NULL); /* Don't assume MS is no longer reachable (hence don't free) after this: TS 44.060 * "When the mobile station receives the PACKET CELL CHANGE ORDER -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia69a7d92c4b5c98ec71a75605c8dc3a755e63a35 Gerrit-Change-Number: 25746 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 21:08:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 21:08:52 +0000 Subject: Change in osmo-pcu[master]: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25747 ) Change subject: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() ...................................................................... pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() If we didn't expect this kind of UL messages according to pdch ULC, then we shouldn't allow going forward and releasing the ULC entry: let it time out instead so that TBF runs whatever appopiate action is needed in this case, be it retransamission, releasing itself, etc. Change-Id: I8ab3f5e4f2f802944269453db13a80c9ede67714 --- M src/pdch.cpp 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved dexter: Looks good to me, but someone else must approve diff --git a/src/pdch.cpp b/src/pdch.cpp index cfec71e..807ce45 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -463,7 +463,8 @@ tfi = ack_nack->DOWNLINK_TFI; poll = pdch_ulc_get_node(ulc, fn); - if (!poll || poll->type != PDCH_ULC_NODE_TBF_POLL) { + if (!poll || poll->type != PDCH_ULC_NODE_TBF_POLL || + poll->tbf_poll.reason != PDCH_ULC_POLL_DL_ACK) { LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "PACKET DOWNLINK ACK with " "unknown FN=%u TFI=%d (TRX %d TS %d)\n", fn, tfi, trx_no(), ts_no); @@ -532,7 +533,8 @@ tfi = ack_nack->DOWNLINK_TFI; poll = pdch_ulc_get_node(ulc, fn); - if (!poll || poll->type != PDCH_ULC_NODE_TBF_POLL) { + if (!poll || poll->type != PDCH_ULC_NODE_TBF_POLL || + poll->tbf_poll.reason != PDCH_ULC_POLL_DL_ACK) { LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "EGPRS PACKET DOWNLINK ACK with " "unknown FN=%u TFI=%d (TRX %d TS %d)\n", fn, tfi, trx_no(), ts_no); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8ab3f5e4f2f802944269453db13a80c9ede67714 Gerrit-Change-Number: 25747 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:40:29 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 12 Oct 2021 10:40:29 +0000 Subject: Change in osmo-pcu[master]: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25747 ) Change subject: pdch: Validate poll reason matches in rcv_control_(egprs)_dl_ack_nack() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25747/1/src/pdch.cpp File src/pdch.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25747/1/src/pdch.cpp at 468 PS1, Line 468: LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "PACKET DOWNLINK ACK with " > It is accurate enough (most of these log messages are really old and I agree should be updated, but [?] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8ab3f5e4f2f802944269453db13a80c9ede67714 Gerrit-Change-Number: 25747 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:40:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:42:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 10:42:01 +0000 Subject: Change in osmo-pcu[master]: pdch: PktResReq: Avoid releasing ULC entry if expecting something els... In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, fixeria, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25748 to look at the new patch set (#2). Change subject: pdch: PktResReq: Avoid releasing ULC entry if expecting something else on UL ...................................................................... pdch: PktResReq: Avoid releasing ULC entry if expecting something else on UL Let's only release PDCH ULC entry if it was indeed what we expected. In other case, time it out. Move the case in the switch statement to the start to easy function readibility (early return style). Change-Id: I3d8749acca8e7859295d73cce556b2083169f726 --- M src/pdch.cpp 1 file changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/48/25748/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3d8749acca8e7859295d73cce556b2083169f726 Gerrit-Change-Number: 25748 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:44:30 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 12 Oct 2021 10:44:30 +0000 Subject: Change in osmo-pcu[master]: pdch: PktResReq: Avoid releasing ULC entry if expecting something els... In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25748 ) Change subject: pdch: PktResReq: Avoid releasing ULC entry if expecting something else on UL ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3d8749acca8e7859295d73cce556b2083169f726 Gerrit-Change-Number: 25748 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:44:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:52:27 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 12 Oct 2021 10:52:27 +0000 Subject: Change in osmo-pcu[master]: Handle Final UL ACK/NACK Confirmation in tbf_fsm In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25749 ) Change subject: Handle Final UL ACK/NACK Confirmation in tbf_fsm ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If30d881037209d33b2b41ecf8bb8419caf36e367 Gerrit-Change-Number: 25749 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:52:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:54:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 10:54:00 +0000 Subject: Change in osmo-pcu[master]: tbf_fsm: rename state NULL -> NEW In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25750 ) Change subject: tbf_fsm: rename state NULL -> NEW ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ieaabfc9fa0dedb299bcf4541783cf80e366a88c3 Gerrit-Change-Number: 25750 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:54:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:54:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 10:54:56 +0000 Subject: Change in osmo-pcu[master]: pdch: PktResReq: Avoid releasing ULC entry if expecting something els... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25748 ) Change subject: pdch: PktResReq: Avoid releasing ULC entry if expecting something else on UL ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3d8749acca8e7859295d73cce556b2083169f726 Gerrit-Change-Number: 25748 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:54:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:56:29 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 12 Oct 2021 10:56:29 +0000 Subject: Change in osmo-pcu[master]: tbf_fsm: rename state NULL -> NEW In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25750 ) Change subject: tbf_fsm: rename state NULL -> NEW ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ieaabfc9fa0dedb299bcf4541783cf80e366a88c3 Gerrit-Change-Number: 25750 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:56:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 10:59:32 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 12 Oct 2021 10:59:32 +0000 Subject: Change in osmo-pcu[master]: pdch_ulc: Log POLL reason upon timeout In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25751 ) Change subject: pdch_ulc: Log POLL reason upon timeout ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7cd59b60fe0af0bfdfcdf8a91e4cf8bd3f25b2f7 Gerrit-Change-Number: 25751 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 10:59:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 11:00:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 11:00:54 +0000 Subject: Change in osmo-pcu[master]: Handle Final UL ACK/NACK Confirmation in tbf_fsm In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25749 ) Change subject: Handle Final UL ACK/NACK Confirmation in tbf_fsm ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If30d881037209d33b2b41ecf8bb8419caf36e367 Gerrit-Change-Number: 25749 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 11:00:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 01:32:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 01:32:46 +0000 Subject: Change in osmo-pcu[master]: pdch: PktResReq: Avoid releasing ULC entry if expecting something els... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25748 ) Change subject: pdch: PktResReq: Avoid releasing ULC entry if expecting something else on UL ...................................................................... pdch: PktResReq: Avoid releasing ULC entry if expecting something else on UL Let's only release PDCH ULC entry if it was indeed what we expected. In other case, time it out. Move the case in the switch statement to the start to easy function readibility (early return style). Change-Id: I3d8749acca8e7859295d73cce556b2083169f726 --- M src/pdch.cpp 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/pdch.cpp b/src/pdch.cpp index 807ce45..a503a55 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -638,6 +638,14 @@ } switch (item->type) { + case PDCH_ULC_NODE_TBF_USF: + /* Is it actually valid for an MS to send a PKT Res Req during USF? */ + ul_tbf = item->tbf_usf.ul_tbf; + LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "FN=%u PKT RESOURCE REQ: " + "Unexpectedly received, waiting USF of %s\n", + fn, tbf_name(item->tbf_usf.ul_tbf)); + /* Ignore it, let common path expire related ULC entry */ + goto return_unref; case PDCH_ULC_NODE_SBA: sba = item->sba.sba; LOGPDCH(this, DRLCMAC, LOGL_DEBUG, "FN=%u PKT RESOURCE REQ: " @@ -675,14 +683,6 @@ ul_tbf->n_reset(N3103); pdch_ulc_release_node(ulc, item); break; - case PDCH_ULC_NODE_TBF_USF: - /* Is it actually valid for an MS to send a PKT Res Req during USF? */ - ul_tbf = item->tbf_usf.ul_tbf; - LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "FN=%u PKT RESOURCE REQ: " - "Unexpectedly received, waiting USF of %s\n", - fn, tbf_name(item->tbf_usf.ul_tbf)); - pdch_ulc_release_node(ulc, item); - break; default: OSMO_ASSERT(0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3d8749acca8e7859295d73cce556b2083169f726 Gerrit-Change-Number: 25748 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 01:32:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 01:32:46 +0000 Subject: Change in osmo-pcu[master]: Handle Final UL ACK/NACK Confirmation in tbf_fsm In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25749 ) Change subject: Handle Final UL ACK/NACK Confirmation in tbf_fsm ...................................................................... Handle Final UL ACK/NACK Confirmation in tbf_fsm Pass the event over the FSM for better understading of the entire lifecycle of the TBF. Change-Id: If30d881037209d33b2b41ecf8bb8419caf36e367 --- M src/pdch.cpp M src/tbf_fsm.c M src/tbf_fsm.h 3 files changed, 23 insertions(+), 11 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/pdch.cpp b/src/pdch.cpp index a503a55..dbdd47f 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -355,9 +355,9 @@ } pdch_ulc_release_fn(ulc, fn); osmo_fsm_inst_dispatch(ul_tbf->ul_ack_fsm.fi, TBF_UL_ACK_EV_RX_CTRL_ACK, NULL); - /* We can free since we only set polling on final UL ACK/NACK */ + /* We only set polling on final UL ACK/NACK */ LOGPTBF(tbf, LOGL_DEBUG, "[UPLINK] END\n"); - tbf_free(tbf); + osmo_fsm_inst_dispatch(ul_tbf->state_fsm.fi, TBF_EV_FINAL_UL_ACK_CONFIRMED, NULL); return; case PDCH_ULC_POLL_UL_ASS: @@ -616,6 +616,7 @@ void gprs_rlcmac_pdch::rcv_resource_request(Packet_Resource_Request_t *request, uint32_t fn, struct pcu_l1_meas *meas) { struct gprs_rlcmac_sba *sba; + int rc; if (request->ID.UnionType) { struct gprs_rlcmac_ul_tbf *ul_tbf = NULL; @@ -682,12 +683,23 @@ "block of final UL ACK/NACK\n", fn); ul_tbf->n_reset(N3103); pdch_ulc_release_node(ulc, item); + rc = osmo_fsm_inst_dispatch(ul_tbf->state_fsm.fi, TBF_EV_FINAL_UL_ACK_CONFIRMED, NULL); + if (rc) { + /* FSM failed handling, get rid of previous finished UL TBF before providing a new one */ + LOGPTBFUL(ul_tbf, LOGL_NOTICE, + "Got PACKET RESOURCE REQ while TBF not finished, killing pending UL TBF\n"); + tbf_free(ul_tbf); + } /* else: ul_tbf has been freed by state_fsm */ + ul_tbf = NULL; break; default: OSMO_ASSERT(0); } - /* here ul_tbf may be NULL in SBA case (no previous TBF) */ + /* Here ul_tbf is NULL: + * - SBA case: no previous TBF) and in + * - POLL case: PktResReq is a final ACk confirmation and ul_tbf was freed + */ if (request->Exist_MS_Radio_Access_capability2) { uint8_t ms_class, egprs_ms_class; @@ -699,14 +711,6 @@ ms_set_egprs_ms_class(ms, egprs_ms_class); } - /* Get rid of previous finished UL TBF before providing a new one */ - if (ul_tbf) { - if (!ul_tbf->state_is(TBF_ST_FINISHED)) - LOGPTBFUL(ul_tbf, LOGL_NOTICE, - "Got PACKET RESOURCE REQ while TBF not finished, killing pending UL TBF\n"); - tbf_free(ul_tbf); - } - ul_tbf = tbf_alloc_ul_pacch(bts(), ms, trx_no(), tlli); if (!ul_tbf) { handle_tbf_reject(bts(), ms, trx_no(), ts_no); diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c index 4202a0c..0b6a2a3 100644 --- a/src/tbf_fsm.c +++ b/src/tbf_fsm.c @@ -50,6 +50,7 @@ { TBF_EV_LAST_DL_DATA_SENT, "LAST_DL_DATA_SENT" }, { TBF_EV_LAST_UL_DATA_RECVD, "LAST_UL_DATA_RECVD" }, { TBF_EV_FINAL_ACK_RECVD, "FINAL_ACK_RECVD" }, + { TBF_EV_FINAL_UL_ACK_CONFIRMED, "FINAL_UL_ACK_CONFIRMED" }, { TBF_EV_MAX_N3101 , "MAX_N3101" }, { TBF_EV_MAX_N3103 , "MAX_N3103" }, { TBF_EV_MAX_N3105 , "MAX_N3105" }, @@ -253,6 +254,11 @@ case we receive more DL data to tx */ tbf_fsm_state_chg(fi, TBF_ST_WAIT_RELEASE); break; + case TBF_EV_FINAL_UL_ACK_CONFIRMED: + /* UL TBF ACKed our transmitted UL ACK/NACK with final Ack + * Indicator set to '1' t. We can free the TBF right away. */ + tbf_free(ctx->tbf); + break; case TBF_EV_MAX_N3103: ctx->T_release = 3169; tbf_fsm_state_chg(fi, TBF_ST_RELEASING); @@ -432,6 +438,7 @@ .in_event_mask = X(TBF_EV_DL_ACKNACK_MISS) | X(TBF_EV_FINAL_ACK_RECVD) | + X(TBF_EV_FINAL_UL_ACK_CONFIRMED) | X(TBF_EV_MAX_N3103) | X(TBF_EV_MAX_N3105), .out_state_mask = diff --git a/src/tbf_fsm.h b/src/tbf_fsm.h index d6fe41f..d62e091 100644 --- a/src/tbf_fsm.h +++ b/src/tbf_fsm.h @@ -36,6 +36,7 @@ TBF_EV_LAST_DL_DATA_SENT, /* DL TBF sends RLCMAC block containing last DL avilable data buffered */ TBF_EV_LAST_UL_DATA_RECVD, /* UL TBF sends RLCMAC block containing last UL data (cv=0) */ TBF_EV_FINAL_ACK_RECVD, /* DL ACK/NACK with FINAL_ACK=1 received from MS */ + TBF_EV_FINAL_UL_ACK_CONFIRMED, /* UL TBF: MS ACKs (CtrlAck or PktResReq) our UL ACK/NACK w/ FinalAckInd=1 */ TBF_EV_MAX_N3101, /* MAX N3101 (max usf timeout) reached (UL TBF) */ TBF_EV_MAX_N3103, /* MAX N3103 (max Pkt Ctrl Ack for last UL ACK/NACK timeout) reached (UL TBF) */ TBF_EV_MAX_N3105, /* MAX N3105 (max poll timeout) reached (UL/DL TBF) */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If30d881037209d33b2b41ecf8bb8419caf36e367 Gerrit-Change-Number: 25749 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:43:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 03:43:58 +0000 Subject: Change in osmo-pcu[master]: tbf_fsm: rename state NULL -> NEW In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25750 ) Change subject: tbf_fsm: rename state NULL -> NEW ...................................................................... tbf_fsm: rename state NULL -> NEW This helps distinguishing the case where a TBF is in the initial state and the unexpected case where osmo_fsm_inst_state_name reports "NULL" due to fi pointer being NULL. Change-Id: Ieaabfc9fa0dedb299bcf4541783cf80e366a88c3 --- M src/tbf_fsm.c M src/tbf_fsm.h M tests/alloc/AllocTest.err M tests/app_info/AppInfoTest.err M tests/ms/MsTest.err M tests/tbf/TbfTest.err M tests/types/TypesTest.err M tests/ulc/PdchUlcTest.err 8 files changed, 490,442 insertions(+), 490,442 deletions(-) Approvals: dexter: Looks good to me, approved Jenkins Builder: Verified -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ieaabfc9fa0dedb299bcf4541783cf80e366a88c3 Gerrit-Change-Number: 25750 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:43:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 03:43:58 +0000 Subject: Change in osmo-pcu[master]: pdch_ulc: Log POLL reason upon timeout In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25751 ) Change subject: pdch_ulc: Log POLL reason upon timeout ...................................................................... pdch_ulc: Log POLL reason upon timeout Change-Id: I7cd59b60fe0af0bfdfcdf8a91e4cf8bd3f25b2f7 --- M src/pdch_ul_controller.c M tests/tbf/TbfTest.err M tests/ulc/PdchUlcTest.err 3 files changed, 54 insertions(+), 53 deletions(-) Approvals: dexter: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/pdch_ul_controller.c b/src/pdch_ul_controller.c index e7a721c..79a0339 100644 --- a/src/pdch_ul_controller.c +++ b/src/pdch_ul_controller.c @@ -325,8 +325,9 @@ break; case PDCH_ULC_NODE_TBF_POLL: LOGPDCH(ulc->pdch, DRLCMAC, LOGL_NOTICE, - "Timeout for registered POLL (FN=%u): %s\n", - item->fn, tbf_name(item->tbf_poll.poll_tbf)); + "Timeout for registered POLL (FN=%u, reason=%s): %s\n", + item->fn, get_value_string(pdch_ulc_tbf_poll_reason_names, item->tbf_poll.reason), + tbf_name(item->tbf_poll.poll_tbf)); tbf_poll_timeout(item->tbf_poll.poll_tbf, ulc->pdch, item->fn, item->tbf_poll.reason); break; case PDCH_ULC_NODE_SBA: diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err index 8d93f59..26ba446 100644 --- a/tests/tbf/TbfTest.err +++ b/tests/tbf/TbfTest.err @@ -2044,7 +2044,7 @@ PDCH(bts=0,trx=0,ts=7) Expiring FN=2654292 but previous FN=2654283 is still reserved! PDCH(bts=0,trx=0,ts=7) Timeout for registered USF (FN=2654283): TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) N3101 1 => 2 (< MAX 10) -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654292): TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654292, reason=DL_ACK): TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) poll timeout for FN=2654292, TS=7 (curr FN 2654292) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) N3105 0 => 1 (< MAX 8) @@ -2106,7 +2106,7 @@ PDCH(bts=0,trx=0,ts=7) Timeout for registered USF (FN=2654301): TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW) N3101 2 => 3 (< MAX 10) PDCH(bts=0,trx=0,ts=7) Expiring FN=2654348 but previous FN=2654309 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654309): TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654309, reason=DL_ACK): TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) poll timeout for FN=2654309, TS=7 (curr FN 2654348) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) N3105 1 => 2 (< MAX 8) @@ -3284,7 +3284,7 @@ PDCH(bts=0,trx=0,ts=7) Expiring FN=2654379 but previous FN=2654374 is still reserved! PDCH(bts=0,trx=0,ts=7) Timeout for registered USF (FN=2654374): TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=RELEASING) TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=RELEASING) N3101 22 => 23 (< MAX 10) -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654379): TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654379, reason=DL_ACK): TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) poll timeout for FN=2654379, TS=7 (curr FN 2654379) TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xf1223344 DIR=DL STATE=FINISHED) N3105 0 => 1 (< MAX 8) @@ -4295,20 +4295,20 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 24, MCS-1): 0f 00 06 16 18 fe 03 02 02 02 02 02 56 56 56 56 56 56 56 56 56 56 56 56 56 56 00 Detected FN jump! 8 -> 112 PDCH(bts=0,trx=0,ts=4) Expiring FN=112 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 112) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=112 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 112) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) TBF(DL-TFI_0){FLOW}: Received Event DL_ACKNACK_MISS PDCH(bts=0,trx=0,ts=4) Expiring FN=112 but previous FN=104 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=104): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=104, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=104, TS=4 (curr FN 112) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 2 => 3 (< MAX 8) TBF(DL-TFI_0){FLOW}: Received Event DL_ACKNACK_MISS @@ -4558,14 +4558,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 19, MCS-2): 0f c0 04 12 20 fe 03 02 02 02 02 02 02 02 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 00 Detected FN jump! 8 -> 91 PDCH(bts=0,trx=0,ts=4) Expiring FN=91 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 91) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=91 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 91) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -4776,14 +4776,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 14, MCS-3): 0f 80 03 06 7c fe 03 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 56 56 56 56 00 Detected FN jump! 8 -> 69 PDCH(bts=0,trx=0,ts=4) Expiring FN=69 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 69) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=69 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 69) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -4978,14 +4978,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 12, MCS-4): 0f 00 03 00 70 fe 03 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 02 56 56 56 56 56 56 56 56 56 56 56 56 56 56 00 Detected FN jump! 8 -> 60 PDCH(bts=0,trx=0,ts=4) Expiring FN=60 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 60) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=60 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 60) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -5164,14 +5164,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-5): 0f 80 02 08 c4 7f 40 40 40 40 40 40 40 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a Detected FN jump! 8 -> 52 PDCH(bts=0,trx=0,ts=4) Expiring FN=52 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 52) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=52 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 52) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -5326,14 +5326,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 7, MCS-6): 0f c0 01 00 e2 7f 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 40 c0 ca ca ca 0a Detected FN jump! 8 -> 39 PDCH(bts=0,trx=0,ts=4) Expiring FN=39 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 39) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=39 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 39) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -5497,14 +5497,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 10, MCS-5): 0f 80 02 08 c4 7f 40 40 40 40 40 40 40 c0 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a Detected FN jump! 8 -> 34 PDCH(bts=0,trx=0,ts=4) Expiring FN=34 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 34) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=34 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 34) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -5659,14 +5659,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 8, MCS-8): 0f 00 02 00 60 20 fd 07 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac ac 80 f4 1f 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 b0 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 02 Detected FN jump! 8 -> 30 PDCH(bts=0,trx=0,ts=4) Expiring FN=30 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 30) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=30 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 30) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -5810,14 +5810,14 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 6, MCS-9): 0f 80 01 02 00 05 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 80 f8 1f 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 b0 b2 b2 b2 02 Detected FN jump! 8 -> 26 PDCH(bts=0,trx=0,ts=4) Expiring FN=26 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=13, reason=DL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=13, TS=4 (curr FN 26) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET DOWNLINK ASSIGNMENT: |Assignment was on PACCH|No downlink ACK received yet| DL_ASS_TBF(DL-TFI_0){WAIT_ACK}: state_chg to SEND_ASS PDCH(bts=0,trx=0,ts=4) Expiring FN=26 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 26) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 1 => 2 (< MAX 8) @@ -6124,7 +6124,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-7): 07 00 00 02 c0 01 04 08 0c 10 14 18 1c 20 24 28 2c 30 34 38 3c 40 44 48 4c 50 54 58 5c 60 64 68 6c 70 74 78 7c 80 84 88 8c 90 94 98 9c a0 a4 a8 ac b0 b4 b8 bc c0 c4 c8 cc d0 d4 d8 dc 80 f5 8f 93 a3 b3 c3 d3 e3 f3 03 14 24 34 44 54 64 74 84 94 a4 b4 c4 d4 e4 f4 04 15 25 35 45 55 65 75 85 95 a5 b5 c5 d5 e5 f5 05 16 26 36 b6 b2 b2 b2 b2 b2 b2 b2 b2 b2 02 Detected FN jump! 58 -> 63 PDCH(bts=0,trx=0,ts=4) Expiring FN=63 but previous FN=21 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=21): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=21, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=21, TS=4 (curr FN 63) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) @@ -6217,7 +6217,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 1 (BSN 1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 0, MCS-9): 07 00 00 02 28 01 04 08 0c 10 14 18 1c 20 24 28 2c 30 34 38 3c 40 44 48 4c 50 54 58 5c 60 64 68 6c 70 74 78 7c 80 84 88 8c 90 94 98 9c a0 a4 a8 ac b0 b4 b8 bc c0 c4 c8 cc d0 d4 d8 dc e0 e4 e8 ec f0 f4 f8 fc 00 05 09 0d 11 15 19 1d 21 25 41 f3 af b4 c4 d4 e4 f4 04 15 25 35 45 55 65 75 85 95 a5 b5 c5 d5 e5 f5 05 16 26 36 b6 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 b2 02 PDCH(bts=0,trx=0,ts=4) Expiring FN=63 but previous FN=21 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=21): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=21, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=21, TS=4 (curr FN 63) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) @@ -6310,7 +6310,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-5): 07 40 00 08 d6 3f 4e 8e ce 0e 4f 8f cf 0f 50 90 d0 10 51 91 d1 11 52 92 d2 12 53 93 d3 13 54 94 d4 14 55 95 d5 15 56 96 d6 16 57 97 d7 17 58 98 d8 d8 ca ca ca ca ca ca ca ca ca 0a PDCH(bts=0,trx=0,ts=4) Expiring FN=63 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 63) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) @@ -6403,7 +6403,7 @@ TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Copying data unit 0 (BSN 1) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) msg block (BSN 1, MCS-6): 07 40 00 02 cd bf d2 12 53 93 d3 13 54 94 d4 14 55 95 d5 15 56 96 d6 16 57 97 d7 17 58 98 d8 d8 ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca ca 0a PDCH(bts=0,trx=0,ts=4) Expiring FN=63 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) +PDCH(bts=0,trx=0,ts=4) Timeout for registered POLL (FN=17, reason=DL_ACK): TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) poll timeout for FN=17, TS=4 (curr FN 63) TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) Timeout for polling PACKET DOWNLINK ACK: |Assignment was on PACCH|No downlink ACK received yet| TBF(TFI=0 TLLI=0xffeeddcc DIR=DL STATE=FLOW EGPRS) N3105 0 => 1 (< MAX 8) @@ -8752,7 +8752,7 @@ UL_ASS_TBF(UL-TFI_1){NONE}: state_chg to SEND_ASS MS(TLLI=0xffeeddcd, IMSI=, TA=7, 11/11, UL) Link quality 12dB (old 12dB) left window [-256, 6], modifying uplink CS level: MCS-1 -> MCS-2 PDCH(bts=0,trx=0,ts=7) Expiring FN=56 but previous FN=2654231 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231): TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN EGPRS) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN EGPRS) TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=2654231, TS=7 (curr FN 56) TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN EGPRS) N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL-TFI_0){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT @@ -8805,7 +8805,7 @@ UL_ASS_TBF(UL-TFI_2){NONE}: state_chg to SEND_ASS MS(TLLI=0xffeeddce, IMSI=, TA=7, 11/11, UL) Link quality 12dB (old 12dB) left window [-256, 6], modifying uplink CS level: MCS-1 -> MCS-2 PDCH(bts=0,trx=0,ts=7) Expiring FN=60 but previous FN=2654231 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231): TBF(TFI=1 TLLI=0xffeeddcd DIR=UL STATE=ASSIGN EGPRS) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(TFI=1 TLLI=0xffeeddcd DIR=UL STATE=ASSIGN EGPRS) TBF(TFI=1 TLLI=0xffeeddcd DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=2654231, TS=7 (curr FN 60) TBF(TFI=1 TLLI=0xffeeddcd DIR=UL STATE=ASSIGN EGPRS) N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL-TFI_1){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT @@ -8858,7 +8858,7 @@ UL_ASS_TBF(UL-TFI_3){NONE}: state_chg to SEND_ASS MS(TLLI=0xffeeddcf, IMSI=, TA=7, 11/11, UL) Link quality 12dB (old 12dB) left window [-256, 6], modifying uplink CS level: MCS-1 -> MCS-2 PDCH(bts=0,trx=0,ts=7) Expiring FN=65 but previous FN=2654231 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231): TBF(TFI=2 TLLI=0xffeeddce DIR=UL STATE=ASSIGN EGPRS) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(TFI=2 TLLI=0xffeeddce DIR=UL STATE=ASSIGN EGPRS) TBF(TFI=2 TLLI=0xffeeddce DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=2654231, TS=7 (curr FN 65) TBF(TFI=2 TLLI=0xffeeddce DIR=UL STATE=ASSIGN EGPRS) N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL-TFI_2){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT @@ -8911,7 +8911,7 @@ UL_ASS_TBF(UL-TFI_4){NONE}: state_chg to SEND_ASS MS(TLLI=0xffeeddd0, IMSI=, TA=7, 11/11, UL) Link quality 12dB (old 12dB) left window [-256, 6], modifying uplink CS level: MCS-1 -> MCS-2 PDCH(bts=0,trx=0,ts=7) Expiring FN=69 but previous FN=2654231 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231): TBF(TFI=3 TLLI=0xffeeddcf DIR=UL STATE=ASSIGN EGPRS) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(TFI=3 TLLI=0xffeeddcf DIR=UL STATE=ASSIGN EGPRS) TBF(TFI=3 TLLI=0xffeeddcf DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=2654231, TS=7 (curr FN 69) TBF(TFI=3 TLLI=0xffeeddcf DIR=UL STATE=ASSIGN EGPRS) N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL-TFI_3){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT @@ -8964,7 +8964,7 @@ UL_ASS_TBF(UL-TFI_5){NONE}: state_chg to SEND_ASS MS(TLLI=0xffeeddd1, IMSI=, TA=7, 11/11, UL) Link quality 12dB (old 12dB) left window [-256, 6], modifying uplink CS level: MCS-1 -> MCS-2 PDCH(bts=0,trx=0,ts=7) Expiring FN=73 but previous FN=2654231 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231): TBF(TFI=4 TLLI=0xffeeddd0 DIR=UL STATE=ASSIGN EGPRS) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(TFI=4 TLLI=0xffeeddd0 DIR=UL STATE=ASSIGN EGPRS) TBF(TFI=4 TLLI=0xffeeddd0 DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=2654231, TS=7 (curr FN 73) TBF(TFI=4 TLLI=0xffeeddd0 DIR=UL STATE=ASSIGN EGPRS) N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL-TFI_4){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT @@ -9017,7 +9017,7 @@ UL_ASS_TBF(UL-TFI_6){NONE}: state_chg to SEND_ASS MS(TLLI=0xffeeddd2, IMSI=, TA=7, 11/11, UL) Link quality 12dB (old 12dB) left window [-256, 6], modifying uplink CS level: MCS-1 -> MCS-2 PDCH(bts=0,trx=0,ts=7) Expiring FN=78 but previous FN=2654231 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231): TBF(TFI=5 TLLI=0xffeeddd1 DIR=UL STATE=ASSIGN EGPRS) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(TFI=5 TLLI=0xffeeddd1 DIR=UL STATE=ASSIGN EGPRS) TBF(TFI=5 TLLI=0xffeeddd1 DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=2654231, TS=7 (curr FN 78) TBF(TFI=5 TLLI=0xffeeddd1 DIR=UL STATE=ASSIGN EGPRS) N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL-TFI_5){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT @@ -9074,7 +9074,7 @@ UL_ASS_TBF{NONE}: Received Event SCHED_ASS_REJ UL_ASS_TBF{NONE}: state_chg to SEND_ASS_REJ PDCH(bts=0,trx=0,ts=7) Expiring FN=82 but previous FN=2654231 is still reserved! -PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231): TBF(TFI=6 TLLI=0xffeeddd2 DIR=UL STATE=ASSIGN EGPRS) +PDCH(bts=0,trx=0,ts=7) Timeout for registered POLL (FN=2654231, reason=UL_ASS): TBF(TFI=6 TLLI=0xffeeddd2 DIR=UL STATE=ASSIGN EGPRS) TBF(TFI=6 TLLI=0xffeeddd2 DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=2654231, TS=7 (curr FN 82) TBF(TFI=6 TLLI=0xffeeddd2 DIR=UL STATE=ASSIGN EGPRS) N3105 0 => 1 (< MAX 8) UL_ASS_TBF(UL-TFI_6){WAIT_ACK}: Received Event ASS_POLL_TIMEOUT diff --git a/tests/ulc/PdchUlcTest.err b/tests/ulc/PdchUlcTest.err index e4a79a6..d122f31 100644 --- a/tests/ulc/PdchUlcTest.err +++ b/tests/ulc/PdchUlcTest.err @@ -7,40 +7,40 @@ Creating MS object, TLLI = 0x12345678 MS(TLLI=0x12345678, IMSI=, TA=220, 0/0,) Attaching DL TBF: TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=2715613 but previous FN=2715608 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715608): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715613): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715608, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715613, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715617 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715617): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715617, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715622 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715622): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715622, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715626 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715626): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715626, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715630 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715630): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715630, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715635 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715635): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715635, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715639 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715639): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715639, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=2715643 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715643): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=2715643, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=4 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=4): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=4, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=8 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=8): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=8, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=13 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=13): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=13, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=17 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=17): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=17, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=21 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=21): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=21, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=26 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=26): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=26, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=30 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=30): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=30, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=34 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=34): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=34, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) Expiring FN=43 but previous FN=39 is still reserved! -PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=39): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) +PDCH(bts=0,trx=0,ts=0) Timeout for registered POLL (FN=39, reason=UL_ASS): TBF(TFI=0 TLLI=0x12345678 DIR=DL STATE=NEW) PDCH(bts=0,trx=0,ts=0) POLL scheduled at FN 26 + 13 = 39 PDCH(bts=0,trx=0,ts=0) UL block already scheduled at FN 91 + 13 = 104 PDCH(bts=0,trx=0,ts=0) POLL scheduled at FN 91 + 17 = 108 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7cd59b60fe0af0bfdfcdf8a91e4cf8bd3f25b2f7 Gerrit-Change-Number: 25751 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 11:09:49 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 12 Oct 2021 11:09:49 +0000 Subject: Change in libosmo-abis[master]: ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_clien... In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/25742 ) Change subject: ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_client_conn ...................................................................... Patch Set 1: Code-Review+2 (2 comments) https://gerrit.osmocom.org/c/libosmo-abis/+/25742/1/src/input/ipaccess.c File src/input/ipaccess.c: https://gerrit.osmocom.org/c/libosmo-abis/+/25742/1/src/input/ipaccess.c at a1170 PS1, Line 1170: > It would be unrelated if I wasn't changing half of the function around it ;) Ack https://gerrit.osmocom.org/c/libosmo-abis/+/25742/1/src/input/ipaccess.c at 1008 PS1, Line 1008: struct ipa_client_conn *ipa_cli[NUM_E1_TS]; /* 0=OML, 1+N=TRX_N */ > I'm following same convention used in e1inp_line, so I prefer keeping it this way. Ack -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/25742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4ee1ae318b446490783c8b910fca10ba5f72dd5a Gerrit-Change-Number: 25742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 11:09:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 03:44:00 +0000 Subject: Change in libosmo-abis[master]: ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_clien... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/25742 ) Change subject: ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_client_conn ...................................................................... ipaccess: e1inp_ipa_bts_rsl_connect: Fix memleak recreating ipa_client_conn If BTS, using this app, tried to use it in order to re-create the connection, it would leak the previous strut ipa_client_conn. A similar fix was already put in place recently for OML, but it was not applied for RSL. The leak was spotted by having a BTS connecting fine over OMl but then failing each time to connect on RSL. Related: OS#5248 Change-Id: I4ee1ae318b446490783c8b910fca10ba5f72dd5a --- M src/input/ipaccess.c 1 file changed, 19 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve dexter: Looks good to me, approved diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c index 63461a2..04b4474 100644 --- a/src/input/ipaccess.c +++ b/src/input/ipaccess.c @@ -1005,7 +1005,7 @@ struct ipaccess_line { bool line_already_initialized; - struct ipa_client_conn *ipa_cli; + struct ipa_client_conn *ipa_cli[NUM_E1_TS]; /* 0=OML, 1+N=TRX_N */ }; static int ipaccess_line_update(struct e1inp_line *line) @@ -1078,10 +1078,10 @@ IPA_TCP_PORT_OML); /* Drop previous line */ - if (il->ipa_cli) { - ipa_client_conn_close(il->ipa_cli); - ipa_client_conn_destroy(il->ipa_cli); - il->ipa_cli = NULL; + if (il->ipa_cli[0]) { + ipa_client_conn_close(il->ipa_cli[0]); + ipa_client_conn_destroy(il->ipa_cli[0]); + il->ipa_cli[0] = NULL; } link = ipa_client_conn_create2(tall_ipa_ctx, @@ -1111,7 +1111,7 @@ e1i_ts = e1inp_line_ipa_oml_ts(line); ipaccess_bts_keepalive_fsm_alloc(e1i_ts, link, "oml_bts_to_bsc"); - il->ipa_cli = link; + il->ipa_cli[0] = link; ret = 0; break; } @@ -1137,6 +1137,7 @@ { struct ipa_client_conn *rsl_link; struct e1inp_ts *e1i_ts = e1inp_line_ipa_rsl_ts(line, trx_nr); + struct ipaccess_line *il; if (E1INP_SIGN_RSL+trx_nr-1 >= NUM_E1_TS) { LOGP(DLINP, LOGL_ERROR, "cannot create RSL BTS link: " @@ -1144,6 +1145,17 @@ return -EINVAL; } + if (!line->driver_data) + line->driver_data = talloc_zero(line, struct ipaccess_line); + il = line->driver_data; + + /* Drop previous line */ + if (il->ipa_cli[1 + trx_nr]) { + ipa_client_conn_close(il->ipa_cli[1 + trx_nr]); + ipa_client_conn_destroy(il->ipa_cli[1 + trx_nr]); + il->ipa_cli[1 + trx_nr] = NULL; + } + rsl_link = ipa_client_conn_create2(tall_ipa_ctx, e1inp_line_ipa_rsl_ts(line, trx_nr), E1INP_SIGN_RSL+trx_nr, @@ -1167,8 +1179,8 @@ ipa_client_conn_destroy(rsl_link); return -EIO; } - ipaccess_bts_keepalive_fsm_alloc(e1i_ts, rsl_link, "rsl_bts_to_bsc"); + il->ipa_cli[1 + trx_nr] = rsl_link; return 0; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/25742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I4ee1ae318b446490783c8b910fca10ba5f72dd5a Gerrit-Change-Number: 25742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:02 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 03:44:02 +0000 Subject: Change in osmo-pcu[master]: tbf_dl_ass_fsm: Move block msg generation conditions to rts() function References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25752 ) Change subject: tbf_dl_ass_fsm: Move block msg generation conditions to rts() function ...................................................................... tbf_dl_ass_fsm: Move block msg generation conditions to rts() function Move the required conditions to generate a message to the rts() function, this way the scheduler knows this TBF cannot yet attempt the procedure and hence will not request it to create a message which will fail. This way the scheduler will schedule other itneresting messages instead of failing and scheduling a dummy block as a result. Change-Id: Idbe4f9bbd23005a43c586b737cf9adc2114287e2 --- M src/tbf_dl_ass_fsm.c 1 file changed, 22 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/52/25752/1 diff --git a/src/tbf_dl_ass_fsm.c b/src/tbf_dl_ass_fsm.c index 5ac1c1a..37ced61 100644 --- a/src/tbf_dl_ass_fsm.c +++ b/src/tbf_dl_ass_fsm.c @@ -65,31 +65,10 @@ /* We only use this function in control TS (PACCH) so that MS can always answer the poll */ OSMO_ASSERT(tbf_is_control_ts(ctx->tbf, d->ts)); - if (tbf_ul_ass_fi(ctx->tbf)->state == TBF_UL_ASS_WAIT_ACK) - { - LOGPTBF(ctx->tbf, LOGL_DEBUG, - "Polling is already scheduled, so we must wait for the uplink assignment...\n"); - // FIXME: call tbf_dl_ass_fsm_state_chg(ctx->fi, TBF_DL_ASS_NONE); ? - return NULL; - } rc = tbf_check_polling(ctx->tbf, d->fn, d->ts, &new_poll_fn, &rrbp); if (rc < 0) return NULL; - /* on uplink TBF we get the downlink TBF to be assigned. */ - if (tbf_direction(ctx->tbf) == GPRS_RLCMAC_UL_TBF) { - struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(ctx->tbf); - - /* be sure to check first, if contention resolution is done, - * otherwise we cannot send the assignment yet (3GPP TS 44.060 sec 7.1.3.1) */ - if (!ul_tbf_contention_resolution_done(ul_tbf)) { - LOGPTBF(ctx->tbf, LOGL_DEBUG, - "Cannot assign DL TBF now, because contention resolution is not finished.\n"); - // FIXME: call tbf_dl_ass_fsm_state_chg(ctx->fi, TBF_DL_ASS_NONE); ? - return NULL; - } - } - new_dl_tbf = ms_dl_tbf(ms); if (!new_dl_tbf) { LOGPTBF(ctx->tbf, LOGL_ERROR, @@ -273,8 +252,28 @@ return data_ctx.msg; } -bool tbf_dl_ass_rts(const struct gprs_rlcmac_tbf* tbf) +bool tbf_dl_ass_rts(const struct gprs_rlcmac_tbf *tbf) { struct osmo_fsm_inst *fi = tbf_dl_ass_fi(tbf); - return fi->state == TBF_DL_ASS_SEND_ASS; + if (fi->state != TBF_DL_ASS_SEND_ASS) + return false; + + if (tbf_ul_ass_fi(tbf)->state == TBF_UL_ASS_WAIT_ACK) { + LOGPTBF(tbf, LOGL_DEBUG, + "Polling is already scheduled, so we must wait for the uplink assignment...\n"); + return false; + } + + /* on uplink TBF we get the downlink TBF to be assigned. */ + if (tbf_direction(tbf) == GPRS_RLCMAC_UL_TBF) { + const struct gprs_rlcmac_ul_tbf *ul_tbf = (const struct gprs_rlcmac_ul_tbf *)tbf; + /* be sure to check first, if contention resolution is done, + * otherwise we cannot send the assignment yet (3GPP TS 44.060 sec 7.1.3.1) */ + if (!ul_tbf_contention_resolution_done(ul_tbf)) { + LOGPTBF(tbf, LOGL_DEBUG, + "Cannot assign DL TBF now, because contention resolution is not finished.\n"); + return false; + } + } + return true; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idbe4f9bbd23005a43c586b737cf9adc2114287e2 Gerrit-Change-Number: 25752 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 03:44:04 +0000 Subject: Change in osmo-bsc[rel-1.7.1]: assignment_fsm: Check for conn->lchan References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25753 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... assignment_fsm: Check for conn->lchan When the SDCCH gets released while the TCH still beeing activated, then the ChanActivACK that is received after the TCH is activated will trigger a segmentation fault in the assignment_fsm. The reason for this is that conn->lchan, which holds the SDCCH at that point in time, is now NULL. To prevent osmo-bsc from crashing, the FSM should check for the presence of conn->lchan first. If it does not exist, the FSM should terminate. (Assignment failed) Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Related: SYS#5627 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/53/25753/1 diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 2f241e3..c5a1250 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -610,6 +610,15 @@ int rc; struct gsm_subscriber_connection *conn = assignment_fi_conn(fi); + /* There may be situations where the SDCCH gets released while the TCH is still being activated. We will then + * receive ChanActivAck message from the BTS when the TCH is ready. Since the SDCCH is already released by + * then conn->lchan will be NULL in this case. */ + if (!conn->lchan) { + assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE, + "Unable to send RR Assignment Command: conn without lchan"); + return; + } + rc = gsm48_send_rr_ass_cmd(conn->lchan, conn->assignment.new_lchan, conn->lchan->ms_power); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.7.1 Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25753 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 14:04:02 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 14:04:02 +0000 Subject: Change in osmo-bsc[rel-1.7.1]: assignment_fsm: Check for conn->lchan In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25753 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.7.1 Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25753 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 12 Oct 2021 14:04:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:08 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 13 Oct 2021 03:44:08 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen_makefile.sh: files/flags in separate lines References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25754 ) Change subject: regen_makefile.sh: files/flags in separate lines ...................................................................... regen_makefile.sh: files/flags in separate lines Make all regen_makefile.sh more readable and diff friendly by moving each entry in FILES and CPPFLAGS_TTCN3 into separate lines. Order entries alphabetically. Related: OS#5252 Change-Id: I6b6866eb9f6ec6232e4ae434517457a4c8c1c050 --- M SCCP_Test/regen_makefile.sh M bsc-nat/regen_makefile.sh M bsc/regen_makefile.sh M bts/regen_makefile.sh M cbc/regen_makefile.sh M ccid/regen_makefile.sh M fr-net/regen_makefile.sh M fr/regen_makefile.sh M gbproxy/regen_makefile.sh M ggsn_tests/regen_makefile.sh M hlr/regen_makefile.sh M lapdm/regen_makefile.sh M mgw/regen_makefile.sh M mme/regen_makefile.sh M msc/regen_makefile.sh M ns/regen_makefile.sh M pcap-client/regen_makefile.sh M pcu/regen_makefile.sh M pgw/regen_makefile.sh M regen-makefile.sh M remsim/regen_makefile.sh M sccp/regen_makefile.sh M selftest/regen_makefile.sh M sgsn/regen_makefile.sh M simtrace/regen_makefile.sh M sip/regen_makefile.sh M smlc/regen_makefile.sh M stp/regen_makefile.sh M sysinfo/regen_makefile.sh 29 files changed, 562 insertions(+), 66 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/25754/1 diff --git a/SCCP_Test/regen_makefile.sh b/SCCP_Test/regen_makefile.sh index 9472e0c..f5d13b7 100755 --- a/SCCP_Test/regen_makefile.sh +++ b/SCCP_Test/regen_makefile.sh @@ -2,6 +2,12 @@ MAIN=SCCP_Testcases.ttcn -FILES="*.ttcn *.ttcnpp" +FILES=" + *.ttcn + *.ttcnpp +" + +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh $MAIN $FILES diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh index ad31551..33b557c 100755 --- a/bsc-nat/regen_makefile.sh +++ b/bsc-nat/regen_makefile.sh @@ -2,8 +2,31 @@ MAIN=BSCNAT_Tests.ttcn -FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RTP_EncDec.cc SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc" +FILES=" + *.c + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + MGCP_CodecPort_CtrlFunctDef.cc + Native_FunctionDefs.cc + RTP_EncDec.cc + SCCP_EncDec.cc + SDP_EncDec.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_SCCP -DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_MGCP + -DIPA_EMULATION_SCCP + -DRAN_EMULATION_BSSAP + -DRAN_EMULATION_CTRL + -DRAN_EMULATION_MGCP + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh $MAIN $FILES diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh index f1ea963..53f8e82 100755 --- a/bsc/regen_makefile.sh +++ b/bsc/regen_makefile.sh @@ -2,8 +2,36 @@ MAIN=BSC_Tests.ttcn -FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc SCTPasp_PT.cc RTP_EncDec.cc SDP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc IuUP_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc CBSP_CodecPort_CtrlFunctdef.cc StatsD_CodecPort_CtrlFunctdef.cc *.c" +FILES=" + *.c + *.ttcn + *.ttcnpp + CBSP_CodecPort_CtrlFunctdef.cc + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + IuUP_EncDec.cc + MGCP_CodecPort_CtrlFunctDef.cc + Native_FunctionDefs.cc + RTP_CodecPort_CtrlFunctDef.cc + RTP_EncDec.cc + SCTPasp_PT.cc + SDP_EncDec.cc + StatsD_CodecPort_CtrlFunctdef.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_MGCP + -DIPA_EMULATION_RSL + -DIPA_EMULATION_SCCP + -DRAN_EMULATION_BSSAP + -DRAN_EMULATION_CTRL + -DRAN_EMULATION_MGCP + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh $MAIN $FILES diff --git a/bts/regen_makefile.sh b/bts/regen_makefile.sh index 42ad0f3..850e0bf 100755 --- a/bts/regen_makefile.sh +++ b/bts/regen_makefile.sh @@ -1,7 +1,29 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc UD_PT.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TRXC_CodecPort_CtrlFunctDef.cc L1CTL_PortType_CtrlFunctDef.cc TELNETasp_PT.cc IuUP_EncDec.cc RTP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc" +FILES=" + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + IuUP_EncDec.cc + L1CTL_PortType_CtrlFunctDef.cc + Native_FunctionDefs.cc + RLCMAC_EncDec.cc + RTP_CodecPort_CtrlFunctDef.cc + RTP_EncDec.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc + TRXC_CodecPort_CtrlFunctDef.cc + UD_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_OML -DIPA_EMULATION_CTRL -DIPA_EMULATION_OSMO_PCU" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_OML + -DIPA_EMULATION_OSMO_PCU + -DIPA_EMULATION_RSL +" ../regen-makefile.sh BTS_Tests.ttcn $FILES diff --git a/cbc/regen_makefile.sh b/cbc/regen_makefile.sh index 0dabc7d..d2c3b12 100755 --- a/cbc/regen_makefile.sh +++ b/cbc/regen_makefile.sh @@ -1,10 +1,27 @@ #!/bin/bash -FILES="*.ttcn TCCConversion.cc TCCInterface.cc TCCEncoding.cc IPL4asp_PT.cc IPL4asp_discovery.cc TELNETasp_PT.cc Native_FunctionDefs.cc SCTPasp_PT.cc Abstract_Socket.cc HTTPmsg_PT.cc HTTPmsg_MessageLen_Function.cc JSON_EncDec.cc CBSP_CodecPort_CtrlFunctdef.cc SABP_EncDec.cc SABP_CodecPort_CtrlFunctDef.cc " -#FILES+="*.ttcnpp " -FILES+="*.asn" +FILES=" + *.asn + *.ttcn + Abstract_Socket.cc + CBSP_CodecPort_CtrlFunctdef.cc + HTTPmsg_MessageLen_Function.cc + HTTPmsg_PT.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + JSON_EncDec.cc + Native_FunctionDefs.cc + SABP_CodecPort_CtrlFunctDef.cc + SABP_EncDec.cc + SCTPasp_PT.cc + TCCConversion.cc + TCCEncoding.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="" +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh CBC_Tests.ttcn $FILES diff --git a/ccid/regen_makefile.sh b/ccid/regen_makefile.sh index 215d9c6..0925654 100755 --- a/ccid/regen_makefile.sh +++ b/ccid/regen_makefile.sh @@ -1,6 +1,13 @@ #!/bin/sh -FILES="*.ttcn USB_PT.cc Native_FunctionDefs.cc " +FILES=" + *.ttcn + Native_FunctionDefs.cc + USB_PT.cc +" + +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh CCID_Tests.ttcn $FILES diff --git a/fr-net/regen_makefile.sh b/fr-net/regen_makefile.sh index e2c143d..6488015 100755 --- a/fr-net/regen_makefile.sh +++ b/fr-net/regen_makefile.sh @@ -1,10 +1,21 @@ #!/bin/bash -FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc " -FILES+="AF_PACKET_PT.cc " -FILES+="Native_FunctionDefs.cc " -FILES+="LLC_EncDec.cc TELNETasp_PT.cc " +FILES=" + *.ttcn + *.ttcnpp + AF_PACKET_PT.cc + BSSGP_EncDec.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + LLC_EncDec.cc + Native_FunctionDefs.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DNS_EMULATION_FR" +export CPPFLAGS_TTCN3=" + -DNS_EMULATION_FR +" ../regen-makefile.sh FRNET_Tests.ttcn $FILES diff --git a/fr/regen_makefile.sh b/fr/regen_makefile.sh index d17f51c..9c473ef 100755 --- a/fr/regen_makefile.sh +++ b/fr/regen_makefile.sh @@ -1,9 +1,22 @@ #!/bin/bash -FILES="*.ttcn *.ttcnpp IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc Native_FunctionDefs.cc " -FILES+="BSSGP_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc " -FILES+="AF_PACKET_PT.cc AF_PACKET_PT.hh " +FILES=" + *.ttcn + *.ttcnpp + AF_PACKET_PT.cc + AF_PACKET_PT.hh + BSSGP_EncDec.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + LLC_EncDec.cc + Native_FunctionDefs.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DNS_EMULATION_FR" +export CPPFLAGS_TTCN3=" + -DNS_EMULATION_FR +" ../regen-makefile.sh FR_Tests.ttcn $FILES diff --git a/gbproxy/regen_makefile.sh b/gbproxy/regen_makefile.sh index e82649c..5ec6689 100755 --- a/gbproxy/regen_makefile.sh +++ b/gbproxy/regen_makefile.sh @@ -1,9 +1,34 @@ #!/bin/bash -FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc LLC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IPA_CodecPort_CtrlFunctDef.cc GTPU_EncDec.cc GTPC_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc SCCP_EncDec.cc SCTPasp_PT.cc " -FILES+="AF_PACKET_PT.cc AF_PACKET_PT.hh " +FILES=" + *.ttcn + *.ttcnpp + AF_PACKET_PT.cc + AF_PACKET_PT.hh + BSSGP_EncDec.cc + GTPC_EncDec.cc + GTPU_EncDec.cc + GTP_CodecPort_CtrlFunctDef.cc + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + LLC_EncDec.cc + Native_FunctionDefs.cc + RLCMAC_EncDec.cc + SCCP_EncDec.cc + SCTPasp_PT.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR -DBSSGP_EM_L3 -DNS_EMULATION_FR" +export CPPFLAGS_TTCN3=" + -DBSSGP_EM_L3 + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_GSUP + -DNS_EMULATION_FR + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh GBProxy_Tests.ttcn $FILES diff --git a/ggsn_tests/regen_makefile.sh b/ggsn_tests/regen_makefile.sh index 6afd5d9..5e6b08d 100755 --- a/ggsn_tests/regen_makefile.sh +++ b/ggsn_tests/regen_makefile.sh @@ -1,5 +1,24 @@ #!/bin/sh -FILES="*.ttcn IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc GTPC_EncDec.cc GTPU_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc ICMPv6_EncDec.cc IP_EncDec.cc Native_FunctionDefs.cc UDP_EncDec.cc ICMP_EncDec.cc TELNETasp_PT.cc BSSGP_EncDec.cc" +FILES=" + *.ttcn + BSSGP_EncDec.cc + GTPC_EncDec.cc + GTPU_EncDec.cc + GTP_CodecPort_CtrlFunctDef.cc + ICMP_EncDec.cc + ICMPv6_EncDec.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + IP_EncDec.cc + Native_FunctionDefs.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc + UDP_EncDec.cc +" + +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh GGSN_Tests.ttcn $FILES diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh index 14b05da..9ab40ce 100755 --- a/hlr/regen_makefile.sh +++ b/hlr/regen_makefile.sh @@ -2,8 +2,26 @@ MAIN="HLR_Tests.ttcn" -FILES="*.ttcn *.ttcnpp DNS_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc TCCEncoding.cc UDPasp_PT.cc SS_EncDec.cc MAP_EncDec.cc *.asn" +FILES=" + *.asn + *.ttcn + *.ttcnpp + DNS_EncDec.cc + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + MAP_EncDec.cc + SS_EncDec.cc + TCCConversion.cc + TCCEncoding.cc + TCCInterface.cc + TELNETasp_PT.cc + UDPasp_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_GSUP + -DIPA_EMULATION_CTRL +" ../regen-makefile.sh $MAIN $FILES diff --git a/lapdm/regen_makefile.sh b/lapdm/regen_makefile.sh index bb02fe8..2eb1366 100755 --- a/lapdm/regen_makefile.sh +++ b/lapdm/regen_makefile.sh @@ -1,5 +1,14 @@ #!/bin/sh -FILES="*.ttcn UD_PT.cc UD_PT.hh RLCMAC_EncDec.cc L1CTL_PortType_CtrlFunctDef.cc" +FILES=" + *.ttcn + L1CTL_PortType_CtrlFunctDef.cc + RLCMAC_EncDec.cc + UD_PT.cc + UD_PT.hh +" + +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh L1CTL_Test.ttcn $FILES diff --git a/mgw/regen_makefile.sh b/mgw/regen_makefile.sh index 46dd587..a47f7ba 100755 --- a/mgw/regen_makefile.sh +++ b/mgw/regen_makefile.sh @@ -1,7 +1,28 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RTP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc OSMUX_CodecPort_CtrlFunctDef.cc IuUP_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IP_EncDec.cc StatsD_CodecPort_CtrlFunctdef.cc " +FILES=" + *.c + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + IP_EncDec.cc + IuUP_EncDec.cc + MGCP_CodecPort_CtrlFunctDef.cc + Native_FunctionDefs.cc + OSMUX_CodecPort_CtrlFunctDef.cc + RTP_CodecPort_CtrlFunctDef.cc + RTP_EncDec.cc + SDP_EncDec.cc + StatsD_CodecPort_CtrlFunctdef.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL +" ../regen-makefile.sh MGCP_Test.ttcn $FILES diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index cb04777..8106664 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -1,8 +1,28 @@ #!/bin/sh -FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc GTPU_EncDec.cc GTPC_EncDec.cc DIAMETER_EncDec.cc DIAMETER_CodecPort_CtrlFunctDef.cc " +FILES=" + *.asn + *.c + *.ttcn + DIAMETER_CodecPort_CtrlFunctDef.cc + DIAMETER_EncDec.cc + GTPC_EncDec.cc + GTPU_EncDec.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + LTE_CryptoFunctionDefs.cc + Native_FunctionDefs.cc + S1AP_CodecPort_CtrlFunctDef.cc + S1AP_EncDec.cc + SGsAP_CodecPort_CtrlFunctDef.cc + TCCConversion.cc + TCCEncoding.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="" +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh MME_Tests.ttcn $FILES diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh index cbb491d..4ca9558 100755 --- a/msc/regen_makefile.sh +++ b/msc/regen_makefile.sh @@ -1,8 +1,46 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SMPP_EncDec.cc SMPP_CodecPort_CtrlFunctDef.cc MAP_EncDec.cc SS_EncDec.cc TCCEncoding.cc SGsAP_CodecPort_CtrlFunctDef.cc RANAP_EncDec.cc TCCOpenSecurity.cc *.c *.asn" +FILES=" + *.asn + *.c + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + MAP_EncDec.cc + MGCP_CodecPort_CtrlFunctDef.cc + MNCC_EncDec.cc + Native_FunctionDefs.cc + RANAP_EncDec.cc + RTP_CodecPort_CtrlFunctDef.cc + RTP_EncDec.cc + SCCP_EncDec.cc + SCTPasp_PT.cc + SDP_EncDec.cc + SGsAP_CodecPort_CtrlFunctDef.cc + SMPP_CodecPort_CtrlFunctDef.cc + SMPP_EncDec.cc + SS_EncDec.cc + TCCConversion.cc + TCCEncoding.cc + TCCInterface.cc + TCCOpenSecurity.cc + TELNETasp_PT.cc + UD_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DIPA_EMULATION_GSUP -DIPA_EMULATION_SCCP -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DRAN_EMULATION_RANAP -DUSE_MTP3_DISTRIBUTOR" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_GSUP + -DIPA_EMULATION_MGCP + -DIPA_EMULATION_SCCP + -DRAN_EMULATION_BSSAP + -DRAN_EMULATION_CTRL + -DRAN_EMULATION_MGCP + -DRAN_EMULATION_RANAP + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh MSC_Tests.ttcn $FILES diff --git a/ns/regen_makefile.sh b/ns/regen_makefile.sh index fece5d8..1958dee 100755 --- a/ns/regen_makefile.sh +++ b/ns/regen_makefile.sh @@ -1,9 +1,26 @@ #!/bin/bash -FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc UD_PT.cc RLCMAC_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc Native_FunctionDefs.cc StatsD_CodecPort_CtrlFunctdef.cc " +FILES=" + *.ttcn + *.ttcnpp + AF_PACKET_PT.cc + AF_PACKET_PT.hh + BSSGP_EncDec.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + LLC_EncDec.cc + Native_FunctionDefs.cc + RLCMAC_EncDec.cc + StatsD_CodecPort_CtrlFunctdef.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc + UD_PT.cc +" -FILES+="AF_PACKET_PT.cc AF_PACKET_PT.hh " - -export CPPFLAGS_TTCN3="-DBSSGP_EM_L3 -DNS_EMULATION_FR" +export CPPFLAGS_TTCN3=" + -DBSSGP_EM_L3 + -DNS_EMULATION_FR +" ../regen-makefile.sh NS_Tests.ttcn $FILES diff --git a/pcap-client/regen_makefile.sh b/pcap-client/regen_makefile.sh index 9e4a6ee..88c062d 100755 --- a/pcap-client/regen_makefile.sh +++ b/pcap-client/regen_makefile.sh @@ -1,11 +1,17 @@ #!/bin/bash -FILES="*.ttcn TCCConversion.cc TCCInterface.cc TCCEncoding.cc IPL4asp_PT.cc IPL4asp_discovery.cc TELNETasp_PT.cc Native_FunctionDefs.cc OPCAP_CodecPort_CtrlFunctdef.cc " -#FILES+="*.ttcnpp " -#FILES+="*.asn" +FILES=" + *.ttcn + IPL4asp_PT.cc + IPL4asp_discovery.cc + Native_FunctionDefs.cc + OPCAP_CodecPort_CtrlFunctdef.cc + TCCConversion.cc + TCCEncoding.cc + TCCInterface.cc + TELNETasp_PT.cc +" export CPPFLAGS_TTCN3="" ../regen-makefile.sh OPCAP_CLIENT_Tests.ttcn $FILES - -#sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile diff --git a/pcu/regen_makefile.sh b/pcu/regen_makefile.sh index 8bb0598..d4404d0 100755 --- a/pcu/regen_makefile.sh +++ b/pcu/regen_makefile.sh @@ -1,7 +1,25 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc UD_PT.cc RLCMAC_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc IPA_CodecPort_CtrlFunctDef.cc Native_FunctionDefs.cc StatsD_CodecPort_CtrlFunctdef.cc" +FILES=" + *.ttcn + *.ttcnpp + BSSGP_EncDec.cc + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + LLC_EncDec.cc + Native_FunctionDefs.cc + RLCMAC_EncDec.cc + StatsD_CodecPort_CtrlFunctdef.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc + UD_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL -DBSSGP_EM_L3" +export CPPFLAGS_TTCN3=" + -DBSSGP_EM_L3 + -DIPA_EMULATION_CTRL +" ../regen-makefile.sh PCU_Tests.ttcn $FILES diff --git a/pgw/regen_makefile.sh b/pgw/regen_makefile.sh index adb5820..65954c5 100755 --- a/pgw/regen_makefile.sh +++ b/pgw/regen_makefile.sh @@ -1,7 +1,26 @@ #!/bin/bash -FILES="*.ttcn IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc GTPC_EncDec.cc GTPU_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunctDef.cc ICMPv6_EncDec.cc IP_EncDec.cc Native_FunctionDefs.cc UDP_EncDec.cc ICMP_EncDec.cc " -FILES+="UECUPS_CodecPort_CtrlFunctDef.cc " -FILES+="DIAMETER_EncDec.cc DIAMETER_CodecPort_CtrlFunctDef.cc " +FILES=" + *.ttcn + DIAMETER_CodecPort_CtrlFunctDef.cc + DIAMETER_EncDec.cc + GTPC_EncDec.cc + GTPU_EncDec.cc + GTP_CodecPort_CtrlFunctDef.cc + GTPv2_CodecPort_CtrlFunctDef.cc + ICMP_EncDec.cc + ICMPv6_EncDec.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + IP_EncDec.cc + Native_FunctionDefs.cc + TCCConversion.cc + TCCInterface.cc + UDP_EncDec.cc + UECUPS_CodecPort_CtrlFunctDef.cc +" + +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh PGW_Tests.ttcn $FILES diff --git a/regen-makefile.sh b/regen-makefile.sh index b53129f..67e5df0 100755 --- a/regen-makefile.sh +++ b/regen-makefile.sh @@ -52,7 +52,8 @@ sed -i -e 's/-Wall//' Makefile if [ "x$CPPFLAGS_TTCN3" != "x" ]; then - sed -i -e 's/CPPFLAGS_TTCN3 =/CPPFLAGS_TTCN3 = '"$CPPFLAGS_TTCN3"'/' Makefile + CPPFLAGS_TTCN3="$(echo "$CPPFLAGS_TTCN3" | tr -d '\n' | tr '\t' ' ')" + sed -i -e "s/CPPFLAGS_TTCN3 =/CPPFLAGS_TTCN3 = $CPPFLAGS_TTCN3/" Makefile fi # for TITAN 6.3.0 diff --git a/remsim/regen_makefile.sh b/remsim/regen_makefile.sh index 3f19228..edfb073 100755 --- a/remsim/regen_makefile.sh +++ b/remsim/regen_makefile.sh @@ -1,8 +1,29 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp *.asn IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc Native_FunctionDefs.cc RSPRO_EncDec.cc Abstract_Socket.cc HTTPmsg_PT.cc HTTPmsg_MessageLen_Function.cc JSON_EncDec.cc VPCD_CodecPort_CtrlFunctDef.cc PIPEasp_PT.cc " +FILES=" + *.asn + *.ttcn + *.ttcnpp + Abstract_Socket.cc + HTTPmsg_MessageLen_Function.cc + HTTPmsg_PT.cc + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + JSON_EncDec.cc + Native_FunctionDefs.cc + PIPEasp_PT.cc + RSPRO_EncDec.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc + VPCD_CodecPort_CtrlFunctDef.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSPRO -DIPA_EMULATION_CTRL" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_RSPRO + -DIPA_EMULATION_CTRL +" ../regen-makefile.sh REMSIM_Tests.ttcn $FILES diff --git a/sccp/regen_makefile.sh b/sccp/regen_makefile.sh index 08db33e..175c10b 100755 --- a/sccp/regen_makefile.sh +++ b/sccp/regen_makefile.sh @@ -1,7 +1,25 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc UD_PT.cc IPL4asp_PT.cc IPL4asp_discovery.cc IPA_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc TCCEncoding.cc " +FILES=" + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + Native_FunctionDefs.cc + SCCP_EncDec.cc + SCTPasp_PT.cc + TCCConversion.cc + TCCEncoding.cc + TCCInterface.cc + TELNETasp_PT.cc + UD_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DUSE_MTP3_DISTRIBUTOR" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_SCCP + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh SCCP_Tests.ttcn $FILES diff --git a/selftest/regen_makefile.sh b/selftest/regen_makefile.sh index 9d302ac..bd2ae91 100755 --- a/selftest/regen_makefile.sh +++ b/selftest/regen_makefile.sh @@ -2,8 +2,20 @@ MAIN=Selftest.ttcn -FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc" +FILES=" + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + TCCConversion.cc + TCCInterface.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_RSL + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh $MAIN $FILES diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index e160379..2a5cb92 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -1,8 +1,34 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp *.asn BSSGP_EncDec.cc LLC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IPA_CodecPort_CtrlFunctDef.cc GTPU_EncDec.cc GTPC_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc SCCP_EncDec.cc SCTPasp_PT.cc RANAP_EncDec.cc " +FILES=" + *.asn + *.ttcn + *.ttcnpp + BSSGP_EncDec.cc + GTPC_EncDec.cc + GTPU_EncDec.cc + GTP_CodecPort_CtrlFunctDef.cc + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + LLC_EncDec.cc + Native_FunctionDefs.cc + RANAP_EncDec.cc + RLCMAC_EncDec.cc + SCCP_EncDec.cc + SCTPasp_PT.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR -DRAN_EMULATION_RANAP -DBSSGP_EM_L3" +export CPPFLAGS_TTCN3=" + -DBSSGP_EM_L3 + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_GSUP + -DRAN_EMULATION_RANAP + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh SGSN_Tests.ttcn $FILES diff --git a/simtrace/regen_makefile.sh b/simtrace/regen_makefile.sh index 3f2d472..509699e 100755 --- a/simtrace/regen_makefile.sh +++ b/simtrace/regen_makefile.sh @@ -1,6 +1,13 @@ #!/bin/sh -FILES="*.ttcn USB_PT.cc Native_FunctionDefs.cc " +FILES=" + *.ttcn + Native_FunctionDefs.cc + USB_PT.cc +" + +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh SIMTRACE_Tests.ttcn $FILES diff --git a/sip/regen_makefile.sh b/sip/regen_makefile.sh index 722620b..caf657c 100755 --- a/sip/regen_makefile.sh +++ b/sip/regen_makefile.sh @@ -1,8 +1,27 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc -IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SIPmsg_PT.cc *.c " +FILES=" + *.c + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + MNCC_EncDec.cc + Native_FunctionDefs.cc + RTP_CodecPort_CtrlFunctDef.cc + RTP_EncDec.cc + SDP_EncDec.cc + SIPmsg_PT.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc + UD_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL -DRAN_EMULATION_CTRL" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DRAN_EMULATION_CTRL +" ../regen-makefile.sh SIP_Tests.ttcn $FILES diff --git a/smlc/regen_makefile.sh b/smlc/regen_makefile.sh index d8b8642..24e3407 100755 --- a/smlc/regen_makefile.sh +++ b/smlc/regen_makefile.sh @@ -2,8 +2,34 @@ MAIN=SMLC_Tests.ttcn -FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc SCTPasp_PT.cc RTP_EncDec.cc SDP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc IuUP_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc *.c" +FILES=" + *.c + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + IuUP_EncDec.cc + MGCP_CodecPort_CtrlFunctDef.cc + Native_FunctionDefs.cc + RTP_CodecPort_CtrlFunctDef.cc + RTP_EncDec.cc + SCTPasp_PT.cc + SDP_EncDec.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_RSL + -DIPA_EMULATION_MGCP + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_SCCP + -DRAN_EMULATION_BSSAP + -DRAN_EMULATION_MGCP + -DRAN_EMULATION_CTRL + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh $MAIN $FILES diff --git a/stp/regen_makefile.sh b/stp/regen_makefile.sh index be96829..0b90687 100755 --- a/stp/regen_makefile.sh +++ b/stp/regen_makefile.sh @@ -1,7 +1,25 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc IPL4asp_PT.cc IPL4asp_discovery.cc IPA_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc TCCEncoding.cc M3UA_CodecPort_CtrlFunctDef.cc " +FILES=" + *.ttcn + *.ttcnpp + SCCP_EncDec.cc + SCTPasp_PT.cc + TCCConversion.cc + TCCInterface.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + IPA_CodecPort_CtrlFunctDef.cc + TELNETasp_PT.cc + Native_FunctionDefs.cc + TCCEncoding.cc + M3UA_CodecPort_CtrlFunctDef.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DUSE_MTP3_DISTRIBUTOR" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_SCCP + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh STP_Tests.ttcn $FILES diff --git a/sysinfo/regen_makefile.sh b/sysinfo/regen_makefile.sh index 9dd3b7f..4a3dfcc 100755 --- a/sysinfo/regen_makefile.sh +++ b/sysinfo/regen_makefile.sh @@ -1,5 +1,16 @@ #!/bin/sh -FILES="*.ttcn IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc IPL4_GSMTAP_CtrlFunctDef.cc TELNETasp_PT.cc" +FILES=" + *.ttcn + IPL4_GSMTAP_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" + +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh Test.ttcn $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6b6866eb9f6ec6232e4ae434517457a4c8c1c050 Gerrit-Change-Number: 25754 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:10 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 13 Oct 2021 03:44:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: selftest: add missing Native_FunctionDefs.cc References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25755 ) Change subject: selftest: add missing Native_FunctionDefs.cc ...................................................................... selftest: add missing Native_FunctionDefs.cc Fix for: /usr/bin/ld: Native_Functions.so: undefined reference to `Native__Functions::f__str__tolower(CHARSTRING const&)' /usr/bin/ld: Native_Functions.so: undefined reference to `Native__Functions::f__inet__hntoa(OCTETSTRING const&)' /usr/bin/ld: Native_Functions.so: undefined reference to `Native__Functions::f__inet__haddr(CHARSTRING const&)' /usr/bin/ld: BSSMAP_Templates.so: undefined reference to `Native__Functions::f__inet6__addr(CHARSTRING const&)' /usr/bin/ld: BSSMAP_Templates.so: undefined reference to `Native__Functions::f__inet__addr(CHARSTRING const&)' /usr/bin/ld: Native_Functions.so: undefined reference to `Native__Functions::f__str__toupper(CHARSTRING const&)' /usr/bin/ld: Native_Functions.so: undefined reference to `Native__Functions::f__inet__ntoa(OCTETSTRING const&)' Related: OS#5252 Change-Id: I73c225f6699cd272b3eeffb249f3dddd2048bc01 --- M selftest/regen_makefile.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/25755/1 diff --git a/selftest/regen_makefile.sh b/selftest/regen_makefile.sh index bd2ae91..17854ce 100755 --- a/selftest/regen_makefile.sh +++ b/selftest/regen_makefile.sh @@ -8,6 +8,7 @@ IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc + Native_FunctionDefs.cc TCCConversion.cc TCCInterface.cc " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I73c225f6699cd272b3eeffb249f3dddd2048bc01 Gerrit-Change-Number: 25755 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:10 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 13 Oct 2021 03:44:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pgw: add missing BSSGP_EncDec.cc References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25756 ) Change subject: pgw: add missing BSSGP_EncDec.cc ...................................................................... pgw: add missing BSSGP_EncDec.cc Fix for: /usr/bin/ld: BSSGP_Types_part_4.so: undefined reference to `BSSGP__Types::dec__PDU__BSSGP(OCTETSTRING const&)' /usr/bin/ld: Osmocom_Gb_Types.so: undefined reference to `BSSGP__Types::enc__PDU__BSSGP(BSSGP__Types::PDU__BSSGP const&)' Related: OS#5252 Change-Id: I010df10396d264e67bd8c712daafcfb79262ece2 --- M pgw/regen_makefile.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/25756/1 diff --git a/pgw/regen_makefile.sh b/pgw/regen_makefile.sh index 65954c5..21f03ba 100755 --- a/pgw/regen_makefile.sh +++ b/pgw/regen_makefile.sh @@ -2,6 +2,7 @@ FILES=" *.ttcn + BSSGP_EncDec.cc DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_EncDec.cc GTPC_EncDec.cc -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I010df10396d264e67bd8c712daafcfb79262ece2 Gerrit-Change-Number: 25756 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:11 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 13 Oct 2021 03:44:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mme: link against gnutls References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25757 ) Change subject: mme: link against gnutls ...................................................................... mme: link against gnutls Fix for: /usr/bin/ld: key_derivation.so: undefined reference to `gnutls_hmac_fast' Related: OS#5252 Change-Id: Iacddc22ecda187e250db9cfb1ca1d1d341ce78f4 --- M mme/regen_makefile.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/25757/1 diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 8106664..5606879 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -26,4 +26,4 @@ ../regen-makefile.sh MME_Tests.ttcn $FILES -sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile +sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode -lgnutls/' Makefile -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iacddc22ecda187e250db9cfb1ca1d1d341ce78f4 Gerrit-Change-Number: 25757 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:12 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 13 Oct 2021 03:44:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen_makefile.sh: remove duplicate main file References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 ) Change subject: regen_makefile.sh: remove duplicate main file ...................................................................... regen_makefile.sh: remove duplicate main file Make the regen_makefile.sh more consistent by removing the "MAIN" file on top, which some of them still have. All regen_makefile.sh have a *.ttcn glob in FILES that match the main file too. So it is redundant and can be removed. Fix for warning: ttcn3_makefilegen: warning: File `BSC_Tests.ttcn' was given more than once for the Makefile. Related: OS#5252 Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f --- M SCCP_Test/regen_makefile.sh M bsc-nat/regen_makefile.sh M bsc/regen_makefile.sh M hlr/regen_makefile.sh M selftest/regen_makefile.sh M smlc/regen_makefile.sh 6 files changed, 6 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/58/25758/1 diff --git a/SCCP_Test/regen_makefile.sh b/SCCP_Test/regen_makefile.sh index f5d13b7..6eaeb03 100755 --- a/SCCP_Test/regen_makefile.sh +++ b/SCCP_Test/regen_makefile.sh @@ -1,7 +1,5 @@ #!/bin/sh -MAIN=SCCP_Testcases.ttcn - FILES=" *.ttcn *.ttcnpp @@ -10,4 +8,4 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh $MAIN $FILES +../regen-makefile.sh $FILES diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh index 33b557c..6838904 100755 --- a/bsc-nat/regen_makefile.sh +++ b/bsc-nat/regen_makefile.sh @@ -1,7 +1,5 @@ #!/bin/sh -MAIN=BSCNAT_Tests.ttcn - FILES=" *.c *.ttcn @@ -29,4 +27,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh $MAIN $FILES +../regen-makefile.sh $FILES diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh index 53f8e82..d21a709 100755 --- a/bsc/regen_makefile.sh +++ b/bsc/regen_makefile.sh @@ -1,7 +1,5 @@ #!/bin/sh -MAIN=BSC_Tests.ttcn - FILES=" *.c *.ttcn @@ -34,4 +32,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh $MAIN $FILES +../regen-makefile.sh $FILES diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh index 9ab40ce..a69419d 100755 --- a/hlr/regen_makefile.sh +++ b/hlr/regen_makefile.sh @@ -1,7 +1,5 @@ #!/bin/sh -MAIN="HLR_Tests.ttcn" - FILES=" *.asn *.ttcn @@ -24,4 +22,4 @@ -DIPA_EMULATION_CTRL " -../regen-makefile.sh $MAIN $FILES +../regen-makefile.sh $FILES diff --git a/selftest/regen_makefile.sh b/selftest/regen_makefile.sh index 17854ce..3fc0e89 100755 --- a/selftest/regen_makefile.sh +++ b/selftest/regen_makefile.sh @@ -1,7 +1,5 @@ #!/bin/sh -MAIN=Selftest.ttcn - FILES=" *.ttcn *.ttcnpp @@ -19,4 +17,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh $MAIN $FILES +../regen-makefile.sh $FILES diff --git a/smlc/regen_makefile.sh b/smlc/regen_makefile.sh index 24e3407..da296a8 100755 --- a/smlc/regen_makefile.sh +++ b/smlc/regen_makefile.sh @@ -1,7 +1,5 @@ #!/bin/sh -MAIN=SMLC_Tests.ttcn - FILES=" *.c *.ttcn @@ -32,4 +30,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh $MAIN $FILES +../regen-makefile.sh $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f Gerrit-Change-Number: 25758 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:24 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 13 Oct 2021 03:44:24 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Brel-1=2E7=2E1=5D=3A_Bump_version=3A_1=2E7=2E0=2E1-55624_=E2=86=92_1=2E7=2E1?= References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25759 ) Change subject: Bump version: 1.7.0.1-55624 ? 1.7.1 ...................................................................... Bump version: 1.7.0.1-55624 ? 1.7.1 Change-Id: I97a59d06e408776e223cb5fc582e29f1608ba85d --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/59/25759/1 diff --git a/debian/changelog b/debian/changelog index 8fc8b76..9713aab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-bsc (1.7.1) unstable; urgency=medium + + [ Philipp Maier ] + * assignment_fsm: Check for conn->lchan + + -- Oliver Smith Tue, 12 Oct 2021 16:57:13 +0200 + osmo-bsc (1.7.0) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.7.1 Gerrit-Change-Id: I97a59d06e408776e223cb5fc582e29f1608ba85d Gerrit-Change-Number: 25759 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 14:59:15 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 14:59:15 +0000 Subject: Change in osmo-bsc[rel-1.7.1]: assignment_fsm: Check for conn->lchan In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25753 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... Patch Set 1: Code-Review+2 patch is trivial and already has +2 from when it was merged to master -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.7.1 Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25753 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 12 Oct 2021 14:59:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 15:07:23 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 12 Oct 2021 15:07:23 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Brel-1=2E7=2E1=5D=3A_Bump_version=3A_1=2E7=2E0=2E1-55624_=E2=86=92_1=2E7=2E1?= In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25759 ) Change subject: Bump version: 1.7.0.1-55624 ? 1.7.1 ...................................................................... Patch Set 1: Code-Review+2 trivial -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.7.1 Gerrit-Change-Id: I97a59d06e408776e223cb5fc582e29f1608ba85d Gerrit-Change-Number: 25759 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 12 Oct 2021 15:07:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:29 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 13 Oct 2021 03:44:29 +0000 Subject: Change in osmo-bsc[rel-1.7.1]: assignment_fsm: Check for conn->lchan In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25753 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... assignment_fsm: Check for conn->lchan When the SDCCH gets released while the TCH still beeing activated, then the ChanActivACK that is received after the TCH is activated will trigger a segmentation fault in the assignment_fsm. The reason for this is that conn->lchan, which holds the SDCCH at that point in time, is now NULL. To prevent osmo-bsc from crashing, the FSM should check for the presence of conn->lchan first. If it does not exist, the FSM should terminate. (Assignment failed) Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Related: SYS#5627 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 2f241e3..c5a1250 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -610,6 +610,15 @@ int rc; struct gsm_subscriber_connection *conn = assignment_fi_conn(fi); + /* There may be situations where the SDCCH gets released while the TCH is still being activated. We will then + * receive ChanActivAck message from the BTS when the TCH is ready. Since the SDCCH is already released by + * then conn->lchan will be NULL in this case. */ + if (!conn->lchan) { + assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE, + "Unable to send RR Assignment Command: conn without lchan"); + return; + } + rc = gsm48_send_rr_ass_cmd(conn->lchan, conn->assignment.new_lchan, conn->lchan->ms_power); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.7.1 Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25753 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:30 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 13 Oct 2021 03:44:30 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Brel-1=2E7=2E1=5D=3A_Bump_version=3A_1=2E7=2E0=2E1-55624_=E2=86=92_1=2E7=2E1?= In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25759 ) Change subject: Bump version: 1.7.0.1-55624 ? 1.7.1 ...................................................................... Bump version: 1.7.0.1-55624 ? 1.7.1 Change-Id: I97a59d06e408776e223cb5fc582e29f1608ba85d --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 8fc8b76..9713aab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-bsc (1.7.1) unstable; urgency=medium + + [ Philipp Maier ] + * assignment_fsm: Check for conn->lchan + + -- Oliver Smith Tue, 12 Oct 2021 16:57:13 +0200 + osmo-bsc (1.7.0) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.7.1 Gerrit-Change-Id: I97a59d06e408776e223cb5fc582e29f1608ba85d Gerrit-Change-Number: 25759 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:31 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 13 Oct 2021 03:44:31 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: remove code dup in bootstrap_bts() References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25760 ) Change subject: osmo_bsc_main: remove code dup in bootstrap_bts() ...................................................................... osmo_bsc_main: remove code dup in bootstrap_bts() The function gsm_set_bts_type() already takes care of setting the model->started flag to true. There is no need to do this in bootstrap_bts() again. Change-Id: Ia70943d96d466ab506fe368ef178a2ccc7483adc --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/25760/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index e8a22fe..dfd055f 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -446,14 +446,6 @@ if (!bts->model) return -EFAULT; - if (bts->model->start && !bts->model->started) { - int ret = bts->model->start(bts->network); - if (ret < 0) - return ret; - - bts->model->started = true; - } - /* FIXME: What about secondary TRX of a BTS? What about a BTS that has TRX * in different bands? Why is 'band' a parameter of the BTS and not of the TRX? */ switch (bts->band) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia70943d96d466ab506fe368ef178a2ccc7483adc Gerrit-Change-Number: 25760 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:31 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 13 Oct 2021 03:44:31 +0000 Subject: Change in osmo-bsc[master]: bts: set R99 MSC flag in SI13 in bts_alloc References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25761 ) Change subject: bts: set R99 MSC flag in SI13 in bts_alloc ...................................................................... bts: set R99 MSC flag in SI13 in bts_alloc At the moment we set the R99 flag from bootstrap_bts() in osmo_bsc_main.c. However this constant flag should be set together with the many preinitalized chan_desc values in bts_alloc Change-Id: I5b78c4e25616ab552c37ba8b7c9948cf7052bad4 --- M src/osmo-bsc/bts.c M src/osmo-bsc/osmo_bsc_main.c 2 files changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/61/25761/1 diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 3f782c1..d60545e 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -266,6 +266,7 @@ bts->si_common.rach_control.tx_integer = 9; /* 12 slots spread - 217/115 slots delay */ bts->si_common.rach_control.max_trans = 3; /* 7 retransmissions */ bts->si_common.rach_control.t2 = 4; /* no emergency calls */ + bts->si_common.chan_desc.mscr = 1; /* Indicate R99 MSC in SI3 */ bts->si_common.chan_desc.att = 1; /* attachment required */ bts->si_common.chan_desc.bs_pa_mfrms = RSL_BS_PA_MFRMS_5; /* paging frames */ bts->si_common.chan_desc.bs_ag_blks_res = 1; /* reserved AGCH blocks */ diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index dfd055f..2931dcf 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -490,9 +490,6 @@ /* Control Channel Description is set from vty/config */ - /* Indicate R99 MSC in SI3 */ - bts->si_common.chan_desc.mscr = 1; - /* Determine the value of CCCH_CONF. Is TS0/C0 combined? */ if (bts->c0->ts[0].pchan_from_config != GSM_PCHAN_CCCH) { bts->si_common.chan_desc.ccch_conf = RSL_BCCH_CCCH_CONF_1_C; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5b78c4e25616ab552c37ba8b7c9948cf7052bad4 Gerrit-Change-Number: 25761 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:31 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 13 Oct 2021 03:44:31 +0000 Subject: Change in osmo-bsc[master]: bts: set pwrc value in bts_alloc References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25762 ) Change subject: bts: set pwrc value in bts_alloc ...................................................................... bts: set pwrc value in bts_alloc The pwrc value is currently set from bootstrap_bts() in osmo_bsc_main.c. The value is set to 0. Since the BTS object is allocated using talloc it is guaranteed to be 0 from the beginning. Lets set it from bts_alloc anyway so that we have a place holder that is easy to find. Change-Id: Id76879a94cf8cf8c07e8fc7e8aa399cd50e04e9a --- M src/osmo-bsc/bts.c M src/osmo-bsc/osmo_bsc_main.c 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/62/25762/1 diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index d60545e..f8ea2c4 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -271,6 +271,7 @@ bts->si_common.chan_desc.bs_pa_mfrms = RSL_BS_PA_MFRMS_5; /* paging frames */ bts->si_common.chan_desc.bs_ag_blks_res = 1; /* reserved AGCH blocks */ bts->si_common.chan_desc.t3212 = osmo_tdef_get(net->T_defs, 3212, OSMO_TDEF_CUSTOM, -1); + bts->si_common.cell_options.pwrc = 0; /* PWRC not set */ gsm_bts_set_radio_link_timeout(bts, 32); /* Use RADIO LINK TIMEOUT of 32 */ INIT_LLIST_HEAD(&bts->abis_queue); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 2931dcf..757f053 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -510,8 +510,6 @@ bts->si_common.chan_desc.ccch_conf = (n << 1); } - bts->si_common.cell_options.pwrc = 0; /* PWRC not set */ - bts->si_common.cell_sel_par.acs = 0; bts->si_common.ncc_permitted = 0xff; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id76879a94cf8cf8c07e8fc7e8aa399cd50e04e9a Gerrit-Change-Number: 25762 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:32 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 13 Oct 2021 03:44:32 +0000 Subject: Change in osmo-bsc[master]: bts: set pwrc value in bts_alloc References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25763 ) Change subject: bts: set pwrc value in bts_alloc ...................................................................... bts: set pwrc value in bts_alloc The acs value is currently set from bootstrap_bts() in osmo_bsc_main.c. The value is set to 0. Since the BTS object is allocated using talloc it is guaranteed to be 0 from the beginning. Lets set it from bts_alloc anyway so that we have a place holder that is easy to find. Change-Id: Idc4e08c471e15c36b4ea7eb3981254e179115765 --- M src/osmo-bsc/bts.c M src/osmo-bsc/osmo_bsc_main.c 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/63/25763/1 diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index f8ea2c4..598641e 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -272,6 +272,7 @@ bts->si_common.chan_desc.bs_ag_blks_res = 1; /* reserved AGCH blocks */ bts->si_common.chan_desc.t3212 = osmo_tdef_get(net->T_defs, 3212, OSMO_TDEF_CUSTOM, -1); bts->si_common.cell_options.pwrc = 0; /* PWRC not set */ + bts->si_common.cell_sel_par.acs = 0; gsm_bts_set_radio_link_timeout(bts, 32); /* Use RADIO LINK TIMEOUT of 32 */ INIT_LLIST_HEAD(&bts->abis_queue); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 757f053..4e2210f 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -510,8 +510,6 @@ bts->si_common.chan_desc.ccch_conf = (n << 1); } - bts->si_common.cell_sel_par.acs = 0; - bts->si_common.ncc_permitted = 0xff; bts->chan_load_samples_idx = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idc4e08c471e15c36b4ea7eb3981254e179115765 Gerrit-Change-Number: 25763 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:32 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 13 Oct 2021 03:44:32 +0000 Subject: Change in osmo-bsc[master]: drop chan_load_samples_idx initalization from bootstrap_bts() References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25764 ) Change subject: drop chan_load_samples_idx initalization from bootstrap_bts() ...................................................................... drop chan_load_samples_idx initalization from bootstrap_bts() The index counter bts->chan_load_samples_idx is initialized to 0 in bootstrap_bts. Since the bts object is allocated using talloc it is already guaranteed that everything is set to zero. So we do not need to initalize chan_load_samples_idx. Change-Id: Ia75e59c44c3ccd653a2614c2cda7519faf999f09 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/64/25764/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 4e2210f..28a56a7 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -512,8 +512,6 @@ bts->si_common.ncc_permitted = 0xff; - bts->chan_load_samples_idx = 0; - /* ACC ramping is initialized from vty/config */ /* Initialize the BTS state */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia75e59c44c3ccd653a2614c2cda7519faf999f09 Gerrit-Change-Number: 25764 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:33 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 13 Oct 2021 03:44:33 +0000 Subject: Change in osmo-bsc[master]: bts: set ncc_permitted from bts_alloc References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25765 ) Change subject: bts: set ncc_permitted from bts_alloc ...................................................................... bts: set ncc_permitted from bts_alloc The value ncc_permitted is preset in osmo_bsc_main.c from bootstrap_bts(). It is a constant value that also cannot be changed via the VTY. Therefore it should be set from bts_alloc(). This also fixes the problem that when the BTS is added at runtime from the VTY. BTSs added at runtime would have an all zero ncc_permitted until the next restart of osmo_bsc. Change-Id: I9f02277d7b4b4bcb383e749435416a0b22efd5e8 Related: SYS#5369 --- M src/osmo-bsc/bts.c M src/osmo-bsc/osmo_bsc_main.c 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/25765/1 diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 598641e..54d6b04 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -273,6 +273,7 @@ bts->si_common.chan_desc.t3212 = osmo_tdef_get(net->T_defs, 3212, OSMO_TDEF_CUSTOM, -1); bts->si_common.cell_options.pwrc = 0; /* PWRC not set */ bts->si_common.cell_sel_par.acs = 0; + bts->si_common.ncc_permitted = 0xff; gsm_bts_set_radio_link_timeout(bts, 32); /* Use RADIO LINK TIMEOUT of 32 */ INIT_LLIST_HEAD(&bts->abis_queue); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 28a56a7..3a1a673 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -510,8 +510,6 @@ bts->si_common.chan_desc.ccch_conf = (n << 1); } - bts->si_common.ncc_permitted = 0xff; - /* ACC ramping is initialized from vty/config */ /* Initialize the BTS state */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9f02277d7b4b4bcb383e749435416a0b22efd5e8 Gerrit-Change-Number: 25765 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:34 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 13 Oct 2021 03:44:34 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: remove not longer needed fixme note References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25766 ) Change subject: osmo_bsc_main: remove not longer needed fixme note ...................................................................... osmo_bsc_main: remove not longer needed fixme note It is not possible to operate a cell that has secondary TRXs in different bands. Especially considering that DCS1800 and PCS1900 have overlapping ARFCN numbers it would be hard for the MS to tell to which band it should switch. Also the ImmAss. message only contains the ARFCN number. It is impractical to have TRXs in different bands and probably this also violates the sepec. Change-Id: Icc2af9e2a9bca3897dbbb34d7b2c0fe6f843bedd --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/66/25766/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 3a1a673..92b7475 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -446,8 +446,6 @@ if (!bts->model) return -EFAULT; - /* FIXME: What about secondary TRX of a BTS? What about a BTS that has TRX - * in different bands? Why is 'band' a parameter of the BTS and not of the TRX? */ switch (bts->band) { case GSM_BAND_1800: if (bts->c0->arfcn < 512 || bts->c0->arfcn > 885) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc2af9e2a9bca3897dbbb34d7b2c0fe6f843bedd Gerrit-Change-Number: 25766 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:35 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 13 Oct 2021 03:44:35 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: call bootstrap_bts when OML TEI comes up References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25767 ) Change subject: osmo_bsc_main: call bootstrap_bts when OML TEI comes up ...................................................................... osmo_bsc_main: call bootstrap_bts when OML TEI comes up At the moment bootstrap_bts is called only once on startup. When a new BTY is set up during runtime bootstrap_bts is not called. This means that some parameters of the BTS stay uninitalized until osmo-bsc is restarted. Lets rather call bootstrap_bts() when the OML TEI of the BTS comes up. Change-Id: Ie599f809623efd6ea4ab3f39294195fc1ef84b85 Related: OS#5369 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 55 insertions(+), 52 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/25767/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 92b7475..a133b9e 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -391,53 +391,6 @@ osmo_timer_schedule(&update_connection_stats_timer, 1, 0); } -/* Callback function to be called every time we receive a signal from INPUT */ -static int inp_sig_cb(unsigned int subsys, unsigned int signal, - void *handler_data, void *signal_data) -{ - struct input_signal_data *isd = signal_data; - struct gsm_bts_trx *trx = isd->trx; - - if (subsys != SS_L_INPUT) - return -EINVAL; - - LOGP(DLMI, LOGL_DEBUG, "%s(): Input signal '%s' received\n", __func__, - get_value_string(e1inp_signal_names, signal)); - switch (signal) { - case S_L_INP_TEI_UP: - if (isd->link_type == E1INP_SIGN_OML) { - /* Generate Mobile Allocation bit-masks for all timeslots. - * This needs to be done here, because it's used for TS configuration. */ - generate_ma_for_bts(trx->bts); - } - if (isd->link_type == E1INP_SIGN_RSL) - bootstrap_rsl(trx); - break; - case S_L_INP_TEI_DN: - LOG_TRX(trx, DLMI, LOGL_ERROR, "Lost E1 %s link\n", e1inp_signtype_name(isd->link_type)); - - if (isd->link_type == E1INP_SIGN_OML) { - rate_ctr_inc(rate_ctr_group_get_ctr(trx->bts->bts_ctrs, BTS_CTR_BTS_OML_FAIL)); - all_ts_dispatch_event(trx, TS_EV_OML_DOWN); - } else if (isd->link_type == E1INP_SIGN_RSL) { - rate_ctr_inc(rate_ctr_group_get_ctr(trx->bts->bts_ctrs, BTS_CTR_BTS_RSL_FAIL)); - acc_ramp_abort(&trx->bts->acc_ramp); - all_ts_dispatch_event(trx, TS_EV_RSL_DOWN); - if (trx->nr == 0) - osmo_timer_del(&trx->bts->cbch_timer); - } - - gsm_bts_sm_mo_reset(trx->bts->site_mgr); - - abis_nm_clear_queue(trx->bts); - break; - default: - break; - } - - return 0; -} - static int bootstrap_bts(struct gsm_bts *bts) { struct gsm_bts_trx *trx; @@ -516,6 +469,61 @@ return 0; } +/* Callback function to be called every time we receive a signal from INPUT */ +static int inp_sig_cb(unsigned int subsys, unsigned int signal, + void *handler_data, void *signal_data) +{ + struct input_signal_data *isd = signal_data; + struct gsm_bts_trx *trx = isd->trx; + int rc; + + if (subsys != SS_L_INPUT) + return -EINVAL; + + LOGP(DLMI, LOGL_DEBUG, "%s(): Input signal '%s' received\n", __func__, + get_value_string(e1inp_signal_names, signal)); + switch (signal) { + case S_L_INP_TEI_UP: + if (isd->link_type == E1INP_SIGN_OML) { + /* Check parameters and apply vty config dependant parameters */ + rc = bootstrap_bts(trx->bts); + if (rc < 0) { + LOGP(DNM, LOGL_FATAL, "Error bootstrapping BTS\n"); + return rc; + } + + /* Generate Mobile Allocation bit-masks for all timeslots. + * This needs to be done here, because it's used for TS configuration. */ + generate_ma_for_bts(trx->bts); + } + if (isd->link_type == E1INP_SIGN_RSL) + bootstrap_rsl(trx); + break; + case S_L_INP_TEI_DN: + LOG_TRX(trx, DLMI, LOGL_ERROR, "Lost E1 %s link\n", e1inp_signtype_name(isd->link_type)); + + if (isd->link_type == E1INP_SIGN_OML) { + rate_ctr_inc(rate_ctr_group_get_ctr(trx->bts->bts_ctrs, BTS_CTR_BTS_OML_FAIL)); + all_ts_dispatch_event(trx, TS_EV_OML_DOWN); + } else if (isd->link_type == E1INP_SIGN_RSL) { + rate_ctr_inc(rate_ctr_group_get_ctr(trx->bts->bts_ctrs, BTS_CTR_BTS_RSL_FAIL)); + acc_ramp_abort(&trx->bts->acc_ramp); + all_ts_dispatch_event(trx, TS_EV_RSL_DOWN); + if (trx->nr == 0) + osmo_timer_del(&trx->bts->cbch_timer); + } + + gsm_bts_sm_mo_reset(trx->bts->site_mgr); + + abis_nm_clear_queue(trx->bts); + break; + default: + break; + } + + return 0; +} + static int bsc_network_configure(const char *config_file) { struct gsm_bts *bts; @@ -537,11 +545,6 @@ osmo_signal_register_handler(SS_L_INPUT, inp_sig_cb, NULL); llist_for_each_entry(bts, &bsc_gsmnet->bts_list, list) { - rc = bootstrap_bts(bts); - if (rc < 0) { - LOGP(DNM, LOGL_FATAL, "Error bootstrapping BTS\n"); - return rc; - } rc = e1_reconfig_bts(bts); if (rc < 0) { LOGP(DNM, LOGL_FATAL, "Error enabling E1 input driver\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie599f809623efd6ea4ab3f39294195fc1ef84b85 Gerrit-Change-Number: 25767 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:44:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 03:44:48 +0000 Subject: Change in osmo-pcu[master]: tbf_ul_ass_fsm: Fix use of incorrect log macro References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25768 ) Change subject: tbf_ul_ass_fsm: Fix use of incorrect log macro ...................................................................... tbf_ul_ass_fsm: Fix use of incorrect log macro Change-Id: I61e46199086a3e82985606cf81995e27663c91f5 --- M src/tbf_ul_ass_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/68/25768/1 diff --git a/src/tbf_ul_ass_fsm.c b/src/tbf_ul_ass_fsm.c index 618e072..791bab7 100644 --- a/src/tbf_ul_ass_fsm.c +++ b/src/tbf_ul_ass_fsm.c @@ -127,7 +127,7 @@ bts_do_rate_ctr_inc(ms->bts, CTR_PKT_UL_ASSIGNMENT); tbf_set_polling(ctx->tbf, new_poll_fn, d->ts, PDCH_ULC_POLL_UL_ASS); - LOGPTBFDL(ctx->tbf, LOGL_INFO, "Scheduled UL Assignment polling on PACCH (FN=%d, TS=%d)\n", + LOGPTBFUL(ctx->tbf, LOGL_INFO, "Scheduled UL Assignment polling on PACCH (FN=%d, TS=%d)\n", new_poll_fn, d->ts); talloc_free(mac_control_block); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I61e46199086a3e82985606cf81995e27663c91f5 Gerrit-Change-Number: 25768 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 15:59:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 15:59:37 +0000 Subject: Change in osmo-pcu[master]: tbf_dl_ass_fsm: Move block msg generation conditions to rts() function In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25752 ) Change subject: tbf_dl_ass_fsm: Move block msg generation conditions to rts() function ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idbe4f9bbd23005a43c586b737cf9adc2114287e2 Gerrit-Change-Number: 25752 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 15:59:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 15:59:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 15:59:51 +0000 Subject: Change in osmo-pcu[master]: tbf_ul_ass_fsm: Fix use of incorrect log macro In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25768 ) Change subject: tbf_ul_ass_fsm: Fix use of incorrect log macro ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I61e46199086a3e82985606cf81995e27663c91f5 Gerrit-Change-Number: 25768 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 15:59:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:00:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:00:44 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: remove code dup in bootstrap_bts() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25760 ) Change subject: osmo_bsc_main: remove code dup in bootstrap_bts() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia70943d96d466ab506fe368ef178a2ccc7483adc Gerrit-Change-Number: 25760 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:00:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:00:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:00:54 +0000 Subject: Change in osmo-bsc[master]: bts: set R99 MSC flag in SI13 in bts_alloc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25761 ) Change subject: bts: set R99 MSC flag in SI13 in bts_alloc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5b78c4e25616ab552c37ba8b7c9948cf7052bad4 Gerrit-Change-Number: 25761 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:00:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:01:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:01:02 +0000 Subject: Change in osmo-bsc[master]: bts: set pwrc value in bts_alloc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25762 ) Change subject: bts: set pwrc value in bts_alloc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id76879a94cf8cf8c07e8fc7e8aa399cd50e04e9a Gerrit-Change-Number: 25762 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:01:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:01:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:01:40 +0000 Subject: Change in osmo-bsc[master]: bts: set pwrc value in bts_alloc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25763 ) Change subject: bts: set pwrc value in bts_alloc ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25763/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/25763/1//COMMIT_MSG at 7 PS1, Line 7: pwrc copy+paste of commit message doesn't fit actual code that changed. you could also merge all those "move a from X to Z" in one patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idc4e08c471e15c36b4ea7eb3981254e179115765 Gerrit-Change-Number: 25763 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:01:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:01:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:01:59 +0000 Subject: Change in osmo-bsc[master]: drop chan_load_samples_idx initalization from bootstrap_bts() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25764 ) Change subject: drop chan_load_samples_idx initalization from bootstrap_bts() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia75e59c44c3ccd653a2614c2cda7519faf999f09 Gerrit-Change-Number: 25764 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:01:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:03:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:03:03 +0000 Subject: Change in osmo-bsc[master]: bts: set ncc_permitted from bts_alloc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25765 ) Change subject: bts: set ncc_permitted from bts_alloc ...................................................................... Patch Set 1: looks like it changes the output of some tests. At first glance, it looks like the change from 00->ff in the SI is intended, but please verify. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9f02277d7b4b4bcb383e749435416a0b22efd5e8 Gerrit-Change-Number: 25765 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:03:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:03:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:03:10 +0000 Subject: Change in osmo-bsc[master]: bts: set ncc_permitted from bts_alloc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25765 ) Change subject: bts: set ncc_permitted from bts_alloc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9f02277d7b4b4bcb383e749435416a0b22efd5e8 Gerrit-Change-Number: 25765 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:03:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:03:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:03:21 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: remove not longer needed fixme note In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25766 ) Change subject: osmo_bsc_main: remove not longer needed fixme note ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc2af9e2a9bca3897dbbb34d7b2c0fe6f843bedd Gerrit-Change-Number: 25766 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:03:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:04:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:04:13 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: call bootstrap_bts when OML TEI comes up In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25767 ) Change subject: osmo_bsc_main: call bootstrap_bts when OML TEI comes up ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie599f809623efd6ea4ab3f39294195fc1ef84b85 Gerrit-Change-Number: 25767 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:04:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:04:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:04:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen_makefile.sh: files/flags in separate lines In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25754 ) Change subject: regen_makefile.sh: files/flags in separate lines ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6b6866eb9f6ec6232e4ae434517457a4c8c1c050 Gerrit-Change-Number: 25754 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:04:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:05:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:05:01 +0000 Subject: Change in osmo-ttcn3-hacks[master]: selftest: add missing Native_FunctionDefs.cc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25755 ) Change subject: selftest: add missing Native_FunctionDefs.cc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I73c225f6699cd272b3eeffb249f3dddd2048bc01 Gerrit-Change-Number: 25755 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:05:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:05:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:05:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pgw: add missing BSSGP_EncDec.cc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25756 ) Change subject: pgw: add missing BSSGP_EncDec.cc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I010df10396d264e67bd8c712daafcfb79262ece2 Gerrit-Change-Number: 25756 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:05:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:05:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:05:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mme: link against gnutls In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25757 ) Change subject: mme: link against gnutls ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iacddc22ecda187e250db9cfb1ca1d1d341ce78f4 Gerrit-Change-Number: 25757 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:05:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:06:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:06:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen_makefile.sh: remove duplicate main file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 ) Change subject: regen_makefile.sh: remove duplicate main file ...................................................................... Patch Set 1: Code-Review-1 I would be seriously surprised if you can do this. AFAIR, the first ttcn file given to the compiler will determine the name of the resulting executable file. That's why we have it stated as first file. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f Gerrit-Change-Number: 25758 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 12 Oct 2021 16:06:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:07:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:07:10 +0000 Subject: Change in pysim[master]: card_handler: clean-up In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23595 ) Change subject: card_handler: clean-up ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7168506cbebb1ebb67f47453419b860824912051 Gerrit-Change-Number: 23595 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:07:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:45:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 03:45:03 +0000 Subject: Change in pysim[master]: card_handler: clean-up In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/23595 ) Change subject: card_handler: clean-up ...................................................................... card_handler: clean-up * introduce type annotations * introduce + derive implementations from base class * move shared code to base class Change-Id: I7168506cbebb1ebb67f47453419b860824912051 --- M pySim/card_handler.py 1 file changed, 63 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/card_handler.py b/pySim/card_handler.py index 385c55e..0425e33 100644 --- a/pySim/card_handler.py +++ b/pySim/card_handler.py @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- -""" pySim: card handler utilities +""" pySim: card handler utilities. A 'card handler' is some method +by which cards can be inserted/removed into the card reader. For +normal smart card readers, this has to be done manually. However, +there are also automatic card feeders. """ # @@ -21,47 +24,81 @@ # along with this program. If not, see . # +from pySim.transport import LinkBase import subprocess import sys import yaml -# Manual card handler: User is prompted to insert/remove card from the reader. -class CardHandler: +class CardHandlerBase: + """Abstract base class representing a mechanism for card insertion/removal.""" - sl = None - - def __init__(self, sl): + def __init__(self, sl:LinkBase): self.sl = sl - def get(self, first = False): - print("Ready for Programming: Insert card now (or CTRL-C to cancel)") - self.sl.wait_for_card(newcardonly=not first) + def get(self, first:bool = False): + """Method called when pySim needs a new card to be inserted. + + Args: + first : set to true when the get method is called the + first time. This is required to prevent blocking + when a card is already inserted into the reader. + The reader API would not recognize that card as + "new card" until it would be removed and re-inserted + again. + """ + print("Ready for Programming: ", end='') + self._get(first) def error(self): - print("Programming failed: Remove card from reader") - print("") + """Method called when pySim failed to program a card. Move card to 'bad' batch.""" + print("Programming failed: ", end='') + self._error() def done(self): - print("Programming successful: Remove card from reader") + """Method called when pySim failed to program a card. Move card to 'good' batch.""" + print("Programming successful: ", end='') + self._done() + + def _get(self, first:bool = False): + pass + + def _error(self): + pass + + def _done(self): + pass + + +class CardHandler(CardHandlerBase): + """Manual card handler: User is prompted to insert/remove card from the reader.""" + + def _get(self, first:bool = False): + print("Insert card now (or CTRL-C to cancel)") + self.sl.wait_for_card(newcardonly=not first) + + def _error(self): + print("Remove card from reader") print("") -# Automatic card handler: A machine is used to handle the cards. -class CardHandlerAuto: + def _done(self): + print("Remove card from reader") + print("") - sl = None - cmds = None + +class CardHandlerAuto(CardHandlerBase): + """Automatic card handler: A machine is used to handle the cards.""" + verbose = True - def __init__(self, sl, config_file): + def __init__(self, sl:LinkBase, config_file:str): + super().__init__(sl) print("Card handler Config-file: " + str(config_file)) - self.sl = sl with open(config_file) as cfg: self.cmds = yaml.load(cfg, Loader=yaml.FullLoader) - self.verbose = (self.cmds.get('verbose') == True) - def __print_outout(self,out): + def __print_outout(self, out): print("") print("Card handler output:") print("---------------------8<---------------------") @@ -91,18 +128,18 @@ print("Error: Card handler failure! (rc=" + str(rc) + ")") sys.exit(rc) - def get(self, first = False): - print("Ready for Programming: Transporting card into the reader-bay...") + def _get(self, first:bool = False): + print("Transporting card into the reader-bay...") self.__exec_cmd(self.cmds['get']) if self.sl: self.sl.connect() - def error(self): - print("Programming failed: Transporting card to the error-bin...") + def _error(self): + print("Transporting card to the error-bin...") self.__exec_cmd(self.cmds['error']) print("") - def done(self): - print("Programming successful: Transporting card into the collector bin...") + def _done(self): + print("Transporting card into the collector bin...") self.__exec_cmd(self.cmds['done']) print("") -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23595 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7168506cbebb1ebb67f47453419b860824912051 Gerrit-Change-Number: 23595 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:07:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:07:57 +0000 Subject: Change in osmo-bts[master]: osmo-trx: fix maxdly In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25619 ) Change subject: osmo-trx: fix maxdly ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Gerrit-Change-Number: 25619 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 16:07:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:45:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 03:45:06 +0000 Subject: Change in osmo-bts[master]: osmo-trx: fix maxdly In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25619 ) Change subject: osmo-trx: fix maxdly ...................................................................... osmo-trx: fix maxdly - one gsm symbol is 0,00000369 seconds - 2*550m/c = 0,00000366 seconds -> one ta symbol is a DISTANCE of 550m (or a RTT of 550m*2) between bts and ue. -> no idea why this was constrained to TA/2. Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Related: OS#5140 --- M src/osmo-bts-trx/trx_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index bb9d158..a24adf7 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -266,7 +266,7 @@ } DEFUN_ATTR(cfg_phyinst_maxdly, cfg_phyinst_maxdly_cmd, - "osmotrx maxdly <0-31>", + "osmotrx maxdly <0-63>", OSMOTRX_STR "Set the maximum acceptable delay of an Access Burst (in GSM symbols)." " Access Burst is the first burst a mobile transmits in order to establish" @@ -275,7 +275,7 @@ " distance. So changing this setting effectively changes maximum range of" " the cell, because if we receive an Access Burst with a delay higher than" " this value, it will be ignored and connection is dropped.\n" - "GSM symbols (approx. 1.1km per symbol)\n", + "GSM symbols (550m distance between UE and BTS per symbol)\n", CMD_ATTR_IMMEDIATE) { struct phy_instance *pinst = vty->index; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8d79080c82411e6427eec37d008614fa5d5e1ace Gerrit-Change-Number: 25619 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:45:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 03:45:06 +0000 Subject: Change in osmo-bsc[master]: stat: add bts.N.num_trx:total In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25506 ) Change subject: stat: add bts.N.num_trx:total ...................................................................... stat: add bts.N.num_trx:total This is similar to bsc.0.num_trx:total but per single BTS. Related: SYS#5542 Related: I5be1cb470930354c4561cbed301bc50a32484ed9 (osmo-ttcn3-hacks) Depends: I137992a5479fc39bbceb6c6c2af9c227bd33b39b (libosmocore) Change-Id: I283d38e7a8c032e274a5bd2fa150ec2c9a7157b4 --- M TODO-RELEASE M include/osmocom/bsc/bts.h M src/osmo-bsc/bsc_stats.c M src/osmo-bsc/bts.c 4 files changed, 9 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 90ec16b..89bc1cb 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -15,3 +15,4 @@ libosmosgsm >1.5.1 needs GSM_PCHAN_OSMO_DYN libosmocore >1.5.1 RSL_IPAC_EIE_OSMO*, struct osmo_preproc_* libosmocore >1.5.1 needs osmo_str_to_int() +libosmocore >1.5.1 needs new osmo_stat_item implementation (omits FIFO size for stat item) diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 5ff798b..f09d068 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -175,6 +175,7 @@ BTS_STAT_RSL_CONNECTED, BTS_STAT_LCHAN_BORKEN, BTS_STAT_TS_BORKEN, + BTS_STAT_NUM_TRX_TOTAL, }; extern const struct osmo_stat_item_desc bts_stat_desc[]; diff --git a/src/osmo-bsc/bsc_stats.c b/src/osmo-bsc/bsc_stats.c index f33e6c8..3b96fed 100644 --- a/src/osmo-bsc/bsc_stats.c +++ b/src/osmo-bsc/bsc_stats.c @@ -162,6 +162,9 @@ trx_rsl_connected++; } + osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_NUM_TRX_TOTAL), + num_trx); + num_trx_total += num_trx; trx_rsl_connected_total += trx_rsl_connected; diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 3f782c1..4bda721 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -1311,6 +1311,10 @@ { "ts_borken", "Number of timeslots in the BORKEN state", "", 16, 0 }, + [BTS_STAT_NUM_TRX_TOTAL] = \ + { "num_trx:total", + "Number of configured TRX in this BTS", + "" }, }; const struct osmo_stat_item_group_desc bts_statg_desc = { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I283d38e7a8c032e274a5bd2fa150ec2c9a7157b4 Gerrit-Change-Number: 25506 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:45:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 03:45:07 +0000 Subject: Change in osmo-bsc[master]: stat: add bts.N.num_trx:rsl_connected In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25507 ) Change subject: stat: add bts.N.num_trx:rsl_connected ...................................................................... stat: add bts.N.num_trx:rsl_connected Controversy: this duplicates bts.N.rsl_connected. I would like to add this duplication for consistency, since we now have these counters: bsc.0.num_trx:rsl_connected bsc.0.num_trx:total bts.N.num_trx:total and the old bts.N.rsl_connected which does not fit well with above naming scheme. Any user will be justified to expect a stat named bts.N.num_trx:rsl_connected as well. Determine bts.N.num_trx:rsl_connected in the new function bsc_update_connection_stats(), where the other num_trx:* are set. Related: SYS#5542 Related: I5be1cb470930354c4561cbed301bc50a32484ed9 (osmo-ttcn3-hacks) Depends: I137992a5479fc39bbceb6c6c2af9c227bd33b39b (libosmocore) Change-Id: I55b55159fe13d937e441d8c2ed915734463e1154 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bsc_stats.c M src/osmo-bsc/bts.c 3 files changed, 8 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index f09d068..68654f2 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -175,6 +175,7 @@ BTS_STAT_RSL_CONNECTED, BTS_STAT_LCHAN_BORKEN, BTS_STAT_TS_BORKEN, + BTS_STAT_NUM_TRX_RSL_CONNECTED, BTS_STAT_NUM_TRX_TOTAL, }; diff --git a/src/osmo-bsc/bsc_stats.c b/src/osmo-bsc/bsc_stats.c index 3b96fed..7176809 100644 --- a/src/osmo-bsc/bsc_stats.c +++ b/src/osmo-bsc/bsc_stats.c @@ -162,6 +162,8 @@ trx_rsl_connected++; } + osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_NUM_TRX_RSL_CONNECTED), + trx_rsl_connected); osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_NUM_TRX_TOTAL), num_trx); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 4bda721..1e202df 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -1301,7 +1301,7 @@ "", 16, 0 }, [BTS_STAT_RSL_CONNECTED] = \ { "rsl_connected", - "Number of RSL links connected", + "Number of RSL links connected (same as num_trx:rsl_connected)", "", 16, 0 }, [BTS_STAT_LCHAN_BORKEN] = \ { "lchan_borken", @@ -1311,6 +1311,10 @@ { "ts_borken", "Number of timeslots in the BORKEN state", "", 16, 0 }, + [BTS_STAT_NUM_TRX_RSL_CONNECTED] = \ + { "num_trx:rsl_connected", + "Number of TRX in this BTS where RSL is up", + "" }, [BTS_STAT_NUM_TRX_TOTAL] = \ { "num_trx:total", "Number of configured TRX in this BTS", -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I55b55159fe13d937e441d8c2ed915734463e1154 Gerrit-Change-Number: 25507 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:09:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:09:45 +0000 Subject: Change in osmo-msc[master]: Make UTRAN encryption algorithms configurable In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22766 ) Change subject: Make UTRAN encryption algorithms configurable ...................................................................... Patch Set 3: assigning to lynxis as he is working with nano3g at the moment anyway. Please test. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I91f9e50f9c1439aa19528f887b83ae9de628fcfd Gerrit-Change-Number: 22766 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Tue, 12 Oct 2021 16:09:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:09:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:09:55 +0000 Subject: Change in osmo-msc[master]: [UNTESTED] Fix enabling of UMTS UEA encryption In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22757 ) Change subject: [UNTESTED] Fix enabling of UMTS UEA encryption ...................................................................... Patch Set 3: assigning to lynxis as he is working with nano3g at the moment anyway. Please test. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ieaaa6b23b7337b7edb902fad8031e195e0c5e9d2 Gerrit-Change-Number: 22757 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Tue, 12 Oct 2021 16:09:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:13:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:13:17 +0000 Subject: Change in pysim[master]: pySim-shell: allow card insertion at runtime In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25549 ) Change subject: pySim-shell: allow card insertion at runtime ...................................................................... Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/pysim/+/25549/3/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/25549/3/pySim-shell.py at a109 PS3, Line 109: self.ad > It is not entirely removed. Its only added later with the equip() function. [?] but what kind of implications does this have? Doesn't it mean that a user config file specifying this conserve_write would now no longer be active, as it is only added later, outside of the constructor? We should make sure that all variables/settables can be set from startup scripts / config files. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 Gerrit-Change-Number: 25549 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 16:13:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:13:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:13:49 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25552 ) Change subject: pySim-shell: add bulk provisioning support ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/pysim/+/25552/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/pysim/+/25552/3//COMMIT_MSG at 1 PS3, Line 1: Parent: b8b87fbe (pySim-shell: add echo command) > is there a specific reason to use print directly rather than the poutput function of cmd2? cmd2 als [?] not yet adressed -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:13:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:15:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:15:27 +0000 Subject: Change in osmo-msc[master]: [WIP] a5/4 support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/24633 ) Change subject: [WIP] a5/4 support ...................................................................... Patch Set 2: what is the status here? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1b3136f0b2728013677b62647c033aade2933299 Gerrit-Change-Number: 24633 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:15:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:16:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:16:16 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_msg.py: enable TRXDv2 protocol support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/24020 ) Change subject: trx_toolkit/data_msg.py: enable TRXDv2 protocol support ...................................................................... Patch Set 2: ping? -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/24020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib76138ec6523970fca43a4d69919c178f5a4b411 Gerrit-Change-Number: 24020 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 16:16:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:17:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:17:12 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: add rate counter for Uplink block decoding errors In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25270 ) Change subject: osmo-bts-trx: add rate counter for Uplink block decoding errors ...................................................................... Patch Set 3: ping? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7aea0529771ad73d5d6bcaf0865f9b0d4ecace6b Gerrit-Change-Number: 25270 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:17:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:18:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:18:28 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/24236 ) Change subject: Add support for LCLS to the MSC ...................................................................... Patch Set 7: assigning to neels as it has MNCC implications and he is best versed in MNCC plans from his codec negotiation works. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 16:18:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:18:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:18:37 +0000 Subject: Change in osmo-sip-connector[master]: MNCC v8: Implement Basic Support for Global Call Reference. In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 ) Change subject: MNCC v8: Implement Basic Support for Global Call Reference. ...................................................................... Patch Set 4: assigning to neels as it has MNCC implications and he is best versed in MNCC plans from his codec negotiation works. -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Id40d7e0fed9356f801b3627c118150055e7232b1 Gerrit-Change-Number: 25675 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 16:18:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:20:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:20:19 +0000 Subject: Change in libosmocore[master]: ratectr: make atomic In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25414 ) Change subject: ratectr: make atomic ...................................................................... Patch Set 2: > Patch Set 2: > > I'm not sure if this is really the way to go and whether it makes sense (I'm not saying the opposite either). This basically makes rate_ctr groups created in one thread unavailable/invsible to other threads. Which means, for instance, if the user uses the VTY to show the rate counters, only the ones attached to the thread checking the VTY would be displayed/accessible. > > An alternative would be doing something like it's done in osmo-trx iirc. counters are copied from one thread to another without critical section, and only updated from within main thread. I share Pau's concerns. Not sure how much we want to modify libosmocore fundamentals just for one odd mgw use case. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I117f89add4798a250b5758543f1fb3e01d974205 Gerrit-Change-Number: 25414 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 16:20:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:22:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:22:25 +0000 Subject: Change in osmo-mgw[master]: e1: one thread per e1 trunk == e1 line In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/25425 ) Change subject: e1: one thread per e1 trunk == e1 line ...................................................................... Patch Set 10: > Patch Set 10: > > > Patch Set 10: Code-Review-1 > > > > (2 comments) > > > > I fear there is a problem with this. This this_trunk variable will limit us to use only one E1 trunk in osmo-mgw but when I get it right we already support multiple E1 trunks. One E1 line can have (NUM_E1_TS-1) usable timeslots. That is one physical line on the E1 card. If you have multiple physical lines, each one will get its own trunk. > > Yes, this is what I pointed out above, previously every e1 thrunk had one and only one thread so this was fine, but I changed that at the last minute to have no threads for e1, so this needs fixing. so are you working on a related fix? I think we discussed that it is OK if there is no multithreading in an E1 mgw. But we did not discuss that a E1 mgw, even if single-threaded, would be constrained to a single trunk (= line). -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25425 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Iabee6375dc521397d605549e3d869d5c8048fac3 Gerrit-Change-Number: 25425 Gerrit-PatchSet: 10 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 16:22:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:23:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:23:57 +0000 Subject: Change in osmo-mgw[master]: rename strip_epname and find_specific_endpoint and make them available In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/25429 ) Change subject: rename strip_epname and find_specific_endpoint and make them available ...................................................................... Patch Set 17: (1 comment) https://gerrit.osmocom.org/c/osmo-mgw/+/25429/17/src/libosmo-mgcp/mgcp_endp.c File src/libosmo-mgcp/mgcp_endp.c: https://gerrit.osmocom.org/c/osmo-mgw/+/25429/17/src/libosmo-mgcp/mgcp_endp.c at 228 PS17, Line 228: * \param[in] trunk mgcp_trunk that might have this endpoint > Looks good, but each line must end with a dot. [?] the dot is what terminatest the single-line summary documentation for the function. Everything after it is shown only in the multi-line detailed documentation. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I4f76676640a308ab84da3848e1c1ec22bd5d9566 Gerrit-Change-Number: 25429 Gerrit-PatchSet: 17 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 16:23:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:26:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:26:07 +0000 Subject: Change in osmo-mgw[master]: add a lock-free bounded spsc interthread queue In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/25431 ) Change subject: add a lock-free bounded spsc interthread queue ...................................................................... Patch Set 19: > Patch Set 19: > > FIne, now only the documentation part is missing. agreed. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I4f17042baf76d086ce6b20eb99402dc64c22c657 Gerrit-Change-Number: 25431 Gerrit-PatchSet: 19 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 16:26:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:27:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:27:54 +0000 Subject: Change in osmo-mgw[master]: adjust mgcp response context In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/25447 ) Change subject: adjust mgcp response context ...................................................................... Patch Set 5: (3 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/25447/5/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/c/osmo-mgw/+/25447/5/src/libosmo-mgcp/mgcp_protocol.c at 179 PS5, Line 179: msg = msgb_alloc_c(ctx, 4096, "MGCP msg"); > I think you should use msgb_alloc_headroom_c() here. [?] nice catch https://gerrit.osmocom.org/c/osmo-mgw/+/25447/5/src/libosmo-mgcp/mgcp_protocol.c at 244 PS5, Line 244: static struct msgb *create_ok_resp_with_param(void *msgctx, struct mgcp_endpoint *endp, int code, const char *msg, > maybe you should keep the 80 column limit here. This is old code. [?] I don't see any of this as critical. https://gerrit.osmocom.org/c/osmo-mgw/+/25447/5/src/libosmo-mgcp/mgcp_protocol.c at 287 PS5, Line 287: msgb_reserve(sdp, 128); > same as above, I would use msgb_alloc_headroom_c() ack -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Id17f51d8bc0d1ba26f7fca72b1679ffadc9d6dc8 Gerrit-Change-Number: 25447 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:27:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 16:42:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 12 Oct 2021 16:42:09 +0000 Subject: Change in osmo-mgw[master]: Add multithreading for the virtual trunk In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/25432 ) Change subject: Add multithreading for the virtual trunk ...................................................................... Patch Set 27: (7 comments) https://gerrit.osmocom.org/c/osmo-mgw/+/25432/27/include/osmocom/mgcp/mgcp_threads.h File include/osmocom/mgcp/mgcp_threads.h: https://gerrit.osmocom.org/c/osmo-mgw/+/25432/27/include/osmocom/mgcp/mgcp_threads.h at 90 PS27, Line 90: struct tapmsg { I think 'tap' and 'freep' require some kind of explanation comment. cfg/vty/loop is obvious to me. https://gerrit.osmocom.org/c/osmo-mgw/+/25432/27/include/osmocom/mgcp/mgcp_trunk.h File include/osmocom/mgcp/mgcp_trunk.h: https://gerrit.osmocom.org/c/osmo-mgw/+/25432/27/include/osmocom/mgcp/mgcp_trunk.h at 30 PS27, Line 30: struct per_thread_info *this_thread_info; what is the rationale of using a union here? Wasting 8 bytes for a pointer is not all that much. Having separate pointers would allow us to catch "wrong" dereferences, i.e. if a master trunk code accesses this_thread_info, it would get a NULL pointer and crash, instead of operating on "forbidden" dat structures. Likewise also the other way around: If a thread accesses thread_info, it would be NULL in a per-thread mgcp_trunk and thus crash? https://gerrit.osmocom.org/c/osmo-mgw/+/25432/27/include/osmocom/mgcp/mgcp_trunk.h at 65 PS27, Line 65: unsigned int number_endpoints_offset; comment required. https://gerrit.osmocom.org/c/osmo-mgw/+/25432/27/src/libosmo-mgcp/mgcp_protocol.c File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/c/osmo-mgw/+/25432/27/src/libosmo-mgcp/mgcp_protocol.c at a1402 PS27, Line 1402: * that we walk over all endpoints on the trunk in order to drop all likewise with this move? https://gerrit.osmocom.org/c/osmo-mgw/+/25432/27/src/libosmo-mgcp/mgcp_protocol.c at 324 PS27, Line 324: #define rq w->x.rq not sure I'm a fan of this, writing those few more characters make it more cleare what is done in the code. Not a blocker, just my thinking. https://gerrit.osmocom.org/c/osmo-mgw/+/25432/27/src/libosmo-mgcp/mgcp_protocol.c at 1188 PS27, Line 1188: if (!endp || !mgcp_endp_avail(endp)) { is moving this around really related to multithreading, or is it an unrelated change that should come before the multithread patch? https://gerrit.osmocom.org/c/osmo-mgw/+/25432/27/src/libosmo-mgcp/mgcp_protocol.c at 1576 PS27, Line 1576: for_each_line (line, rq->pdatap->save) { unrelated whitespace change -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25432 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I31be8253600c8af0a43c967d0d128f5ba7b16260 Gerrit-Change-Number: 25432 Gerrit-PatchSet: 27 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: dexter Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 16:42:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:45:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 03:45:19 +0000 Subject: Change in osmo-pcu[master]: tbf_fsm: Handle MAX_N3105 in state ASSIGN References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25769 ) Change subject: tbf_fsm: Handle MAX_N3105 in state ASSIGN ...................................................................... tbf_fsm: Handle MAX_N3105 in state ASSIGN Seen on a runnig osmo-pcu against real MS: """ pdch_ul_controller.c:329 PDCH(bts=0,trx=1,ts=7) Timeout for registered POLL (FN=751140): TBF(TFI=0 TLLI=0xe8c12143 DIR=UL STATE=ASSIGN EGPRS) tbf.cpp:542 TBF(TFI=0 TLLI=0xe8c12143 DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=751140, TS=7 (curr FN 751140) tbf.cpp:384 TBF(TFI=0 TLLI=0xe8c12143 DIR=UL STATE=ASSIGN EGPRS) N3105 exceeded MAX (8) tbf.cpp:594 TBF(UL-TFI_0)[9bc050]{ASSIGN}: Received Event MAX_N3105 tbf.cpp:594 TBF(UL-TFI_0)[9bc050]{ASSIGN}: Event MAX_N3105 not permitted """ It was first though when FSMs where introduced that an FSM in ASSIGN state could not receive this kind of event because it was believed to be sending no CTRL blocks at all until flow state. That's because the believe was that Assignment over PACCH was done by another existing TBF. It turns out this is usually the case, but not in all cases. In at least one case, the tbf object (and tbf_fsm/tbf_{ul,dl}_ass_fsm) itself is handling its own assignment (hence eg. sending the UL assignment and waiting response through tbf_ul_ass_fsm. This happens if a UL TBF sends a Pkt Resource Req as a response to RRBP of final UL ACK/NACK in order to request a new TBF, where it temporarily uses the control_ts of the previous TBF to get a new Pkt UL Assignment over PACCH. If Pkt Ul Assignment doesn't receive a CTRL ACK, tbf_ul_ass_fsm will retrnamist it, until MAX_N3015 is reached (the event we failed to handle until now). At this point, we really want to transition to RELEASING in order to avoid keeping the TBF allocating resources (until X2001 times out). Related: SYS#5647 Change-Id: I86d5c1bbccd06673d08451b812d149e727404733 --- M src/tbf_fsm.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/69/25769/1 diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c index d1d4668..84d5bcc 100644 --- a/src/tbf_fsm.c +++ b/src/tbf_fsm.c @@ -188,6 +188,10 @@ /* change state to FLOW, so scheduler will start transmission */ tbf_fsm_state_chg(fi, TBF_ST_FLOW); break; + case TBF_EV_MAX_N3105: + ctx->T_release = 3195; + tbf_fsm_state_chg(fi, TBF_ST_RELEASING); + break; default: OSMO_ASSERT(0); } @@ -409,7 +413,8 @@ X(TBF_EV_ASSIGN_ADD_PACCH) | X(TBF_EV_ASSIGN_ACK_PACCH) | X(TBF_EV_ASSIGN_PCUIF_CNF) | - X(TBF_EV_ASSIGN_READY_CCCH), + X(TBF_EV_ASSIGN_READY_CCCH) | + X(TBF_EV_MAX_N3105), .out_state_mask = X(TBF_ST_FLOW) | X(TBF_ST_FINISHED) | -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I86d5c1bbccd06673d08451b812d149e727404733 Gerrit-Change-Number: 25769 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:45:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 03:45:22 +0000 Subject: Change in osmo-pcu[master]: tbf: Use define to flag control_ts unset special value References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25770 ) Change subject: tbf: Use define to flag control_ts unset special value ...................................................................... tbf: Use define to flag control_ts unset special value Change-Id: Idd3ccec509b40b6229544b45e54da1142805b6f9 --- M src/tbf.cpp M src/tbf.h 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/70/25770/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index 7ebd268..153ba80 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -96,7 +96,7 @@ trx(NULL), first_ts(0), first_common_ts(0), - control_ts(0xff), + control_ts(TBF_CONTROL_TS_UNSET), fT(0), num_fT_exp(0), upgrade_to_multislot(false), @@ -328,7 +328,7 @@ int tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf) { - if (tbf->control_ts == 0xff) + if (tbf->control_ts == TBF_CONTROL_TS_UNSET) LOGPTBF(tbf, LOGL_INFO, "Setting Control TS %d\n", tbf->first_common_ts); else if (tbf->control_ts != tbf->first_common_ts) diff --git a/src/tbf.h b/src/tbf.h index 3aaf9fb..05beed5 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -116,6 +116,8 @@ #define GPRS_RLCMAC_FLAG_TO_DL_ACK 3 /* DL TBF: Failed to receive last polled DL ACK/NACK */ #define GPRS_RLCMAC_FLAG_TO_MASK 0xf0 /* timeout bits */ +#define TBF_CONTROL_TS_UNSET 0xff + #define T_START(tbf, t, T, r, f) tbf->t_start(t, T, r, f, __FILE__, __LINE__) #ifdef __cplusplus -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idd3ccec509b40b6229544b45e54da1142805b6f9 Gerrit-Change-Number: 25770 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 17:20:08 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 12 Oct 2021 17:20:08 +0000 Subject: Change in osmo-pcu[master]: tbf_dl_ass_fsm: Move block msg generation conditions to rts() function In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25752 ) Change subject: tbf_dl_ass_fsm: Move block msg generation conditions to rts() function ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idbe4f9bbd23005a43c586b737cf9adc2114287e2 Gerrit-Change-Number: 25752 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 17:20:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 17:20:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 12 Oct 2021 17:20:18 +0000 Subject: Change in osmo-pcu[master]: tbf_dl_ass_fsm: Move block msg generation conditions to rts() function In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25752 ) Change subject: tbf_dl_ass_fsm: Move block msg generation conditions to rts() function ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idbe4f9bbd23005a43c586b737cf9adc2114287e2 Gerrit-Change-Number: 25752 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 12 Oct 2021 17:20:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 17:20:22 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 12 Oct 2021 17:20:22 +0000 Subject: Change in osmo-pcu[master]: tbf_fsm: Handle MAX_N3105 in state ASSIGN In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25769 ) Change subject: tbf_fsm: Handle MAX_N3105 in state ASSIGN ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I86d5c1bbccd06673d08451b812d149e727404733 Gerrit-Change-Number: 25769 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Tue, 12 Oct 2021 17:20:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:45:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 03:45:29 +0000 Subject: Change in osmo-pcu[master]: tbf_dl_ass_fsm: Move block msg generation conditions to rts() function In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25752 ) Change subject: tbf_dl_ass_fsm: Move block msg generation conditions to rts() function ...................................................................... tbf_dl_ass_fsm: Move block msg generation conditions to rts() function Move the required conditions to generate a message to the rts() function, this way the scheduler knows this TBF cannot yet attempt the procedure and hence will not request it to create a message which will fail. This way the scheduler will schedule other itneresting messages instead of failing and scheduling a dummy block as a result. Change-Id: Idbe4f9bbd23005a43c586b737cf9adc2114287e2 --- M src/tbf_dl_ass_fsm.c 1 file changed, 22 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/tbf_dl_ass_fsm.c b/src/tbf_dl_ass_fsm.c index 5ac1c1a..37ced61 100644 --- a/src/tbf_dl_ass_fsm.c +++ b/src/tbf_dl_ass_fsm.c @@ -65,31 +65,10 @@ /* We only use this function in control TS (PACCH) so that MS can always answer the poll */ OSMO_ASSERT(tbf_is_control_ts(ctx->tbf, d->ts)); - if (tbf_ul_ass_fi(ctx->tbf)->state == TBF_UL_ASS_WAIT_ACK) - { - LOGPTBF(ctx->tbf, LOGL_DEBUG, - "Polling is already scheduled, so we must wait for the uplink assignment...\n"); - // FIXME: call tbf_dl_ass_fsm_state_chg(ctx->fi, TBF_DL_ASS_NONE); ? - return NULL; - } rc = tbf_check_polling(ctx->tbf, d->fn, d->ts, &new_poll_fn, &rrbp); if (rc < 0) return NULL; - /* on uplink TBF we get the downlink TBF to be assigned. */ - if (tbf_direction(ctx->tbf) == GPRS_RLCMAC_UL_TBF) { - struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(ctx->tbf); - - /* be sure to check first, if contention resolution is done, - * otherwise we cannot send the assignment yet (3GPP TS 44.060 sec 7.1.3.1) */ - if (!ul_tbf_contention_resolution_done(ul_tbf)) { - LOGPTBF(ctx->tbf, LOGL_DEBUG, - "Cannot assign DL TBF now, because contention resolution is not finished.\n"); - // FIXME: call tbf_dl_ass_fsm_state_chg(ctx->fi, TBF_DL_ASS_NONE); ? - return NULL; - } - } - new_dl_tbf = ms_dl_tbf(ms); if (!new_dl_tbf) { LOGPTBF(ctx->tbf, LOGL_ERROR, @@ -273,8 +252,28 @@ return data_ctx.msg; } -bool tbf_dl_ass_rts(const struct gprs_rlcmac_tbf* tbf) +bool tbf_dl_ass_rts(const struct gprs_rlcmac_tbf *tbf) { struct osmo_fsm_inst *fi = tbf_dl_ass_fi(tbf); - return fi->state == TBF_DL_ASS_SEND_ASS; + if (fi->state != TBF_DL_ASS_SEND_ASS) + return false; + + if (tbf_ul_ass_fi(tbf)->state == TBF_UL_ASS_WAIT_ACK) { + LOGPTBF(tbf, LOGL_DEBUG, + "Polling is already scheduled, so we must wait for the uplink assignment...\n"); + return false; + } + + /* on uplink TBF we get the downlink TBF to be assigned. */ + if (tbf_direction(tbf) == GPRS_RLCMAC_UL_TBF) { + const struct gprs_rlcmac_ul_tbf *ul_tbf = (const struct gprs_rlcmac_ul_tbf *)tbf; + /* be sure to check first, if contention resolution is done, + * otherwise we cannot send the assignment yet (3GPP TS 44.060 sec 7.1.3.1) */ + if (!ul_tbf_contention_resolution_done(ul_tbf)) { + LOGPTBF(tbf, LOGL_DEBUG, + "Cannot assign DL TBF now, because contention resolution is not finished.\n"); + return false; + } + } + return true; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idbe4f9bbd23005a43c586b737cf9adc2114287e2 Gerrit-Change-Number: 25752 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:45:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 03:45:31 +0000 Subject: Change in osmo-pcu[master]: tbf_ul_ass_fsm: Fix use of incorrect log macro In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25768 ) Change subject: tbf_ul_ass_fsm: Fix use of incorrect log macro ...................................................................... tbf_ul_ass_fsm: Fix use of incorrect log macro Change-Id: I61e46199086a3e82985606cf81995e27663c91f5 --- M src/tbf_ul_ass_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/tbf_ul_ass_fsm.c b/src/tbf_ul_ass_fsm.c index 618e072..791bab7 100644 --- a/src/tbf_ul_ass_fsm.c +++ b/src/tbf_ul_ass_fsm.c @@ -127,7 +127,7 @@ bts_do_rate_ctr_inc(ms->bts, CTR_PKT_UL_ASSIGNMENT); tbf_set_polling(ctx->tbf, new_poll_fn, d->ts, PDCH_ULC_POLL_UL_ASS); - LOGPTBFDL(ctx->tbf, LOGL_INFO, "Scheduled UL Assignment polling on PACCH (FN=%d, TS=%d)\n", + LOGPTBFUL(ctx->tbf, LOGL_INFO, "Scheduled UL Assignment polling on PACCH (FN=%d, TS=%d)\n", new_poll_fn, d->ts); talloc_free(mac_control_block); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I61e46199086a3e82985606cf81995e27663c91f5 Gerrit-Change-Number: 25768 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:45:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 03:45:34 +0000 Subject: Change in osmo-pcu[master]: tbf: Document temporary change of control_ts and move code assigning ... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25771 ) Change subject: tbf: Document temporary change of control_ts and move code assigning it back to FSM ...................................................................... tbf: Document temporary change of control_ts and move code assigning it back to FSM Change-Id: I1b7eb7802060778487e5729ee789b2323b6636f8 --- M src/pdch.cpp M src/tbf_fsm.c 2 files changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/71/25771/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index dbdd47f..ca3a0ea 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -384,8 +384,6 @@ tbf_free(tbf); osmo_fsm_inst_dispatch(new_tbf->state_fsm.fi, TBF_EV_ASSIGN_ACK_PACCH, NULL); - - tbf_assign_control_ts(new_tbf); /* there might be LLC packets waiting in the queue, but the DL * TBF might have been released while the UL TBF has been * established */ @@ -417,8 +415,6 @@ tbf_free(tbf); osmo_fsm_inst_dispatch(new_tbf->state_fsm.fi, TBF_EV_ASSIGN_ACK_PACCH, NULL); - - tbf_assign_control_ts(new_tbf); return; case PDCH_ULC_POLL_CELL_CHG_CONTINUE: @@ -717,7 +713,13 @@ goto return_unref; } - /* set control ts to current MS's TS, until assignment complete */ + /* Set control TS to the TS where this PktResReq was received, + * which in practice happens to be the control_ts from the + * previous UL-TBF or SBA. When CTRL ACK is received as RRBP of the Pkt + * UL Ass scheduled below, then TBF_EV_ASSIGN_ACK_PACCH will be + * sent to tbf_fsm which will call tbf_assign_control_ts(), + * effectively setting back control_ts to + * tbf->initial_common_ts. */ LOGPTBF(ul_tbf, LOGL_DEBUG, "change control TS %d -> %d until assignment is complete.\n", ul_tbf->control_ts, ts_no); diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c index 84d5bcc..36981e6 100644 --- a/src/tbf_fsm.c +++ b/src/tbf_fsm.c @@ -157,6 +157,7 @@ mod_ass_type(ctx, GPRS_RLCMAC_FLAG_PACCH, true); break; case TBF_EV_ASSIGN_ACK_PACCH: + tbf_assign_control_ts(ctx->tbf); if (ctx->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH)) { /* We now know that the PACCH really existed */ LOGPTBF(ctx->tbf, LOGL_INFO, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1b7eb7802060778487e5729ee789b2323b6636f8 Gerrit-Change-Number: 25771 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:45:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 03:45:37 +0000 Subject: Change in osmo-pcu[master]: Return void in tbf_assign_control_ts() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25772 ) Change subject: Return void in tbf_assign_control_ts() ...................................................................... Return void in tbf_assign_control_ts() This operation cannot fail, hence let's simplify code. Change-Id: I5675df4b6309d680d1d5e2dbea87991468f30630 --- M src/tbf.cpp M src/tbf.h 2 files changed, 4 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/72/25772/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index 153ba80..af15c72 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -326,7 +326,7 @@ return 0; } -int tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf) +void tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf) { if (tbf->control_ts == TBF_CONTROL_TS_UNSET) LOGPTBF(tbf, LOGL_INFO, "Setting Control TS %d\n", @@ -335,8 +335,6 @@ LOGPTBF(tbf, LOGL_INFO, "Changing Control TS %d -> %d\n", tbf->control_ts, tbf->first_common_ts); tbf->control_ts = tbf->first_common_ts; - - return 0; } void gprs_rlcmac_tbf::n_reset(enum tbf_counters n) @@ -660,13 +658,8 @@ bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_FAIL); return -1; } - /* assign control ts */ - rc = tbf_assign_control_ts(this); - /* if no resource */ - if (rc < 0) { - LOGPTBF(this, LOGL_ERROR, "Failed to assign control TS\n"); - return -1; - } + /* assign initial control ts */ + tbf_assign_control_ts(this); /* set timestamp */ osmo_clock_gettime(CLOCK_MONOTONIC, &meas.rssi_tv); diff --git a/src/tbf.h b/src/tbf.h index 05beed5..cab9364 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -142,7 +142,7 @@ bool tbf_is_tfi_assigned(const struct gprs_rlcmac_tbf *tbf); uint8_t tbf_tfi(const struct gprs_rlcmac_tbf *tbf); bool tbf_is_egprs_enabled(const struct gprs_rlcmac_tbf *tbf); -int tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf); +void tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf); int tbf_check_polling(const struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts, uint32_t *poll_fn, unsigned int *rrbp); void tbf_set_polling(struct gprs_rlcmac_tbf *tbf, uint32_t new_poll_fn, uint8_t ts, enum pdch_ulc_tbf_poll_reason t); void tbf_poll_timeout(struct gprs_rlcmac_tbf *tbf, struct gprs_rlcmac_pdch *pdch, uint32_t poll_fn, enum pdch_ulc_tbf_poll_reason reason); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5675df4b6309d680d1d5e2dbea87991468f30630 Gerrit-Change-Number: 25772 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 17:41:54 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 12 Oct 2021 17:41:54 +0000 Subject: Change in libosmocore[master]: ns2: correct parse a BLOCK PDU which was received over a different NSVC In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, daniel, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/25558 to look at the new patch set (#4). Change subject: ns2: correct parse a BLOCK PDU which was received over a different NSVC ...................................................................... ns2: correct parse a BLOCK PDU which was received over a different NSVC BLOCK PDU can be send over a different NSVC than the NSVC. E.g. informing a NSVC got blocked in case of a lower-layer failure. Change-Id: I483e3a1d3b8c43bbb0cc6185b7f7f772bcb264bf --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 36 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/25558/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I483e3a1d3b8c43bbb0cc6185b7f7f772bcb264bf Gerrit-Change-Number: 25558 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:45:39 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 13 Oct 2021 03:45:39 +0000 Subject: Change in libosmocore[master]: ns2: improve log line when receving a PDU with wrong NSE References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/25773 ) Change subject: ns2: improve log line when receving a PDU with wrong NSE ...................................................................... ns2: improve log line when receving a PDU with wrong NSE Change-Id: I072510461fb426fa62ca20c5103764b0efd25f82 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/73/25773/1 diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index aa6613b..726fc0c 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -876,7 +876,7 @@ if (nsh->pdu_type == NS_PDUT_RESET) ns2_tx_reset_ack(nsvc); - LOG_NS_SIGNAL(nsvc, "Rx", nsh->pdu_type, LOGL_ERROR, " with wrong NSEI=%05u. Ignoring PDU.\n", nsei); + LOG_NS_SIGNAL(nsvc, "Rx", nsh->pdu_type, LOGL_ERROR, " with wrong NSEI (exp: %05u, got %05u). Ignoring PDU.\n", nsvc->nse->nsei, nsei); goto out; } } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I072510461fb426fa62ca20c5103764b0efd25f82 Gerrit-Change-Number: 25773 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:45:39 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 13 Oct 2021 03:45:39 +0000 Subject: Change in libosmocore[master]: ns2: don't forward an invalid RESET PDU to the FSM References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/25774 ) Change subject: ns2: don't forward an invalid RESET PDU to the FSM ...................................................................... ns2: don't forward an invalid RESET PDU to the FSM When receiving an invalid RESET (e.g. wrong NSEI or NSVCI) do not forward the PDU to the NSVC fsm. Answer it with correct NSEI & NSVCI, log the PDU, then ignore it. Fixes: OS#5258 Change-Id: I6e562def9c5a1e4534d42884215272b1e66d26c2 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/74/25774/1 diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 726fc0c..d28897e 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -887,6 +887,8 @@ /* 48.016 ? 7.3.1 send RESET_ACK to wrong NSVCI + ignore */ if (nsh->pdu_type == NS_PDUT_RESET) { ns2_tx_reset_ack(nsvc); + LOG_NS_SIGNAL(nsvc, "Rx", nsh->pdu_type, LOGL_ERROR, " with wrong NSVCI (exp: %05u, got %05u). Ignoring PDU.\n", nsvc->nsvci, nsvci); + goto out; } else if (nsh->pdu_type == NS_PDUT_STATUS) { /* this is a PDU received over a NSVC and reports a status for another NSVC */ target_nsvc = gprs_ns2_nsvc_by_nsvci(nsvc->nse->nsi, nsvci); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6e562def9c5a1e4534d42884215272b1e66d26c2 Gerrit-Change-Number: 25774 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:45:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 03:45:49 +0000 Subject: Change in osmo-pcu[master]: pdch: rcv_data_block: Avoid releasing ULC entry if expecting somethin... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25775 ) Change subject: pdch: rcv_data_block: Avoid releasing ULC entry if expecting something else on UL ...................................................................... pdch: rcv_data_block: Avoid releasing ULC entry if expecting something else on UL Let's only release PDCH ULC entry if it was indeed what we expected. In other case, time it out. Change-Id: I1537587f5ee801c633784691b576ebb1ed521e95 --- M src/pdch.cpp 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/75/25775/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index ca3a0ea..68bc69d 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -982,7 +982,9 @@ if (node) { switch (node->type) { case PDCH_ULC_NODE_TBF_USF: - if (tbf != node->tbf_usf.ul_tbf) + if (tbf == node->tbf_usf.ul_tbf) + pdch_ulc_release_node(ulc, node); + else LOGPDCH(this, DRLCMACUL, LOGL_NOTICE, "FN=%" PRIu32 " " "Rx UL DATA from unexpected %s vs expected %s\n", fn, tbf_name(tbf), tbf_name(node->tbf_usf.ul_tbf)); @@ -998,7 +1000,6 @@ fn, tbf_name(tbf)); break; } - pdch_ulc_release_node(ulc, node); } else { LOGPDCH(this, DRLCMACUL, LOGL_NOTICE, "FN=%" PRIu32 " " "Rx UL DATA from unexpected %s\n", fn, tbf_name(tbf)); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1537587f5ee801c633784691b576ebb1ed521e95 Gerrit-Change-Number: 25775 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 03:45:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 03:45:50 +0000 Subject: Change in osmo-pcu[master]: tbf: Avoid keeping poll nodes in pdch_ulc of temporary control_ts use... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25776 ) Change subject: tbf: Avoid keeping poll nodes in pdch_ulc of temporary control_ts used during PACCH assignment ...................................................................... tbf: Avoid keeping poll nodes in pdch_ulc of temporary control_ts used during PACCH assignment When MS sends us the Packet Resource Request as RRBP from final UL ACK/NACK, we create a new TBF with a different set of allocated TS. However, we must send the Pkt UL Assignment with information of the new TBF using that same TS where we receive the Packet Resource Request, which happens to be the control TS of the previous/old TBF. The original control TS of the new TBF is kept in tbf->first_common_ts. Hence the code does gprs_rlcmac_pdch::rcv_resource_request(): """ ul_tbf->control_ts = ts_no; """ And later, when we receive a CTRL ACK answering the Pkt UL Assigment, we change the control TS of the new TBF back to the new one, by calling tbf_assign_control_ts(), which basically does: """ tbf->control_ts = tbf->first_common_ts; """ So, for instance we have a TBF which was allocated with tbf->control_ts=4 and hence is only attached to PDCH 4 (tbf->pdch[]), but for which is temporarily applied tbf->control_ts=7. Hence, when a poll is requested, it is done in control_ts, aka 7, which is not in the array of attached PDCH. The problem is of course if we never reach the point where the final control_ts is set, due to never receiving the CTRL ACK. If the TBF is freed (due to timer X2001) before receiving the CTRL ACK and hence tbf_assign_control_ts() is called, a crash may occur, because potentially a poll for the TBF is left in TS 7 because it's not a PDCH attached to the TBF and hence poll entries on that TS are not released, hence keeping a pointer to the freed TBF. Related: SYS#5647 Change-Id: I0c49f2695e0d932d956c01976c9458eebee63cd4 --- M src/tbf.cpp 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/76/25776/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index af15c72..0331a80 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -243,6 +243,16 @@ { int ts; + /* During assignment (state=ASSIGN), tbf may be temporarily using + * tbf->control_ts from a previous TBF/SBA to transmit the UL/DL + * Assignment, which may not be necessarly be a TS where the current TBF + * is attached to. Hence, we may have ULC pollings ongoing and we need + * to make sure we drop all reserved nodes there: */ + if (tbf_state(tbf) == TBF_ST_ASSIGN && + tbf->control_ts != TBF_CONTROL_TS_UNSET && !tbf->pdch[tbf->control_ts]) + pdch_ulc_release_tbf(tbf->trx->pdch[tbf->control_ts].ulc, tbf); + + /* Now simply detach from all attached PDCHs */ for (ts = 0; ts < 8; ts++) { if (!tbf->pdch[ts]) continue; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0c49f2695e0d932d956c01976c9458eebee63cd4 Gerrit-Change-Number: 25776 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 20:09:00 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 12 Oct 2021 20:09:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: selftest: add missing Native_FunctionDefs.cc In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25755 ) Change subject: selftest: add missing Native_FunctionDefs.cc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I73c225f6699cd272b3eeffb249f3dddd2048bc01 Gerrit-Change-Number: 25755 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 20:09:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 20:08:46 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 12 Oct 2021 20:08:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen_makefile.sh: files/flags in separate lines In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25754 ) Change subject: regen_makefile.sh: files/flags in separate lines ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6b6866eb9f6ec6232e4ae434517457a4c8c1c050 Gerrit-Change-Number: 25754 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 20:08:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 20:09:10 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 12 Oct 2021 20:09:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pgw: add missing BSSGP_EncDec.cc In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25756 ) Change subject: pgw: add missing BSSGP_EncDec.cc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I010df10396d264e67bd8c712daafcfb79262ece2 Gerrit-Change-Number: 25756 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 20:09:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 20:09:25 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 12 Oct 2021 20:09:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mme: link against gnutls In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25757 ) Change subject: mme: link against gnutls ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iacddc22ecda187e250db9cfb1ca1d1d341ce78f4 Gerrit-Change-Number: 25757 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 12 Oct 2021 20:09:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 12 20:15:22 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 12 Oct 2021 20:15:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen_makefile.sh: remove duplicate main file In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 ) Change subject: regen_makefile.sh: remove duplicate main file ...................................................................... Patch Set 1: > Patch Set 1: Code-Review-1 > > I would be seriously surprised if you can do this. AFAIR, the first ttcn file given to the compiler will determine the name of the resulting executable file. That's why we have it stated as first file. One can still specify name of the resulting binary implicitly using '-e'. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f Gerrit-Change-Number: 25758 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 12 Oct 2021 20:15:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 08:27:30 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 13 Oct 2021 08:27:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen_makefile.sh: files/flags in separate lines In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25754 ) Change subject: regen_makefile.sh: files/flags in separate lines ...................................................................... regen_makefile.sh: files/flags in separate lines Make all regen_makefile.sh more readable and diff friendly by moving each entry in FILES and CPPFLAGS_TTCN3 into separate lines. Order entries alphabetically. Related: OS#5252 Change-Id: I6b6866eb9f6ec6232e4ae434517457a4c8c1c050 --- M SCCP_Test/regen_makefile.sh M bsc-nat/regen_makefile.sh M bsc/regen_makefile.sh M bts/regen_makefile.sh M cbc/regen_makefile.sh M ccid/regen_makefile.sh M fr-net/regen_makefile.sh M fr/regen_makefile.sh M gbproxy/regen_makefile.sh M ggsn_tests/regen_makefile.sh M hlr/regen_makefile.sh M lapdm/regen_makefile.sh M mgw/regen_makefile.sh M mme/regen_makefile.sh M msc/regen_makefile.sh M ns/regen_makefile.sh M pcap-client/regen_makefile.sh M pcu/regen_makefile.sh M pgw/regen_makefile.sh M regen-makefile.sh M remsim/regen_makefile.sh M sccp/regen_makefile.sh M selftest/regen_makefile.sh M sgsn/regen_makefile.sh M simtrace/regen_makefile.sh M sip/regen_makefile.sh M smlc/regen_makefile.sh M stp/regen_makefile.sh M sysinfo/regen_makefile.sh 29 files changed, 562 insertions(+), 66 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/SCCP_Test/regen_makefile.sh b/SCCP_Test/regen_makefile.sh index 9472e0c..f5d13b7 100755 --- a/SCCP_Test/regen_makefile.sh +++ b/SCCP_Test/regen_makefile.sh @@ -2,6 +2,12 @@ MAIN=SCCP_Testcases.ttcn -FILES="*.ttcn *.ttcnpp" +FILES=" + *.ttcn + *.ttcnpp +" + +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh $MAIN $FILES diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh index ad31551..33b557c 100755 --- a/bsc-nat/regen_makefile.sh +++ b/bsc-nat/regen_makefile.sh @@ -2,8 +2,31 @@ MAIN=BSCNAT_Tests.ttcn -FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RTP_EncDec.cc SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc" +FILES=" + *.c + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + MGCP_CodecPort_CtrlFunctDef.cc + Native_FunctionDefs.cc + RTP_EncDec.cc + SCCP_EncDec.cc + SDP_EncDec.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_SCCP -DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_MGCP + -DIPA_EMULATION_SCCP + -DRAN_EMULATION_BSSAP + -DRAN_EMULATION_CTRL + -DRAN_EMULATION_MGCP + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh $MAIN $FILES diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh index f1ea963..53f8e82 100755 --- a/bsc/regen_makefile.sh +++ b/bsc/regen_makefile.sh @@ -2,8 +2,36 @@ MAIN=BSC_Tests.ttcn -FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc SCTPasp_PT.cc RTP_EncDec.cc SDP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc IuUP_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc CBSP_CodecPort_CtrlFunctdef.cc StatsD_CodecPort_CtrlFunctdef.cc *.c" +FILES=" + *.c + *.ttcn + *.ttcnpp + CBSP_CodecPort_CtrlFunctdef.cc + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + IuUP_EncDec.cc + MGCP_CodecPort_CtrlFunctDef.cc + Native_FunctionDefs.cc + RTP_CodecPort_CtrlFunctDef.cc + RTP_EncDec.cc + SCTPasp_PT.cc + SDP_EncDec.cc + StatsD_CodecPort_CtrlFunctdef.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_MGCP + -DIPA_EMULATION_RSL + -DIPA_EMULATION_SCCP + -DRAN_EMULATION_BSSAP + -DRAN_EMULATION_CTRL + -DRAN_EMULATION_MGCP + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh $MAIN $FILES diff --git a/bts/regen_makefile.sh b/bts/regen_makefile.sh index 42ad0f3..850e0bf 100755 --- a/bts/regen_makefile.sh +++ b/bts/regen_makefile.sh @@ -1,7 +1,29 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc UD_PT.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TRXC_CodecPort_CtrlFunctDef.cc L1CTL_PortType_CtrlFunctDef.cc TELNETasp_PT.cc IuUP_EncDec.cc RTP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc" +FILES=" + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + IuUP_EncDec.cc + L1CTL_PortType_CtrlFunctDef.cc + Native_FunctionDefs.cc + RLCMAC_EncDec.cc + RTP_CodecPort_CtrlFunctDef.cc + RTP_EncDec.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc + TRXC_CodecPort_CtrlFunctDef.cc + UD_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_OML -DIPA_EMULATION_CTRL -DIPA_EMULATION_OSMO_PCU" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_OML + -DIPA_EMULATION_OSMO_PCU + -DIPA_EMULATION_RSL +" ../regen-makefile.sh BTS_Tests.ttcn $FILES diff --git a/cbc/regen_makefile.sh b/cbc/regen_makefile.sh index 0dabc7d..d2c3b12 100755 --- a/cbc/regen_makefile.sh +++ b/cbc/regen_makefile.sh @@ -1,10 +1,27 @@ #!/bin/bash -FILES="*.ttcn TCCConversion.cc TCCInterface.cc TCCEncoding.cc IPL4asp_PT.cc IPL4asp_discovery.cc TELNETasp_PT.cc Native_FunctionDefs.cc SCTPasp_PT.cc Abstract_Socket.cc HTTPmsg_PT.cc HTTPmsg_MessageLen_Function.cc JSON_EncDec.cc CBSP_CodecPort_CtrlFunctdef.cc SABP_EncDec.cc SABP_CodecPort_CtrlFunctDef.cc " -#FILES+="*.ttcnpp " -FILES+="*.asn" +FILES=" + *.asn + *.ttcn + Abstract_Socket.cc + CBSP_CodecPort_CtrlFunctdef.cc + HTTPmsg_MessageLen_Function.cc + HTTPmsg_PT.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + JSON_EncDec.cc + Native_FunctionDefs.cc + SABP_CodecPort_CtrlFunctDef.cc + SABP_EncDec.cc + SCTPasp_PT.cc + TCCConversion.cc + TCCEncoding.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="" +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh CBC_Tests.ttcn $FILES diff --git a/ccid/regen_makefile.sh b/ccid/regen_makefile.sh index 215d9c6..0925654 100755 --- a/ccid/regen_makefile.sh +++ b/ccid/regen_makefile.sh @@ -1,6 +1,13 @@ #!/bin/sh -FILES="*.ttcn USB_PT.cc Native_FunctionDefs.cc " +FILES=" + *.ttcn + Native_FunctionDefs.cc + USB_PT.cc +" + +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh CCID_Tests.ttcn $FILES diff --git a/fr-net/regen_makefile.sh b/fr-net/regen_makefile.sh index e2c143d..6488015 100755 --- a/fr-net/regen_makefile.sh +++ b/fr-net/regen_makefile.sh @@ -1,10 +1,21 @@ #!/bin/bash -FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc " -FILES+="AF_PACKET_PT.cc " -FILES+="Native_FunctionDefs.cc " -FILES+="LLC_EncDec.cc TELNETasp_PT.cc " +FILES=" + *.ttcn + *.ttcnpp + AF_PACKET_PT.cc + BSSGP_EncDec.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + LLC_EncDec.cc + Native_FunctionDefs.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DNS_EMULATION_FR" +export CPPFLAGS_TTCN3=" + -DNS_EMULATION_FR +" ../regen-makefile.sh FRNET_Tests.ttcn $FILES diff --git a/fr/regen_makefile.sh b/fr/regen_makefile.sh index d17f51c..9c473ef 100755 --- a/fr/regen_makefile.sh +++ b/fr/regen_makefile.sh @@ -1,9 +1,22 @@ #!/bin/bash -FILES="*.ttcn *.ttcnpp IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc Native_FunctionDefs.cc " -FILES+="BSSGP_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc " -FILES+="AF_PACKET_PT.cc AF_PACKET_PT.hh " +FILES=" + *.ttcn + *.ttcnpp + AF_PACKET_PT.cc + AF_PACKET_PT.hh + BSSGP_EncDec.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + LLC_EncDec.cc + Native_FunctionDefs.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DNS_EMULATION_FR" +export CPPFLAGS_TTCN3=" + -DNS_EMULATION_FR +" ../regen-makefile.sh FR_Tests.ttcn $FILES diff --git a/gbproxy/regen_makefile.sh b/gbproxy/regen_makefile.sh index e82649c..5ec6689 100755 --- a/gbproxy/regen_makefile.sh +++ b/gbproxy/regen_makefile.sh @@ -1,9 +1,34 @@ #!/bin/bash -FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc LLC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IPA_CodecPort_CtrlFunctDef.cc GTPU_EncDec.cc GTPC_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc SCCP_EncDec.cc SCTPasp_PT.cc " -FILES+="AF_PACKET_PT.cc AF_PACKET_PT.hh " +FILES=" + *.ttcn + *.ttcnpp + AF_PACKET_PT.cc + AF_PACKET_PT.hh + BSSGP_EncDec.cc + GTPC_EncDec.cc + GTPU_EncDec.cc + GTP_CodecPort_CtrlFunctDef.cc + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + LLC_EncDec.cc + Native_FunctionDefs.cc + RLCMAC_EncDec.cc + SCCP_EncDec.cc + SCTPasp_PT.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR -DBSSGP_EM_L3 -DNS_EMULATION_FR" +export CPPFLAGS_TTCN3=" + -DBSSGP_EM_L3 + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_GSUP + -DNS_EMULATION_FR + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh GBProxy_Tests.ttcn $FILES diff --git a/ggsn_tests/regen_makefile.sh b/ggsn_tests/regen_makefile.sh index 6afd5d9..5e6b08d 100755 --- a/ggsn_tests/regen_makefile.sh +++ b/ggsn_tests/regen_makefile.sh @@ -1,5 +1,24 @@ #!/bin/sh -FILES="*.ttcn IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc GTPC_EncDec.cc GTPU_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc ICMPv6_EncDec.cc IP_EncDec.cc Native_FunctionDefs.cc UDP_EncDec.cc ICMP_EncDec.cc TELNETasp_PT.cc BSSGP_EncDec.cc" +FILES=" + *.ttcn + BSSGP_EncDec.cc + GTPC_EncDec.cc + GTPU_EncDec.cc + GTP_CodecPort_CtrlFunctDef.cc + ICMP_EncDec.cc + ICMPv6_EncDec.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + IP_EncDec.cc + Native_FunctionDefs.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc + UDP_EncDec.cc +" + +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh GGSN_Tests.ttcn $FILES diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh index 14b05da..9ab40ce 100755 --- a/hlr/regen_makefile.sh +++ b/hlr/regen_makefile.sh @@ -2,8 +2,26 @@ MAIN="HLR_Tests.ttcn" -FILES="*.ttcn *.ttcnpp DNS_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc TCCEncoding.cc UDPasp_PT.cc SS_EncDec.cc MAP_EncDec.cc *.asn" +FILES=" + *.asn + *.ttcn + *.ttcnpp + DNS_EncDec.cc + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + MAP_EncDec.cc + SS_EncDec.cc + TCCConversion.cc + TCCEncoding.cc + TCCInterface.cc + TELNETasp_PT.cc + UDPasp_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_GSUP + -DIPA_EMULATION_CTRL +" ../regen-makefile.sh $MAIN $FILES diff --git a/lapdm/regen_makefile.sh b/lapdm/regen_makefile.sh index bb02fe8..2eb1366 100755 --- a/lapdm/regen_makefile.sh +++ b/lapdm/regen_makefile.sh @@ -1,5 +1,14 @@ #!/bin/sh -FILES="*.ttcn UD_PT.cc UD_PT.hh RLCMAC_EncDec.cc L1CTL_PortType_CtrlFunctDef.cc" +FILES=" + *.ttcn + L1CTL_PortType_CtrlFunctDef.cc + RLCMAC_EncDec.cc + UD_PT.cc + UD_PT.hh +" + +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh L1CTL_Test.ttcn $FILES diff --git a/mgw/regen_makefile.sh b/mgw/regen_makefile.sh index 46dd587..a47f7ba 100755 --- a/mgw/regen_makefile.sh +++ b/mgw/regen_makefile.sh @@ -1,7 +1,28 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc SDP_EncDec.cc *.c MGCP_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RTP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc OSMUX_CodecPort_CtrlFunctDef.cc IuUP_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IP_EncDec.cc StatsD_CodecPort_CtrlFunctdef.cc " +FILES=" + *.c + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + IP_EncDec.cc + IuUP_EncDec.cc + MGCP_CodecPort_CtrlFunctDef.cc + Native_FunctionDefs.cc + OSMUX_CodecPort_CtrlFunctDef.cc + RTP_CodecPort_CtrlFunctDef.cc + RTP_EncDec.cc + SDP_EncDec.cc + StatsD_CodecPort_CtrlFunctdef.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL +" ../regen-makefile.sh MGCP_Test.ttcn $FILES diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index cb04777..8106664 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -1,8 +1,28 @@ #!/bin/sh -FILES="*.ttcn *.asn *.c IPL4asp_PT.cc IPL4asp_discovery.cc Native_FunctionDefs.cc SGsAP_CodecPort_CtrlFunctDef.cc S1AP_CodecPort_CtrlFunctDef.cc TCCConversion.cc TCCEncoding.cc TCCInterface.cc TELNETasp_PT.cc S1AP_EncDec.cc LTE_CryptoFunctionDefs.cc GTPU_EncDec.cc GTPC_EncDec.cc DIAMETER_EncDec.cc DIAMETER_CodecPort_CtrlFunctDef.cc " +FILES=" + *.asn + *.c + *.ttcn + DIAMETER_CodecPort_CtrlFunctDef.cc + DIAMETER_EncDec.cc + GTPC_EncDec.cc + GTPU_EncDec.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + LTE_CryptoFunctionDefs.cc + Native_FunctionDefs.cc + S1AP_CodecPort_CtrlFunctDef.cc + S1AP_EncDec.cc + SGsAP_CodecPort_CtrlFunctDef.cc + TCCConversion.cc + TCCEncoding.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="" +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh MME_Tests.ttcn $FILES diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh index cbb491d..4ca9558 100755 --- a/msc/regen_makefile.sh +++ b/msc/regen_makefile.sh @@ -1,8 +1,46 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SMPP_EncDec.cc SMPP_CodecPort_CtrlFunctDef.cc MAP_EncDec.cc SS_EncDec.cc TCCEncoding.cc SGsAP_CodecPort_CtrlFunctDef.cc RANAP_EncDec.cc TCCOpenSecurity.cc *.c *.asn" +FILES=" + *.asn + *.c + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + MAP_EncDec.cc + MGCP_CodecPort_CtrlFunctDef.cc + MNCC_EncDec.cc + Native_FunctionDefs.cc + RANAP_EncDec.cc + RTP_CodecPort_CtrlFunctDef.cc + RTP_EncDec.cc + SCCP_EncDec.cc + SCTPasp_PT.cc + SDP_EncDec.cc + SGsAP_CodecPort_CtrlFunctDef.cc + SMPP_CodecPort_CtrlFunctDef.cc + SMPP_EncDec.cc + SS_EncDec.cc + TCCConversion.cc + TCCEncoding.cc + TCCInterface.cc + TCCOpenSecurity.cc + TELNETasp_PT.cc + UD_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DIPA_EMULATION_GSUP -DIPA_EMULATION_SCCP -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DRAN_EMULATION_RANAP -DUSE_MTP3_DISTRIBUTOR" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_GSUP + -DIPA_EMULATION_MGCP + -DIPA_EMULATION_SCCP + -DRAN_EMULATION_BSSAP + -DRAN_EMULATION_CTRL + -DRAN_EMULATION_MGCP + -DRAN_EMULATION_RANAP + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh MSC_Tests.ttcn $FILES diff --git a/ns/regen_makefile.sh b/ns/regen_makefile.sh index fece5d8..1958dee 100755 --- a/ns/regen_makefile.sh +++ b/ns/regen_makefile.sh @@ -1,9 +1,26 @@ #!/bin/bash -FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc UD_PT.cc RLCMAC_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc Native_FunctionDefs.cc StatsD_CodecPort_CtrlFunctdef.cc " +FILES=" + *.ttcn + *.ttcnpp + AF_PACKET_PT.cc + AF_PACKET_PT.hh + BSSGP_EncDec.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + LLC_EncDec.cc + Native_FunctionDefs.cc + RLCMAC_EncDec.cc + StatsD_CodecPort_CtrlFunctdef.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc + UD_PT.cc +" -FILES+="AF_PACKET_PT.cc AF_PACKET_PT.hh " - -export CPPFLAGS_TTCN3="-DBSSGP_EM_L3 -DNS_EMULATION_FR" +export CPPFLAGS_TTCN3=" + -DBSSGP_EM_L3 + -DNS_EMULATION_FR +" ../regen-makefile.sh NS_Tests.ttcn $FILES diff --git a/pcap-client/regen_makefile.sh b/pcap-client/regen_makefile.sh index 9e4a6ee..88c062d 100755 --- a/pcap-client/regen_makefile.sh +++ b/pcap-client/regen_makefile.sh @@ -1,11 +1,17 @@ #!/bin/bash -FILES="*.ttcn TCCConversion.cc TCCInterface.cc TCCEncoding.cc IPL4asp_PT.cc IPL4asp_discovery.cc TELNETasp_PT.cc Native_FunctionDefs.cc OPCAP_CodecPort_CtrlFunctdef.cc " -#FILES+="*.ttcnpp " -#FILES+="*.asn" +FILES=" + *.ttcn + IPL4asp_PT.cc + IPL4asp_discovery.cc + Native_FunctionDefs.cc + OPCAP_CodecPort_CtrlFunctdef.cc + TCCConversion.cc + TCCEncoding.cc + TCCInterface.cc + TELNETasp_PT.cc +" export CPPFLAGS_TTCN3="" ../regen-makefile.sh OPCAP_CLIENT_Tests.ttcn $FILES - -#sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile diff --git a/pcu/regen_makefile.sh b/pcu/regen_makefile.sh index 8bb0598..d4404d0 100755 --- a/pcu/regen_makefile.sh +++ b/pcu/regen_makefile.sh @@ -1,7 +1,25 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp BSSGP_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc UD_PT.cc RLCMAC_EncDec.cc LLC_EncDec.cc TELNETasp_PT.cc IPA_CodecPort_CtrlFunctDef.cc Native_FunctionDefs.cc StatsD_CodecPort_CtrlFunctdef.cc" +FILES=" + *.ttcn + *.ttcnpp + BSSGP_EncDec.cc + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + LLC_EncDec.cc + Native_FunctionDefs.cc + RLCMAC_EncDec.cc + StatsD_CodecPort_CtrlFunctdef.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc + UD_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL -DBSSGP_EM_L3" +export CPPFLAGS_TTCN3=" + -DBSSGP_EM_L3 + -DIPA_EMULATION_CTRL +" ../regen-makefile.sh PCU_Tests.ttcn $FILES diff --git a/pgw/regen_makefile.sh b/pgw/regen_makefile.sh index adb5820..65954c5 100755 --- a/pgw/regen_makefile.sh +++ b/pgw/regen_makefile.sh @@ -1,7 +1,26 @@ #!/bin/bash -FILES="*.ttcn IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc GTPC_EncDec.cc GTPU_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc GTPv2_CodecPort_CtrlFunctDef.cc ICMPv6_EncDec.cc IP_EncDec.cc Native_FunctionDefs.cc UDP_EncDec.cc ICMP_EncDec.cc " -FILES+="UECUPS_CodecPort_CtrlFunctDef.cc " -FILES+="DIAMETER_EncDec.cc DIAMETER_CodecPort_CtrlFunctDef.cc " +FILES=" + *.ttcn + DIAMETER_CodecPort_CtrlFunctDef.cc + DIAMETER_EncDec.cc + GTPC_EncDec.cc + GTPU_EncDec.cc + GTP_CodecPort_CtrlFunctDef.cc + GTPv2_CodecPort_CtrlFunctDef.cc + ICMP_EncDec.cc + ICMPv6_EncDec.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + IP_EncDec.cc + Native_FunctionDefs.cc + TCCConversion.cc + TCCInterface.cc + UDP_EncDec.cc + UECUPS_CodecPort_CtrlFunctDef.cc +" + +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh PGW_Tests.ttcn $FILES diff --git a/regen-makefile.sh b/regen-makefile.sh index b53129f..67e5df0 100755 --- a/regen-makefile.sh +++ b/regen-makefile.sh @@ -52,7 +52,8 @@ sed -i -e 's/-Wall//' Makefile if [ "x$CPPFLAGS_TTCN3" != "x" ]; then - sed -i -e 's/CPPFLAGS_TTCN3 =/CPPFLAGS_TTCN3 = '"$CPPFLAGS_TTCN3"'/' Makefile + CPPFLAGS_TTCN3="$(echo "$CPPFLAGS_TTCN3" | tr -d '\n' | tr '\t' ' ')" + sed -i -e "s/CPPFLAGS_TTCN3 =/CPPFLAGS_TTCN3 = $CPPFLAGS_TTCN3/" Makefile fi # for TITAN 6.3.0 diff --git a/remsim/regen_makefile.sh b/remsim/regen_makefile.sh index 3f19228..edfb073 100755 --- a/remsim/regen_makefile.sh +++ b/remsim/regen_makefile.sh @@ -1,8 +1,29 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp *.asn IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc TELNETasp_PT.cc Native_FunctionDefs.cc RSPRO_EncDec.cc Abstract_Socket.cc HTTPmsg_PT.cc HTTPmsg_MessageLen_Function.cc JSON_EncDec.cc VPCD_CodecPort_CtrlFunctDef.cc PIPEasp_PT.cc " +FILES=" + *.asn + *.ttcn + *.ttcnpp + Abstract_Socket.cc + HTTPmsg_MessageLen_Function.cc + HTTPmsg_PT.cc + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + JSON_EncDec.cc + Native_FunctionDefs.cc + PIPEasp_PT.cc + RSPRO_EncDec.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc + VPCD_CodecPort_CtrlFunctDef.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSPRO -DIPA_EMULATION_CTRL" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_RSPRO + -DIPA_EMULATION_CTRL +" ../regen-makefile.sh REMSIM_Tests.ttcn $FILES diff --git a/sccp/regen_makefile.sh b/sccp/regen_makefile.sh index 08db33e..175c10b 100755 --- a/sccp/regen_makefile.sh +++ b/sccp/regen_makefile.sh @@ -1,7 +1,25 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc UD_PT.cc IPL4asp_PT.cc IPL4asp_discovery.cc IPA_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc TCCEncoding.cc " +FILES=" + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + Native_FunctionDefs.cc + SCCP_EncDec.cc + SCTPasp_PT.cc + TCCConversion.cc + TCCEncoding.cc + TCCInterface.cc + TELNETasp_PT.cc + UD_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DUSE_MTP3_DISTRIBUTOR" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_SCCP + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh SCCP_Tests.ttcn $FILES diff --git a/selftest/regen_makefile.sh b/selftest/regen_makefile.sh index 9d302ac..bd2ae91 100755 --- a/selftest/regen_makefile.sh +++ b/selftest/regen_makefile.sh @@ -2,8 +2,20 @@ MAIN=Selftest.ttcn -FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc" +FILES=" + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + TCCConversion.cc + TCCInterface.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_RSL + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh $MAIN $FILES diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index e160379..2a5cb92 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -1,8 +1,34 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp *.asn BSSGP_EncDec.cc LLC_EncDec.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc RLCMAC_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc IPA_CodecPort_CtrlFunctDef.cc GTPU_EncDec.cc GTPC_EncDec.cc GTP_CodecPort_CtrlFunctDef.cc SCCP_EncDec.cc SCTPasp_PT.cc RANAP_EncDec.cc " +FILES=" + *.asn + *.ttcn + *.ttcnpp + BSSGP_EncDec.cc + GTPC_EncDec.cc + GTPU_EncDec.cc + GTP_CodecPort_CtrlFunctDef.cc + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + LLC_EncDec.cc + Native_FunctionDefs.cc + RANAP_EncDec.cc + RLCMAC_EncDec.cc + SCCP_EncDec.cc + SCTPasp_PT.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_GSUP -DIPA_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR -DRAN_EMULATION_RANAP -DBSSGP_EM_L3" +export CPPFLAGS_TTCN3=" + -DBSSGP_EM_L3 + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_GSUP + -DRAN_EMULATION_RANAP + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh SGSN_Tests.ttcn $FILES diff --git a/simtrace/regen_makefile.sh b/simtrace/regen_makefile.sh index 3f2d472..509699e 100755 --- a/simtrace/regen_makefile.sh +++ b/simtrace/regen_makefile.sh @@ -1,6 +1,13 @@ #!/bin/sh -FILES="*.ttcn USB_PT.cc Native_FunctionDefs.cc " +FILES=" + *.ttcn + Native_FunctionDefs.cc + USB_PT.cc +" + +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh SIMTRACE_Tests.ttcn $FILES diff --git a/sip/regen_makefile.sh b/sip/regen_makefile.sh index 722620b..caf657c 100755 --- a/sip/regen_makefile.sh +++ b/sip/regen_makefile.sh @@ -1,8 +1,27 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp TCCConversion.cc TCCInterface.cc UD_PT.cc MNCC_EncDec.cc IPL4asp_PT.cc -IPL4asp_discovery.cc SDP_EncDec.cc RTP_EncDec.cc IPA_CodecPort_CtrlFunctDef.cc RTP_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc SIPmsg_PT.cc *.c " +FILES=" + *.c + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + MNCC_EncDec.cc + Native_FunctionDefs.cc + RTP_CodecPort_CtrlFunctDef.cc + RTP_EncDec.cc + SDP_EncDec.cc + SIPmsg_PT.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc + UD_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL -DRAN_EMULATION_CTRL" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DRAN_EMULATION_CTRL +" ../regen-makefile.sh SIP_Tests.ttcn $FILES diff --git a/smlc/regen_makefile.sh b/smlc/regen_makefile.sh index d8b8642..24e3407 100755 --- a/smlc/regen_makefile.sh +++ b/smlc/regen_makefile.sh @@ -2,8 +2,34 @@ MAIN=SMLC_Tests.ttcn -FILES="*.ttcn *.ttcnpp IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc SCTPasp_PT.cc RTP_EncDec.cc SDP_EncDec.cc RTP_CodecPort_CtrlFunctDef.cc MGCP_CodecPort_CtrlFunctDef.cc IuUP_EncDec.cc Native_FunctionDefs.cc TELNETasp_PT.cc *.c" +FILES=" + *.c + *.ttcn + *.ttcnpp + IPA_CodecPort_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + IuUP_EncDec.cc + MGCP_CodecPort_CtrlFunctDef.cc + Native_FunctionDefs.cc + RTP_CodecPort_CtrlFunctDef.cc + RTP_EncDec.cc + SCTPasp_PT.cc + SDP_EncDec.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_RSL -DIPA_EMULATION_MGCP -DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DRAN_EMULATION_BSSAP -DRAN_EMULATION_MGCP -DRAN_EMULATION_CTRL -DUSE_MTP3_DISTRIBUTOR" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_RSL + -DIPA_EMULATION_MGCP + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_SCCP + -DRAN_EMULATION_BSSAP + -DRAN_EMULATION_MGCP + -DRAN_EMULATION_CTRL + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh $MAIN $FILES diff --git a/stp/regen_makefile.sh b/stp/regen_makefile.sh index be96829..0b90687 100755 --- a/stp/regen_makefile.sh +++ b/stp/regen_makefile.sh @@ -1,7 +1,25 @@ #!/bin/sh -FILES="*.ttcn *.ttcnpp SCCP_EncDec.cc SCTPasp_PT.cc TCCConversion.cc TCCInterface.cc IPL4asp_PT.cc IPL4asp_discovery.cc IPA_CodecPort_CtrlFunctDef.cc TELNETasp_PT.cc Native_FunctionDefs.cc TCCEncoding.cc M3UA_CodecPort_CtrlFunctDef.cc " +FILES=" + *.ttcn + *.ttcnpp + SCCP_EncDec.cc + SCTPasp_PT.cc + TCCConversion.cc + TCCInterface.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + IPA_CodecPort_CtrlFunctDef.cc + TELNETasp_PT.cc + Native_FunctionDefs.cc + TCCEncoding.cc + M3UA_CodecPort_CtrlFunctDef.cc +" -export CPPFLAGS_TTCN3="-DIPA_EMULATION_CTRL -DIPA_EMULATION_SCCP -DUSE_MTP3_DISTRIBUTOR" +export CPPFLAGS_TTCN3=" + -DIPA_EMULATION_CTRL + -DIPA_EMULATION_SCCP + -DUSE_MTP3_DISTRIBUTOR +" ../regen-makefile.sh STP_Tests.ttcn $FILES diff --git a/sysinfo/regen_makefile.sh b/sysinfo/regen_makefile.sh index 9dd3b7f..4a3dfcc 100755 --- a/sysinfo/regen_makefile.sh +++ b/sysinfo/regen_makefile.sh @@ -1,5 +1,16 @@ #!/bin/sh -FILES="*.ttcn IPL4asp_PT.cc IPL4asp_discovery.cc TCCConversion.cc TCCInterface.cc IPL4_GSMTAP_CtrlFunctDef.cc TELNETasp_PT.cc" +FILES=" + *.ttcn + IPL4_GSMTAP_CtrlFunctDef.cc + IPL4asp_PT.cc + IPL4asp_discovery.cc + TCCConversion.cc + TCCInterface.cc + TELNETasp_PT.cc +" + +export CPPFLAGS_TTCN3=" +" ../regen-makefile.sh Test.ttcn $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6b6866eb9f6ec6232e4ae434517457a4c8c1c050 Gerrit-Change-Number: 25754 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 08:27:32 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 13 Oct 2021 08:27:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: selftest: add missing Native_FunctionDefs.cc In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25755 ) Change subject: selftest: add missing Native_FunctionDefs.cc ...................................................................... selftest: add missing Native_FunctionDefs.cc Fix for: /usr/bin/ld: Native_Functions.so: undefined reference to `Native__Functions::f__str__tolower(CHARSTRING const&)' /usr/bin/ld: Native_Functions.so: undefined reference to `Native__Functions::f__inet__hntoa(OCTETSTRING const&)' /usr/bin/ld: Native_Functions.so: undefined reference to `Native__Functions::f__inet__haddr(CHARSTRING const&)' /usr/bin/ld: BSSMAP_Templates.so: undefined reference to `Native__Functions::f__inet6__addr(CHARSTRING const&)' /usr/bin/ld: BSSMAP_Templates.so: undefined reference to `Native__Functions::f__inet__addr(CHARSTRING const&)' /usr/bin/ld: Native_Functions.so: undefined reference to `Native__Functions::f__str__toupper(CHARSTRING const&)' /usr/bin/ld: Native_Functions.so: undefined reference to `Native__Functions::f__inet__ntoa(OCTETSTRING const&)' Related: OS#5252 Change-Id: I73c225f6699cd272b3eeffb249f3dddd2048bc01 --- M selftest/regen_makefile.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/selftest/regen_makefile.sh b/selftest/regen_makefile.sh index bd2ae91..17854ce 100755 --- a/selftest/regen_makefile.sh +++ b/selftest/regen_makefile.sh @@ -8,6 +8,7 @@ IPA_CodecPort_CtrlFunctDef.cc IPL4asp_PT.cc IPL4asp_discovery.cc + Native_FunctionDefs.cc TCCConversion.cc TCCInterface.cc " -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I73c225f6699cd272b3eeffb249f3dddd2048bc01 Gerrit-Change-Number: 25755 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 08:27:33 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 13 Oct 2021 08:27:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pgw: add missing BSSGP_EncDec.cc In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25756 ) Change subject: pgw: add missing BSSGP_EncDec.cc ...................................................................... pgw: add missing BSSGP_EncDec.cc Fix for: /usr/bin/ld: BSSGP_Types_part_4.so: undefined reference to `BSSGP__Types::dec__PDU__BSSGP(OCTETSTRING const&)' /usr/bin/ld: Osmocom_Gb_Types.so: undefined reference to `BSSGP__Types::enc__PDU__BSSGP(BSSGP__Types::PDU__BSSGP const&)' Related: OS#5252 Change-Id: I010df10396d264e67bd8c712daafcfb79262ece2 --- M pgw/regen_makefile.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/pgw/regen_makefile.sh b/pgw/regen_makefile.sh index 65954c5..21f03ba 100755 --- a/pgw/regen_makefile.sh +++ b/pgw/regen_makefile.sh @@ -2,6 +2,7 @@ FILES=" *.ttcn + BSSGP_EncDec.cc DIAMETER_CodecPort_CtrlFunctDef.cc DIAMETER_EncDec.cc GTPC_EncDec.cc -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I010df10396d264e67bd8c712daafcfb79262ece2 Gerrit-Change-Number: 25756 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 08:27:33 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 13 Oct 2021 08:27:33 +0000 Subject: Change in osmo-ttcn3-hacks[master]: mme: link against gnutls In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25757 ) Change subject: mme: link against gnutls ...................................................................... mme: link against gnutls Fix for: /usr/bin/ld: key_derivation.so: undefined reference to `gnutls_hmac_fast' Related: OS#5252 Change-Id: Iacddc22ecda187e250db9cfb1ca1d1d341ce78f4 --- M mme/regen_makefile.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 8106664..5606879 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -26,4 +26,4 @@ ../regen-makefile.sh MME_Tests.ttcn $FILES -sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile +sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode -lgnutls/' Makefile -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iacddc22ecda187e250db9cfb1ca1d1d341ce78f4 Gerrit-Change-Number: 25757 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 09:35:40 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 09:35:40 +0000 Subject: Change in osmo-pcu[master]: tbf_fsm: Handle MAX_N3105 in state ASSIGN In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25769 ) Change subject: tbf_fsm: Handle MAX_N3105 in state ASSIGN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I86d5c1bbccd06673d08451b812d149e727404733 Gerrit-Change-Number: 25769 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 13 Oct 2021 09:35:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 10:56:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 10:56:04 +0000 Subject: Change in osmo-pcu[master]: tbf: Use define to flag control_ts unset special value In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25770 ) Change subject: tbf: Use define to flag control_ts unset special value ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idd3ccec509b40b6229544b45e54da1142805b6f9 Gerrit-Change-Number: 25770 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 13 Oct 2021 10:56:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 10:56:52 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 10:56:52 +0000 Subject: Change in osmo-pcu[master]: tbf: Document temporary change of control_ts and move code assigning ... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25771 ) Change subject: tbf: Document temporary change of control_ts and move code assigning it back to FSM ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1b7eb7802060778487e5729ee789b2323b6636f8 Gerrit-Change-Number: 25771 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 13 Oct 2021 10:56:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 10:57:11 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 10:57:11 +0000 Subject: Change in osmo-pcu[master]: tbf: Document temporary change of control_ts and move code assigning ... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25771 ) Change subject: tbf: Document temporary change of control_ts and move code assigning it back to FSM ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1b7eb7802060778487e5729ee789b2323b6636f8 Gerrit-Change-Number: 25771 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 13 Oct 2021 10:57:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 10:57:36 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 10:57:36 +0000 Subject: Change in osmo-pcu[master]: Return void in tbf_assign_control_ts() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25772 ) Change subject: Return void in tbf_assign_control_ts() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5675df4b6309d680d1d5e2dbea87991468f30630 Gerrit-Change-Number: 25772 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 13 Oct 2021 10:57:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 10:58:31 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 10:58:31 +0000 Subject: Change in osmo-pcu[master]: pdch: rcv_data_block: Avoid releasing ULC entry if expecting somethin... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25775 ) Change subject: pdch: rcv_data_block: Avoid releasing ULC entry if expecting something else on UL ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1537587f5ee801c633784691b576ebb1ed521e95 Gerrit-Change-Number: 25775 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 13 Oct 2021 10:58:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 11:01:23 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 11:01:23 +0000 Subject: Change in osmo-pcu[master]: tbf: Avoid keeping poll nodes in pdch_ulc of temporary control_ts use... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25776 ) Change subject: tbf: Avoid keeping poll nodes in pdch_ulc of temporary control_ts used during PACCH assignment ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0c49f2695e0d932d956c01976c9458eebee63cd4 Gerrit-Change-Number: 25776 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 13 Oct 2021 11:01:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 11:04:27 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 11:04:27 +0000 Subject: Change in libosmocore[master]: utils: introduce osmo_talloc_replace_string_fmt() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/24598 ) Change subject: utils: introduce osmo_talloc_replace_string_fmt() ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6b84fa0525555a98c531fc558e5dc1298fec00c1 Gerrit-Change-Number: 24598 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 11:04:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 11:39:30 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 11:39:30 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: refactor 'maxdly' / 'maxdlynb' commands In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23773 ) Change subject: osmo-bts-trx: refactor 'maxdly' / 'maxdlynb' commands ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I46839cf56bba2dcdc70303cd393e86d35aa2f3f5 Gerrit-Change-Number: 23773 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 11:39:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 11:41:39 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 11:41:39 +0000 Subject: Change in osmo-bsc[master]: bts: set R99 MSC flag in SI13 in bts_alloc In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25761 ) Change subject: bts: set R99 MSC flag in SI13 in bts_alloc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5b78c4e25616ab552c37ba8b7c9948cf7052bad4 Gerrit-Change-Number: 25761 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Oct 2021 11:41:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 11:42:09 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 11:42:09 +0000 Subject: Change in osmo-bsc[master]: bts: set pwrc value in bts_alloc In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25762 ) Change subject: bts: set pwrc value in bts_alloc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id76879a94cf8cf8c07e8fc7e8aa399cd50e04e9a Gerrit-Change-Number: 25762 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Oct 2021 11:42:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 11:44:23 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 11:44:23 +0000 Subject: Change in osmo-bsc[master]: bts: set pwrc value in bts_alloc In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25763 ) Change subject: bts: set pwrc value in bts_alloc ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idc4e08c471e15c36b4ea7eb3981254e179115765 Gerrit-Change-Number: 25763 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Oct 2021 11:44:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 11:44:58 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 11:44:58 +0000 Subject: Change in osmo-bsc[master]: bts: set pwrc value in bts_alloc In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25763 ) Change subject: bts: set pwrc value in bts_alloc ...................................................................... Patch Set 1: Code-Review-1 Agreeing with Harald. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idc4e08c471e15c36b4ea7eb3981254e179115765 Gerrit-Change-Number: 25763 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Oct 2021 11:44:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 12:01:28 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 13 Oct 2021 12:01:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc a54 tests In-Reply-To: References: Message-ID: Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24630 ) Change subject: bsc a54 tests ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24630 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4940d06b55824936b94f97649401b691339c2e7d Gerrit-Change-Number: 24630 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: dexter Gerrit-CC: neels Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 12:01:33 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 13 Oct 2021 12:01:33 +0000 Subject: Change in osmo-msc[master]: [WIP] a5/4 support In-Reply-To: References: Message-ID: Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/24633 ) Change subject: [WIP] a5/4 support ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I1b3136f0b2728013677b62647c033aade2933299 Gerrit-Change-Number: 24633 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 12:51:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 12:51:13 +0000 Subject: Change in libosmocore[master]: ns2: correct parse a BLOCK PDU which was received over a different NSVC In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25558 ) Change subject: ns2: correct parse a BLOCK PDU which was received over a different NSVC ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/25558/4/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/25558/4/src/gb/gprs_ns2_vc_fsm.c at 909 PS4, Line 909: } else if (nsh->pdu_type == NS_PDUT_BLOCK || nsh->pdu_type == NS_PDUT_STATUS) { looks like using a switch statement here over nsh->pty_type would be cleaner. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I483e3a1d3b8c43bbb0cc6185b7f7f772bcb264bf Gerrit-Change-Number: 25558 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 12:51:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 12:57:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 12:57:06 +0000 Subject: Change in osmo-pcu[master]: tbf_fsm: Handle MAX_N3105 in state ASSIGN In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25769 ) Change subject: tbf_fsm: Handle MAX_N3105 in state ASSIGN ...................................................................... tbf_fsm: Handle MAX_N3105 in state ASSIGN Seen on a runnig osmo-pcu against real MS: """ pdch_ul_controller.c:329 PDCH(bts=0,trx=1,ts=7) Timeout for registered POLL (FN=751140): TBF(TFI=0 TLLI=0xe8c12143 DIR=UL STATE=ASSIGN EGPRS) tbf.cpp:542 TBF(TFI=0 TLLI=0xe8c12143 DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=751140, TS=7 (curr FN 751140) tbf.cpp:384 TBF(TFI=0 TLLI=0xe8c12143 DIR=UL STATE=ASSIGN EGPRS) N3105 exceeded MAX (8) tbf.cpp:594 TBF(UL-TFI_0)[9bc050]{ASSIGN}: Received Event MAX_N3105 tbf.cpp:594 TBF(UL-TFI_0)[9bc050]{ASSIGN}: Event MAX_N3105 not permitted """ It was first though when FSMs where introduced that an FSM in ASSIGN state could not receive this kind of event because it was believed to be sending no CTRL blocks at all until flow state. That's because the believe was that Assignment over PACCH was done by another existing TBF. It turns out this is usually the case, but not in all cases. In at least one case, the tbf object (and tbf_fsm/tbf_{ul,dl}_ass_fsm) itself is handling its own assignment (hence eg. sending the UL assignment and waiting response through tbf_ul_ass_fsm. This happens if a UL TBF sends a Pkt Resource Req as a response to RRBP of final UL ACK/NACK in order to request a new TBF, where it temporarily uses the control_ts of the previous TBF to get a new Pkt UL Assignment over PACCH. If Pkt Ul Assignment doesn't receive a CTRL ACK, tbf_ul_ass_fsm will retrnamist it, until MAX_N3015 is reached (the event we failed to handle until now). At this point, we really want to transition to RELEASING in order to avoid keeping the TBF allocating resources (until X2001 times out). Related: SYS#5647 Change-Id: I86d5c1bbccd06673d08451b812d149e727404733 --- M src/tbf_fsm.c 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c index d1d4668..84d5bcc 100644 --- a/src/tbf_fsm.c +++ b/src/tbf_fsm.c @@ -188,6 +188,10 @@ /* change state to FLOW, so scheduler will start transmission */ tbf_fsm_state_chg(fi, TBF_ST_FLOW); break; + case TBF_EV_MAX_N3105: + ctx->T_release = 3195; + tbf_fsm_state_chg(fi, TBF_ST_RELEASING); + break; default: OSMO_ASSERT(0); } @@ -409,7 +413,8 @@ X(TBF_EV_ASSIGN_ADD_PACCH) | X(TBF_EV_ASSIGN_ACK_PACCH) | X(TBF_EV_ASSIGN_PCUIF_CNF) | - X(TBF_EV_ASSIGN_READY_CCCH), + X(TBF_EV_ASSIGN_READY_CCCH) | + X(TBF_EV_MAX_N3105), .out_state_mask = X(TBF_ST_FLOW) | X(TBF_ST_FINISHED) | -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I86d5c1bbccd06673d08451b812d149e727404733 Gerrit-Change-Number: 25769 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 12:57:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 12:57:06 +0000 Subject: Change in osmo-pcu[master]: tbf: Use define to flag control_ts unset special value In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25770 ) Change subject: tbf: Use define to flag control_ts unset special value ...................................................................... tbf: Use define to flag control_ts unset special value Change-Id: Idd3ccec509b40b6229544b45e54da1142805b6f9 --- M src/tbf.cpp M src/tbf.h 2 files changed, 4 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/tbf.cpp b/src/tbf.cpp index 7ebd268..153ba80 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -96,7 +96,7 @@ trx(NULL), first_ts(0), first_common_ts(0), - control_ts(0xff), + control_ts(TBF_CONTROL_TS_UNSET), fT(0), num_fT_exp(0), upgrade_to_multislot(false), @@ -328,7 +328,7 @@ int tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf) { - if (tbf->control_ts == 0xff) + if (tbf->control_ts == TBF_CONTROL_TS_UNSET) LOGPTBF(tbf, LOGL_INFO, "Setting Control TS %d\n", tbf->first_common_ts); else if (tbf->control_ts != tbf->first_common_ts) diff --git a/src/tbf.h b/src/tbf.h index 3aaf9fb..05beed5 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -116,6 +116,8 @@ #define GPRS_RLCMAC_FLAG_TO_DL_ACK 3 /* DL TBF: Failed to receive last polled DL ACK/NACK */ #define GPRS_RLCMAC_FLAG_TO_MASK 0xf0 /* timeout bits */ +#define TBF_CONTROL_TS_UNSET 0xff + #define T_START(tbf, t, T, r, f) tbf->t_start(t, T, r, f, __FILE__, __LINE__) #ifdef __cplusplus -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idd3ccec509b40b6229544b45e54da1142805b6f9 Gerrit-Change-Number: 25770 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 12:57:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 12:57:07 +0000 Subject: Change in osmo-pcu[master]: tbf: Document temporary change of control_ts and move code assigning ... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25771 ) Change subject: tbf: Document temporary change of control_ts and move code assigning it back to FSM ...................................................................... tbf: Document temporary change of control_ts and move code assigning it back to FSM Change-Id: I1b7eb7802060778487e5729ee789b2323b6636f8 --- M src/pdch.cpp M src/tbf_fsm.c 2 files changed, 8 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/pdch.cpp b/src/pdch.cpp index dbdd47f..ca3a0ea 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -384,8 +384,6 @@ tbf_free(tbf); osmo_fsm_inst_dispatch(new_tbf->state_fsm.fi, TBF_EV_ASSIGN_ACK_PACCH, NULL); - - tbf_assign_control_ts(new_tbf); /* there might be LLC packets waiting in the queue, but the DL * TBF might have been released while the UL TBF has been * established */ @@ -417,8 +415,6 @@ tbf_free(tbf); osmo_fsm_inst_dispatch(new_tbf->state_fsm.fi, TBF_EV_ASSIGN_ACK_PACCH, NULL); - - tbf_assign_control_ts(new_tbf); return; case PDCH_ULC_POLL_CELL_CHG_CONTINUE: @@ -717,7 +713,13 @@ goto return_unref; } - /* set control ts to current MS's TS, until assignment complete */ + /* Set control TS to the TS where this PktResReq was received, + * which in practice happens to be the control_ts from the + * previous UL-TBF or SBA. When CTRL ACK is received as RRBP of the Pkt + * UL Ass scheduled below, then TBF_EV_ASSIGN_ACK_PACCH will be + * sent to tbf_fsm which will call tbf_assign_control_ts(), + * effectively setting back control_ts to + * tbf->initial_common_ts. */ LOGPTBF(ul_tbf, LOGL_DEBUG, "change control TS %d -> %d until assignment is complete.\n", ul_tbf->control_ts, ts_no); diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c index 84d5bcc..36981e6 100644 --- a/src/tbf_fsm.c +++ b/src/tbf_fsm.c @@ -157,6 +157,7 @@ mod_ass_type(ctx, GPRS_RLCMAC_FLAG_PACCH, true); break; case TBF_EV_ASSIGN_ACK_PACCH: + tbf_assign_control_ts(ctx->tbf); if (ctx->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH)) { /* We now know that the PACCH really existed */ LOGPTBF(ctx->tbf, LOGL_INFO, -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25771 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1b7eb7802060778487e5729ee789b2323b6636f8 Gerrit-Change-Number: 25771 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 12:57:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 12:57:07 +0000 Subject: Change in osmo-pcu[master]: Return void in tbf_assign_control_ts() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25772 ) Change subject: Return void in tbf_assign_control_ts() ...................................................................... Return void in tbf_assign_control_ts() This operation cannot fail, hence let's simplify code. Change-Id: I5675df4b6309d680d1d5e2dbea87991468f30630 --- M src/tbf.cpp M src/tbf.h 2 files changed, 4 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/tbf.cpp b/src/tbf.cpp index 153ba80..af15c72 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -326,7 +326,7 @@ return 0; } -int tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf) +void tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf) { if (tbf->control_ts == TBF_CONTROL_TS_UNSET) LOGPTBF(tbf, LOGL_INFO, "Setting Control TS %d\n", @@ -335,8 +335,6 @@ LOGPTBF(tbf, LOGL_INFO, "Changing Control TS %d -> %d\n", tbf->control_ts, tbf->first_common_ts); tbf->control_ts = tbf->first_common_ts; - - return 0; } void gprs_rlcmac_tbf::n_reset(enum tbf_counters n) @@ -660,13 +658,8 @@ bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_FAIL); return -1; } - /* assign control ts */ - rc = tbf_assign_control_ts(this); - /* if no resource */ - if (rc < 0) { - LOGPTBF(this, LOGL_ERROR, "Failed to assign control TS\n"); - return -1; - } + /* assign initial control ts */ + tbf_assign_control_ts(this); /* set timestamp */ osmo_clock_gettime(CLOCK_MONOTONIC, &meas.rssi_tv); diff --git a/src/tbf.h b/src/tbf.h index 05beed5..cab9364 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -142,7 +142,7 @@ bool tbf_is_tfi_assigned(const struct gprs_rlcmac_tbf *tbf); uint8_t tbf_tfi(const struct gprs_rlcmac_tbf *tbf); bool tbf_is_egprs_enabled(const struct gprs_rlcmac_tbf *tbf); -int tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf); +void tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf); int tbf_check_polling(const struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts, uint32_t *poll_fn, unsigned int *rrbp); void tbf_set_polling(struct gprs_rlcmac_tbf *tbf, uint32_t new_poll_fn, uint8_t ts, enum pdch_ulc_tbf_poll_reason t); void tbf_poll_timeout(struct gprs_rlcmac_tbf *tbf, struct gprs_rlcmac_pdch *pdch, uint32_t poll_fn, enum pdch_ulc_tbf_poll_reason reason); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25772 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I5675df4b6309d680d1d5e2dbea87991468f30630 Gerrit-Change-Number: 25772 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 12:57:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 12:57:07 +0000 Subject: Change in osmo-pcu[master]: pdch: rcv_data_block: Avoid releasing ULC entry if expecting somethin... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25775 ) Change subject: pdch: rcv_data_block: Avoid releasing ULC entry if expecting something else on UL ...................................................................... pdch: rcv_data_block: Avoid releasing ULC entry if expecting something else on UL Let's only release PDCH ULC entry if it was indeed what we expected. In other case, time it out. Change-Id: I1537587f5ee801c633784691b576ebb1ed521e95 --- M src/pdch.cpp 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/pdch.cpp b/src/pdch.cpp index ca3a0ea..68bc69d 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -982,7 +982,9 @@ if (node) { switch (node->type) { case PDCH_ULC_NODE_TBF_USF: - if (tbf != node->tbf_usf.ul_tbf) + if (tbf == node->tbf_usf.ul_tbf) + pdch_ulc_release_node(ulc, node); + else LOGPDCH(this, DRLCMACUL, LOGL_NOTICE, "FN=%" PRIu32 " " "Rx UL DATA from unexpected %s vs expected %s\n", fn, tbf_name(tbf), tbf_name(node->tbf_usf.ul_tbf)); @@ -998,7 +1000,6 @@ fn, tbf_name(tbf)); break; } - pdch_ulc_release_node(ulc, node); } else { LOGPDCH(this, DRLCMACUL, LOGL_NOTICE, "FN=%" PRIu32 " " "Rx UL DATA from unexpected %s\n", fn, tbf_name(tbf)); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25775 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I1537587f5ee801c633784691b576ebb1ed521e95 Gerrit-Change-Number: 25775 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:20:25 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 13 Oct 2021 13:20:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen_makefile.sh: set executable name explicitly In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 to look at the new patch set (#2). Change subject: regen_makefile.sh: set executable name explicitly ...................................................................... regen_makefile.sh: set executable name explicitly Set the executable name in each regen_makefile.sh explicitly with -e, instead of having it set indirectly from the first .ttcn file. Make it consistent by placing the name on top of each of these files. Fix for warning: ttcn3_makefilegen: warning: File `BSC_Tests.ttcn' was given more than once for the Makefile. Related: OS#5252 Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f --- M SCCP_Test/regen_makefile.sh M bsc-nat/regen_makefile.sh M bsc/regen_makefile.sh M bts/regen_makefile.sh M cbc/regen_makefile.sh M ccid/regen_makefile.sh M fr-net/regen_makefile.sh M fr/regen_makefile.sh M gbproxy/regen_makefile.sh M ggsn_tests/regen_makefile.sh M hlr/regen_makefile.sh M lapdm/regen_makefile.sh M mgw/regen_makefile.sh M mme/regen_makefile.sh M msc/regen_makefile.sh M ns/regen_makefile.sh M pcap-client/regen_makefile.sh M pcu/regen_makefile.sh M pgw/regen_makefile.sh M remsim/regen_makefile.sh M sccp/regen_makefile.sh M selftest/regen_makefile.sh M sgsn/regen_makefile.sh M simtrace/regen_makefile.sh M sip/regen_makefile.sh M smlc/regen_makefile.sh M stp/regen_makefile.sh M sysinfo/regen_makefile.sh 28 files changed, 78 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/58/25758/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f Gerrit-Change-Number: 25758 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:21:19 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 13 Oct 2021 13:21:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen_makefile.sh: set executable name explicitly In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 ) Change subject: regen_makefile.sh: set executable name explicitly ...................................................................... Patch Set 2: > Patch Set 1: Code-Review-1 > > I would be seriously surprised if you can do this. AFAIR, the first ttcn file given to the compiler will determine the name of the resulting executable file. That's why we have it stated as first file. ah I didn't realize that this was the point fixeria, thanks for the suggestion with -e. I've updated the patches to use that instead. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f Gerrit-Change-Number: 25758 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 13 Oct 2021 13:21:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:31:17 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 13 Oct 2021 13:31:17 +0000 Subject: Change in osmo-bsc[master]: bts: set acs value in bts_alloc In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25763 to look at the new patch set (#2). Change subject: bts: set acs value in bts_alloc ...................................................................... bts: set acs value in bts_alloc The acs value is currently set from bootstrap_bts() in osmo_bsc_main.c. The value is set to 0. Since the BTS object is allocated using talloc it is guaranteed to be 0 from the beginning. Lets set it from bts_alloc anyway so that we have a place holder that is easy to find. Change-Id: Idc4e08c471e15c36b4ea7eb3981254e179115765 --- M src/osmo-bsc/bts.c M src/osmo-bsc/osmo_bsc_main.c 2 files changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/63/25763/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idc4e08c471e15c36b4ea7eb3981254e179115765 Gerrit-Change-Number: 25763 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:31:17 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 13 Oct 2021 13:31:17 +0000 Subject: Change in osmo-bsc[master]: bts: set ncc_permitted from bts_alloc In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25765 to look at the new patch set (#2). Change subject: bts: set ncc_permitted from bts_alloc ...................................................................... bts: set ncc_permitted from bts_alloc The value ncc_permitted is preset in osmo_bsc_main.c from bootstrap_bts(). It is a constant value that also cannot be changed via the VTY. Therefore it should be set from bts_alloc(). This also fixes the problem that when the BTS is added at runtime from the VTY. BTSs added at runtime would have an all zero ncc_permitted until the next restart of osmo_bsc. Change-Id: I9f02277d7b4b4bcb383e749435416a0b22efd5e8 Related: SYS#5369 --- M src/osmo-bsc/bts.c M src/osmo-bsc/osmo_bsc_main.c M tests/gsm0408/gsm0408_test.ok 3 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/25765/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9f02277d7b4b4bcb383e749435416a0b22efd5e8 Gerrit-Change-Number: 25765 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:31:17 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 13 Oct 2021 13:31:17 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: call bootstrap_bts when OML TEI comes up In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25767 to look at the new patch set (#2). Change subject: osmo_bsc_main: call bootstrap_bts when OML TEI comes up ...................................................................... osmo_bsc_main: call bootstrap_bts when OML TEI comes up At the moment bootstrap_bts is called only once on startup. When a new BTY is set up during runtime bootstrap_bts is not called. This means that some parameters of the BTS stay uninitalized until osmo-bsc is restarted. Lets rather call bootstrap_bts() when the OML TEI of the BTS comes up. Change-Id: Ie599f809623efd6ea4ab3f39294195fc1ef84b85 Related: OS#5369 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 55 insertions(+), 52 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/25767/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie599f809623efd6ea4ab3f39294195fc1ef84b85 Gerrit-Change-Number: 25767 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:32:15 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 13 Oct 2021 13:32:15 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: remove code dup in bootstrap_bts() In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25760 ) Change subject: osmo_bsc_main: remove code dup in bootstrap_bts() ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia70943d96d466ab506fe368ef178a2ccc7483adc Gerrit-Change-Number: 25760 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Oct 2021 13:32:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:34:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 13:34:12 +0000 Subject: Change in libosmocore[master]: ns2: improve log line when receving a PDU with wrong NSE In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25773 ) Change subject: ns2: improve log line when receving a PDU with wrong NSE ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/25773/1/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/25773/1/src/gb/gprs_ns2_vc_fsm.c at 879 PS1, Line 879: LOG_NS_SIGNAL(nsvc, "Rx", nsh->pdu_type, LOGL_ERROR, " with wrong NSEI (exp: %05u, got %05u). Ignoring PDU.\n", nsvc->nse->nsei, nsei); Probably better splitting into 2 lines -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I072510461fb426fa62ca20c5103764b0efd25f82 Gerrit-Change-Number: 25773 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 13:34:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:35:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 13:35:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen_makefile.sh: set executable name explicitly In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 ) Change subject: regen_makefile.sh: set executable name explicitly ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f Gerrit-Change-Number: 25758 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 13 Oct 2021 13:35:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:37:52 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 13:37:52 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen_makefile.sh: set executable name explicitly In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 ) Change subject: regen_makefile.sh: set executable name explicitly ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f Gerrit-Change-Number: 25758 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 13:37:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:38:12 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Wed, 13 Oct 2021 13:38:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: regen_makefile.sh: set executable name explicitly In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 ) Change subject: regen_makefile.sh: set executable name explicitly ...................................................................... regen_makefile.sh: set executable name explicitly Set the executable name in each regen_makefile.sh explicitly with -e, instead of having it set indirectly from the first .ttcn file. Make it consistent by placing the name on top of each of these files. Fix for warning: ttcn3_makefilegen: warning: File `BSC_Tests.ttcn' was given more than once for the Makefile. Related: OS#5252 Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f --- M SCCP_Test/regen_makefile.sh M bsc-nat/regen_makefile.sh M bsc/regen_makefile.sh M bts/regen_makefile.sh M cbc/regen_makefile.sh M ccid/regen_makefile.sh M fr-net/regen_makefile.sh M fr/regen_makefile.sh M gbproxy/regen_makefile.sh M ggsn_tests/regen_makefile.sh M hlr/regen_makefile.sh M lapdm/regen_makefile.sh M mgw/regen_makefile.sh M mme/regen_makefile.sh M msc/regen_makefile.sh M ns/regen_makefile.sh M pcap-client/regen_makefile.sh M pcu/regen_makefile.sh M pgw/regen_makefile.sh M remsim/regen_makefile.sh M sccp/regen_makefile.sh M selftest/regen_makefile.sh M sgsn/regen_makefile.sh M simtrace/regen_makefile.sh M sip/regen_makefile.sh M smlc/regen_makefile.sh M stp/regen_makefile.sh M sysinfo/regen_makefile.sh 28 files changed, 78 insertions(+), 34 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/SCCP_Test/regen_makefile.sh b/SCCP_Test/regen_makefile.sh index f5d13b7..ee2cdb3 100755 --- a/SCCP_Test/regen_makefile.sh +++ b/SCCP_Test/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -MAIN=SCCP_Testcases.ttcn +NAME=SCCP_Testcases FILES=" *.ttcn @@ -10,4 +10,4 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh $MAIN $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh index 33b557c..470d109 100755 --- a/bsc-nat/regen_makefile.sh +++ b/bsc-nat/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -MAIN=BSCNAT_Tests.ttcn +NAME=BSCNAT_Tests FILES=" *.c @@ -29,4 +29,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh $MAIN $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh index 53f8e82..9e69bef 100755 --- a/bsc/regen_makefile.sh +++ b/bsc/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -MAIN=BSC_Tests.ttcn +NAME=BSC_Tests FILES=" *.c @@ -34,4 +34,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh $MAIN $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/bts/regen_makefile.sh b/bts/regen_makefile.sh index 850e0bf..147d64f 100755 --- a/bts/regen_makefile.sh +++ b/bts/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh +NAME=BTS_Tests + FILES=" *.ttcn *.ttcnpp @@ -26,4 +28,4 @@ -DIPA_EMULATION_RSL " -../regen-makefile.sh BTS_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/cbc/regen_makefile.sh b/cbc/regen_makefile.sh index d2c3b12..11a93c4 100755 --- a/cbc/regen_makefile.sh +++ b/cbc/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/bash +NAME=CBC_Tests + FILES=" *.asn *.ttcn @@ -23,6 +25,6 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh CBC_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lfftranscode/' Makefile diff --git a/ccid/regen_makefile.sh b/ccid/regen_makefile.sh index 0925654..bbb7f33 100755 --- a/ccid/regen_makefile.sh +++ b/ccid/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh +NAME=CCID_Tests + FILES=" *.ttcn Native_FunctionDefs.cc @@ -9,7 +11,7 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh CCID_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES #sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lusb/' Makefile sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libusb-1.0`/' Makefile diff --git a/fr-net/regen_makefile.sh b/fr-net/regen_makefile.sh index 6488015..89eccd3 100755 --- a/fr-net/regen_makefile.sh +++ b/fr-net/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/bash +NAME=FRNET_Tests + FILES=" *.ttcn *.ttcnpp @@ -18,4 +20,4 @@ -DNS_EMULATION_FR " -../regen-makefile.sh FRNET_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/fr/regen_makefile.sh b/fr/regen_makefile.sh index 9c473ef..1b37cb6 100755 --- a/fr/regen_makefile.sh +++ b/fr/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/bash +NAME=FR_Tests + FILES=" *.ttcn *.ttcnpp @@ -19,4 +21,4 @@ -DNS_EMULATION_FR " -../regen-makefile.sh FR_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/gbproxy/regen_makefile.sh b/gbproxy/regen_makefile.sh index 5ec6689..78910a4 100755 --- a/gbproxy/regen_makefile.sh +++ b/gbproxy/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/bash +NAME=GBProxy_Tests + FILES=" *.ttcn *.ttcnpp @@ -30,6 +32,6 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh GBProxy_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES sed -i -i 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lsctp/' Makefile diff --git a/ggsn_tests/regen_makefile.sh b/ggsn_tests/regen_makefile.sh index 5e6b08d..7adbd0b 100755 --- a/ggsn_tests/regen_makefile.sh +++ b/ggsn_tests/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh +NAME=GGSN_Tests + FILES=" *.ttcn BSSGP_EncDec.cc @@ -21,4 +23,4 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh GGSN_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/hlr/regen_makefile.sh b/hlr/regen_makefile.sh index 9ab40ce..7cd6cf4 100755 --- a/hlr/regen_makefile.sh +++ b/hlr/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -MAIN="HLR_Tests.ttcn" +NAME=HLR_Tests FILES=" *.asn @@ -24,4 +24,4 @@ -DIPA_EMULATION_CTRL " -../regen-makefile.sh $MAIN $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/lapdm/regen_makefile.sh b/lapdm/regen_makefile.sh index 2eb1366..f354e87 100755 --- a/lapdm/regen_makefile.sh +++ b/lapdm/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh +NAME=L1CTL_Test + FILES=" *.ttcn L1CTL_PortType_CtrlFunctDef.cc @@ -11,4 +13,4 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh L1CTL_Test.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/mgw/regen_makefile.sh b/mgw/regen_makefile.sh index a47f7ba..921956c 100755 --- a/mgw/regen_makefile.sh +++ b/mgw/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh +NAME=MGCP_Test + FILES=" *.c *.ttcn @@ -25,4 +27,4 @@ -DIPA_EMULATION_CTRL " -../regen-makefile.sh MGCP_Test.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/mme/regen_makefile.sh b/mme/regen_makefile.sh index 5606879..62956d8 100755 --- a/mme/regen_makefile.sh +++ b/mme/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh +NAME=MME_Tests + FILES=" *.asn *.c @@ -24,6 +26,6 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh MME_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode -lgnutls/' Makefile diff --git a/msc/regen_makefile.sh b/msc/regen_makefile.sh index 4ca9558..081d2cb 100755 --- a/msc/regen_makefile.sh +++ b/msc/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh +NAME=MSC_Tests + FILES=" *.asn *.c @@ -42,6 +44,6 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh MSC_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode -lssl/' Makefile diff --git a/ns/regen_makefile.sh b/ns/regen_makefile.sh index 1958dee..88360d8 100755 --- a/ns/regen_makefile.sh +++ b/ns/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/bash +NAME=NS_Tests + FILES=" *.ttcn *.ttcnpp @@ -23,4 +25,4 @@ -DNS_EMULATION_FR " -../regen-makefile.sh NS_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/pcap-client/regen_makefile.sh b/pcap-client/regen_makefile.sh index 88c062d..81dd1eb 100755 --- a/pcap-client/regen_makefile.sh +++ b/pcap-client/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/bash +NAME=OPCAP_CLIENT_Tests + FILES=" *.ttcn IPL4asp_PT.cc @@ -14,4 +16,4 @@ export CPPFLAGS_TTCN3="" -../regen-makefile.sh OPCAP_CLIENT_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/pcu/regen_makefile.sh b/pcu/regen_makefile.sh index d4404d0..006c6ba 100755 --- a/pcu/regen_makefile.sh +++ b/pcu/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh +NAME=PCU_Tests + FILES=" *.ttcn *.ttcnpp @@ -22,4 +24,4 @@ -DIPA_EMULATION_CTRL " -../regen-makefile.sh PCU_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/pgw/regen_makefile.sh b/pgw/regen_makefile.sh index 21f03ba..ce59dfb 100755 --- a/pgw/regen_makefile.sh +++ b/pgw/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/bash +NAME=PGW_Tests + FILES=" *.ttcn BSSGP_EncDec.cc @@ -24,4 +26,4 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh PGW_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/remsim/regen_makefile.sh b/remsim/regen_makefile.sh index edfb073..fb04cce 100755 --- a/remsim/regen_makefile.sh +++ b/remsim/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh +NAME=REMSIM_Tests + FILES=" *.asn *.ttcn @@ -25,7 +27,7 @@ -DIPA_EMULATION_CTRL " -../regen-makefile.sh REMSIM_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES # required for forkpty(3) used by PIPEasp sed -i -e '/^LINUX_LIBS/ s/$/ -lutil/' Makefile diff --git a/sccp/regen_makefile.sh b/sccp/regen_makefile.sh index 175c10b..7cd809d 100755 --- a/sccp/regen_makefile.sh +++ b/sccp/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh +NAME=SCCP_Tests + FILES=" *.ttcn *.ttcnpp @@ -22,4 +24,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh SCCP_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/selftest/regen_makefile.sh b/selftest/regen_makefile.sh index 17854ce..383e2db 100755 --- a/selftest/regen_makefile.sh +++ b/selftest/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -MAIN=Selftest.ttcn +NAME=Selftest FILES=" *.ttcn @@ -19,4 +19,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh $MAIN $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/sgsn/regen_makefile.sh b/sgsn/regen_makefile.sh index 2a5cb92..a1f702a 100755 --- a/sgsn/regen_makefile.sh +++ b/sgsn/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh +NAME=SGSN_Tests + FILES=" *.asn *.ttcn @@ -30,6 +32,6 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh SGSN_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES sed -i -e 's/^LINUX_LIBS = -lxml2 -lsctp/LINUX_LIBS = -lxml2 -lsctp -lfftranscode/' Makefile diff --git a/simtrace/regen_makefile.sh b/simtrace/regen_makefile.sh index 509699e..baecf7d 100755 --- a/simtrace/regen_makefile.sh +++ b/simtrace/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh +NAME=SIMTRACE_Tests + FILES=" *.ttcn Native_FunctionDefs.cc @@ -9,7 +11,7 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh SIMTRACE_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES #sed -i -e 's/^LINUX_LIBS = -lxml2/LINUX_LIBS = -lxml2 -lusb/' Makefile sed -i -e '/^LINUX_LIBS/ s/$/ `pkg-config --libs libusb-1.0`/' Makefile diff --git a/sip/regen_makefile.sh b/sip/regen_makefile.sh index caf657c..c7a645d 100755 --- a/sip/regen_makefile.sh +++ b/sip/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh +NAME=SIP_Tests + FILES=" *.c *.ttcn @@ -24,4 +26,4 @@ -DRAN_EMULATION_CTRL " -../regen-makefile.sh SIP_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/smlc/regen_makefile.sh b/smlc/regen_makefile.sh index 24e3407..180486c 100755 --- a/smlc/regen_makefile.sh +++ b/smlc/regen_makefile.sh @@ -1,6 +1,6 @@ #!/bin/sh -MAIN=SMLC_Tests.ttcn +NAME=SMLC_Tests FILES=" *.c @@ -32,4 +32,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh $MAIN $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/stp/regen_makefile.sh b/stp/regen_makefile.sh index 0b90687..032be0d 100755 --- a/stp/regen_makefile.sh +++ b/stp/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh +NAME=STP_Tests + FILES=" *.ttcn *.ttcnpp @@ -22,4 +24,4 @@ -DUSE_MTP3_DISTRIBUTOR " -../regen-makefile.sh STP_Tests.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES diff --git a/sysinfo/regen_makefile.sh b/sysinfo/regen_makefile.sh index 4a3dfcc..569f406 100755 --- a/sysinfo/regen_makefile.sh +++ b/sysinfo/regen_makefile.sh @@ -1,5 +1,7 @@ #!/bin/sh +NAME=Test + FILES=" *.ttcn IPL4_GSMTAP_CtrlFunctDef.cc @@ -13,4 +15,4 @@ export CPPFLAGS_TTCN3=" " -../regen-makefile.sh Test.ttcn $FILES +../regen-makefile.sh -e $NAME $FILES -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5ed03f8f3ed905483620dc7bae33b617bbb8507f Gerrit-Change-Number: 25758 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:39:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 13:39:59 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: remove code dup in bootstrap_bts() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25760 ) Change subject: osmo_bsc_main: remove code dup in bootstrap_bts() ...................................................................... Patch Set 2: Code-Review+1 what if "type" VTY command is not set in the config? it won't be called then. I guess that's why it's duplicated, to make sure it's called anyway. But I guess we are fine making "type" command presence being mandatory. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia70943d96d466ab506fe368ef178a2ccc7483adc Gerrit-Change-Number: 25760 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 13:39:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:40:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 13:40:41 +0000 Subject: Change in osmo-bsc[master]: bts: set R99 MSC flag in SI13 in bts_alloc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25761 ) Change subject: bts: set R99 MSC flag in SI13 in bts_alloc ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5b78c4e25616ab552c37ba8b7c9948cf7052bad4 Gerrit-Change-Number: 25761 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 13:40:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:41:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 13:41:12 +0000 Subject: Change in osmo-bsc[master]: bts: set pwrc value in bts_alloc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25762 ) Change subject: bts: set pwrc value in bts_alloc ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id76879a94cf8cf8c07e8fc7e8aa399cd50e04e9a Gerrit-Change-Number: 25762 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 13:41:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:41:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 13:41:36 +0000 Subject: Change in osmo-bsc[master]: bts: set acs value in bts_alloc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25763 ) Change subject: bts: set acs value in bts_alloc ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idc4e08c471e15c36b4ea7eb3981254e179115765 Gerrit-Change-Number: 25763 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 13:41:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:42:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 13:42:33 +0000 Subject: Change in osmo-bsc[master]: bts: set ncc_permitted from bts_alloc In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25765 ) Change subject: bts: set ncc_permitted from bts_alloc ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9f02277d7b4b4bcb383e749435416a0b22efd5e8 Gerrit-Change-Number: 25765 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 13:42:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:42:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 13:42:57 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: remove not longer needed fixme note In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25766 ) Change subject: osmo_bsc_main: remove not longer needed fixme note ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc2af9e2a9bca3897dbbb34d7b2c0fe6f843bedd Gerrit-Change-Number: 25766 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 13:42:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:45:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 13:45:06 +0000 Subject: Change in libosmocore[master]: ns2: don't forward an invalid RESET PDU to the FSM In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25774 ) Change subject: ns2: don't forward an invalid RESET PDU to the FSM ...................................................................... Patch Set 1: so we answer it with ACK but ignore it? how's that? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6e562def9c5a1e4534d42884215272b1e66d26c2 Gerrit-Change-Number: 25774 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 13:45:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:48:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 13:48:46 +0000 Subject: Change in libosmocore[master]: utils: introduce osmo_talloc_replace_string_fmt() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/24598 ) Change subject: utils: introduce osmo_talloc_replace_string_fmt() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6b84fa0525555a98c531fc558e5dc1298fec00c1 Gerrit-Change-Number: 24598 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 13:48:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:49:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 13:49:56 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: refactor 'maxdly' / 'maxdlynb' commands In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23773 ) Change subject: osmo-bts-trx: refactor 'maxdly' / 'maxdlynb' commands ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/23773/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/23773/4//COMMIT_MSG at 11 PS4, Line 11: ** Remove meaningless call to l1if_provision_transceiver_trx(). one * too much here? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I46839cf56bba2dcdc70303cd393e86d35aa2f3f5 Gerrit-Change-Number: 23773 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 13:49:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:54:09 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 13 Oct 2021 13:54:09 +0000 Subject: Change in osmo-pcu[master]: tbf: Avoid keeping poll nodes in pdch_ulc of temporary control_ts use... In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25776 ) Change subject: tbf: Avoid keeping poll nodes in pdch_ulc of temporary control_ts used during PACCH assignment ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0c49f2695e0d932d956c01976c9458eebee63cd4 Gerrit-Change-Number: 25776 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 13 Oct 2021 13:54:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:55:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 13:55:21 +0000 Subject: Change in osmo-pcu[master]: tbf: Avoid keeping poll nodes in pdch_ulc of temporary control_ts use... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25776 ) Change subject: tbf: Avoid keeping poll nodes in pdch_ulc of temporary control_ts used during PACCH assignment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0c49f2695e0d932d956c01976c9458eebee63cd4 Gerrit-Change-Number: 25776 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 13:55:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 13:55:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 13:55:23 +0000 Subject: Change in osmo-pcu[master]: tbf: Avoid keeping poll nodes in pdch_ulc of temporary control_ts use... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25776 ) Change subject: tbf: Avoid keeping poll nodes in pdch_ulc of temporary control_ts used during PACCH assignment ...................................................................... tbf: Avoid keeping poll nodes in pdch_ulc of temporary control_ts used during PACCH assignment When MS sends us the Packet Resource Request as RRBP from final UL ACK/NACK, we create a new TBF with a different set of allocated TS. However, we must send the Pkt UL Assignment with information of the new TBF using that same TS where we receive the Packet Resource Request, which happens to be the control TS of the previous/old TBF. The original control TS of the new TBF is kept in tbf->first_common_ts. Hence the code does gprs_rlcmac_pdch::rcv_resource_request(): """ ul_tbf->control_ts = ts_no; """ And later, when we receive a CTRL ACK answering the Pkt UL Assigment, we change the control TS of the new TBF back to the new one, by calling tbf_assign_control_ts(), which basically does: """ tbf->control_ts = tbf->first_common_ts; """ So, for instance we have a TBF which was allocated with tbf->control_ts=4 and hence is only attached to PDCH 4 (tbf->pdch[]), but for which is temporarily applied tbf->control_ts=7. Hence, when a poll is requested, it is done in control_ts, aka 7, which is not in the array of attached PDCH. The problem is of course if we never reach the point where the final control_ts is set, due to never receiving the CTRL ACK. If the TBF is freed (due to timer X2001) before receiving the CTRL ACK and hence tbf_assign_control_ts() is called, a crash may occur, because potentially a poll for the TBF is left in TS 7 because it's not a PDCH attached to the TBF and hence poll entries on that TS are not released, hence keeping a pointer to the freed TBF. Related: SYS#5647 Change-Id: I0c49f2695e0d932d956c01976c9458eebee63cd4 --- M src/tbf.cpp 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/tbf.cpp b/src/tbf.cpp index af15c72..0331a80 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -243,6 +243,16 @@ { int ts; + /* During assignment (state=ASSIGN), tbf may be temporarily using + * tbf->control_ts from a previous TBF/SBA to transmit the UL/DL + * Assignment, which may not be necessarly be a TS where the current TBF + * is attached to. Hence, we may have ULC pollings ongoing and we need + * to make sure we drop all reserved nodes there: */ + if (tbf_state(tbf) == TBF_ST_ASSIGN && + tbf->control_ts != TBF_CONTROL_TS_UNSET && !tbf->pdch[tbf->control_ts]) + pdch_ulc_release_tbf(tbf->trx->pdch[tbf->control_ts].ulc, tbf); + + /* Now simply detach from all attached PDCHs */ for (ts = 0; ts < 8; ts++) { if (!tbf->pdch[ts]) continue; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25776 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I0c49f2695e0d932d956c01976c9458eebee63cd4 Gerrit-Change-Number: 25776 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 14:28:07 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 13 Oct 2021 14:28:07 +0000 Subject: Change in pysim[master]: cards: remove "auto_once" from possible ctype options In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25723 to look at the new patch set (#3). Change subject: cards: remove "auto_once" from possible ctype options ...................................................................... cards: remove "auto_once" from possible ctype options The card_detect function in cards.py allows to specify the card type or use the hints "auto" and "auto_once" to trigger autodetection of the card. However, "auto_once" has no effect and is not used by any caller, so lets remove it. Change-Id: Iea726f51e5ddb43d8a4da2672552fff38e29b006 --- M pySim/cards.py 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/23/25723/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iea726f51e5ddb43d8a4da2672552fff38e29b006 Gerrit-Change-Number: 25723 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 14:28:16 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 13 Oct 2021 14:28:16 +0000 Subject: Change in pysim[master]: cards: remove "auto_once" from possible ctype options In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25723 ) Change subject: cards: remove "auto_once" from possible ctype options ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/pysim/+/25723/2/pySim/cards.py File pySim/cards.py: https://gerrit.osmocom.org/c/pysim/+/25723/2/pySim/cards.py at 1567 PS2, Line 1567: if ctype in ("auto"): > How about: [?] Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iea726f51e5ddb43d8a4da2672552fff38e29b006 Gerrit-Change-Number: 25723 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: osmith Gerrit-Comment-Date: Wed, 13 Oct 2021 14:28:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 14:43:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 14:43:23 +0000 Subject: Change in libosmo-abis[master]: e1inp_input: Fix e1inp_line_clone removing original line from global ... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/25777 ) Change subject: e1inp_input: Fix e1inp_line_clone removing original line from global list when freed ...................................................................... e1inp_input: Fix e1inp_line_clone removing original line from global list when freed Since a recent commit (see hash below), e1_input.c code was fixed to release the line from the global line list (e1inp_line_list) before freeing the object. However, the change didn't have into account that there were cloned lines from the original one which had a duplicate of the original line->list. Hence, whenver a clone was freed, it actually removed the original line from the global list. Since the original line is the one actually holding the permanent reference due to being configured over VTY, let's fix e1inp_line_clone to reset the clone->list so that whenever it is freed it doesn't affect the original line. Fixes: 49924f0a79db69c7e180543299a9e1078d5c16ac Related: SYS#5642 Change-Id: I0627da0d28057649b494e2bd83b283b09fb9a2d7 --- M src/e1_input.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/77/25777/1 diff --git a/src/e1_input.c b/src/e1_input.c index 9fb8a3b..6507835 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -563,6 +563,8 @@ .use_cb = e1inp_line_use_cb, .use_counts = {0}, }; + /* initialize list so it can be safely deleted without affecting original line */ + INIT_LLIST_HEAD(&clone->list); e1inp_line_get2(clone, use); /* Clone is used internally for bfd */ return clone; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/25777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0627da0d28057649b494e2bd83b283b09fb9a2d7 Gerrit-Change-Number: 25777 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 15:02:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 15:02:04 +0000 Subject: Change in libosmo-abis[master]: e1inp_input: Fix e1inp_line_clone removing original line from global ... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/25777 ) Change subject: e1inp_input: Fix e1inp_line_clone removing original line from global list when freed ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/25777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0627da0d28057649b494e2bd83b283b09fb9a2d7 Gerrit-Change-Number: 25777 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 13 Oct 2021 15:02:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 15:49:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 13 Oct 2021 15:49:32 +0000 Subject: Change in osmo-bts[master]: bts-trx: Guard call to trx_sched_clean with NULL trx ptr References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25778 ) Change subject: bts-trx: Guard call to trx_sched_clean with NULL trx ptr ...................................................................... bts-trx: Guard call to trx_sched_clean with NULL trx ptr trx_phy_inst_open() already guards against NULL trx ptr when calling trx_sched_init(). Later on, in same path, trx_phy_inst_close() can be called which ends up calling trx_sched_clean(trx), this time not being guarded against NULL trx. This fixes Coverity CID#240498. Fixes: CID#240498 Change-Id: I00afc739559d57dd98db68c76f2a85006c15e875 --- M src/osmo-bts-trx/trx_if.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/78/25778/1 diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index f0c8746..914d0e1 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -1272,7 +1272,8 @@ struct trx_l1h *l1h = pinst->u.osmotrx.hdl; trx_if_close(l1h); - trx_sched_clean(pinst->trx); + if (pinst->trx) + trx_sched_clean(pinst->trx); } /*! open the control + burst data sockets for one phy_instance */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I00afc739559d57dd98db68c76f2a85006c15e875 Gerrit-Change-Number: 25778 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 19:53:58 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 13 Oct 2021 19:53:58 +0000 Subject: Change in osmo-msc[master]: Make UTRAN encryption algorithms configurable In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22766 ) Change subject: Make UTRAN encryption algorithms configurable ...................................................................... Patch Set 3: (1 comment) Without any configuration changes I get > "encryption uea 1 2" The location update works with my s8 tr069 node. The s8 take uia1 as encryption. When changing it to > "encryption uea 2" The s8 choose no encryption. I also saw a SecurityCommand failing, when the msc set encryption+integrity, but a little bit later when the LU/CS was still ongoing, the sgsn sent a SecurityCommand with only integrity, the security command failed. https://gerrit.osmocom.org/c/osmo-msc/+/22766/3/src/libmsc/ran_msg_iu.c File src/libmsc/ran_msg_iu.c: https://gerrit.osmocom.org/c/osmo-msc/+/22766/3/src/libmsc/ran_msg_iu.c at 375 PS3, Line 375: return ranap_new_msg_sec_mod_cmd2(cm->vec->ik, cm->utran.uea_encryption_mask > 0x01 ? cm->vec->ck : NULL, You mismatched the arguments. The keystatus needs to be in fron of 0x06. ``` return ranap_new_msg_sec_mod_cmd2(cm->vec->ik, cm->utran.uea_encryption_mask > 0x01 ? cm->vec->ck : NULL, RANAP_KeyStatus_new, 0x06, cm->utran.uea_encryption_mask); ``` -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I91f9e50f9c1439aa19528f887b83ae9de628fcfd Gerrit-Change-Number: 22766 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Wed, 13 Oct 2021 19:53:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 19:54:53 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 13 Oct 2021 19:54:53 +0000 Subject: Change in osmo-msc[master]: [UNTESTED] Fix enabling of UMTS UEA encryption In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22757 ) Change subject: [UNTESTED] Fix enabling of UMTS UEA encryption ...................................................................... Patch Set 3: Code-Review+1 I tested only the following patch, I think it should validate this commit as well. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ieaaa6b23b7337b7edb902fad8031e195e0c5e9d2 Gerrit-Change-Number: 22757 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Wed, 13 Oct 2021 19:54:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 19:56:57 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 13 Oct 2021 19:56:57 +0000 Subject: Change in osmo-msc[master]: Make UTRAN encryption algorithms configurable In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22766 ) Change subject: Make UTRAN encryption algorithms configurable ...................................................................... Patch Set 3: So we might also check the security command complete which of the encryption was selected and if it's not one of the allowed one, release the iu connection. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I91f9e50f9c1439aa19528f887b83ae9de628fcfd Gerrit-Change-Number: 22766 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-CC: lynxis lazus Gerrit-Comment-Date: Wed, 13 Oct 2021 19:56:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 19:58:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 19:58:21 +0000 Subject: Change in osmo-bts[master]: bts-trx: Guard call to trx_sched_clean with NULL trx ptr In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25778 ) Change subject: bts-trx: Guard call to trx_sched_clean with NULL trx ptr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I00afc739559d57dd98db68c76f2a85006c15e875 Gerrit-Change-Number: 25778 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 13 Oct 2021 19:58:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 19:58:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 19:58:23 +0000 Subject: Change in osmo-bts[master]: bts-trx: Guard call to trx_sched_clean with NULL trx ptr In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25778 ) Change subject: bts-trx: Guard call to trx_sched_clean with NULL trx ptr ...................................................................... bts-trx: Guard call to trx_sched_clean with NULL trx ptr trx_phy_inst_open() already guards against NULL trx ptr when calling trx_sched_init(). Later on, in same path, trx_phy_inst_close() can be called which ends up calling trx_sched_clean(trx), this time not being guarded against NULL trx. This fixes Coverity CID#240498. Fixes: CID#240498 Change-Id: I00afc739559d57dd98db68c76f2a85006c15e875 --- M src/osmo-bts-trx/trx_if.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index f0c8746..914d0e1 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -1272,7 +1272,8 @@ struct trx_l1h *l1h = pinst->u.osmotrx.hdl; trx_if_close(l1h); - trx_sched_clean(pinst->trx); + if (pinst->trx) + trx_sched_clean(pinst->trx); } /*! open the control + burst data sockets for one phy_instance */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I00afc739559d57dd98db68c76f2a85006c15e875 Gerrit-Change-Number: 25778 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 19:58:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 19:58:44 +0000 Subject: Change in libosmo-abis[master]: e1inp_input: Fix e1inp_line_clone removing original line from global ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/25777 ) Change subject: e1inp_input: Fix e1inp_line_clone removing original line from global list when freed ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/25777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0627da0d28057649b494e2bd83b283b09fb9a2d7 Gerrit-Change-Number: 25777 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 13 Oct 2021 19:58:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 19:58:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 19:58:46 +0000 Subject: Change in libosmo-abis[master]: e1inp_input: Fix e1inp_line_clone removing original line from global ... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/25777 ) Change subject: e1inp_input: Fix e1inp_line_clone removing original line from global list when freed ...................................................................... e1inp_input: Fix e1inp_line_clone removing original line from global list when freed Since a recent commit (see hash below), e1_input.c code was fixed to release the line from the global line list (e1inp_line_list) before freeing the object. However, the change didn't have into account that there were cloned lines from the original one which had a duplicate of the original line->list. Hence, whenver a clone was freed, it actually removed the original line from the global list. Since the original line is the one actually holding the permanent reference due to being configured over VTY, let's fix e1inp_line_clone to reset the clone->list so that whenever it is freed it doesn't affect the original line. Fixes: 49924f0a79db69c7e180543299a9e1078d5c16ac Related: SYS#5642 Change-Id: I0627da0d28057649b494e2bd83b283b09fb9a2d7 --- M src/e1_input.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/e1_input.c b/src/e1_input.c index 9fb8a3b..6507835 100644 --- a/src/e1_input.c +++ b/src/e1_input.c @@ -563,6 +563,8 @@ .use_cb = e1inp_line_use_cb, .use_counts = {0}, }; + /* initialize list so it can be safely deleted without affecting original line */ + INIT_LLIST_HEAD(&clone->list); e1inp_line_get2(clone, use); /* Clone is used internally for bfd */ return clone; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/25777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I0627da0d28057649b494e2bd83b283b09fb9a2d7 Gerrit-Change-Number: 25777 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 19:59:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 19:59:04 +0000 Subject: Change in pysim[master]: cards: remove "auto_once" from possible ctype options In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25723 ) Change subject: cards: remove "auto_once" from possible ctype options ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iea726f51e5ddb43d8a4da2672552fff38e29b006 Gerrit-Change-Number: 25723 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-Comment-Date: Wed, 13 Oct 2021 19:59:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 20:00:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 20:00:10 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: refactor 'maxdly' / 'maxdlynb' commands In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23773 ) Change subject: osmo-bts-trx: refactor 'maxdly' / 'maxdlynb' commands ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I46839cf56bba2dcdc70303cd393e86d35aa2f3f5 Gerrit-Change-Number: 23773 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 20:00:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 20:00:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 20:00:57 +0000 Subject: Change in libosmocore[master]: utils: introduce osmo_talloc_replace_string_fmt() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/24598 ) Change subject: utils: introduce osmo_talloc_replace_string_fmt() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6b84fa0525555a98c531fc558e5dc1298fec00c1 Gerrit-Change-Number: 24598 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 20:00:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 20:01:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 20:01:01 +0000 Subject: Change in libosmocore[master]: utils: introduce osmo_talloc_replace_string_fmt() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/24598 ) Change subject: utils: introduce osmo_talloc_replace_string_fmt() ...................................................................... utils: introduce osmo_talloc_replace_string_fmt() Change-Id: I6b84fa0525555a98c531fc558e5dc1298fec00c1 --- M include/osmocom/core/utils.h M src/utils.c 2 files changed, 23 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/core/utils.h b/include/osmocom/core/utils.h index 85a8cb3..1fdb0eb 100644 --- a/include/osmocom/core/utils.h +++ b/include/osmocom/core/utils.h @@ -117,6 +117,8 @@ *dst = talloc_strdup(ctx, newstr); } +void osmo_talloc_replace_string_fmt(void *ctx, char **dst, const char *fmt, ...); + /*! Append to a string and re-/allocate if necessary. * \param[in] ctx Talloc context to use for initial allocation. * \param[in,out] dest char* to re-/allocate and append to. diff --git a/src/utils.c b/src/utils.c index c180595..626dcb4 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1493,4 +1493,25 @@ return rc; } +/*! Replace a string using talloc and release its prior content (if any). + * This is a format string capable equivalent of osmo_talloc_replace_string(). + * \param[in] ctx Talloc context to use for allocation. + * \param[out] dst Pointer to string, will be updated with ptr to new string. + * \param[in] fmt Format string that will be copied to newly allocated string. */ +void osmo_talloc_replace_string_fmt(void *ctx, char **dst, const char *fmt, ...) +{ + char *name = NULL; + + if (fmt != NULL) { + va_list ap; + + va_start(ap, fmt); + name = talloc_vasprintf(ctx, fmt, ap); + va_end(ap); + } + + talloc_free(*dst); + *dst = name; +} + /*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6b84fa0525555a98c531fc558e5dc1298fec00c1 Gerrit-Change-Number: 24598 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 20:01:08 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 20:01:08 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: refactor 'maxdly' / 'maxdlynb' commands In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23773 ) Change subject: osmo-bts-trx: refactor 'maxdly' / 'maxdlynb' commands ...................................................................... osmo-bts-trx: refactor 'maxdly' / 'maxdlynb' commands * Move way too verbose command description to the manuals. * None of these commands apply immediately, correct the attributes. ** Remove meaningless call to l1if_provision_transceiver_trx(). * Make 'maxdlynb' hidden, so it only appears in the expert mode. * One GMSK symbol actually corresponds to 550m. Change-Id: I46839cf56bba2dcdc70303cd393e86d35aa2f3f5 --- M doc/manuals/vty/bts_vty_additions.xml M src/osmo-bts-trx/trx_vty.c 2 files changed, 39 insertions(+), 29 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/doc/manuals/vty/bts_vty_additions.xml b/doc/manuals/vty/bts_vty_additions.xml index 519c4b4..2d22b41 100644 --- a/doc/manuals/vty/bts_vty_additions.xml +++ b/doc/manuals/vty/bts_vty_additions.xml @@ -1 +1,26 @@ - + + + + + + + Access Burst is the first burst a mobile transmits in order to establish a connection and it + is used to estimate Timing Advance (TA) which is then applied to Normal Bursts to compensate + for signal delay due to distance. So changing this setting effectively changes maximum range + of the cell, because Access Bursts with a delay higher than this value will be ignored. + + + + + + USE FOR TESTING ONLY, DO NOT CHANGE IN PRODUCTION USE! + During the normal operation, delay of Normal Bursts is controlled by the Timing Advance loop + and thus Normal Bursts arrive to a BTS with no more than a couple GSM symbols, which is + already taken into account in osmo-trx. Changing this setting will have no effect in + production installations except increasing osmo-trx CPU load. This setting is only useful + when testing with a transmitter which cannot precisely synchronize to the BTS downlink + signal, like R&S CMD57. + + + + diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index a24adf7..2b8bc24 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -265,18 +265,12 @@ return CMD_SUCCESS; } -DEFUN_ATTR(cfg_phyinst_maxdly, cfg_phyinst_maxdly_cmd, - "osmotrx maxdly <0-63>", - OSMOTRX_STR - "Set the maximum acceptable delay of an Access Burst (in GSM symbols)." - " Access Burst is the first burst a mobile transmits in order to establish" - " a connection and it is used to estimate Timing Advance (TA) which is" - " then applied to Normal Bursts to compensate for signal delay due to" - " distance. So changing this setting effectively changes maximum range of" - " the cell, because if we receive an Access Burst with a delay higher than" - " this value, it will be ignored and connection is dropped.\n" - "GSM symbols (550m distance between UE and BTS per symbol)\n", - CMD_ATTR_IMMEDIATE) +DEFUN_USRATTR(cfg_phyinst_maxdly, cfg_phyinst_maxdly_cmd, + X(BTS_VTY_TRX_POWERCYCLE), + "osmotrx maxdly <0-63>", + OSMOTRX_STR + "Set the maximum acceptable delay of an Access Burst\n" + "Delay in GSMK symbol periods (approx. 550m per symbol)\n") { struct phy_instance *pinst = vty->index; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; @@ -284,25 +278,17 @@ l1h->config.maxdly = atoi(argv[0]); l1h->config.maxdly_valid = 1; l1h->config.maxdly_sent = false; - l1if_provision_transceiver_trx(l1h); return CMD_SUCCESS; } -DEFUN_ATTR(cfg_phyinst_maxdlynb, cfg_phyinst_maxdlynb_cmd, - "osmotrx maxdlynb <0-31>", - OSMOTRX_STR - "Set the maximum acceptable delay of a Normal Burst (in GSM symbols)." - " USE FOR TESTING ONLY, DON'T CHANGE IN PRODUCTION USE!" - " During normal operation, Normal Bursts delay are controlled by a Timing" - " Advance control loop and thus Normal Bursts arrive to a BTS with no more" - " than a couple GSM symbols, which is already taken into account in osmo-trx." - " So changing this setting will have no effect in production installations" - " except increasing osmo-trx CPU load. This setting is only useful when" - " testing with a transmitter which can't precisely synchronize to the BTS" - " downlink signal, like e.g. R&S CMD57.\n" - "GSM symbols (approx. 1.1km per symbol)\n", - CMD_ATTR_IMMEDIATE) +DEFUN_ATTR_USRATTR(cfg_phyinst_maxdlynb, cfg_phyinst_maxdlynb_cmd, + CMD_ATTR_HIDDEN, /* expert mode command */ + X(BTS_VTY_TRX_POWERCYCLE), + "osmotrx maxdlynb <0-63>", + OSMOTRX_STR + "Set the maximum acceptable delay of a Normal Burst\n" + "Delay in GMSK symbol periods (approx. 550m per symbol)\n") { struct phy_instance *pinst = vty->index; struct trx_l1h *l1h = pinst->u.osmotrx.hdl; @@ -310,7 +296,6 @@ l1h->config.maxdlynb = atoi(argv[0]); l1h->config.maxdlynb_valid = 1; l1h->config.maxdlynb_sent = false; - l1if_provision_transceiver_trx(l1h); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I46839cf56bba2dcdc70303cd393e86d35aa2f3f5 Gerrit-Change-Number: 23773 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 20:01:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 20:01:22 +0000 Subject: Change in libosmocore[master]: ns2: improve log line when receving a PDU with wrong NSE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25773 ) Change subject: ns2: improve log line when receving a PDU with wrong NSE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I072510461fb426fa62ca20c5103764b0efd25f82 Gerrit-Change-Number: 25773 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 20:01:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 20:02:29 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 13 Oct 2021 20:02:29 +0000 Subject: Change in osmo-bts[master]: gsm_lchan_name_update(): use shadow timeslot as talloc context In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25733 ) Change subject: gsm_lchan_name_update(): use shadow timeslot as talloc context ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie449f931db5431e8aa4ab9b232b19d22cbd330aa Gerrit-Change-Number: 25733 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 20:02:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 20:02:36 +0000 Subject: Change in libosmocore[master]: ns2: don't forward an invalid RESET PDU to the FSM In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25774 ) Change subject: ns2: don't forward an invalid RESET PDU to the FSM ...................................................................... Patch Set 1: I also don't understand the rationale. Why would we answer the RESET with a RESET-ACK if it's somehow wrong? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6e562def9c5a1e4534d42884215272b1e66d26c2 Gerrit-Change-Number: 25774 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 20:02:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 20:03:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 20:03:57 +0000 Subject: Change in osmo-bsc[master]: bts: set acs value in bts_alloc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25763 ) Change subject: bts: set acs value in bts_alloc ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idc4e08c471e15c36b4ea7eb3981254e179115765 Gerrit-Change-Number: 25763 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 20:03:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 20:04:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 20:04:30 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: remove code dup in bootstrap_bts() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25760 ) Change subject: osmo_bsc_main: remove code dup in bootstrap_bts() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia70943d96d466ab506fe368ef178a2ccc7483adc Gerrit-Change-Number: 25760 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 20:04:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 20:04:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 13 Oct 2021 20:04:47 +0000 Subject: Change in osmo-bsc[master]: bts: set ncc_permitted from bts_alloc In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25765 ) Change subject: bts: set ncc_permitted from bts_alloc ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9f02277d7b4b4bcb383e749435416a0b22efd5e8 Gerrit-Change-Number: 25765 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 20:04:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 20:07:44 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 13 Oct 2021 20:07:44 +0000 Subject: Change in libosmocore[master]: ns2: don't forward an invalid RESET PDU to the FSM In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25774 ) Change subject: ns2: don't forward an invalid RESET PDU to the FSM ...................................................................... Patch Set 1: > Patch Set 1: > > I also don't understand the rationale. Why would we answer the RESET with a RESET-ACK if it's somehow wrong? The spec (48.016 ? 7.3.1 Reset procedure / Abnormal conditions) says so. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6e562def9c5a1e4534d42884215272b1e66d26c2 Gerrit-Change-Number: 25774 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 20:07:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 20:13:09 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 13 Oct 2021 20:13:09 +0000 Subject: Change in libosmocore[master]: ns2: correct parse a BLOCK PDU which was received over a different NSVC In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25558 ) Change subject: ns2: correct parse a BLOCK PDU which was received over a different NSVC ...................................................................... Patch Set 4: (2 comments) https://gerrit.osmocom.org/c/libosmocore/+/25558/3/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/25558/3/src/gb/gprs_ns2_vc_fsm.c at a388 PS3, Line 388: ns2_tx_unblock_ack(priv->nsvc); > So you are now doing the opposite of what I advised to existent code! damn you hate me so much! I like you. There also cake in the kitchen! https://gerrit.osmocom.org/c/libosmocore/+/25558/4/src/gb/gprs_ns2_vc_fsm.c File src/gb/gprs_ns2_vc_fsm.c: https://gerrit.osmocom.org/c/libosmocore/+/25558/4/src/gb/gprs_ns2_vc_fsm.c at 909 PS4, Line 909: } else if (nsh->pdu_type == NS_PDUT_BLOCK || nsh->pdu_type == NS_PDUT_STATUS) { > looks like using a switch statement here over nsh->pty_type would be cleaner. I'll do it in a following patch. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I483e3a1d3b8c43bbb0cc6185b7f7f772bcb264bf Gerrit-Change-Number: 25558 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 20:13:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 13 20:37:34 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Wed, 13 Oct 2021 20:37:34 +0000 Subject: Change in osmo-msc[master]: Make UTRAN encryption algorithms configurable In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22766 ) Change subject: Make UTRAN encryption algorithms configurable ...................................................................... Patch Set 3: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I91f9e50f9c1439aa19528f887b83ae9de628fcfd Gerrit-Change-Number: 22766 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 13 Oct 2021 20:37:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 08:02:40 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 14 Oct 2021 08:02:40 +0000 Subject: Change in pysim[master]: cards: remove "auto_once" from possible ctype options In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25723 ) Change subject: cards: remove "auto_once" from possible ctype options ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iea726f51e5ddb43d8a4da2672552fff38e29b006 Gerrit-Change-Number: 25723 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 14 Oct 2021 08:02:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 08:22:37 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 14 Oct 2021 08:22:37 +0000 Subject: Change in pysim[master]: cards: remove "auto_once" from possible ctype options In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25723 ) Change subject: cards: remove "auto_once" from possible ctype options ...................................................................... cards: remove "auto_once" from possible ctype options The card_detect function in cards.py allows to specify the card type or use the hints "auto" and "auto_once" to trigger autodetection of the card. However, "auto_once" has no effect and is not used by any caller, so lets remove it. Change-Id: Iea726f51e5ddb43d8a4da2672552fff38e29b006 --- M pySim/cards.py 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/pySim/cards.py b/pySim/cards.py index 2f96ee1..95352ff 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -1564,7 +1564,7 @@ card = None ctypes = dict([(kls.name, kls) for kls in _cards_classes]) - if ctype in ("auto", "auto_once"): + if ctype == "auto": for kls in _cards_classes: card = kls.autodetect(scc) if card: @@ -1576,9 +1576,6 @@ print("Autodetection failed") return None - if ctype == "auto_once": - ctype = card.name - elif ctype in ctypes: card = ctypes[ctype](scc) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iea726f51e5ddb43d8a4da2672552fff38e29b006 Gerrit-Change-Number: 25723 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 08:51:36 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 14 Oct 2021 08:51:36 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: remove code dup in bootstrap_bts() In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25760 ) Change subject: osmo_bsc_main: remove code dup in bootstrap_bts() ...................................................................... osmo_bsc_main: remove code dup in bootstrap_bts() The function gsm_set_bts_type() already takes care of setting the model->started flag to true. There is no need to do this in bootstrap_bts() again. Change-Id: Ia70943d96d466ab506fe368ef178a2ccc7483adc --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 0 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index e8a22fe..dfd055f 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -446,14 +446,6 @@ if (!bts->model) return -EFAULT; - if (bts->model->start && !bts->model->started) { - int ret = bts->model->start(bts->network); - if (ret < 0) - return ret; - - bts->model->started = true; - } - /* FIXME: What about secondary TRX of a BTS? What about a BTS that has TRX * in different bands? Why is 'band' a parameter of the BTS and not of the TRX? */ switch (bts->band) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia70943d96d466ab506fe368ef178a2ccc7483adc Gerrit-Change-Number: 25760 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 08:52:14 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 14 Oct 2021 08:52:14 +0000 Subject: Change in osmo-bsc[master]: bts: set R99 MSC flag in SI13 in bts_alloc In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25761 ) Change subject: bts: set R99 MSC flag in SI13 in bts_alloc ...................................................................... bts: set R99 MSC flag in SI13 in bts_alloc At the moment we set the R99 flag from bootstrap_bts() in osmo_bsc_main.c. However this constant flag should be set together with the many preinitalized chan_desc values in bts_alloc Change-Id: I5b78c4e25616ab552c37ba8b7c9948cf7052bad4 --- M src/osmo-bsc/bts.c M src/osmo-bsc/osmo_bsc_main.c 2 files changed, 1 insertion(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 1e202df..dc835d5 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -266,6 +266,7 @@ bts->si_common.rach_control.tx_integer = 9; /* 12 slots spread - 217/115 slots delay */ bts->si_common.rach_control.max_trans = 3; /* 7 retransmissions */ bts->si_common.rach_control.t2 = 4; /* no emergency calls */ + bts->si_common.chan_desc.mscr = 1; /* Indicate R99 MSC in SI3 */ bts->si_common.chan_desc.att = 1; /* attachment required */ bts->si_common.chan_desc.bs_pa_mfrms = RSL_BS_PA_MFRMS_5; /* paging frames */ bts->si_common.chan_desc.bs_ag_blks_res = 1; /* reserved AGCH blocks */ diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index dfd055f..2931dcf 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -490,9 +490,6 @@ /* Control Channel Description is set from vty/config */ - /* Indicate R99 MSC in SI3 */ - bts->si_common.chan_desc.mscr = 1; - /* Determine the value of CCCH_CONF. Is TS0/C0 combined? */ if (bts->c0->ts[0].pchan_from_config != GSM_PCHAN_CCCH) { bts->si_common.chan_desc.ccch_conf = RSL_BCCH_CCCH_CONF_1_C; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5b78c4e25616ab552c37ba8b7c9948cf7052bad4 Gerrit-Change-Number: 25761 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 08:52:31 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 14 Oct 2021 08:52:31 +0000 Subject: Change in osmo-bsc[master]: bts: set pwrc value in bts_alloc In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25762 ) Change subject: bts: set pwrc value in bts_alloc ...................................................................... bts: set pwrc value in bts_alloc The pwrc value is currently set from bootstrap_bts() in osmo_bsc_main.c. The value is set to 0. Since the BTS object is allocated using talloc it is guaranteed to be 0 from the beginning. Lets set it from bts_alloc anyway so that we have a place holder that is easy to find. Change-Id: Id76879a94cf8cf8c07e8fc7e8aa399cd50e04e9a --- M src/osmo-bsc/bts.c M src/osmo-bsc/osmo_bsc_main.c 2 files changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index dc835d5..82fe496 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -271,6 +271,7 @@ bts->si_common.chan_desc.bs_pa_mfrms = RSL_BS_PA_MFRMS_5; /* paging frames */ bts->si_common.chan_desc.bs_ag_blks_res = 1; /* reserved AGCH blocks */ bts->si_common.chan_desc.t3212 = osmo_tdef_get(net->T_defs, 3212, OSMO_TDEF_CUSTOM, -1); + bts->si_common.cell_options.pwrc = 0; /* PWRC not set */ gsm_bts_set_radio_link_timeout(bts, 32); /* Use RADIO LINK TIMEOUT of 32 */ INIT_LLIST_HEAD(&bts->abis_queue); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 2931dcf..757f053 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -510,8 +510,6 @@ bts->si_common.chan_desc.ccch_conf = (n << 1); } - bts->si_common.cell_options.pwrc = 0; /* PWRC not set */ - bts->si_common.cell_sel_par.acs = 0; bts->si_common.ncc_permitted = 0xff; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id76879a94cf8cf8c07e8fc7e8aa399cd50e04e9a Gerrit-Change-Number: 25762 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 08:52:46 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 14 Oct 2021 08:52:46 +0000 Subject: Change in osmo-bsc[master]: bts: set acs value in bts_alloc In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25763 ) Change subject: bts: set acs value in bts_alloc ...................................................................... bts: set acs value in bts_alloc The acs value is currently set from bootstrap_bts() in osmo_bsc_main.c. The value is set to 0. Since the BTS object is allocated using talloc it is guaranteed to be 0 from the beginning. Lets set it from bts_alloc anyway so that we have a place holder that is easy to find. Change-Id: Idc4e08c471e15c36b4ea7eb3981254e179115765 --- M src/osmo-bsc/bts.c M src/osmo-bsc/osmo_bsc_main.c 2 files changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 82fe496..092c790 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -272,6 +272,7 @@ bts->si_common.chan_desc.bs_ag_blks_res = 1; /* reserved AGCH blocks */ bts->si_common.chan_desc.t3212 = osmo_tdef_get(net->T_defs, 3212, OSMO_TDEF_CUSTOM, -1); bts->si_common.cell_options.pwrc = 0; /* PWRC not set */ + bts->si_common.cell_sel_par.acs = 0; gsm_bts_set_radio_link_timeout(bts, 32); /* Use RADIO LINK TIMEOUT of 32 */ INIT_LLIST_HEAD(&bts->abis_queue); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 757f053..4e2210f 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -510,8 +510,6 @@ bts->si_common.chan_desc.ccch_conf = (n << 1); } - bts->si_common.cell_sel_par.acs = 0; - bts->si_common.ncc_permitted = 0xff; bts->chan_load_samples_idx = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25763 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idc4e08c471e15c36b4ea7eb3981254e179115765 Gerrit-Change-Number: 25763 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 08:53:07 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 14 Oct 2021 08:53:07 +0000 Subject: Change in osmo-bsc[master]: drop chan_load_samples_idx initalization from bootstrap_bts() In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25764 ) Change subject: drop chan_load_samples_idx initalization from bootstrap_bts() ...................................................................... drop chan_load_samples_idx initalization from bootstrap_bts() The index counter bts->chan_load_samples_idx is initialized to 0 in bootstrap_bts. Since the bts object is allocated using talloc it is already guaranteed that everything is set to zero. So we do not need to initalize chan_load_samples_idx. Change-Id: Ia75e59c44c3ccd653a2614c2cda7519faf999f09 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 4e2210f..28a56a7 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -512,8 +512,6 @@ bts->si_common.ncc_permitted = 0xff; - bts->chan_load_samples_idx = 0; - /* ACC ramping is initialized from vty/config */ /* Initialize the BTS state */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia75e59c44c3ccd653a2614c2cda7519faf999f09 Gerrit-Change-Number: 25764 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 08:53:33 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 14 Oct 2021 08:53:33 +0000 Subject: Change in osmo-bsc[master]: bts: set ncc_permitted from bts_alloc In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25765 ) Change subject: bts: set ncc_permitted from bts_alloc ...................................................................... bts: set ncc_permitted from bts_alloc The value ncc_permitted is preset in osmo_bsc_main.c from bootstrap_bts(). It is a constant value that also cannot be changed via the VTY. Therefore it should be set from bts_alloc(). This also fixes the problem that when the BTS is added at runtime from the VTY. BTSs added at runtime would have an all zero ncc_permitted until the next restart of osmo_bsc. Change-Id: I9f02277d7b4b4bcb383e749435416a0b22efd5e8 Related: SYS#5369 --- M src/osmo-bsc/bts.c M src/osmo-bsc/osmo_bsc_main.c M tests/gsm0408/gsm0408_test.ok 3 files changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 092c790..fe18b59 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -273,6 +273,7 @@ bts->si_common.chan_desc.t3212 = osmo_tdef_get(net->T_defs, 3212, OSMO_TDEF_CUSTOM, -1); bts->si_common.cell_options.pwrc = 0; /* PWRC not set */ bts->si_common.cell_sel_par.acs = 0; + bts->si_common.ncc_permitted = 0xff; gsm_bts_set_radio_link_timeout(bts, 32); /* Use RADIO LINK TIMEOUT of 32 */ INIT_LLIST_HEAD(&bts->abis_queue); diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 28a56a7..3a1a673 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -510,8 +510,6 @@ bts->si_common.chan_desc.ccch_conf = (n << 1); } - bts->si_common.ncc_permitted = 0xff; - /* ACC ramping is initialized from vty/config */ /* Initialize the BTS state */ diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index b22d0c2..0bb7ee0 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -169,7 +169,7 @@ BTS deallocated OK in test_si2q_long() BTS allocation OK in test_si_ba_ind() Testing if BA-IND is set as expected in SI2xxx and SI5xxx -SI2: 59 06 1a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 e5 04 00 +SI2: 59 06 1a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ff e5 04 00 SI2bis: 55 06 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 e5 04 00 2b SI2ter: 49 06 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 2b 2b 2b 2b SI5: 06 1d 10 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9f02277d7b4b4bcb383e749435416a0b22efd5e8 Gerrit-Change-Number: 25765 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 08:53:52 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 14 Oct 2021 08:53:52 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: remove not longer needed fixme note In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25766 ) Change subject: osmo_bsc_main: remove not longer needed fixme note ...................................................................... osmo_bsc_main: remove not longer needed fixme note It is not possible to operate a cell that has secondary TRXs in different bands. Especially considering that DCS1800 and PCS1900 have overlapping ARFCN numbers it would be hard for the MS to tell to which band it should switch. Also the ImmAss. message only contains the ARFCN number. It is impractical to have TRXs in different bands and probably this also violates the sepec. Change-Id: Icc2af9e2a9bca3897dbbb34d7b2c0fe6f843bedd --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 3a1a673..92b7475 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -446,8 +446,6 @@ if (!bts->model) return -EFAULT; - /* FIXME: What about secondary TRX of a BTS? What about a BTS that has TRX - * in different bands? Why is 'band' a parameter of the BTS and not of the TRX? */ switch (bts->band) { case GSM_BAND_1800: if (bts->c0->arfcn < 512 || bts->c0->arfcn > 885) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icc2af9e2a9bca3897dbbb34d7b2c0fe6f843bedd Gerrit-Change-Number: 25766 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 10:05:08 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 14 Oct 2021 10:05:08 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25552 to look at the new patch set (#6). Change subject: pySim-shell: add bulk provisioning support ...................................................................... pySim-shell: add bulk provisioning support There are scenarios where multiple cards need to get the same change. Lets add a new command that takes a script as parameter and executes the secript in a loop on multiple cards while prompting the user to change the card before starting the next cycle. Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Related: SYS#5617 --- M pySim-shell.py 1 file changed, 184 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/52/25552/6 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 10:05:14 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 14 Oct 2021 10:05:14 +0000 Subject: Change in pysim[master]: pySim-shell: allow card insertion at runtime In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25549 ) Change subject: pySim-shell: allow card insertion at runtime ...................................................................... Patch Set 6: (1 comment) This change is ready for review. https://gerrit.osmocom.org/c/pysim/+/25549/3/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/25549/3/pySim-shell.py at a109 PS3, Line 109: self.ad > but what kind of implications does this have? Doesn't it mean that a user config file specifying thi [?] I think I get what you mean. The conserve_write flag should be settable from the beginning, even in the unequipped state. Also card changes should not reset the flag. I have fixed now. apdu_trace also had similar problems. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 Gerrit-Change-Number: 25549 Gerrit-PatchSet: 6 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 14 Oct 2021 10:05:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 12:05:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 12:05:31 +0000 Subject: Change in osmo-msc[master]: [UNTESTED] Fix enabling of UMTS UEA encryption In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22757 ) Change subject: [UNTESTED] Fix enabling of UMTS UEA encryption ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ieaaa6b23b7337b7edb902fad8031e195e0c5e9d2 Gerrit-Change-Number: 22757 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 14 Oct 2021 12:05:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 12:11:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 12:11:07 +0000 Subject: Change in libosmocore[master]: ns2: don't forward an invalid RESET PDU to the FSM In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25774 ) Change subject: ns2: don't forward an invalid RESET PDU to the FSM ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6e562def9c5a1e4534d42884215272b1e66d26c2 Gerrit-Change-Number: 25774 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 12:11:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 12:42:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 12:42:35 +0000 Subject: Change in osmo-bts[master]: lchan: Setup early_rr_ia timer only once during init References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25779 ) Change subject: lchan: Setup early_rr_ia timer only once during init ...................................................................... lchan: Setup early_rr_ia timer only once during init There's no need to re-setup it every time. Mark the cb as static since its private to the module, and move it above its use point so it can be referenced. Change-Id: I90324f26d8ca09d425c7523a25b3e6c951fa49d6 --- M src/common/lchan.c 1 file changed, 29 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/79/25779/1 diff --git a/src/common/lchan.c b/src/common/lchan.c index f7ee33b..747e8b0 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -52,6 +52,33 @@ { 0, NULL } }; +static void early_rr_ia_delay_cb(void *data) +{ + struct gsm_lchan *lchan = data; + struct gsm_bts *bts = lchan->ts->trx->bts; + + if (!lchan->early_rr_ia) { + /* The IA message has disappeared since the timer was started. */ + return; + } + + if (lchan->state != LCHAN_S_ACTIVE) { + /* Release has happened since the timer was started. */ + msgb_free(lchan->early_rr_ia); + lchan->early_rr_ia = NULL; + return; + } + + /* Activation is done, send the RR IA now. Put RR IA msg into the AGCH queue of the BTS. */ + if (bts_agch_enqueue(bts, lchan->early_rr_ia) < 0) { + /* if there is no space in the queue: send DELETE IND */ + rsl_tx_delete_ind(bts, lchan->early_rr_ia->data, lchan->early_rr_ia->len); + rate_ctr_inc2(bts->ctrs, BTS_CTR_AGCH_DELETED); + msgb_free(lchan->early_rr_ia); + } + lchan->early_rr_ia = NULL; +} + void gsm_lchan_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr) { lchan->ts = ts; @@ -59,6 +86,8 @@ lchan->type = GSM_LCHAN_NONE; gsm_lchan_name_update(lchan); + osmo_timer_setup(&lchan->early_rr_ia_delay, early_rr_ia_delay_cb, lchan); + INIT_LLIST_HEAD(&lchan->sapi_cmds); INIT_LLIST_HEAD(&lchan->dl_tch_queue); } @@ -150,33 +179,6 @@ return get_value_string(lchan_s_names, s); } -void early_rr_ia_delay_cb(void *data) -{ - struct gsm_lchan *lchan = data; - struct gsm_bts *bts = lchan->ts->trx->bts; - - if (!lchan->early_rr_ia) { - /* The IA message has disappeared since the timer was started. */ - return; - } - - if (lchan->state != LCHAN_S_ACTIVE) { - /* Release has happened since the timer was started. */ - msgb_free(lchan->early_rr_ia); - lchan->early_rr_ia = NULL; - return; - } - - /* Activation is done, send the RR IA now. Put RR IA msg into the AGCH queue of the BTS. */ - if (bts_agch_enqueue(bts, lchan->early_rr_ia) < 0) { - /* if there is no space in the queue: send DELETE IND */ - rsl_tx_delete_ind(bts, lchan->early_rr_ia->data, lchan->early_rr_ia->len); - rate_ctr_inc2(bts->ctrs, BTS_CTR_AGCH_DELETED); - msgb_free(lchan->early_rr_ia); - } - lchan->early_rr_ia = NULL; -} - void lchan_set_state(struct gsm_lchan *lchan, enum gsm_lchan_state state) { DEBUGP(DL1C, "%s state %s -> %s\n", @@ -197,7 +199,6 @@ /* Activation is done, send the RR IA now. Delay a bit more to give Um time to let the lchan * light up for the MS */ osmo_timer_del(&lchan->early_rr_ia_delay); - osmo_timer_setup(&lchan->early_rr_ia_delay, early_rr_ia_delay_cb, lchan); osmo_timer_schedule(&lchan->early_rr_ia_delay, 0, osmo_tdef_get(abis_T_defs, -15, OSMO_TDEF_US, -1)); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I90324f26d8ca09d425c7523a25b3e6c951fa49d6 Gerrit-Change-Number: 25779 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 12:46:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 12:46:43 +0000 Subject: Change in osmo-bts[master]: WIP References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25780 ) Change subject: WIP ...................................................................... WIP Change-Id: Id32d63b802f435b4abe67716b0876d97877c3574 --- M src/common/lchan.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/80/25780/1 diff --git a/src/common/lchan.c b/src/common/lchan.c index 747e8b0..26b6dda 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -198,6 +198,7 @@ case LCHAN_S_ACTIVE: /* Activation is done, send the RR IA now. Delay a bit more to give Um time to let the lchan * light up for the MS */ + LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "PESPIN: RE-SCHEDULING lchan->early_rr_ia_delay\n"); osmo_timer_del(&lchan->early_rr_ia_delay); osmo_timer_schedule(&lchan->early_rr_ia_delay, 0, osmo_tdef_get(abis_T_defs, -15, OSMO_TDEF_US, -1)); @@ -205,6 +206,7 @@ default: /* Transition to any other state means whatever IA the BSC has sent shall now not be relevant * anymore. */ + LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "PESPIN: DELETING lchan->early_rr_ia_delay\n"); osmo_timer_del(&lchan->early_rr_ia_delay); msgb_free(lchan->early_rr_ia); lchan->early_rr_ia = NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id32d63b802f435b4abe67716b0876d97877c3574 Gerrit-Change-Number: 25780 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 12:46:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 12:46:53 +0000 Subject: Change in osmo-bts[master]: WIP In-Reply-To: References: Message-ID: pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25780 ) Change subject: WIP ...................................................................... Abandoned accidental push -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id32d63b802f435b4abe67716b0876d97877c3574 Gerrit-Change-Number: 25780 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 12:55:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 12:55:38 +0000 Subject: Change in osmo-bts[master]: Move lchan related code to lchan.{c,h} References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25781 ) Change subject: Move lchan related code to lchan.{c,h} ...................................................................... Move lchan related code to lchan.{c,h} Change-Id: I17ebe6af69e31d1b4dbad7656bbf043f4c9243c1 --- M include/osmo-bts/bts.h M include/osmo-bts/lchan.h M src/common/bts.c M src/common/lchan.c M src/common/sysinfo.c 5 files changed, 79 insertions(+), 78 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/81/25781/1 diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 4683758..8832588 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -407,8 +407,6 @@ void regenerate_si3_restoctets(struct gsm_bts *bts); void regenerate_si4_restoctets(struct gsm_bts *bts); int get_si4_ro_offset(const uint8_t *si4_buf); -uint8_t *lchan_sacch_get(struct gsm_lchan *lchan); -int lchan_init_lapdm(struct gsm_lchan *lchan); void load_timer_start(struct gsm_bts *bts); void load_timer_stop(struct gsm_bts *bts); diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 8fcf36a..665bb44 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -329,6 +329,7 @@ void gsm_lchan_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr); void gsm_lchan_name_update(struct gsm_lchan *lchan); +int lchan_init_lapdm(struct gsm_lchan *lchan); void gsm_lchan_release(struct gsm_lchan *lchan, enum lchan_rel_act_kind rel_kind); const char *gsm_lchans_name(enum gsm_lchan_state s); @@ -337,6 +338,8 @@ return lchan->name; } +uint8_t *lchan_sacch_get(struct gsm_lchan *lchan); + uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan); uint8_t gsm_lchan2chan_nr_rsl(const struct gsm_lchan *lchan); uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, diff --git a/src/common/bts.c b/src/common/bts.c index b226df2..86140ba 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -454,66 +454,6 @@ return bts_model_oml_estab(bts); } -/* prepare the per-SAPI T200 arrays for a given lchan */ -static int t200_by_lchan(int *t200_ms_dcch, int *t200_ms_acch, struct gsm_lchan *lchan) -{ - struct gsm_bts *bts = lchan->ts->trx->bts; - - /* we have to compensate for the "RTS advance" due to the asynchronous interface between - * the BTS (LAPDm) and the PHY/L1 (OsmoTRX or DSP in case of osmo-bts-{sysmo,lc15,oc2g,octphy} */ - int32_t fn_advance = bts_get_avg_fn_advance(bts); - int32_t fn_advance_us = fn_advance * 4615; - int fn_advance_ms = fn_advance_us / 1000; - - t200_ms_acch[DL_SAPI0] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; - t200_ms_acch[DL_SAPI3] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; - - if (lchan->repeated_acch_capability.dl_facch_all && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { - t200_ms_acch[DL_SAPI0] *= 2; - t200_ms_acch[DL_SAPI3] *= 2; - } - - switch (lchan->type) { - case GSM_LCHAN_SDCCH: - t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_SDCCH] + fn_advance_ms; - t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_SDCCH_SAPI3] + fn_advance_ms; - break; - case GSM_LCHAN_TCH_F: - t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_FACCH_F] + fn_advance_ms; - t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_FACCH_F] + fn_advance_ms; - break; - case GSM_LCHAN_TCH_H: - t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_FACCH_H] + fn_advance_ms; - t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_FACCH_H] + fn_advance_ms; - break; - default: - /* Channels such as CCCH don't use lapdm DL, and hence no T200 is needed */ - return -1; - } - return 0; -} - -int lchan_init_lapdm(struct gsm_lchan *lchan) -{ - struct lapdm_channel *lc = &lchan->lapdm_ch; - int t200_ms_dcch[_NR_DL_SAPI], t200_ms_acch[_NR_DL_SAPI]; - - if (t200_by_lchan(t200_ms_dcch, t200_ms_acch, lchan) == 0) { - LOGPLCHAN(lchan, DLLAPD, LOGL_DEBUG, - "Setting T200 D0=%u, D3=%u, S0=%u, S3=%u (all in ms)\n", - t200_ms_dcch[DL_SAPI0], t200_ms_dcch[DL_SAPI3], - t200_ms_acch[DL_SAPI0], t200_ms_acch[DL_SAPI3]); - lapdm_channel_init3(lc, LAPDM_MODE_BTS, t200_ms_dcch, t200_ms_acch, lchan->type, - gsm_lchan_name(lchan)); - lapdm_channel_set_flags(lc, LAPDM_ENT_F_POLLING_ONLY); - lapdm_channel_set_l1(lc, NULL, lchan); - } - /* We still need to set Rx callback to receive RACH requests: */ - lapdm_channel_set_l3(lc, lapdm_rll_tx_cb, lchan); - - return 0; -} - #define CCCH_RACH_RATIO_COMBINED256 (256*1/9) #define CCCH_RACH_RATIO_SEPARATE256 (256*10/55) diff --git a/src/common/lchan.c b/src/common/lchan.c index 747e8b0..14fa625 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -52,6 +52,45 @@ { 0, NULL } }; +/* prepare the per-SAPI T200 arrays for a given lchan */ +static int t200_by_lchan(int *t200_ms_dcch, int *t200_ms_acch, struct gsm_lchan *lchan) +{ + struct gsm_bts *bts = lchan->ts->trx->bts; + + /* we have to compensate for the "RTS advance" due to the asynchronous interface between + * the BTS (LAPDm) and the PHY/L1 (OsmoTRX or DSP in case of osmo-bts-{sysmo,lc15,oc2g,octphy} */ + int32_t fn_advance = bts_get_avg_fn_advance(bts); + int32_t fn_advance_us = fn_advance * 4615; + int fn_advance_ms = fn_advance_us / 1000; + + t200_ms_acch[DL_SAPI0] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; + t200_ms_acch[DL_SAPI3] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; + + if (lchan->repeated_acch_capability.dl_facch_all && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { + t200_ms_acch[DL_SAPI0] *= 2; + t200_ms_acch[DL_SAPI3] *= 2; + } + + switch (lchan->type) { + case GSM_LCHAN_SDCCH: + t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_SDCCH] + fn_advance_ms; + t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_SDCCH_SAPI3] + fn_advance_ms; + break; + case GSM_LCHAN_TCH_F: + t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_FACCH_F] + fn_advance_ms; + t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_FACCH_F] + fn_advance_ms; + break; + case GSM_LCHAN_TCH_H: + t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_FACCH_H] + fn_advance_ms; + t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_FACCH_H] + fn_advance_ms; + break; + default: + /* Channels such as CCCH don't use lapdm DL, and hence no T200 is needed */ + return -1; + } + return 0; +} + static void early_rr_ia_delay_cb(void *data) { struct gsm_lchan *lchan = data; @@ -105,6 +144,27 @@ lchan->name = name; } +int lchan_init_lapdm(struct gsm_lchan *lchan) +{ + struct lapdm_channel *lc = &lchan->lapdm_ch; + int t200_ms_dcch[_NR_DL_SAPI], t200_ms_acch[_NR_DL_SAPI]; + + if (t200_by_lchan(t200_ms_dcch, t200_ms_acch, lchan) == 0) { + LOGPLCHAN(lchan, DLLAPD, LOGL_DEBUG, + "Setting T200 D0=%u, D3=%u, S0=%u, S3=%u (all in ms)\n", + t200_ms_dcch[DL_SAPI0], t200_ms_dcch[DL_SAPI3], + t200_ms_acch[DL_SAPI0], t200_ms_acch[DL_SAPI3]); + lapdm_channel_init3(lc, LAPDM_MODE_BTS, t200_ms_dcch, t200_ms_acch, lchan->type, + gsm_lchan_name(lchan)); + lapdm_channel_set_flags(lc, LAPDM_ENT_F_POLLING_ONLY); + lapdm_channel_set_l1(lc, NULL, lchan); + } + /* We still need to set Rx callback to receive RACH requests: */ + lapdm_channel_set_l3(lc, lapdm_rll_tx_cb, lchan); + + return 0; +} + static int dyn_ts_pdch_release(struct gsm_lchan *lchan) { struct gsm_bts_trx_ts *ts = lchan->ts; @@ -179,6 +239,22 @@ return get_value_string(lchan_s_names, s); } +/* obtain the next to-be transmitted dowlink SACCH frame (L2 hdr + L3); returns pointer to lchan->si buffer */ +uint8_t *lchan_sacch_get(struct gsm_lchan *lchan) +{ + uint32_t tmp, i; + + for (i = 0; i < _MAX_SYSINFO_TYPE; i++) { + tmp = (lchan->si.last + 1 + i) % _MAX_SYSINFO_TYPE; + if (!(lchan->si.valid & (1 << tmp))) + continue; + lchan->si.last = tmp; + return GSM_LCHAN_SI(lchan, tmp); + } + LOGPLCHAN(lchan, DL1P, LOGL_NOTICE, "SACCH no SI available\n"); + return NULL; +} + void lchan_set_state(struct gsm_lchan *lchan, enum gsm_lchan_state state) { DEBUGP(DL1C, "%s state %s -> %s\n", diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c index 5c5af25..b0f1ebf 100644 --- a/src/common/sysinfo.c +++ b/src/common/sysinfo.c @@ -164,22 +164,6 @@ return 1; } -/* obtain the next to-be transmitted dowlink SACCH frame (L2 hdr + L3); returns pointer to lchan->si buffer */ -uint8_t *lchan_sacch_get(struct gsm_lchan *lchan) -{ - uint32_t tmp, i; - - for (i = 0; i < _MAX_SYSINFO_TYPE; i++) { - tmp = (lchan->si.last + 1 + i) % _MAX_SYSINFO_TYPE; - if (!(lchan->si.valid & (1 << tmp))) - continue; - lchan->si.last = tmp; - return GSM_LCHAN_SI(lchan, tmp); - } - LOGPLCHAN(lchan, DL1P, LOGL_NOTICE, "SACCH no SI available\n"); - return NULL; -} - /* re-generate SI3 restoctets with GPRS indicator depending on the PCU socket connection state */ void regenerate_si3_restoctets(struct gsm_bts *bts) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17ebe6af69e31d1b4dbad7656bbf043f4c9243c1 Gerrit-Change-Number: 25781 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:05:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 14:05:59 +0000 Subject: Change in pysim[master]: cat: Add more terminal profile bitmask definitions References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25782 ) Change subject: cat: Add more terminal profile bitmask definitions ...................................................................... cat: Add more terminal profile bitmask definitions Change-Id: Ie9934f684956381f6e57ded2140951e473cb09ec --- M pySim/cat.py 1 file changed, 79 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/25782/1 diff --git a/pySim/cat.py b/pySim/cat.py index cd98a81..27065ee 100644 --- a/pySim/cat.py +++ b/pySim/cat.py @@ -163,9 +163,16 @@ nested=[DeviceIdentities, USSDString]): pass + +# reasonable default for playing with OTA +# 010203040506070809101112131415161718192021222324252627282930313233 +#'7fe1e10e000000000000001f43000000ff00000000000000000000000000000000' + +# TS 102 223 Section 5.2 term_prof_bits = { + # first byte 1: 'Profile download', - 2: 'SMS-PP data doanload', + 2: 'SMS-PP data download', 3: 'Cell Broadcast data download', 4: 'Menu selection', 5: 'SMS-PP data download', @@ -173,8 +180,9 @@ 7: 'USSD string DO support in CC by USIM', 8: 'Call Control by NAA', + # first byte 9: 'Command result', - 10: 'Call Controll by NAA', + 10: 'Call Control by NAA', 11: 'Call Control by NAA', 12: 'MO short message control support', 13: 'Call Control by NAA', @@ -182,6 +190,7 @@ 15: 'UCS2 Display supported', 16: 'Display Text', + # third byte 17: 'Proactive UICC: DISPLAY TEXT', 18: 'Proactive UICC: GET INKEY', 19: 'Proactive UICC: GET INPUT', @@ -191,6 +200,7 @@ 23: 'Proactive UICC: POLLING OFF', 24: 'Proactive UICC: REFRESH', + # fourth byte 25: 'Proactive UICC: SELECT ITEM', 26: 'Proactive UICC: SEND SHORT MESSAGE with 3GPP-SMS-TPDU', 27: 'Proactive UICC: SEND SS', @@ -200,6 +210,7 @@ 31: 'Proactive UICC: PROVIDE LOCAL INFORMATION (MCC, MNC, LAC, Cell ID & IMEI)', 32: 'Proactive UICC: PROVIDE LOCAL INFORMATION (NMR)', + # fifth byte 33: 'Proactive UICC: SET UP EVENT LIST', 34: 'Event: MT call', 35: 'Event: Call connected', @@ -209,6 +220,7 @@ 39: 'Event: Idle screen available', 40: 'Event: Card reader status', + # sixth byte 41: 'Event: Language selection', 42: 'Event: Browser Termination', 43: 'Event: Data aailable', @@ -218,5 +230,70 @@ 47: 'Event: Local Connection', 48: 'Event: Network Search Mode Change', + # seventh byte + 49: 'Proactive UICC: POWER ON CARD', + 50: 'Proactive UICC: POWER OFF CARD', + 51: 'Proactive UICC: PERFORM CARD RESET', + 52: 'Proactive UICC: GET READER STATUS (Card reader status)', + 53: 'Proactive UICC: GET READER STATUS (Card reader identifier)', + # RFU: 3 bit (54,55,56) + + # eigth byte + 57: 'Proactive UICC: TIMER MANAGEMENT (start, stop)', + 58: 'Proactive UICC: TIMER MANAGEMENT (get current value)', + 59: 'Proactive UICC: PROVIDE LOCAL INFORMATION (date, time and time zone)', + 60: 'GET INKEY', + 61: 'SET UP IDLE MODE TEXT', + 62: 'RUN AT COMMAND', + 63: 'SETUP CALL', + 64: 'Call Control by NAA', + + # ninth byte + 65: 'DISPLAY TEXT', + 66: 'SEND DTMF command', + 67: 'Proactive UICC: PROVIDE LOCAL INFORMATION (NMR)', + 68: 'Proactive UICC: PROVIDE LOCAL INFORMATION (language)', + 69: 'Proactive UICC: PROVIDE LOCAL INFORMATION (Timing Advance)', + 70: 'Proactive UICC: LANGUAGE NOTIFICATION', + 71: 'Proactive UICC: LAUNCH BROWSER', + 72: 'Proactive UICC: PROVIDE LOCAL INFORMATION (Access Technology)', + + # tenth byte + 73: 'Soft keys support for SELECT ITEM', + 74: 'Soft keys support for SET UP MENU ITEM', + # RFU: 6 bit (75-80) + + # eleventh byte: max number of soft keys as 8bit value (81..88) + + # twelfth byte + 89: 'Proactive UICC: OPEN CHANNEL', + 90: 'Proactive UICC: CLOSE CHANNEL', + 91: 'Proactive UICC: RECEIVE DATA', + 92: 'Proactive UICC: SEND DATA', + 93: 'Proactive UICC: GET CHANNEL STATUS', + 94: 'Proactive UICC: SERVICE SEARCH', + 95: 'Proactive UICC: GET SERVICE INFORMATION', + 96: 'Proactive UICC: DECLARE SERVICE', + + # thirteenth byte + 97: 'BIP supported Bearer: CSD', + 98: 'BIP supported Bearer: GPRS', + 99: 'BIP supported Bearer: Bluetooth', + 100: 'BIP supported Bearer: IrDA', + 101: 'BIP supported Bearer: RS232', + # 3 bits: number of channels supported (102..104) + + # fourtheenth byte (screen height) + # fifteenth byte (screen width) + # sixeenth byte (screen effects) + # seventeenth byte (BIP suppored bearers) + 129: 'BIP: TCP, UICC in client mode, remote connection', + 130: 'BIP: UDP, UICC in client mode, remote connection', + 131: 'BIP: TCP, UICC in server mode', + 132: 'BIP: TCP, UICC in client mode, local connection', + 133: 'BIP: UDP, UICC in client mode, local connection', + 134: 'BIP: direct communication channel', + # 2 bits reserved: 135, 136 + # FIXME: remainder } -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie9934f684956381f6e57ded2140951e473cb09ec Gerrit-Change-Number: 25782 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:05:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 14:05:59 +0000 Subject: Change in pysim[master]: cat: Fix SMS/ENVELOPE related IE tag definitions References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25783 ) Change subject: cat: Fix SMS/ENVELOPE related IE tag definitions ...................................................................... cat: Fix SMS/ENVELOPE related IE tag definitions Change-Id: I7ed4d78479b6ff75cde20cb5b0bd1672035806ff --- M pySim/cat.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/83/25783/1 diff --git a/pySim/cat.py b/pySim/cat.py index 27065ee..00658de 100644 --- a/pySim/cat.py +++ b/pySim/cat.py @@ -52,7 +52,7 @@ 'command_qualifier'/Int8ub) # TS 102 223 Section 8.7 -class DeviceIdentities(COMPR_TLV_IE, tag=0x02): +class DeviceIdentities(COMPR_TLV_IE, tag=0x82): DEV_IDS = bidict({ 0x01: 'keypad', 0x02: 'display', @@ -126,8 +126,8 @@ # TS 102 223 Section 8.13 + TS 31.111 Section 8.13 -class SMS_TPDU(COMPR_TLV_IE, tag=0x0B): - pass +class SMS_TPDU(COMPR_TLV_IE, tag=0x8B): + _construct = Struct('tpdu'/HexAdapter(GreedyBytes)) # TS 102 223 Section 8.15 class TextString(COMPR_TLV_IE, tag=0x0d): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7ed4d78479b6ff75cde20cb5b0bd1672035806ff Gerrit-Change-Number: 25783 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:06:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 14:06:00 +0000 Subject: Change in pysim[master]: pysim-Shell: Add sysmocom SJA2 card specific bits References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25784 ) Change subject: pysim-Shell: Add sysmocom SJA2 card specific bits ...................................................................... pysim-Shell: Add sysmocom SJA2 card specific bits Depending on the ATR, we register the various sysmocom SJA2 card model specific files [or not]. Change-Id: Id410489841bb9020ddbf74de9114d808b1d5adb6 --- M pySim-shell.py M pySim/filesystem.py A pySim/sysmocom_sja2.py 3 files changed, 275 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/84/25784/1 diff --git a/pySim-shell.py b/pySim-shell.py index f821e41..871c45e 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -42,12 +42,14 @@ from pySim.utils import dec_st, sanitize_pin_adm, tabulate_str_list, is_hex, boxed_heading_str from pySim.card_handler import CardHandler -from pySim.filesystem import CardMF, RuntimeState, CardDF, CardADF +from pySim.filesystem import CardMF, RuntimeState, CardDF, CardADF, CardModel from pySim.ts_51_011 import CardProfileSIM, DF_TELECOM, DF_GSM from pySim.ts_102_221 import CardProfileUICC from pySim.ts_31_102 import CardApplicationUSIM from pySim.ts_31_103 import CardApplicationISIM +import pySim.sysmocom_sja2 + from pySim.card_key_provider import CardKeyProviderCsv, card_key_provider_register, card_key_provider_get_field def init_card(sl): @@ -84,6 +86,8 @@ rs.mf.add_file(DF_TELECOM()) rs.mf.add_file(DF_GSM()) + CardModel.apply_matching_models(scc, rs) + # inform the transport that we can do context-specific SW interpretation sl.set_sw_interpreter(rs) diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 170429b..f46c88b 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -27,6 +27,8 @@ import code import tempfile import json +import abc +import inspect import cmd2 from cmd2 import CommandSet, with_default_category, with_argparser @@ -34,10 +36,13 @@ from typing import cast, Optional, Iterable, List, Any, Dict, Tuple +from smartcard.util import toBytes + from pySim.utils import sw_match, h2b, b2h, i2h, is_hex, auto_int, bertlv_parse_one, Hexstr from pySim.construct import filter_dict, parse_construct from pySim.exceptions import * from pySim.jsonpath import js_path_find, js_path_modify +from pySim.commands import SimCardCommands class CardFile(object): """Base class for all objects in the smart card filesystem. @@ -1427,3 +1432,28 @@ Tuple of two strings """ return interpret_sw(self.sw, sw) + + +class CardModel(abc.ABC): + """A specific card model, typically having some additional vendor-specific files""" + _atrs = [] + + @abc.abstractmethod + def add_files(self, rs:RuntimeState): + """Add model specific files to given RuntimeState.""" + + def match(self, scc:SimCardCommands) -> bool: + """Test if given card matches this model.""" + card_atr = scc.get_atr() + for atr in self._atrs: + atr_bin = toBytes(atr) + if atr_bin == card_atr: + print("Detected CardModel:", self.__name__) + return True + return False + + @staticmethod + def apply_matching_models(scc:SimCardCommands, rs:RuntimeState): + for m in CardModel.__subclasses__(): + if m.match(m, scc): + m.add_files(m, rs) diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py new file mode 100644 index 0000000..e4d1c42 --- /dev/null +++ b/pySim/sysmocom_sja2.py @@ -0,0 +1,240 @@ +# coding=utf-8 +"""Utilities / Functions related to sysmocom SJA2 cards + +(C) 2021 by Harald Welte + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +""" + +from pytlv.TLV import * +from struct import pack, unpack +from pySim.utils import * +from pySim.filesystem import * +from pySim.ts_102_221 import CardProfileUICC +from pySim.construct import * +from construct import * +import pySim + +key_type2str = { + 0: 'kic', + 1: 'kid', + 2: 'kik', + 3: 'any', +} + +key_algo2str = { + 0: 'des', + 1: 'aes' +} + +mac_length = { + 0: 8, + 1: 4 +} + +class EF_PIN(TransparentEF): + def __init__(self, fid, name): + super().__init__(fid, name=name, desc='%s PIN file' % name) + def _decode_bin(self, raw_bin_data): + u = unpack('!BBB8s', raw_bin_data[:11]) + res = {'enabled': (True, False)[u[0] & 0x01], + 'initialized': (True, False)[u[0] & 0x02], + 'disable_able': (False, True)[u[0] & 0x10], + 'unblock_able': (False, True)[u[0] & 0x20], + 'change_able': (False, True)[u[0] & 0x40], + 'valid': (False, True)[u[0] & 0x80], + 'attempts_remaining': u[1], + 'maximum_attempts': u[2], + 'pin': u[3].hex(), + } + if len(raw_bin_data) == 21: + u2 = unpack('!BB8s', raw_bin_data[11:10]) + res['attempts_remaining_puk'] = u2[0] + res['maximum_attempts_puk'] = u2[1] + res['puk'] = u2[2].hex() + return res + +class EF_MILENAGE_CFG(TransparentEF): + def __init__(self, fid='6f21', name='EF.MILENAGE_CFG', desc='Milenage connfiguration'): + super().__init__(fid, name=name, desc=desc) + def _decode_bin(self, raw_bin_data): + u = unpack('!BBBBB16s16s16s16s16s', raw_bin_data) + return {'r1': u[0], 'r2': u[1], 'r3': u[2], 'r4': u[3], 'r5': u[4], + 'c1': u[5].hex(), + 'c2': u[6].hex(), + 'c3': u[7].hex(), + 'c4': u[8].hex(), + 'c5': u[9].hex(), + } + +class EF_0348_KEY(LinFixedEF): + def __init__(self, fid='6f22', name='EF.0348_KEY', desc='TS 03.48 OTA Keys'): + super().__init__(fid, name=name, desc=desc, rec_len={27,35}) + def _decode_record_bin(self, raw_bin_data): + u = unpack('!BBB', raw_bin_data[0:3]) + key_algo = (u[2] >> 6) & 1 + key_length = ((u[2] >> 3) & 3) * 8 + return {'sec_domain': u[0], + 'key_set_version': u[1], + 'key_type': key_type2str[u[2] & 3], + 'key_length': key_length, + 'algorithm': key_algo2str[key_algo], + 'mac_length': mac_length[(u[2] >> 7)], + 'key': raw_bin_data[3:key_length].hex() + } + +class EF_0348_COUNT(LinFixedEF): + def __init__(self, fid='6f23', name='EF.0348_COUNT', desc='TS 03.48 OTA Counters'): + super().__init__(fid, name=name, desc=desc, rec_len={7,7}) + def _decode_record_bin(self, raw_bin_data): + u = unpack('!BB5s', raw_bin_data) + return {'sec_domain': u[0], 'key_set_version': u[1], 'counter': u[2]} + +class EF_SIM_AUTH_COUNTER(TransparentEF): + def __init__(self, fid='af24', name='EF.SIM_AUTH_COUNTER'): + super().__init__(fid, name=name, desc='Number of remaining RUN GSM ALGORITHM executions') + self._construct = Struct('num_run_gsm_algo_remain'/Int32ub) + +class EF_GP_COUNT(LinFixedEF): + def __init__(self, fid='6f26', name='EF.GP_COUNT', desc='GP SCP02 Counters'): + super().__init__(fid, name=name, desc=desc, rec_len={5,5}) + def _decode_record_bin(self, raw_bin_data): + u = unpack('!BBHB', raw_bin_data) + return {'sec_domain': u[0], 'key_set_version': u[1], 'counter': u[2], 'rfu': u[3]} + +class EF_GP_DIV_DATA(LinFixedEF): + def __init__(self, fid='6f27', name='EF.GP_DIV_DATA', desc='GP SCP02 key diversification data'): + super().__init__(fid, name=name, desc=desc, rec_len={12,12}) + def _decode_record_bin(self, raw_bin_data): + u = unpack('!BB8s', raw_bin_data) + return {'sec_domain': u[0], 'key_set_version': u[1], 'key_div_data': u[2].hex()} + +class EF_SIM_AUTH_KEY(TransparentEF): + def __init__(self, fid='6f20', name='EF.SIM_AUTH_KEY'): + super().__init__(fid, name=name, desc='USIM authentication key') + CfgByte = BitStruct(Bit[2], + 'use_sres_deriv_func_2'/Bit, + 'use_opc_instead_of_op'/Bit, + 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3)) + self._construct = Struct('cfg'/CfgByte, + 'key'/Bytes(16), + 'op'/If(this.cfg.algorithm=='milenage' and not this.cfg.use_opc_instead_of_op, Bytes(16)), + 'opc'/If(this.cfg.algorithm=='milenage' and this.cfg.use_opc_instead_of_op, Bytes(16)) + ) + +class DF_SYSTEM(CardDF): + def __init__(self): + super().__init__(fid='a515', name='DF.SYSTEM', desc='CardOS specifics') + files = [ + EF_PIN('6f01', 'EF.CHV1'), + EF_PIN('6f81', 'EF.CHV2'), + EF_PIN('6f0a', 'EF.ADM1'), + EF_PIN('6f0b', 'EF.ADM2'), + EF_PIN('6f0c', 'EF.ADM3'), + EF_PIN('6f0d', 'EF.ADM4'), + EF_MILENAGE_CFG(), + EF_0348_KEY(), + EF_SIM_AUTH_COUNTER(), + EF_SIM_AUTH_KEY(), + EF_0348_COUNT(), + EF_GP_COUNT(), + EF_GP_DIV_DATA(), + ] + self.add_files(files) + + def decode_select_response(self, resp_hex): + return pySim.ts_102_221.decode_select_response(resp_hex) + +class EF_USIM_SQN(TransparentEF): + def __init__(self, fid='af30', name='EF.USIM_SQN'): + super().__init__(fid, name=name, desc='SQN parameters for AKA') + Flag1 = BitStruct('skip_next_sqn_check'/Bit, 'delta_max_check'/Bit, + 'age_limit_check'/Bit, 'sqn_check'/Bit, + 'ind_len'/BitsInteger(4)) + Flag2 = BitStruct('rfu'/BitsRFU(5), 'dont_clear_amf_for_macs'/Bit, + 'aus_concealed'/Bit, 'autn_concealed'/Bit) + self._construct = Struct('flag1'/Flag1, 'flag2'/Flag2, + 'delta_max'/BytesInteger(6), 'age_limit'/BytesInteger(6), + 'freshness'/HexAdapter(GreedyBytes)) + +class EF_USIM_AUTH_KEY(TransparentEF): + def __init__(self, fid='af20', name='EF.USIM_AUTH_KEY'): + super().__init__(fid, name=name, desc='USIM authentication key') + CfgByte = BitStruct(Bit, 'only_4bytes_res_in_3g'/Bit, + 'use_sres_deriv_func_2_in_3g'/Bit, + 'use_opc_instead_of_op'/Bit, + 'algorithm'/Enum(Nibble, milenage=4, sha1_aka=5, xor=15)) + self._construct = Struct('cfg'/CfgByte, + 'key'/Bytes(16), + 'op'/If(this.cfg.algorithm=='milenage' and not this.cfg.use_opc_instead_of_op, Bytes(16)), + 'opc'/If(this.cfg.algorithm=='milenage' and this.cfg.use_opc_instead_of_op, Bytes(16)) + ) +class EF_USIM_AUTH_KEY_2G(TransparentEF): + def __init__(self, fid='af22', name='EF.USIM_AUTH_KEY_2G'): + super().__init__(fid, name=name, desc='USIM authentication key in 2G context') + CfgByte = BitStruct(Bit, 'only_4bytes_res_in_3g'/Bit, + 'use_sres_deriv_func_2_in_3g'/Bit, + 'use_opc_instead_of_op'/Bit, + 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3)) + self._construct = Struct('cfg'/CfgByte, + 'key'/Bytes(16), + 'op'/If(this.cfg.algorithm=='milenage' and not this.cfg.use_opc_instead_of_op, Bytes(16)), + 'opc'/If(this.cfg.algorithm=='milenage' and this.cfg.use_opc_instead_of_op, Bytes(16)) + ) +class EF_GBA_SK(TransparentEF): + def __init__(self, fid='af31', name='EF.GBA_SK'): + super().__init__(fid, name=name, desc='Secret key for GBA key derivation') + self._construct = GreedyBytes + +class EF_GBA_REC_LIST(TransparentEF): + def __init__(self, fid='af32', name='EF.GBA_REC_LIST'): + super().__init__(fid, name=name, desc='Secret key for GBA key derivation') + # integers representing record numbers in EF-GBANL + self._construct = GreedyRange(Int8ub) + +class EF_GBA_INT_KEY(LinFixedEF): + def __init__(self, fid='af33', name='EF.GBA_INT_KEY'): + super().__init__(fid, name=name, desc='Secret key for GBA key derivation', rec_len={32,32}) + self._construct = GreedyBytes + + + +class SysmocomSJA2(CardModel): + _atrs = [ "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 4C 75 30 34 05 4B A9", + "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 4C 75 31 33 02 51 B2", + "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 4C 52 75 31 04 51 D5" ] + def add_files(self, rs:RuntimeState): + """Add sysmocom SJA2 specific files to given RuntimeState.""" + rs.mf.add_file(DF_SYSTEM()) + # optional USIM application + if 'a0000000871002' in rs.mf.applications: + usim_adf = rs.mf.applications['a0000000871002'] + files_adf_usim = [ + EF_USIM_AUTH_KEY(), + EF_USIM_AUTH_KEY_2G(), + EF_GBA_SK(), + EF_GBA_REC_LIST(), + EF_GBA_INT_KEY(), + EF_USIM_SQN(), + ] + usim_adf.add_files(files_adf_usim) + # optional ISIM application + if 'a0000000871004' in rs.mf.applications: + isim_adf = rs.mf.applications['a0000000871004'] + files_adf_isim = [ + EF_USIM_AUTH_KEY(name='EF.ISIM_AUTH_KEY'), + EF_USIM_AUTH_KEY_2G(name='EF.ISIM_AUTH_KEY_2G'), + EF_USIM_SQN(name='EF.ISIM_SQN'), + ] + isim_adf.add_files(files_adf_isim) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id410489841bb9020ddbf74de9114d808b1d5adb6 Gerrit-Change-Number: 25784 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:06:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 14:06:00 +0000 Subject: Change in pysim[master]: Add API + shell command for sending TERMINAL PROFILE to card References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25785 ) Change subject: Add API + shell command for sending TERMINAL PROFILE to card ...................................................................... Add API + shell command for sending TERMINAL PROFILE to card This allows a very first start to play with PROACTIVE SIM Change-Id: Id8f23f7cebe0f9efce2c0ce4229509f35cd93d6a --- M pySim/commands.py M pySim/transport/__init__.py M pySim/ts_31_102.py 3 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/85/25785/1 diff --git a/pySim/commands.py b/pySim/commands.py index 9657162..031b636 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -441,3 +441,9 @@ def envelope(self, payload:str): """Send one ENVELOPE command to the SIM""" return self._tp.send_apdu_checksw('80c20000%02x%s' % (len(payload)//2, payload)) + + def terminal_profile(self, payload:str): + """Send TERMINAL PROFILE to card""" + data_length = len(payload) // 2 + date, sw = self._tp.send_apdu(('80100000%02x' % data_length) + payload) + return (data, sw) diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index 72a80a9..cb781b0 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -136,6 +136,10 @@ """ rv = self.send_apdu(pdu) + if sw == '9000' and sw_match(rv[1], '91xx'): + # proactive sim as per TS 102 221 Setion 7.4.2 + rv = self.send_apdu_checksw('80120000' + rv[1][2:], sw) + print("FETCH: %s", rv[0]) if not sw_match(rv[1], sw): raise SwMatchError(rv[1], sw.lower(), self.sw_interpreter) return rv diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index f3628ad..f347f67 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1084,6 +1084,10 @@ (data, sw) = self._cmd.card._scc.authenticate(opts.rand, opts.autn) self._cmd.poutput_json(data) + def do_terminal_profile(self, arg): + """Send a TERMINAL PROFILE command to the card.""" + (data, sw) = self._cmd.card._scc.terminal_profile(arg) + self._cmd.poutput('SW: %s, data: %s' % (sw, data)) # TS 31.102 Section 7.3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id8f23f7cebe0f9efce2c0ce4229509f35cd93d6a Gerrit-Change-Number: 25785 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:06:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 14:06:01 +0000 Subject: Change in pysim[master]: USIM: Add ENVELOPE and ENVELOPE-SMS shell commands References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25786 ) Change subject: USIM: Add ENVELOPE and ENVELOPE-SMS shell commands ...................................................................... USIM: Add ENVELOPE and ENVELOPE-SMS shell commands Change-Id: I4345459d99c0eeb5753217ad4e7188747c51a2a2 --- M pySim/ts_31_102.py 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/86/25786/1 diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index f347f67..faf0f38 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1089,6 +1089,20 @@ (data, sw) = self._cmd.card._scc.terminal_profile(arg) self._cmd.poutput('SW: %s, data: %s' % (sw, data)) + def do_envelope(self, arg): + """Send an ENVELOPE command to the card.""" + (data, sw) = self._cmd.card._scc.envelope(arg) + self._cmd.poutput('SW: %s, data: %s' % (sw, data)) + + def do_envelope_sms(self, arg): + """Send an ENVELOPE command to the card.""" + tpdu_ie = SMS_TPDU() + tpdu_ie.from_bytes(h2b(arg)) + dev_ids = DeviceIdentities(decoded={'source_dev_id':'network','dest_dev_id':'uicc'}) + sms_dl = SMSPPDownload(children=[dev_ids, tpdu_ie]) + (data, sw) = self._cmd.card._scc.envelope(b2h(sms_dl.to_tlv())) + self._cmd.poutput('SW: %s, data: %s' % (sw, data)) + # TS 31.102 Section 7.3 sw_usim = { -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4345459d99c0eeb5753217ad4e7188747c51a2a2 Gerrit-Change-Number: 25786 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:14:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 14:14:50 +0000 Subject: Change in osmo-bts[master]: lchan: Setup early_rr_ia timer only once during init In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25779 ) Change subject: lchan: Setup early_rr_ia timer only once during init ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I90324f26d8ca09d425c7523a25b3e6c951fa49d6 Gerrit-Change-Number: 25779 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 14:14:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:15:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 14:15:08 +0000 Subject: Change in osmo-bts[master]: Move lchan related code to lchan.{c,h} In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25781 ) Change subject: Move lchan related code to lchan.{c,h} ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17ebe6af69e31d1b4dbad7656bbf043f4c9243c1 Gerrit-Change-Number: 25781 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 14:15:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:37:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 14:37:59 +0000 Subject: Change in osmo-bts[master]: lchan: Update log line level to use macro and level INFO References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25787 ) Change subject: lchan: Update log line level to use macro and level INFO ...................................................................... lchan: Update log line level to use macro and level INFO Change-Id: Idd48fd8fbb13b715096a4765dcb08a18d85098a7 --- M src/common/lchan.c 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/25787/1 diff --git a/src/common/lchan.c b/src/common/lchan.c index 14fa625..c4f3a47 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -257,8 +257,7 @@ void lchan_set_state(struct gsm_lchan *lchan, enum gsm_lchan_state state) { - DEBUGP(DL1C, "%s state %s -> %s\n", - gsm_lchan_name(lchan), + LOGPLCHAN(lchan, DL1C, LOGL_INFO, "state %s -> %s\n", gsm_lchans_name(lchan->state), gsm_lchans_name(state)); lchan->state = state; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idd48fd8fbb13b715096a4765dcb08a18d85098a7 Gerrit-Change-Number: 25787 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:38:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 14:38:01 +0000 Subject: Change in osmo-bts[master]: lchan: Avoid applying transition changes if state new==old References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25788 ) Change subject: lchan: Avoid applying transition changes if state new==old ...................................................................... lchan: Avoid applying transition changes if state new==old This should just not happen, but in case it does, let's make sure we don't run over unexpected paths. Change-Id: I1ca86aa846084f53751076643665cb6dabc26a06 --- M src/common/lchan.c 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/25788/1 diff --git a/src/common/lchan.c b/src/common/lchan.c index c4f3a47..99c452b 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -260,6 +260,10 @@ LOGPLCHAN(lchan, DL1C, LOGL_INFO, "state %s -> %s\n", gsm_lchans_name(lchan->state), gsm_lchans_name(state)); + + if (lchan->state == state) + return; + lchan->state = state; /* Early Immediate Assignment: if we have a cached early IA pending, send it upon becoming active, or discard it -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1ca86aa846084f53751076643665cb6dabc26a06 Gerrit-Change-Number: 25788 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:42:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 14:42:04 +0000 Subject: Change in pysim[master]: cat: Add more terminal profile bitmask definitions In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25782 to look at the new patch set (#2). Change subject: cat: Add more terminal profile bitmask definitions ...................................................................... cat: Add more terminal profile bitmask definitions Change-Id: Ie9934f684956381f6e57ded2140951e473cb09ec --- M pySim/cat.py 1 file changed, 79 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/25782/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie9934f684956381f6e57ded2140951e473cb09ec Gerrit-Change-Number: 25782 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:42:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 14:42:04 +0000 Subject: Change in pysim[master]: pysim-Shell: Add sysmocom SJA2 card specific bits In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25784 to look at the new patch set (#2). Change subject: pysim-Shell: Add sysmocom SJA2 card specific bits ...................................................................... pysim-Shell: Add sysmocom SJA2 card specific bits Depending on the ATR, we register the various sysmocom SJA2 card model specific files [or not]. Change-Id: Id410489841bb9020ddbf74de9114d808b1d5adb6 --- M pySim-shell.py M pySim/filesystem.py A pySim/sysmocom_sja2.py 3 files changed, 278 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/84/25784/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id410489841bb9020ddbf74de9114d808b1d5adb6 Gerrit-Change-Number: 25784 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:42:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 14:42:04 +0000 Subject: Change in pysim[master]: Add API + shell command for sending TERMINAL PROFILE to card In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25785 to look at the new patch set (#2). Change subject: Add API + shell command for sending TERMINAL PROFILE to card ...................................................................... Add API + shell command for sending TERMINAL PROFILE to card This allows a very first start to play with PROACTIVE SIM Change-Id: Id8f23f7cebe0f9efce2c0ce4229509f35cd93d6a --- M pySim/commands.py M pySim/transport/__init__.py M pySim/ts_31_102.py 3 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/85/25785/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id8f23f7cebe0f9efce2c0ce4229509f35cd93d6a Gerrit-Change-Number: 25785 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:42:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 14:42:06 +0000 Subject: Change in pysim[master]: filsystem: Make NotImplementedError more verbose. References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25789 ) Change subject: filsystem: Make NotImplementedError more verbose. ...................................................................... filsystem: Make NotImplementedError more verbose. Before: EXCEPTION of type 'NotImplementedError' occurred with message: '' After: EXCEPTION of type 'NotImplementedError' occurred with message: 'EF(EF.SST) encoder not yet implemented. Patches welcome.' Change-Id: Ie8a10a8847f7c7c6a3332fb9f78de18c9f7f41d0 --- M pySim/filesystem.py 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/89/25789/1 diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 5cdac56..8edac41 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -551,7 +551,7 @@ elif self._tlv: self._tlv.from_dict(abstract_data) return self._tlv.to_tlv() - raise NotImplementedError + raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def encode_hex(self, abstract_data:dict) -> str: """Encode abstract representation into raw (hex string) data. @@ -577,7 +577,7 @@ elif self._tlv: self._tlv.from_dict(abstract_data) return b2h(self._tlv.to_tlv()) - raise NotImplementedError + raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) class LinFixedEF(CardEF): @@ -787,7 +787,7 @@ elif self._tlv: self._tlv.from_dict(abstract_data) return b2h(self._tlv.to_tlv()) - raise NotImplementedError + raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def encode_record_bin(self, abstract_data:dict) -> bytearray: """Encode abstract representation into raw (binary) data. @@ -812,7 +812,7 @@ elif self._tlv: self._tlv.from_dict(abstract_data) return self._tlv.to_tlv() - raise NotImplementedError + raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) class CyclicEF(LinFixedEF): """Cyclic EF (Entry File) in the smart card filesystem""" @@ -920,7 +920,7 @@ elif self._tlv: self._tlv.from_dict(abstract_data) return b2h(self._tlv.to_tlv()) - raise NotImplementedError + raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def encode_record_bin(self, abstract_data:dict) -> bytearray: """Encode abstract representation into raw (binary) data. @@ -945,7 +945,7 @@ elif self._tlv: self._tlv.from_dict(abstract_data) return self._tlv.to_tlv() - raise NotImplementedError + raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def _decode_bin(self, raw_bin_data:bytearray): chunks = [raw_bin_data[i:i+self.rec_len] for i in range(0, len(raw_bin_data), self.rec_len)] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie8a10a8847f7c7c6a3332fb9f78de18c9f7f41d0 Gerrit-Change-Number: 25789 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:42:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 14:42:06 +0000 Subject: Change in pysim[master]: 51.011: Fix EF_SST decoder for services > table description References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25790 ) Change subject: 51.011: Fix EF_SST decoder for services > table description ...................................................................... 51.011: Fix EF_SST decoder for services > table description Before: EXCEPTION of type 'KeyError' occurred with message: '60' After: "60": { "description": null, "allocated": false, "activated": false } Change-Id: Ic089f9632a936bdbedd2344442678c5bf9797713 --- M pySim/ts_51_011.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/90/25790/1 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 65be06a..70629f7 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -513,7 +513,7 @@ bit_offset = (i % 4) * 2 bits = (byte >> bit_offset) & 3 ret[service_nr] = { - 'description': self.table[service_nr] or None, + 'description': self.table[service_nr] if service_nr in self.table else None, 'allocated': True if bits & 1 else False, 'activated': True if bits & 2 else False, } -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic089f9632a936bdbedd2344442678c5bf9797713 Gerrit-Change-Number: 25790 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:57:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 14:57:33 +0000 Subject: Change in pysim[master]: cat: Add more terminal profile bitmask definitions In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25782 ) Change subject: cat: Add more terminal profile bitmask definitions ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie9934f684956381f6e57ded2140951e473cb09ec Gerrit-Change-Number: 25782 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 14:57:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:57:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 14:57:41 +0000 Subject: Change in pysim[master]: cat: Fix SMS/ENVELOPE related IE tag definitions In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25783 ) Change subject: cat: Fix SMS/ENVELOPE related IE tag definitions ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7ed4d78479b6ff75cde20cb5b0bd1672035806ff Gerrit-Change-Number: 25783 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 14:57:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:57:48 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 14:57:48 +0000 Subject: Change in osmo-bts[master]: lchan: Setup early_rr_ia timer only once during init In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25779 ) Change subject: lchan: Setup early_rr_ia timer only once during init ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I90324f26d8ca09d425c7523a25b3e6c951fa49d6 Gerrit-Change-Number: 25779 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 14:57:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:58:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 14:58:07 +0000 Subject: Change in osmo-bts[master]: lchan: Setup early_rr_ia timer only once during init In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25779 ) Change subject: lchan: Setup early_rr_ia timer only once during init ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I90324f26d8ca09d425c7523a25b3e6c951fa49d6 Gerrit-Change-Number: 25779 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 14 Oct 2021 14:58:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:58:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 14:58:12 +0000 Subject: Change in osmo-bts[master]: lchan: Setup early_rr_ia timer only once during init In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25779 ) Change subject: lchan: Setup early_rr_ia timer only once during init ...................................................................... lchan: Setup early_rr_ia timer only once during init There's no need to re-setup it every time. Mark the cb as static since its private to the module, and move it above its use point so it can be referenced. Change-Id: I90324f26d8ca09d425c7523a25b3e6c951fa49d6 --- M src/common/lchan.c 1 file changed, 29 insertions(+), 28 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/common/lchan.c b/src/common/lchan.c index f7ee33b..747e8b0 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -52,6 +52,33 @@ { 0, NULL } }; +static void early_rr_ia_delay_cb(void *data) +{ + struct gsm_lchan *lchan = data; + struct gsm_bts *bts = lchan->ts->trx->bts; + + if (!lchan->early_rr_ia) { + /* The IA message has disappeared since the timer was started. */ + return; + } + + if (lchan->state != LCHAN_S_ACTIVE) { + /* Release has happened since the timer was started. */ + msgb_free(lchan->early_rr_ia); + lchan->early_rr_ia = NULL; + return; + } + + /* Activation is done, send the RR IA now. Put RR IA msg into the AGCH queue of the BTS. */ + if (bts_agch_enqueue(bts, lchan->early_rr_ia) < 0) { + /* if there is no space in the queue: send DELETE IND */ + rsl_tx_delete_ind(bts, lchan->early_rr_ia->data, lchan->early_rr_ia->len); + rate_ctr_inc2(bts->ctrs, BTS_CTR_AGCH_DELETED); + msgb_free(lchan->early_rr_ia); + } + lchan->early_rr_ia = NULL; +} + void gsm_lchan_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr) { lchan->ts = ts; @@ -59,6 +86,8 @@ lchan->type = GSM_LCHAN_NONE; gsm_lchan_name_update(lchan); + osmo_timer_setup(&lchan->early_rr_ia_delay, early_rr_ia_delay_cb, lchan); + INIT_LLIST_HEAD(&lchan->sapi_cmds); INIT_LLIST_HEAD(&lchan->dl_tch_queue); } @@ -150,33 +179,6 @@ return get_value_string(lchan_s_names, s); } -void early_rr_ia_delay_cb(void *data) -{ - struct gsm_lchan *lchan = data; - struct gsm_bts *bts = lchan->ts->trx->bts; - - if (!lchan->early_rr_ia) { - /* The IA message has disappeared since the timer was started. */ - return; - } - - if (lchan->state != LCHAN_S_ACTIVE) { - /* Release has happened since the timer was started. */ - msgb_free(lchan->early_rr_ia); - lchan->early_rr_ia = NULL; - return; - } - - /* Activation is done, send the RR IA now. Put RR IA msg into the AGCH queue of the BTS. */ - if (bts_agch_enqueue(bts, lchan->early_rr_ia) < 0) { - /* if there is no space in the queue: send DELETE IND */ - rsl_tx_delete_ind(bts, lchan->early_rr_ia->data, lchan->early_rr_ia->len); - rate_ctr_inc2(bts->ctrs, BTS_CTR_AGCH_DELETED); - msgb_free(lchan->early_rr_ia); - } - lchan->early_rr_ia = NULL; -} - void lchan_set_state(struct gsm_lchan *lchan, enum gsm_lchan_state state) { DEBUGP(DL1C, "%s state %s -> %s\n", @@ -197,7 +199,6 @@ /* Activation is done, send the RR IA now. Delay a bit more to give Um time to let the lchan * light up for the MS */ osmo_timer_del(&lchan->early_rr_ia_delay); - osmo_timer_setup(&lchan->early_rr_ia_delay, early_rr_ia_delay_cb, lchan); osmo_timer_schedule(&lchan->early_rr_ia_delay, 0, osmo_tdef_get(abis_T_defs, -15, OSMO_TDEF_US, -1)); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I90324f26d8ca09d425c7523a25b3e6c951fa49d6 Gerrit-Change-Number: 25779 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:58:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 14:58:42 +0000 Subject: Change in osmo-bts[master]: lchan: Avoid applying transition changes if state new==old In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25788 to look at the new patch set (#2). Change subject: lchan: Avoid applying transition changes if state new==old ...................................................................... lchan: Avoid applying transition changes if state new==old Let's avoid running over state change conditions or even printing log lines if there's no state change. Change-Id: I1ca86aa846084f53751076643665cb6dabc26a06 --- M src/common/lchan.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/25788/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1ca86aa846084f53751076643665cb6dabc26a06 Gerrit-Change-Number: 25788 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 14:59:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 14:59:56 +0000 Subject: Change in osmo-bts[master]: Move lchan related code to lchan.{c,h} In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25781 ) Change subject: Move lchan related code to lchan.{c,h} ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17ebe6af69e31d1b4dbad7656bbf043f4c9243c1 Gerrit-Change-Number: 25781 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 14:59:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:00:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 15:00:57 +0000 Subject: Change in osmo-bts[master]: lchan: Update log line level to use macro and level INFO In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25787 ) Change subject: lchan: Update log line level to use macro and level INFO ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25787/1/src/common/lchan.c File src/common/lchan.c: https://gerrit.osmocom.org/c/osmo-bts/+/25787/1/src/common/lchan.c at 261 PS1, Line 261: gsm_lchans_name(lchan->state), Please re-align the arguments. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idd48fd8fbb13b715096a4765dcb08a18d85098a7 Gerrit-Change-Number: 25787 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 14 Oct 2021 15:00:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:01:30 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 15:01:30 +0000 Subject: Change in osmo-bts[master]: lchan: Avoid applying transition changes if state new==old In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25788 ) Change subject: lchan: Avoid applying transition changes if state new==old ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25788/2/src/common/lchan.c File src/common/lchan.c: https://gerrit.osmocom.org/c/osmo-bts/+/25788/2/src/common/lchan.c at 265 PS2, Line 265: ws -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1ca86aa846084f53751076643665cb6dabc26a06 Gerrit-Change-Number: 25788 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 14 Oct 2021 15:01:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:02:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 15:02:53 +0000 Subject: Change in osmo-bts[master]: Move lchan related code to lchan.{c,h} In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25781 ) Change subject: Move lchan related code to lchan.{c,h} ...................................................................... Move lchan related code to lchan.{c,h} Change-Id: I17ebe6af69e31d1b4dbad7656bbf043f4c9243c1 --- M include/osmo-bts/bts.h M include/osmo-bts/lchan.h M src/common/bts.c M src/common/lchan.c M src/common/sysinfo.c 5 files changed, 79 insertions(+), 78 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h index 4683758..8832588 100644 --- a/include/osmo-bts/bts.h +++ b/include/osmo-bts/bts.h @@ -407,8 +407,6 @@ void regenerate_si3_restoctets(struct gsm_bts *bts); void regenerate_si4_restoctets(struct gsm_bts *bts); int get_si4_ro_offset(const uint8_t *si4_buf); -uint8_t *lchan_sacch_get(struct gsm_lchan *lchan); -int lchan_init_lapdm(struct gsm_lchan *lchan); void load_timer_start(struct gsm_bts *bts); void load_timer_stop(struct gsm_bts *bts); diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 8fcf36a..665bb44 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -329,6 +329,7 @@ void gsm_lchan_init(struct gsm_lchan *lchan, struct gsm_bts_trx_ts *ts, unsigned int lchan_nr); void gsm_lchan_name_update(struct gsm_lchan *lchan); +int lchan_init_lapdm(struct gsm_lchan *lchan); void gsm_lchan_release(struct gsm_lchan *lchan, enum lchan_rel_act_kind rel_kind); const char *gsm_lchans_name(enum gsm_lchan_state s); @@ -337,6 +338,8 @@ return lchan->name; } +uint8_t *lchan_sacch_get(struct gsm_lchan *lchan); + uint8_t gsm_lchan2chan_nr(const struct gsm_lchan *lchan); uint8_t gsm_lchan2chan_nr_rsl(const struct gsm_lchan *lchan); uint8_t gsm_lchan_as_pchan2chan_nr(const struct gsm_lchan *lchan, diff --git a/src/common/bts.c b/src/common/bts.c index b226df2..86140ba 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -454,66 +454,6 @@ return bts_model_oml_estab(bts); } -/* prepare the per-SAPI T200 arrays for a given lchan */ -static int t200_by_lchan(int *t200_ms_dcch, int *t200_ms_acch, struct gsm_lchan *lchan) -{ - struct gsm_bts *bts = lchan->ts->trx->bts; - - /* we have to compensate for the "RTS advance" due to the asynchronous interface between - * the BTS (LAPDm) and the PHY/L1 (OsmoTRX or DSP in case of osmo-bts-{sysmo,lc15,oc2g,octphy} */ - int32_t fn_advance = bts_get_avg_fn_advance(bts); - int32_t fn_advance_us = fn_advance * 4615; - int fn_advance_ms = fn_advance_us / 1000; - - t200_ms_acch[DL_SAPI0] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; - t200_ms_acch[DL_SAPI3] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; - - if (lchan->repeated_acch_capability.dl_facch_all && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { - t200_ms_acch[DL_SAPI0] *= 2; - t200_ms_acch[DL_SAPI3] *= 2; - } - - switch (lchan->type) { - case GSM_LCHAN_SDCCH: - t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_SDCCH] + fn_advance_ms; - t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_SDCCH_SAPI3] + fn_advance_ms; - break; - case GSM_LCHAN_TCH_F: - t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_FACCH_F] + fn_advance_ms; - t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_FACCH_F] + fn_advance_ms; - break; - case GSM_LCHAN_TCH_H: - t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_FACCH_H] + fn_advance_ms; - t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_FACCH_H] + fn_advance_ms; - break; - default: - /* Channels such as CCCH don't use lapdm DL, and hence no T200 is needed */ - return -1; - } - return 0; -} - -int lchan_init_lapdm(struct gsm_lchan *lchan) -{ - struct lapdm_channel *lc = &lchan->lapdm_ch; - int t200_ms_dcch[_NR_DL_SAPI], t200_ms_acch[_NR_DL_SAPI]; - - if (t200_by_lchan(t200_ms_dcch, t200_ms_acch, lchan) == 0) { - LOGPLCHAN(lchan, DLLAPD, LOGL_DEBUG, - "Setting T200 D0=%u, D3=%u, S0=%u, S3=%u (all in ms)\n", - t200_ms_dcch[DL_SAPI0], t200_ms_dcch[DL_SAPI3], - t200_ms_acch[DL_SAPI0], t200_ms_acch[DL_SAPI3]); - lapdm_channel_init3(lc, LAPDM_MODE_BTS, t200_ms_dcch, t200_ms_acch, lchan->type, - gsm_lchan_name(lchan)); - lapdm_channel_set_flags(lc, LAPDM_ENT_F_POLLING_ONLY); - lapdm_channel_set_l1(lc, NULL, lchan); - } - /* We still need to set Rx callback to receive RACH requests: */ - lapdm_channel_set_l3(lc, lapdm_rll_tx_cb, lchan); - - return 0; -} - #define CCCH_RACH_RATIO_COMBINED256 (256*1/9) #define CCCH_RACH_RATIO_SEPARATE256 (256*10/55) diff --git a/src/common/lchan.c b/src/common/lchan.c index 747e8b0..14fa625 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -52,6 +52,45 @@ { 0, NULL } }; +/* prepare the per-SAPI T200 arrays for a given lchan */ +static int t200_by_lchan(int *t200_ms_dcch, int *t200_ms_acch, struct gsm_lchan *lchan) +{ + struct gsm_bts *bts = lchan->ts->trx->bts; + + /* we have to compensate for the "RTS advance" due to the asynchronous interface between + * the BTS (LAPDm) and the PHY/L1 (OsmoTRX or DSP in case of osmo-bts-{sysmo,lc15,oc2g,octphy} */ + int32_t fn_advance = bts_get_avg_fn_advance(bts); + int32_t fn_advance_us = fn_advance * 4615; + int fn_advance_ms = fn_advance_us / 1000; + + t200_ms_acch[DL_SAPI0] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; + t200_ms_acch[DL_SAPI3] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; + + if (lchan->repeated_acch_capability.dl_facch_all && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { + t200_ms_acch[DL_SAPI0] *= 2; + t200_ms_acch[DL_SAPI3] *= 2; + } + + switch (lchan->type) { + case GSM_LCHAN_SDCCH: + t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_SDCCH] + fn_advance_ms; + t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_SDCCH_SAPI3] + fn_advance_ms; + break; + case GSM_LCHAN_TCH_F: + t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_FACCH_F] + fn_advance_ms; + t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_FACCH_F] + fn_advance_ms; + break; + case GSM_LCHAN_TCH_H: + t200_ms_dcch[DL_SAPI0] = bts->t200_ms[T200_FACCH_H] + fn_advance_ms; + t200_ms_dcch[DL_SAPI3] = bts->t200_ms[T200_FACCH_H] + fn_advance_ms; + break; + default: + /* Channels such as CCCH don't use lapdm DL, and hence no T200 is needed */ + return -1; + } + return 0; +} + static void early_rr_ia_delay_cb(void *data) { struct gsm_lchan *lchan = data; @@ -105,6 +144,27 @@ lchan->name = name; } +int lchan_init_lapdm(struct gsm_lchan *lchan) +{ + struct lapdm_channel *lc = &lchan->lapdm_ch; + int t200_ms_dcch[_NR_DL_SAPI], t200_ms_acch[_NR_DL_SAPI]; + + if (t200_by_lchan(t200_ms_dcch, t200_ms_acch, lchan) == 0) { + LOGPLCHAN(lchan, DLLAPD, LOGL_DEBUG, + "Setting T200 D0=%u, D3=%u, S0=%u, S3=%u (all in ms)\n", + t200_ms_dcch[DL_SAPI0], t200_ms_dcch[DL_SAPI3], + t200_ms_acch[DL_SAPI0], t200_ms_acch[DL_SAPI3]); + lapdm_channel_init3(lc, LAPDM_MODE_BTS, t200_ms_dcch, t200_ms_acch, lchan->type, + gsm_lchan_name(lchan)); + lapdm_channel_set_flags(lc, LAPDM_ENT_F_POLLING_ONLY); + lapdm_channel_set_l1(lc, NULL, lchan); + } + /* We still need to set Rx callback to receive RACH requests: */ + lapdm_channel_set_l3(lc, lapdm_rll_tx_cb, lchan); + + return 0; +} + static int dyn_ts_pdch_release(struct gsm_lchan *lchan) { struct gsm_bts_trx_ts *ts = lchan->ts; @@ -179,6 +239,22 @@ return get_value_string(lchan_s_names, s); } +/* obtain the next to-be transmitted dowlink SACCH frame (L2 hdr + L3); returns pointer to lchan->si buffer */ +uint8_t *lchan_sacch_get(struct gsm_lchan *lchan) +{ + uint32_t tmp, i; + + for (i = 0; i < _MAX_SYSINFO_TYPE; i++) { + tmp = (lchan->si.last + 1 + i) % _MAX_SYSINFO_TYPE; + if (!(lchan->si.valid & (1 << tmp))) + continue; + lchan->si.last = tmp; + return GSM_LCHAN_SI(lchan, tmp); + } + LOGPLCHAN(lchan, DL1P, LOGL_NOTICE, "SACCH no SI available\n"); + return NULL; +} + void lchan_set_state(struct gsm_lchan *lchan, enum gsm_lchan_state state) { DEBUGP(DL1C, "%s state %s -> %s\n", diff --git a/src/common/sysinfo.c b/src/common/sysinfo.c index 5c5af25..b0f1ebf 100644 --- a/src/common/sysinfo.c +++ b/src/common/sysinfo.c @@ -164,22 +164,6 @@ return 1; } -/* obtain the next to-be transmitted dowlink SACCH frame (L2 hdr + L3); returns pointer to lchan->si buffer */ -uint8_t *lchan_sacch_get(struct gsm_lchan *lchan) -{ - uint32_t tmp, i; - - for (i = 0; i < _MAX_SYSINFO_TYPE; i++) { - tmp = (lchan->si.last + 1 + i) % _MAX_SYSINFO_TYPE; - if (!(lchan->si.valid & (1 << tmp))) - continue; - lchan->si.last = tmp; - return GSM_LCHAN_SI(lchan, tmp); - } - LOGPLCHAN(lchan, DL1P, LOGL_NOTICE, "SACCH no SI available\n"); - return NULL; -} - /* re-generate SI3 restoctets with GPRS indicator depending on the PCU socket connection state */ void regenerate_si3_restoctets(struct gsm_bts *bts) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17ebe6af69e31d1b4dbad7656bbf043f4c9243c1 Gerrit-Change-Number: 25781 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:04:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 15:04:37 +0000 Subject: Change in osmo-bts[master]: lchan: Update log line level to use macro and level INFO In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25787 to look at the new patch set (#2). Change subject: lchan: Update log line level to use macro and level INFO ...................................................................... lchan: Update log line level to use macro and level INFO Change-Id: Idd48fd8fbb13b715096a4765dcb08a18d85098a7 --- M src/common/lchan.c 1 file changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/25787/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idd48fd8fbb13b715096a4765dcb08a18d85098a7 Gerrit-Change-Number: 25787 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:04:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 15:04:37 +0000 Subject: Change in osmo-bts[master]: lchan: Avoid applying transition changes if state new==old In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25788 to look at the new patch set (#3). Change subject: lchan: Avoid applying transition changes if state new==old ...................................................................... lchan: Avoid applying transition changes if state new==old Let's avoid running over state change conditions or even printing log lines if there's no state change. Change-Id: I1ca86aa846084f53751076643665cb6dabc26a06 --- M src/common/lchan.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/25788/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1ca86aa846084f53751076643665cb6dabc26a06 Gerrit-Change-Number: 25788 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:05:11 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 15:05:11 +0000 Subject: Change in osmo-bts[master]: lchan: Update log line level to use macro and level INFO In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25787 ) Change subject: lchan: Update log line level to use macro and level INFO ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idd48fd8fbb13b715096a4765dcb08a18d85098a7 Gerrit-Change-Number: 25787 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 14 Oct 2021 15:05:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:05:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 15:05:21 +0000 Subject: Change in osmo-bts[master]: lchan: Avoid applying transition changes if state new==old In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25788 ) Change subject: lchan: Avoid applying transition changes if state new==old ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1ca86aa846084f53751076643665cb6dabc26a06 Gerrit-Change-Number: 25788 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 14 Oct 2021 15:05:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:07:19 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 15:07:19 +0000 Subject: Change in pysim[master]: cat: Add more terminal profile bitmask definitions In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25782 ) Change subject: cat: Add more terminal profile bitmask definitions ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/pysim/+/25782/2/pySim/cat.py File pySim/cat.py: https://gerrit.osmocom.org/c/pysim/+/25782/2/pySim/cat.py at 175 PS2, Line 175: download The commit message states that you're adding new entries, while you also fix typos in the existing ones... I would do this in a separate commit. Not critical. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie9934f684956381f6e57ded2140951e473cb09ec Gerrit-Change-Number: 25782 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 14 Oct 2021 15:07:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:07:39 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 15:07:39 +0000 Subject: Change in pysim[master]: cat: Fix SMS/ENVELOPE related IE tag definitions In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25783 ) Change subject: cat: Fix SMS/ENVELOPE related IE tag definitions ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7ed4d78479b6ff75cde20cb5b0bd1672035806ff Gerrit-Change-Number: 25783 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 15:07:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:08:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 15:08:17 +0000 Subject: Change in osmo-bts[master]: Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE) References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25791 ) Change subject: Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE) ...................................................................... Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE) osmo-bts-trx/l1_if.c lchan_init_lapdm() for CCCH is already done when trx_set_ts_as_pchan() calls: "lchan_set_state(&ts->lchan[CCCH_LCHAN], LCHAN_S_ACTIVE);" Change-Id: I7a9c3660b9aab57ff8765e2f1526349599630cd9 --- M src/common/lchan.c M src/osmo-bts-lc15/oml.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/l1_if.c 7 files changed, 21 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/91/25791/1 diff --git a/src/common/lchan.c b/src/common/lchan.c index e06ea5c..6dd11f7 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -263,29 +263,34 @@ gsm_lchans_name(lchan->state), gsm_lchans_name(state)); lchan->state = state; - /* Early Immediate Assignment: if we have a cached early IA pending, send it upon becoming active, or discard it - * when releasing. */ - if (lchan->early_rr_ia) { - switch (lchan->state) { - case LCHAN_S_ACT_REQ: - /* Activation is requested, keep the early IA until active. This allows the BSC to send the IA - * even before a dynamic timeslot is done switching to a different pchan kind (experimental). */ - break; - case LCHAN_S_ACTIVE: - /* Activation is done, send the RR IA now. Delay a bit more to give Um time to let the lchan - * light up for the MS */ + switch (lchan->state) { + case LCHAN_S_ACT_REQ: + /* Early Immediate Assignment: Activation is requested, keep the + * early IA until active. This allows the BSC to send the IA + * even before a dynamic timeslot is done switching to a + * different pchan kind (experimental). */ + break; + case LCHAN_S_ACTIVE: + lchan_init_lapdm(lchan); + if (lchan->early_rr_ia) { + /* Early Immediate Assignment: Activation is done, send + * the RR IA now. Delay a bit more to give Um time to + * let the lchan light up for the MS */ osmo_timer_del(&lchan->early_rr_ia_delay); osmo_timer_schedule(&lchan->early_rr_ia_delay, 0, osmo_tdef_get(abis_T_defs, -15, OSMO_TDEF_US, -1)); - break; - default: - /* Transition to any other state means whatever IA the BSC has sent shall now not be relevant - * anymore. */ + } + break; + default: + if (lchan->early_rr_ia) { + /* Early Immediate Assignment: Transition to any other + * state means whatever IA the BSC has sent shall now + * not be relevant anymore. */ osmo_timer_del(&lchan->early_rr_ia_delay); msgb_free(lchan->early_rr_ia); lchan->early_rr_ia = NULL; - break; } + break; } } diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c index 6169ef7..675e3fe 100644 --- a/src/osmo-bts-lc15/oml.c +++ b/src/osmo-bts-lc15/oml.c @@ -1197,10 +1197,6 @@ enqueue_sapi_act_cmd(lchan, sapi, dir); } - -#warning "FIXME: Should this be in sapi_activate_cb?" - lchan_init_lapdm(lchan); - return 0; } diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c index ba85f36..d12571b 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -1212,10 +1212,6 @@ enqueue_sapi_act_cmd(lchan, sapi, dir); } - -#warning "FIXME: Should this be in sapi_activate_cb?" - lchan_init_lapdm(lchan); - return 0; } diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c index 73ab9bd..5894c21 100644 --- a/src/osmo-bts-octphy/l1_oml.c +++ b/src/osmo-bts-octphy/l1_oml.c @@ -1107,9 +1107,6 @@ } enqueue_sapi_act_cmd(lchan, sapi, dir); } - - lchan_init_lapdm(lchan); - return 0; } diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index 74af56b..ba60b76 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -1204,10 +1204,6 @@ continue; enqueue_sapi_act_cmd(lchan, sapi, dir); } - -#warning "FIXME: Should this be in sapi_activate_cb?" - lchan_init_lapdm(lchan); - return 0; } diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 9faae88..5ac3e31 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -165,10 +165,6 @@ if (rc != 0) return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_NACK, (void*)(intptr_t)NM_NACK_CANT_PERFORM); - - if (trx == trx->bts->c0) - lchan_init_lapdm(&trx->ts[0].lchan[CCCH_LCHAN]); - /* Send OPSTART ack */ return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL); } @@ -438,8 +434,6 @@ lchan->tch.amr_mr.bts_mode[3].mode, amr_get_initial_mode(lchan), (lchan->ho.active == 1)); - /* init lapdm */ - lchan_init_lapdm(lchan); /* set lchan active */ lchan_set_state(lchan, LCHAN_S_ACTIVE); /* set initial ciphering */ diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index a4a81bd..0d36db1 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -224,8 +224,6 @@ * / PRIM_INFO_ACTIVATE */ if (pinst->trx == pinst->trx->bts->c0) { vbts_sched_start(pinst->trx->bts); - /* init lapdm layer 3 callback for the trx on timeslot 0 == BCCH */ - lchan_init_lapdm(&pinst->trx->ts[0].lchan[CCCH_LCHAN]); /* FIXME: This is probably the wrong location to set the CCCH to active... the OML link def. needs to be reworked and fixed. */ pinst->trx->ts[0].lchan[CCCH_LCHAN].rel_act_kind = LCHAN_REL_ACT_OML; lchan_set_state(&pinst->trx->ts[0].lchan[CCCH_LCHAN], LCHAN_S_ACTIVE); @@ -392,8 +390,6 @@ lchan->tch.amr_mr.bts_mode[3].mode, amr_get_initial_mode(lchan), (lchan->ho.active == 1)); - /* init lapdm */ - lchan_init_lapdm(lchan); /* set lchan active */ lchan_set_state(lchan, LCHAN_S_ACTIVE); /* set initial ciphering */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7a9c3660b9aab57ff8765e2f1526349599630cd9 Gerrit-Change-Number: 25791 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:08:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 15:08:18 +0000 Subject: Change in osmo-bts[master]: lchan: Call lapdm_channel_exit() when state changes to NONE References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25792 ) Change subject: lchan: Call lapdm_channel_exit() when state changes to NONE ...................................................................... lchan: Call lapdm_channel_exit() when state changes to NONE Fixes crash when TTCN3 BTS_Tests_LAPDm TC_rr_response_frame_loss runs run after TC_t200_n200. The BTS was shutdown after TC_t200_n200 failed (drop oml link), and lchan was moved ACTIVE->NONE without lapdm_channel_exit() being called on it. Hence, on next test (TC_rr_response_frame_loss), when lchan_init_lapdm() was called again, some memory corruption was caused. Related: SYS#5262 Change-Id: If0ec5f0c7be4d15c8d684d33e15e24d68bd5192e --- M src/common/lchan.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/25792/1 diff --git a/src/common/lchan.c b/src/common/lchan.c index 6dd11f7..74a7de0 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -281,6 +281,9 @@ osmo_tdef_get(abis_T_defs, -15, OSMO_TDEF_US, -1)); } break; + case LCHAN_S_NONE: + lapdm_channel_exit(&lchan->lapdm_ch); + /* fall through */ default: if (lchan->early_rr_ia) { /* Early Immediate Assignment: Transition to any other -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If0ec5f0c7be4d15c8d684d33e15e24d68bd5192e Gerrit-Change-Number: 25792 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:10:22 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 15:10:22 +0000 Subject: Change in pysim[master]: pysim-Shell: Add sysmocom SJA2 card specific bits In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25784 ) Change subject: pysim-Shell: Add sysmocom SJA2 card specific bits ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/pysim/+/25784/2/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/25784/2/pySim-shell.py at 51 PS2, Line 51: import pySim.sysmocom_sja2 I don't see this module being referenced/used in this file. Are you sure about importing it? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id410489841bb9020ddbf74de9114d808b1d5adb6 Gerrit-Change-Number: 25784 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 14 Oct 2021 15:10:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:11:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 15:11:20 +0000 Subject: Change in pysim[master]: Add API + shell command for sending TERMINAL PROFILE to card In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25785 ) Change subject: Add API + shell command for sending TERMINAL PROFILE to card ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id8f23f7cebe0f9efce2c0ce4229509f35cd93d6a Gerrit-Change-Number: 25785 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 14 Oct 2021 15:11:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:23:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 15:23:13 +0000 Subject: Change in osmo-bts[master]: lchan: Update log line level to use macro and level INFO In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25787 ) Change subject: lchan: Update log line level to use macro and level INFO ...................................................................... lchan: Update log line level to use macro and level INFO Change-Id: Idd48fd8fbb13b715096a4765dcb08a18d85098a7 --- M src/common/lchan.c 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/lchan.c b/src/common/lchan.c index 14fa625..5e05c86 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -257,10 +257,8 @@ void lchan_set_state(struct gsm_lchan *lchan, enum gsm_lchan_state state) { - DEBUGP(DL1C, "%s state %s -> %s\n", - gsm_lchan_name(lchan), - gsm_lchans_name(lchan->state), - gsm_lchans_name(state)); + LOGPLCHAN(lchan, DL1C, LOGL_INFO, "state %s -> %s\n", + gsm_lchans_name(lchan->state), gsm_lchans_name(state)); lchan->state = state; /* Early Immediate Assignment: if we have a cached early IA pending, send it upon becoming active, or discard it -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idd48fd8fbb13b715096a4765dcb08a18d85098a7 Gerrit-Change-Number: 25787 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:23:14 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 15:23:14 +0000 Subject: Change in osmo-bts[master]: lchan: Avoid applying transition changes if state new==old In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25788 ) Change subject: lchan: Avoid applying transition changes if state new==old ...................................................................... lchan: Avoid applying transition changes if state new==old Let's avoid running over state change conditions or even printing log lines if there's no state change. Change-Id: I1ca86aa846084f53751076643665cb6dabc26a06 --- M src/common/lchan.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/lchan.c b/src/common/lchan.c index 5e05c86..e06ea5c 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -257,6 +257,8 @@ void lchan_set_state(struct gsm_lchan *lchan, enum gsm_lchan_state state) { + if (lchan->state == state) + return; LOGPLCHAN(lchan, DL1C, LOGL_INFO, "state %s -> %s\n", gsm_lchans_name(lchan->state), gsm_lchans_name(state)); lchan->state = state; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25788 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1ca86aa846084f53751076643665cb6dabc26a06 Gerrit-Change-Number: 25788 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:37:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 15:37:46 +0000 Subject: Change in osmo-bts[master]: lchan: Call lapdm_channel_exit() when state changes to NONE In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25792 ) Change subject: lchan: Call lapdm_channel_exit() when state changes to NONE ...................................................................... Patch Set 1: This one may be creating problems in real use of BTS due to dropping lapdm too early. Marking as WIP. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If0ec5f0c7be4d15c8d684d33e15e24d68bd5192e Gerrit-Change-Number: 25792 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 14 Oct 2021 15:37:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:43:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 15:43:50 +0000 Subject: Change in pysim[master]: pysim-Shell: Add sysmocom SJA2 card specific bits In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25784 ) Change subject: pysim-Shell: Add sysmocom SJA2 card specific bits ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/pysim/+/25784/2/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/25784/2/pySim-shell.py at 51 PS2, Line 51: import pySim.sysmocom_sja2 > I don't see this module being referenced/used in this file. [?] there is some magic going on in the CardModel class: All subclasses (such as the one defined in sysmocom_sja2) are automatically checked if they match the inserted card, and their files added to the directory tree. I'll add a comment. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id410489841bb9020ddbf74de9114d808b1d5adb6 Gerrit-Change-Number: 25784 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 14 Oct 2021 15:43:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:44:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 15:44:15 +0000 Subject: Change in pysim[master]: filsystem: Make NotImplementedError more verbose. In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25789 ) Change subject: filsystem: Make NotImplementedError more verbose. ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie8a10a8847f7c7c6a3332fb9f78de18c9f7f41d0 Gerrit-Change-Number: 25789 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 15:44:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:44:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 15:44:18 +0000 Subject: Change in pysim[master]: 51.011: Fix EF_SST decoder for services > table description In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25790 ) Change subject: 51.011: Fix EF_SST decoder for services > table description ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic089f9632a936bdbedd2344442678c5bf9797713 Gerrit-Change-Number: 25790 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 15:44:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:44:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 15:44:20 +0000 Subject: Change in pysim[master]: USIM: Add ENVELOPE and ENVELOPE-SMS shell commands In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25786 ) Change subject: USIM: Add ENVELOPE and ENVELOPE-SMS shell commands ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4345459d99c0eeb5753217ad4e7188747c51a2a2 Gerrit-Change-Number: 25786 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 15:44:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:44:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 15:44:23 +0000 Subject: Change in pysim[master]: Add API + shell command for sending TERMINAL PROFILE to card In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25785 ) Change subject: Add API + shell command for sending TERMINAL PROFILE to card ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id8f23f7cebe0f9efce2c0ce4229509f35cd93d6a Gerrit-Change-Number: 25785 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 15:44:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:44:26 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 15:44:26 +0000 Subject: Change in pysim[master]: pysim-Shell: Add sysmocom SJA2 card specific bits In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25784 ) Change subject: pysim-Shell: Add sysmocom SJA2 card specific bits ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id410489841bb9020ddbf74de9114d808b1d5adb6 Gerrit-Change-Number: 25784 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 14 Oct 2021 15:44:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:44:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 15:44:29 +0000 Subject: Change in pysim[master]: cat: Add more terminal profile bitmask definitions In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25782 ) Change subject: cat: Add more terminal profile bitmask definitions ...................................................................... cat: Add more terminal profile bitmask definitions Change-Id: Ie9934f684956381f6e57ded2140951e473cb09ec --- M pySim/cat.py 1 file changed, 79 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/cat.py b/pySim/cat.py index cd98a81..fd99c36 100644 --- a/pySim/cat.py +++ b/pySim/cat.py @@ -163,9 +163,16 @@ nested=[DeviceIdentities, USSDString]): pass + +# reasonable default for playing with OTA +# 010203040506070809101112131415161718192021222324252627282930313233 +#'7fe1e10e000000000000001f43000000ff00000000000000000000000000000000' + +# TS 102 223 Section 5.2 term_prof_bits = { + # first byte 1: 'Profile download', - 2: 'SMS-PP data doanload', + 2: 'SMS-PP data download', 3: 'Cell Broadcast data download', 4: 'Menu selection', 5: 'SMS-PP data download', @@ -173,8 +180,9 @@ 7: 'USSD string DO support in CC by USIM', 8: 'Call Control by NAA', + # first byte 9: 'Command result', - 10: 'Call Controll by NAA', + 10: 'Call Control by NAA', 11: 'Call Control by NAA', 12: 'MO short message control support', 13: 'Call Control by NAA', @@ -182,6 +190,7 @@ 15: 'UCS2 Display supported', 16: 'Display Text', + # third byte 17: 'Proactive UICC: DISPLAY TEXT', 18: 'Proactive UICC: GET INKEY', 19: 'Proactive UICC: GET INPUT', @@ -191,6 +200,7 @@ 23: 'Proactive UICC: POLLING OFF', 24: 'Proactive UICC: REFRESH', + # fourth byte 25: 'Proactive UICC: SELECT ITEM', 26: 'Proactive UICC: SEND SHORT MESSAGE with 3GPP-SMS-TPDU', 27: 'Proactive UICC: SEND SS', @@ -200,6 +210,7 @@ 31: 'Proactive UICC: PROVIDE LOCAL INFORMATION (MCC, MNC, LAC, Cell ID & IMEI)', 32: 'Proactive UICC: PROVIDE LOCAL INFORMATION (NMR)', + # fifth byte 33: 'Proactive UICC: SET UP EVENT LIST', 34: 'Event: MT call', 35: 'Event: Call connected', @@ -209,6 +220,7 @@ 39: 'Event: Idle screen available', 40: 'Event: Card reader status', + # sixth byte 41: 'Event: Language selection', 42: 'Event: Browser Termination', 43: 'Event: Data aailable', @@ -218,5 +230,70 @@ 47: 'Event: Local Connection', 48: 'Event: Network Search Mode Change', + # seventh byte + 49: 'Proactive UICC: POWER ON CARD', + 50: 'Proactive UICC: POWER OFF CARD', + 51: 'Proactive UICC: PERFORM CARD RESET', + 52: 'Proactive UICC: GET READER STATUS (Card reader status)', + 53: 'Proactive UICC: GET READER STATUS (Card reader identifier)', + # RFU: 3 bit (54,55,56) + + # eighth byte + 57: 'Proactive UICC: TIMER MANAGEMENT (start, stop)', + 58: 'Proactive UICC: TIMER MANAGEMENT (get current value)', + 59: 'Proactive UICC: PROVIDE LOCAL INFORMATION (date, time and time zone)', + 60: 'GET INKEY', + 61: 'SET UP IDLE MODE TEXT', + 62: 'RUN AT COMMAND', + 63: 'SETUP CALL', + 64: 'Call Control by NAA', + + # ninth byte + 65: 'DISPLAY TEXT', + 66: 'SEND DTMF command', + 67: 'Proactive UICC: PROVIDE LOCAL INFORMATION (NMR)', + 68: 'Proactive UICC: PROVIDE LOCAL INFORMATION (language)', + 69: 'Proactive UICC: PROVIDE LOCAL INFORMATION (Timing Advance)', + 70: 'Proactive UICC: LANGUAGE NOTIFICATION', + 71: 'Proactive UICC: LAUNCH BROWSER', + 72: 'Proactive UICC: PROVIDE LOCAL INFORMATION (Access Technology)', + + # tenth byte + 73: 'Soft keys support for SELECT ITEM', + 74: 'Soft keys support for SET UP MENU ITEM', + # RFU: 6 bit (75-80) + + # eleventh byte: max number of soft keys as 8bit value (81..88) + + # twelfth byte + 89: 'Proactive UICC: OPEN CHANNEL', + 90: 'Proactive UICC: CLOSE CHANNEL', + 91: 'Proactive UICC: RECEIVE DATA', + 92: 'Proactive UICC: SEND DATA', + 93: 'Proactive UICC: GET CHANNEL STATUS', + 94: 'Proactive UICC: SERVICE SEARCH', + 95: 'Proactive UICC: GET SERVICE INFORMATION', + 96: 'Proactive UICC: DECLARE SERVICE', + + # thirteenth byte + 97: 'BIP supported Bearer: CSD', + 98: 'BIP supported Bearer: GPRS', + 99: 'BIP supported Bearer: Bluetooth', + 100: 'BIP supported Bearer: IrDA', + 101: 'BIP supported Bearer: RS232', + # 3 bits: number of channels supported (102..104) + + # fourtheenth byte (screen height) + # fifteenth byte (screen width) + # sixeenth byte (screen effects) + # seventeenth byte (BIP supported bearers) + 129: 'BIP: TCP, UICC in client mode, remote connection', + 130: 'BIP: UDP, UICC in client mode, remote connection', + 131: 'BIP: TCP, UICC in server mode', + 132: 'BIP: TCP, UICC in client mode, local connection', + 133: 'BIP: UDP, UICC in client mode, local connection', + 134: 'BIP: direct communication channel', + # 2 bits reserved: 135, 136 + # FIXME: remainder } -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie9934f684956381f6e57ded2140951e473cb09ec Gerrit-Change-Number: 25782 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:44:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 15:44:29 +0000 Subject: Change in pysim[master]: cat: Fix SMS/ENVELOPE related IE tag definitions In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25783 ) Change subject: cat: Fix SMS/ENVELOPE related IE tag definitions ...................................................................... cat: Fix SMS/ENVELOPE related IE tag definitions Change-Id: I7ed4d78479b6ff75cde20cb5b0bd1672035806ff --- M pySim/cat.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/pySim/cat.py b/pySim/cat.py index fd99c36..b8756e2 100644 --- a/pySim/cat.py +++ b/pySim/cat.py @@ -52,7 +52,7 @@ 'command_qualifier'/Int8ub) # TS 102 223 Section 8.7 -class DeviceIdentities(COMPR_TLV_IE, tag=0x02): +class DeviceIdentities(COMPR_TLV_IE, tag=0x82): DEV_IDS = bidict({ 0x01: 'keypad', 0x02: 'display', @@ -126,8 +126,8 @@ # TS 102 223 Section 8.13 + TS 31.111 Section 8.13 -class SMS_TPDU(COMPR_TLV_IE, tag=0x0B): - pass +class SMS_TPDU(COMPR_TLV_IE, tag=0x8B): + _construct = Struct('tpdu'/HexAdapter(GreedyBytes)) # TS 102 223 Section 8.15 class TextString(COMPR_TLV_IE, tag=0x0d): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I7ed4d78479b6ff75cde20cb5b0bd1672035806ff Gerrit-Change-Number: 25783 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:44:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 15:44:29 +0000 Subject: Change in pysim[master]: pysim-Shell: Add sysmocom SJA2 card specific bits In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25784 ) Change subject: pysim-Shell: Add sysmocom SJA2 card specific bits ...................................................................... pysim-Shell: Add sysmocom SJA2 card specific bits Depending on the ATR, we register the various sysmocom SJA2 card model specific files [or not]. Change-Id: Id410489841bb9020ddbf74de9114d808b1d5adb6 --- M pySim-shell.py M pySim/filesystem.py A pySim/sysmocom_sja2.py 3 files changed, 278 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index f821e41..871c45e 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -42,12 +42,14 @@ from pySim.utils import dec_st, sanitize_pin_adm, tabulate_str_list, is_hex, boxed_heading_str from pySim.card_handler import CardHandler -from pySim.filesystem import CardMF, RuntimeState, CardDF, CardADF +from pySim.filesystem import CardMF, RuntimeState, CardDF, CardADF, CardModel from pySim.ts_51_011 import CardProfileSIM, DF_TELECOM, DF_GSM from pySim.ts_102_221 import CardProfileUICC from pySim.ts_31_102 import CardApplicationUSIM from pySim.ts_31_103 import CardApplicationISIM +import pySim.sysmocom_sja2 + from pySim.card_key_provider import CardKeyProviderCsv, card_key_provider_register, card_key_provider_get_field def init_card(sl): @@ -84,6 +86,8 @@ rs.mf.add_file(DF_TELECOM()) rs.mf.add_file(DF_GSM()) + CardModel.apply_matching_models(scc, rs) + # inform the transport that we can do context-specific SW interpretation sl.set_sw_interpreter(rs) diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 170429b..5cdac56 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -27,6 +27,8 @@ import code import tempfile import json +import abc +import inspect import cmd2 from cmd2 import CommandSet, with_default_category, with_argparser @@ -34,10 +36,13 @@ from typing import cast, Optional, Iterable, List, Any, Dict, Tuple +from smartcard.util import toBytes + from pySim.utils import sw_match, h2b, b2h, i2h, is_hex, auto_int, bertlv_parse_one, Hexstr from pySim.construct import filter_dict, parse_construct from pySim.exceptions import * from pySim.jsonpath import js_path_find, js_path_modify +from pySim.commands import SimCardCommands class CardFile(object): """Base class for all objects in the smart card filesystem. @@ -1427,3 +1432,30 @@ Tuple of two strings """ return interpret_sw(self.sw, sw) + + +class CardModel(abc.ABC): + """A specific card model, typically having some additional vendor-specific files""" + _atrs = [] + + @classmethod + @abc.abstractmethod + def add_files(cls, rs:RuntimeState): + """Add model specific files to given RuntimeState.""" + + @classmethod + def match(cls, scc:SimCardCommands) -> bool: + """Test if given card matches this model.""" + card_atr = scc.get_atr() + for atr in cls._atrs: + atr_bin = toBytes(atr) + if atr_bin == card_atr: + print("Detected CardModel:", cls.__name__) + return True + return False + + @staticmethod + def apply_matching_models(scc:SimCardCommands, rs:RuntimeState): + for m in CardModel.__subclasses__(): + if m.match(scc): + m.add_files(rs) diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py new file mode 100644 index 0000000..337eca7 --- /dev/null +++ b/pySim/sysmocom_sja2.py @@ -0,0 +1,241 @@ +# coding=utf-8 +"""Utilities / Functions related to sysmocom SJA2 cards + +(C) 2021 by Harald Welte + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +""" + +from pytlv.TLV import * +from struct import pack, unpack +from pySim.utils import * +from pySim.filesystem import * +from pySim.ts_102_221 import CardProfileUICC +from pySim.construct import * +from construct import * +import pySim + +key_type2str = { + 0: 'kic', + 1: 'kid', + 2: 'kik', + 3: 'any', +} + +key_algo2str = { + 0: 'des', + 1: 'aes' +} + +mac_length = { + 0: 8, + 1: 4 +} + +class EF_PIN(TransparentEF): + def __init__(self, fid, name): + super().__init__(fid, name=name, desc='%s PIN file' % name) + def _decode_bin(self, raw_bin_data): + u = unpack('!BBB8s', raw_bin_data[:11]) + res = {'enabled': (True, False)[u[0] & 0x01], + 'initialized': (True, False)[u[0] & 0x02], + 'disable_able': (False, True)[u[0] & 0x10], + 'unblock_able': (False, True)[u[0] & 0x20], + 'change_able': (False, True)[u[0] & 0x40], + 'valid': (False, True)[u[0] & 0x80], + 'attempts_remaining': u[1], + 'maximum_attempts': u[2], + 'pin': u[3].hex(), + } + if len(raw_bin_data) == 21: + u2 = unpack('!BB8s', raw_bin_data[11:10]) + res['attempts_remaining_puk'] = u2[0] + res['maximum_attempts_puk'] = u2[1] + res['puk'] = u2[2].hex() + return res + +class EF_MILENAGE_CFG(TransparentEF): + def __init__(self, fid='6f21', name='EF.MILENAGE_CFG', desc='Milenage connfiguration'): + super().__init__(fid, name=name, desc=desc) + def _decode_bin(self, raw_bin_data): + u = unpack('!BBBBB16s16s16s16s16s', raw_bin_data) + return {'r1': u[0], 'r2': u[1], 'r3': u[2], 'r4': u[3], 'r5': u[4], + 'c1': u[5].hex(), + 'c2': u[6].hex(), + 'c3': u[7].hex(), + 'c4': u[8].hex(), + 'c5': u[9].hex(), + } + +class EF_0348_KEY(LinFixedEF): + def __init__(self, fid='6f22', name='EF.0348_KEY', desc='TS 03.48 OTA Keys'): + super().__init__(fid, name=name, desc=desc, rec_len={27,35}) + def _decode_record_bin(self, raw_bin_data): + u = unpack('!BBB', raw_bin_data[0:3]) + key_algo = (u[2] >> 6) & 1 + key_length = ((u[2] >> 3) & 3) * 8 + return {'sec_domain': u[0], + 'key_set_version': u[1], + 'key_type': key_type2str[u[2] & 3], + 'key_length': key_length, + 'algorithm': key_algo2str[key_algo], + 'mac_length': mac_length[(u[2] >> 7)], + 'key': raw_bin_data[3:key_length].hex() + } + +class EF_0348_COUNT(LinFixedEF): + def __init__(self, fid='6f23', name='EF.0348_COUNT', desc='TS 03.48 OTA Counters'): + super().__init__(fid, name=name, desc=desc, rec_len={7,7}) + def _decode_record_bin(self, raw_bin_data): + u = unpack('!BB5s', raw_bin_data) + return {'sec_domain': u[0], 'key_set_version': u[1], 'counter': u[2]} + +class EF_SIM_AUTH_COUNTER(TransparentEF): + def __init__(self, fid='af24', name='EF.SIM_AUTH_COUNTER'): + super().__init__(fid, name=name, desc='Number of remaining RUN GSM ALGORITHM executions') + self._construct = Struct('num_run_gsm_algo_remain'/Int32ub) + +class EF_GP_COUNT(LinFixedEF): + def __init__(self, fid='6f26', name='EF.GP_COUNT', desc='GP SCP02 Counters'): + super().__init__(fid, name=name, desc=desc, rec_len={5,5}) + def _decode_record_bin(self, raw_bin_data): + u = unpack('!BBHB', raw_bin_data) + return {'sec_domain': u[0], 'key_set_version': u[1], 'counter': u[2], 'rfu': u[3]} + +class EF_GP_DIV_DATA(LinFixedEF): + def __init__(self, fid='6f27', name='EF.GP_DIV_DATA', desc='GP SCP02 key diversification data'): + super().__init__(fid, name=name, desc=desc, rec_len={12,12}) + def _decode_record_bin(self, raw_bin_data): + u = unpack('!BB8s', raw_bin_data) + return {'sec_domain': u[0], 'key_set_version': u[1], 'key_div_data': u[2].hex()} + +class EF_SIM_AUTH_KEY(TransparentEF): + def __init__(self, fid='6f20', name='EF.SIM_AUTH_KEY'): + super().__init__(fid, name=name, desc='USIM authentication key') + CfgByte = BitStruct(Bit[2], + 'use_sres_deriv_func_2'/Bit, + 'use_opc_instead_of_op'/Bit, + 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3)) + self._construct = Struct('cfg'/CfgByte, + 'key'/Bytes(16), + 'op'/If(this.cfg.algorithm=='milenage' and not this.cfg.use_opc_instead_of_op, Bytes(16)), + 'opc'/If(this.cfg.algorithm=='milenage' and this.cfg.use_opc_instead_of_op, Bytes(16)) + ) + +class DF_SYSTEM(CardDF): + def __init__(self): + super().__init__(fid='a515', name='DF.SYSTEM', desc='CardOS specifics') + files = [ + EF_PIN('6f01', 'EF.CHV1'), + EF_PIN('6f81', 'EF.CHV2'), + EF_PIN('6f0a', 'EF.ADM1'), + EF_PIN('6f0b', 'EF.ADM2'), + EF_PIN('6f0c', 'EF.ADM3'), + EF_PIN('6f0d', 'EF.ADM4'), + EF_MILENAGE_CFG(), + EF_0348_KEY(), + EF_SIM_AUTH_COUNTER(), + EF_SIM_AUTH_KEY(), + EF_0348_COUNT(), + EF_GP_COUNT(), + EF_GP_DIV_DATA(), + ] + self.add_files(files) + + def decode_select_response(self, resp_hex): + return pySim.ts_102_221.decode_select_response(resp_hex) + +class EF_USIM_SQN(TransparentEF): + def __init__(self, fid='af30', name='EF.USIM_SQN'): + super().__init__(fid, name=name, desc='SQN parameters for AKA') + Flag1 = BitStruct('skip_next_sqn_check'/Bit, 'delta_max_check'/Bit, + 'age_limit_check'/Bit, 'sqn_check'/Bit, + 'ind_len'/BitsInteger(4)) + Flag2 = BitStruct('rfu'/BitsRFU(5), 'dont_clear_amf_for_macs'/Bit, + 'aus_concealed'/Bit, 'autn_concealed'/Bit) + self._construct = Struct('flag1'/Flag1, 'flag2'/Flag2, + 'delta_max'/BytesInteger(6), 'age_limit'/BytesInteger(6), + 'freshness'/HexAdapter(GreedyBytes)) + +class EF_USIM_AUTH_KEY(TransparentEF): + def __init__(self, fid='af20', name='EF.USIM_AUTH_KEY'): + super().__init__(fid, name=name, desc='USIM authentication key') + CfgByte = BitStruct(Bit, 'only_4bytes_res_in_3g'/Bit, + 'use_sres_deriv_func_2_in_3g'/Bit, + 'use_opc_instead_of_op'/Bit, + 'algorithm'/Enum(Nibble, milenage=4, sha1_aka=5, xor=15)) + self._construct = Struct('cfg'/CfgByte, + 'key'/Bytes(16), + 'op'/If(this.cfg.algorithm=='milenage' and not this.cfg.use_opc_instead_of_op, Bytes(16)), + 'opc'/If(this.cfg.algorithm=='milenage' and this.cfg.use_opc_instead_of_op, Bytes(16)) + ) +class EF_USIM_AUTH_KEY_2G(TransparentEF): + def __init__(self, fid='af22', name='EF.USIM_AUTH_KEY_2G'): + super().__init__(fid, name=name, desc='USIM authentication key in 2G context') + CfgByte = BitStruct(Bit, 'only_4bytes_res_in_3g'/Bit, + 'use_sres_deriv_func_2_in_3g'/Bit, + 'use_opc_instead_of_op'/Bit, + 'algorithm'/Enum(Nibble, milenage=4, comp128v1=1, comp128v2=2, comp128v3=3)) + self._construct = Struct('cfg'/CfgByte, + 'key'/Bytes(16), + 'op'/If(this.cfg.algorithm=='milenage' and not this.cfg.use_opc_instead_of_op, Bytes(16)), + 'opc'/If(this.cfg.algorithm=='milenage' and this.cfg.use_opc_instead_of_op, Bytes(16)) + ) +class EF_GBA_SK(TransparentEF): + def __init__(self, fid='af31', name='EF.GBA_SK'): + super().__init__(fid, name=name, desc='Secret key for GBA key derivation') + self._construct = GreedyBytes + +class EF_GBA_REC_LIST(TransparentEF): + def __init__(self, fid='af32', name='EF.GBA_REC_LIST'): + super().__init__(fid, name=name, desc='Secret key for GBA key derivation') + # integers representing record numbers in EF-GBANL + self._construct = GreedyRange(Int8ub) + +class EF_GBA_INT_KEY(LinFixedEF): + def __init__(self, fid='af33', name='EF.GBA_INT_KEY'): + super().__init__(fid, name=name, desc='Secret key for GBA key derivation', rec_len={32,32}) + self._construct = GreedyBytes + + + +class SysmocomSJA2(CardModel): + _atrs = [ "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 4C 75 30 34 05 4B A9", + "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 4C 75 31 33 02 51 B2", + "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 4C 52 75 31 04 51 D5" ] + @classmethod + def add_files(cls, rs:RuntimeState): + """Add sysmocom SJA2 specific files to given RuntimeState.""" + rs.mf.add_file(DF_SYSTEM()) + # optional USIM application + if 'a0000000871002' in rs.mf.applications: + usim_adf = rs.mf.applications['a0000000871002'] + files_adf_usim = [ + EF_USIM_AUTH_KEY(), + EF_USIM_AUTH_KEY_2G(), + EF_GBA_SK(), + EF_GBA_REC_LIST(), + EF_GBA_INT_KEY(), + EF_USIM_SQN(), + ] + usim_adf.add_files(files_adf_usim) + # optional ISIM application + if 'a0000000871004' in rs.mf.applications: + isim_adf = rs.mf.applications['a0000000871004'] + files_adf_isim = [ + EF_USIM_AUTH_KEY(name='EF.ISIM_AUTH_KEY'), + EF_USIM_AUTH_KEY_2G(name='EF.ISIM_AUTH_KEY_2G'), + EF_USIM_SQN(name='EF.ISIM_SQN'), + ] + isim_adf.add_files(files_adf_isim) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id410489841bb9020ddbf74de9114d808b1d5adb6 Gerrit-Change-Number: 25784 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:44:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 15:44:29 +0000 Subject: Change in pysim[master]: Add API + shell command for sending TERMINAL PROFILE to card In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25785 ) Change subject: Add API + shell command for sending TERMINAL PROFILE to card ...................................................................... Add API + shell command for sending TERMINAL PROFILE to card This allows a very first start to play with PROACTIVE SIM Change-Id: Id8f23f7cebe0f9efce2c0ce4229509f35cd93d6a --- M pySim/commands.py M pySim/transport/__init__.py M pySim/ts_31_102.py 3 files changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/commands.py b/pySim/commands.py index 9657162..eb8217d 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -441,3 +441,9 @@ def envelope(self, payload:str): """Send one ENVELOPE command to the SIM""" return self._tp.send_apdu_checksw('80c20000%02x%s' % (len(payload)//2, payload)) + + def terminal_profile(self, payload:str): + """Send TERMINAL PROFILE to card""" + data_length = len(payload) // 2 + data, sw = self._tp.send_apdu(('80100000%02x' % data_length) + payload) + return (data, sw) diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py index 72a80a9..cb781b0 100644 --- a/pySim/transport/__init__.py +++ b/pySim/transport/__init__.py @@ -136,6 +136,10 @@ """ rv = self.send_apdu(pdu) + if sw == '9000' and sw_match(rv[1], '91xx'): + # proactive sim as per TS 102 221 Setion 7.4.2 + rv = self.send_apdu_checksw('80120000' + rv[1][2:], sw) + print("FETCH: %s", rv[0]) if not sw_match(rv[1], sw): raise SwMatchError(rv[1], sw.lower(), self.sw_interpreter) return rv diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index f3628ad..f347f67 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1084,6 +1084,10 @@ (data, sw) = self._cmd.card._scc.authenticate(opts.rand, opts.autn) self._cmd.poutput_json(data) + def do_terminal_profile(self, arg): + """Send a TERMINAL PROFILE command to the card.""" + (data, sw) = self._cmd.card._scc.terminal_profile(arg) + self._cmd.poutput('SW: %s, data: %s' % (sw, data)) # TS 31.102 Section 7.3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25785 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id8f23f7cebe0f9efce2c0ce4229509f35cd93d6a Gerrit-Change-Number: 25785 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:44:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 15:44:30 +0000 Subject: Change in pysim[master]: USIM: Add ENVELOPE and ENVELOPE-SMS shell commands In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25786 ) Change subject: USIM: Add ENVELOPE and ENVELOPE-SMS shell commands ...................................................................... USIM: Add ENVELOPE and ENVELOPE-SMS shell commands Change-Id: I4345459d99c0eeb5753217ad4e7188747c51a2a2 --- M pySim/ts_31_102.py 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index f347f67..faf0f38 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1089,6 +1089,20 @@ (data, sw) = self._cmd.card._scc.terminal_profile(arg) self._cmd.poutput('SW: %s, data: %s' % (sw, data)) + def do_envelope(self, arg): + """Send an ENVELOPE command to the card.""" + (data, sw) = self._cmd.card._scc.envelope(arg) + self._cmd.poutput('SW: %s, data: %s' % (sw, data)) + + def do_envelope_sms(self, arg): + """Send an ENVELOPE command to the card.""" + tpdu_ie = SMS_TPDU() + tpdu_ie.from_bytes(h2b(arg)) + dev_ids = DeviceIdentities(decoded={'source_dev_id':'network','dest_dev_id':'uicc'}) + sms_dl = SMSPPDownload(children=[dev_ids, tpdu_ie]) + (data, sw) = self._cmd.card._scc.envelope(b2h(sms_dl.to_tlv())) + self._cmd.poutput('SW: %s, data: %s' % (sw, data)) + # TS 31.102 Section 7.3 sw_usim = { -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4345459d99c0eeb5753217ad4e7188747c51a2a2 Gerrit-Change-Number: 25786 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:44:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 15:44:30 +0000 Subject: Change in pysim[master]: filsystem: Make NotImplementedError more verbose. In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25789 ) Change subject: filsystem: Make NotImplementedError more verbose. ...................................................................... filsystem: Make NotImplementedError more verbose. Before: EXCEPTION of type 'NotImplementedError' occurred with message: '' After: EXCEPTION of type 'NotImplementedError' occurred with message: 'EF(EF.SST) encoder not yet implemented. Patches welcome.' Change-Id: Ie8a10a8847f7c7c6a3332fb9f78de18c9f7f41d0 --- M pySim/filesystem.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 5cdac56..8edac41 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -551,7 +551,7 @@ elif self._tlv: self._tlv.from_dict(abstract_data) return self._tlv.to_tlv() - raise NotImplementedError + raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def encode_hex(self, abstract_data:dict) -> str: """Encode abstract representation into raw (hex string) data. @@ -577,7 +577,7 @@ elif self._tlv: self._tlv.from_dict(abstract_data) return b2h(self._tlv.to_tlv()) - raise NotImplementedError + raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) class LinFixedEF(CardEF): @@ -787,7 +787,7 @@ elif self._tlv: self._tlv.from_dict(abstract_data) return b2h(self._tlv.to_tlv()) - raise NotImplementedError + raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def encode_record_bin(self, abstract_data:dict) -> bytearray: """Encode abstract representation into raw (binary) data. @@ -812,7 +812,7 @@ elif self._tlv: self._tlv.from_dict(abstract_data) return self._tlv.to_tlv() - raise NotImplementedError + raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) class CyclicEF(LinFixedEF): """Cyclic EF (Entry File) in the smart card filesystem""" @@ -920,7 +920,7 @@ elif self._tlv: self._tlv.from_dict(abstract_data) return b2h(self._tlv.to_tlv()) - raise NotImplementedError + raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def encode_record_bin(self, abstract_data:dict) -> bytearray: """Encode abstract representation into raw (binary) data. @@ -945,7 +945,7 @@ elif self._tlv: self._tlv.from_dict(abstract_data) return self._tlv.to_tlv() - raise NotImplementedError + raise NotImplementedError("%s encoder not yet implemented. Patches welcome." % self) def _decode_bin(self, raw_bin_data:bytearray): chunks = [raw_bin_data[i:i+self.rec_len] for i in range(0, len(raw_bin_data), self.rec_len)] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25789 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie8a10a8847f7c7c6a3332fb9f78de18c9f7f41d0 Gerrit-Change-Number: 25789 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:44:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 15:44:30 +0000 Subject: Change in pysim[master]: 51.011: Fix EF_SST decoder for services > table description In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25790 ) Change subject: 51.011: Fix EF_SST decoder for services > table description ...................................................................... 51.011: Fix EF_SST decoder for services > table description Before: EXCEPTION of type 'KeyError' occurred with message: '60' After: "60": { "description": null, "allocated": false, "activated": false } Change-Id: Ic089f9632a936bdbedd2344442678c5bf9797713 --- M pySim/ts_51_011.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 65be06a..70629f7 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -513,7 +513,7 @@ bit_offset = (i % 4) * 2 bits = (byte >> bit_offset) & 3 ret[service_nr] = { - 'description': self.table[service_nr] or None, + 'description': self.table[service_nr] if service_nr in self.table else None, 'allocated': True if bits & 1 else False, 'activated': True if bits & 2 else False, } -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25790 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic089f9632a936bdbedd2344442678c5bf9797713 Gerrit-Change-Number: 25790 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 15:48:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 15:48:55 +0000 Subject: Change in pysim[master]: CardModel: Document how this 'magic' works in some comments. References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25793 ) Change subject: CardModel: Document how this 'magic' works in some comments. ...................................................................... CardModel: Document how this 'magic' works in some comments. Change-Id: If16ade6e1098a87f749259bad6dea805ddb61ede --- M pySim-shell.py M pySim/filesystem.py 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/93/25793/1 diff --git a/pySim-shell.py b/pySim-shell.py index 871c45e..5aa311c 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -48,6 +48,9 @@ from pySim.ts_31_102 import CardApplicationUSIM from pySim.ts_31_103 import CardApplicationISIM +# we need to import this module so that the SysmocomSJA2 sub-class of +# CardModel is created, which will add the ATR-based matching and +# calling of SysmocomSJA2.add_files. See CardModel.apply_matching_models import pySim.sysmocom_sja2 from pySim.card_key_provider import CardKeyProviderCsv, card_key_provider_register, card_key_provider_get_field diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 8edac41..4f23b4f 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1435,7 +1435,9 @@ class CardModel(abc.ABC): - """A specific card model, typically having some additional vendor-specific files""" + """A specific card model, typically having some additional vendor-specific files. All + you need to do is to define a sub-class with a list of ATRs or an overridden match + method.""" _atrs = [] @classmethod @@ -1456,6 +1458,9 @@ @staticmethod def apply_matching_models(scc:SimCardCommands, rs:RuntimeState): + """Check if any of the CardModel sub-classes 'match' the currently inserted card + (by ATR or overriding teh 'match' method). If so, call their 'add_files' + method.""" for m in CardModel.__subclasses__(): if m.match(scc): m.add_files(rs) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If16ade6e1098a87f749259bad6dea805ddb61ede Gerrit-Change-Number: 25793 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 16:01:47 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 14 Oct 2021 16:01:47 +0000 Subject: Change in pysim[master]: ts_51_011: fix select response decoder References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25794 ) Change subject: ts_51_011: fix select response decoder ...................................................................... ts_51_011: fix select response decoder The select response decoder is using b2h() wrongly. b2h expects a bytearray but we call it with an integer. In the following two lines we try to convert an integer to an integer. Change-Id: Ib6448d3bd7a0dc7f25e5ee82a42266b3313e2a95 --- M pySim/ts_51_011.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/94/25794/1 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 70629f7..ec621c1 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -937,9 +937,9 @@ file_type = type_of_file_map[resp_bin[6]] if resp_bin[6] in type_of_file_map else resp_bin[6] ret['file_descriptor']['file_type'] = file_type if file_type in ['mf', 'df']: - ret['file_characteristics'] = b2h(resp_bin[13]) - ret['num_direct_child_df'] = int(resp_bin[14], 16) - ret['num_direct_child_ef'] = int(resp_bin[15], 16) + ret['file_characteristics'] = b2h(resp_bin[13:14]) + ret['num_direct_child_df'] = int(resp_bin[14]) + ret['num_direct_child_ef'] = int(resp_bin[15]) ret['num_chv_unblock_adm_codes'] = int(resp_bin[16]) # CHV / UNBLOCK CHV stats elif file_type in ['working_ef']: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib6448d3bd7a0dc7f25e5ee82a42266b3313e2a95 Gerrit-Change-Number: 25794 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 16:06:01 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 14 Oct 2021 16:06:01 +0000 Subject: Change in pysim[master]: ts_51_011: fix select response decoder In-Reply-To: References: Message-ID: Hello osmith, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25794 to look at the new patch set (#2). Change subject: ts_51_011: fix select response decoder ...................................................................... ts_51_011: fix select response decoder The select response decoder is using b2h() wrongly. b2h expects a bytearray but we call it with an integer. In the following two lines we try to convert an integer to an integer. Change-Id: Ib6448d3bd7a0dc7f25e5ee82a42266b3313e2a95 --- M pySim/ts_51_011.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/94/25794/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib6448d3bd7a0dc7f25e5ee82a42266b3313e2a95 Gerrit-Change-Number: 25794 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 16:14:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 16:14:34 +0000 Subject: Change in libosmocore[master]: logging: Change LLAPD category color to purple-like one References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/25795 ) Change subject: logging: Change LLAPD category color to purple-like one ...................................................................... logging: Change LLAPD category color to purple-like one Previous dark shiny blue one is really difficult to read on the terminal. Let's change it for some purpleish color which is far easier to read. Change-Id: Ia5c0860dd8d756bb24eb8972f94590bfba5bc865 --- M src/logging.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/95/25795/1 diff --git a/src/logging.c b/src/logging.c index 4517afc..1d139d5 100644 --- a/src/logging.c +++ b/src/logging.c @@ -159,7 +159,7 @@ .description = "LAPD in libosmogsm", .loglevel = LOGL_NOTICE, .enabled = 1, - .color = "\033[38;5;21m", + .color = "\033[38;5;12m", }, [INT2IDX(DLINP)] = { .name = "DLINP", -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia5c0860dd8d756bb24eb8972f94590bfba5bc865 Gerrit-Change-Number: 25795 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 16:17:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 16:17:51 +0000 Subject: Change in osmo-bts[master]: Move lchan_deactivate() to lchan.c References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25796 ) Change subject: Move lchan_deactivate() to lchan.c ...................................................................... Move lchan_deactivate() to lchan.c Change-Id: If75ed432fa9dcb10159a0dac9b8ba7efe6958b35 --- M include/osmo-bts/lchan.h M include/osmo-bts/rsl.h M src/common/lchan.c M src/common/rsl.c 4 files changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/25796/1 diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 665bb44..ccc6760 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -331,6 +331,7 @@ void gsm_lchan_name_update(struct gsm_lchan *lchan); int lchan_init_lapdm(struct gsm_lchan *lchan); void gsm_lchan_release(struct gsm_lchan *lchan, enum lchan_rel_act_kind rel_kind); +int lchan_deactivate(struct gsm_lchan *lchan); const char *gsm_lchans_name(enum gsm_lchan_state s); static inline char *gsm_lchan_name(const struct gsm_lchan *lchan) diff --git a/include/osmo-bts/rsl.h b/include/osmo-bts/rsl.h index 1663006..9d5ec31 100644 --- a/include/osmo-bts/rsl.h +++ b/include/osmo-bts/rsl.h @@ -17,8 +17,6 @@ int rsl_tx_rf_rel_ack(struct gsm_lchan *lchan); int rsl_tx_hando_det(struct gsm_lchan *lchan, uint8_t *ho_delay); -int lchan_deactivate(struct gsm_lchan *lchan); - /* call-back for LAPDm code, called when it wants to send msgs UP */ int lapdm_rll_tx_cb(struct msgb *msg, struct lapdm_entity *le, void *ctx); diff --git a/src/common/lchan.c b/src/common/lchan.c index e06ea5c..5d12952 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -30,6 +30,7 @@ #include #include #include +#include #include static const struct value_string lchan_s_names[] = { @@ -234,6 +235,14 @@ lapdm_channel_exit(&lchan->lapdm_ch); } +int lchan_deactivate(struct gsm_lchan *lchan) +{ + OSMO_ASSERT(lchan); + + lchan->ciph_state = 0; + return bts_model_lchan_deactivate(lchan); +} + const char *gsm_lchans_name(enum gsm_lchan_state s) { return get_value_string(lchan_s_names, s); diff --git a/src/common/rsl.c b/src/common/rsl.c index b186adf..99e8195 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3832,14 +3832,6 @@ return ret; } -int lchan_deactivate(struct gsm_lchan *lchan) -{ - OSMO_ASSERT(lchan); - - lchan->ciph_state = 0; - return bts_model_lchan_deactivate(lchan); -} - int down_rsl(struct gsm_bts_trx *trx, struct msgb *msg) { struct abis_rsl_common_hdr *rslh; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If75ed432fa9dcb10159a0dac9b8ba7efe6958b35 Gerrit-Change-Number: 25796 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 16:22:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 16:22:46 +0000 Subject: Change in osmo-bts[master]: lchan: Call lapdm_channel_exit() when state changes to NONE In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25792 ) Change subject: lchan: Call lapdm_channel_exit() when state changes to NONE ...................................................................... Patch Set 2: Wroks fine now. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If0ec5f0c7be4d15c8d684d33e15e24d68bd5192e Gerrit-Change-Number: 25792 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 14 Oct 2021 16:22:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 16:46:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 16:46:12 +0000 Subject: Change in osmo-pcu[master]: tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25797 ) Change subject: tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN ...................................................................... tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN It doesn't make sense to keep asking the scheduler to retransmit Pkt Ul Ass if the tbf_fsm already decided we are going to release the TBF. It can be seen in following log extract: """ tbf_ul_ass_fsm.c:112 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=ASSIGN EGPRS) start Packet Uplink Assignment (PACCH) tbf_ul_ass_fsm.c:131 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=ASSIGN EGPRS) Scheduled UL Assignment polling on PACCH (FN=612941, TS=7) tbf_ul_ass_fsm.c:188 UL_ASS_TBF(UL-TFI_1)[849e50]{SEND_ASS}: state_chg to WAIT_ACK pdch_ul_controller.c:330 PDCH(bts=0,trx=1,ts=7) Timeout for registered POLL (FN=612937, reason=DL_ASS): TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=ASSIGN EGPRS) tbf.cpp:550 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=612937, TS=7 (curr FN 612937) tbf.cpp:392 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=ASSIGN EGPRS) N3105 exceeded MAX (8) tbf.cpp:602 TBF(UL-TFI_1)[7bd530]{ASSIGN}: Received Event MAX_N3105 tbf_fsm.c:194 TBF(UL-TFI_1)[7bd530]{ASSIGN}: state_chg to RELEASING pdch_ul_controller.c:330 PDCH(bts=0,trx=1,ts=7) Timeout for registered POLL (FN=612941, reason=UL_ASS): TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=RELEASING EGPRS) tbf.cpp:550 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=RELEASING EGPRS) poll timeout for FN=612941, TS=7 (curr FN 612941) tbf.cpp:589 UL_ASS_TBF(UL-TFI_1)[849e50]{WAIT_ACK}: Received Event ASS_POLL_TIMEOUT tbf_ul_ass_fsm.c:224 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=RELEASING EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT: |Assignment was on PACCH|No uplink data received yet| tbf_ul_ass_fsm.c:226 UL_ASS_TBF(UL-TFI_1)[849e50]{WAIT_ACK}: state_chg to SEND_ASS tbf_ul_ass_fsm.c:308 UL_ASS_TBF(UL-TFI_1)[849e50]{SEND_ASS}: Received Event CREATE_RLCMAC_MSG tbf_ul_ass_fsm.c:112 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=RELEASING EGPRS) start Packet Uplink Assignment (PACCH) tbf_ul_ass_fsm.c:131 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=RELEASING EGPRS) Scheduled UL Assignment polling on PACCH (FN=612976, TS=7) tbf_ul_ass_fsm.c:188 UL_ASS_TBF(UL-TFI_1)[849e50]{SEND_ASS}: state_chg to WAIT_ACK """ Change-Id: I94243ff99dfaf3664a1a4b3c4c87b5104ba4f7d1 --- M src/tbf_ul_ass_fsm.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/97/25797/1 diff --git a/src/tbf_ul_ass_fsm.c b/src/tbf_ul_ass_fsm.c index 791bab7..149f481 100644 --- a/src/tbf_ul_ass_fsm.c +++ b/src/tbf_ul_ass_fsm.c @@ -222,8 +222,13 @@ LOGPTBF(ctx->tbf, LOGL_NOTICE, "Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT: %s\n", tbf_rlcmac_diag(ctx->tbf)); - /* Reschedule Pkt Ul Ass */ - tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_SEND_ASS); + if (tbf_state(ctx->tbf) == TBF_ST_ASSIGN) { + /* Reschedule Pkt Ul Ass */ + tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_SEND_ASS); + } else{ + /* We are most probably in RELEASING, so stop retrying. */ + tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_NONE); + } break; default: OSMO_ASSERT(0); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I94243ff99dfaf3664a1a4b3c4c87b5104ba4f7d1 Gerrit-Change-Number: 25797 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:10:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 17:10:21 +0000 Subject: Change in pysim[master]: CardModel: Document how this 'magic' works in some comments. In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25793 to look at the new patch set (#2). Change subject: CardModel: Document how this 'magic' works in some comments. ...................................................................... CardModel: Document how this 'magic' works in some comments. Change-Id: If16ade6e1098a87f749259bad6dea805ddb61ede --- M pySim-shell.py M pySim/filesystem.py 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/93/25793/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If16ade6e1098a87f749259bad6dea805ddb61ede Gerrit-Change-Number: 25793 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:15:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 17:15:46 +0000 Subject: Change in pysim[master]: commands: fix update_binary() with non-zero offset References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25798 ) Change subject: commands: fix update_binary() with non-zero offset ...................................................................... commands: fix update_binary() with non-zero offset In Icc240d5c8c04198640eb118565ea99f10ba27466 we introduced support for writing files > 255 bytes by splitting the write into multiple chunks. However, at the same time, that commit broke support for writing data at non-zero offsets. Unfortunately, this is used extensively within pySim-prog e.g. for writing K + OP/OPc data to sysmoISIM-SJA2 and sysmoUSIM-SJS1 cards. This commit fixes the related problem. Change-Id: Ie1aeaab29701946233ed73db3331039690d695da Fixes: Icc240d5c8c04198640eb118565ea99f10ba27466 Closes: OS#5254 --- M pySim/commands.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/98/25798/1 diff --git a/pySim/commands.py b/pySim/commands.py index eb8217d..cd2b5b3 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -172,11 +172,11 @@ self.select_path(ef) total_data = '' total_sw = "9000" - chunk_offset = offset + chunk_offset = 0 while chunk_offset < data_length: chunk_len = min(255, data_length - chunk_offset) # chunk_offset is bytes, but data slicing is hex chars, so we need to multiply by 2 - pdu = self.cla_byte + 'd6%04x%02x' % (chunk_offset, chunk_len) + data[chunk_offset*2 : (chunk_offset+chunk_len)*2] + pdu = self.cla_byte + 'd6%04x%02x' % (offset + chunk_offset, chunk_len) + data[chunk_offset*2 : (chunk_offset+chunk_len)*2] chunk_data, chunk_sw = self._tp.send_apdu(pdu) if chunk_sw == total_sw: total_data += chunk_data -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie1aeaab29701946233ed73db3331039690d695da Gerrit-Change-Number: 25798 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:17:20 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 17:17:20 +0000 Subject: Change in pysim[master]: ts_51_011: fix select response decoder In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25794 ) Change subject: ts_51_011: fix select response decoder ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib6448d3bd7a0dc7f25e5ee82a42266b3313e2a95 Gerrit-Change-Number: 25794 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 14 Oct 2021 17:17:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:17:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 17:17:41 +0000 Subject: Change in pysim[master]: pySim-shell: allow card insertion at runtime In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25549 ) Change subject: pySim-shell: allow card insertion at runtime ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 Gerrit-Change-Number: 25549 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 14 Oct 2021 17:17:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:18:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 17:18:07 +0000 Subject: Change in pysim[master]: CardModel: Document how this 'magic' works in some comments. In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25793 ) Change subject: CardModel: Document how this 'magic' works in some comments. ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If16ade6e1098a87f749259bad6dea805ddb61ede Gerrit-Change-Number: 25793 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 17:18:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:18:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 17:18:22 +0000 Subject: Change in pysim[master]: CardModel: Document how this 'magic' works in some comments. In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25793 ) Change subject: CardModel: Document how this 'magic' works in some comments. ...................................................................... CardModel: Document how this 'magic' works in some comments. Change-Id: If16ade6e1098a87f749259bad6dea805ddb61ede --- M pySim-shell.py M pySim/filesystem.py 2 files changed, 9 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index 871c45e..5aa311c 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -48,6 +48,9 @@ from pySim.ts_31_102 import CardApplicationUSIM from pySim.ts_31_103 import CardApplicationISIM +# we need to import this module so that the SysmocomSJA2 sub-class of +# CardModel is created, which will add the ATR-based matching and +# calling of SysmocomSJA2.add_files. See CardModel.apply_matching_models import pySim.sysmocom_sja2 from pySim.card_key_provider import CardKeyProviderCsv, card_key_provider_register, card_key_provider_get_field diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 8edac41..fe781de 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1435,7 +1435,9 @@ class CardModel(abc.ABC): - """A specific card model, typically having some additional vendor-specific files""" + """A specific card model, typically having some additional vendor-specific files. All + you need to do is to define a sub-class with a list of ATRs or an overridden match + method.""" _atrs = [] @classmethod @@ -1456,6 +1458,9 @@ @staticmethod def apply_matching_models(scc:SimCardCommands, rs:RuntimeState): + """Check if any of the CardModel sub-classes 'match' the currently inserted card + (by ATR or overriding the 'match' method). If so, call their 'add_files' + method.""" for m in CardModel.__subclasses__(): if m.match(scc): m.add_files(rs) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25793 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If16ade6e1098a87f749259bad6dea805ddb61ede Gerrit-Change-Number: 25793 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:19:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 17:19:18 +0000 Subject: Change in osmo-pcu[master]: tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25797 ) Change subject: tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I94243ff99dfaf3664a1a4b3c4c87b5104ba4f7d1 Gerrit-Change-Number: 25797 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 14 Oct 2021 17:19:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:21:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 17:21:51 +0000 Subject: Change in osmo-pcu[master]: Abort scheduling of pending Pkt Ul Ass if tbf goes into RELEASE step References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25799 ) Change subject: Abort scheduling of pending Pkt Ul Ass if tbf goes into RELEASE step ...................................................................... Abort scheduling of pending Pkt Ul Ass if tbf goes into RELEASE step Change-Id: I20bab79070274b1d8f6b4e1867b30de61983ab54 --- M src/tbf_fsm.c M src/tbf_ul_ass_fsm.c M src/tbf_ul_ass_fsm.h 3 files changed, 31 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/99/25799/1 diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c index 36981e6..fb947b2 100644 --- a/src/tbf_fsm.c +++ b/src/tbf_fsm.c @@ -190,6 +190,8 @@ tbf_fsm_state_chg(fi, TBF_ST_FLOW); break; case TBF_EV_MAX_N3105: + /* We are going to release, so abort any Pkt Ul Ass pending to be scheduled: */ + osmo_fsm_inst_dispatch(tbf_ul_ass_fi(ctx->tbf), TBF_UL_ASS_EV_ABORT, NULL); ctx->T_release = 3195; tbf_fsm_state_chg(fi, TBF_ST_RELEASING); break; diff --git a/src/tbf_ul_ass_fsm.c b/src/tbf_ul_ass_fsm.c index 149f481..e4e0ffc 100644 --- a/src/tbf_ul_ass_fsm.c +++ b/src/tbf_ul_ass_fsm.c @@ -48,6 +48,7 @@ { TBF_UL_ASS_EV_CREATE_RLCMAC_MSG, "CREATE_RLCMAC_MSG" }, { TBF_UL_ASS_EV_RX_ASS_CTRL_ACK, "RX_ASS_CTRL_ACK" }, { TBF_UL_ASS_EV_ASS_POLL_TIMEOUT, "ASS_POLL_TIMEOUT" }, + { TBF_UL_ASS_EV_ABORT, "ABORT" }, { 0, NULL } }; @@ -169,6 +170,9 @@ case TBF_UL_ASS_EV_SCHED_ASS_REJ: tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_SEND_ASS_REJ); break; + case TBF_UL_ASS_EV_ABORT: + /* Nothing to do, we are already in proper state */ + break; default: OSMO_ASSERT(0); } @@ -187,6 +191,10 @@ return; tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_WAIT_ACK); break; + case TBF_UL_ASS_EV_ABORT: + /* Cancel pending schedule for Pkt Ul Ass: */ + tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_NONE); + break; default: OSMO_ASSERT(0); } @@ -205,6 +213,10 @@ return; tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_NONE); break; + case TBF_UL_ASS_EV_ABORT: + /* Cancel pending schedule for Pkt Ul Ass Rej: */ + tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_NONE); + break; default: OSMO_ASSERT(0); } @@ -230,6 +242,12 @@ tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_NONE); } break; + case TBF_UL_ASS_EV_ABORT: + /* There's nothing we can do here, we already transmitted and + * hence we must keep the POLL since the MS is already expected + * to transmit there. Whenever we receive event CTRL_ACK or + * TIMEOUT above, it will move back to ST_NONE autoamtically */ + break; default: OSMO_ASSERT(0); } @@ -252,7 +270,8 @@ [TBF_UL_ASS_NONE] = { .in_event_mask = X(TBF_UL_ASS_EV_SCHED_ASS) | - X(TBF_UL_ASS_EV_SCHED_ASS_REJ), + X(TBF_UL_ASS_EV_SCHED_ASS_REJ) | + X(TBF_UL_ASS_EV_ABORT), .out_state_mask = X(TBF_UL_ASS_SEND_ASS) | X(TBF_UL_ASS_SEND_ASS_REJ), @@ -261,7 +280,9 @@ .onenter = st_none_on_enter, }, [TBF_UL_ASS_SEND_ASS] = { - .in_event_mask = X(TBF_UL_ASS_EV_CREATE_RLCMAC_MSG), + .in_event_mask = + X(TBF_UL_ASS_EV_CREATE_RLCMAC_MSG) | + X(TBF_UL_ASS_EV_ABORT), .out_state_mask = X(TBF_UL_ASS_WAIT_ACK) | X(TBF_UL_ASS_NONE), @@ -269,7 +290,9 @@ .action = st_send_ass, }, [TBF_UL_ASS_SEND_ASS_REJ] = { - .in_event_mask = X(TBF_UL_ASS_EV_CREATE_RLCMAC_MSG), + .in_event_mask = + X(TBF_UL_ASS_EV_CREATE_RLCMAC_MSG) | + X(TBF_UL_ASS_EV_ABORT), .out_state_mask = X(TBF_UL_ASS_NONE), .name = "SEND_ASS_REJ", .action = st_send_ass_rej, @@ -277,7 +300,8 @@ [TBF_UL_ASS_WAIT_ACK] = { .in_event_mask = X(TBF_UL_ASS_EV_RX_ASS_CTRL_ACK) | - X(TBF_UL_ASS_EV_ASS_POLL_TIMEOUT), + X(TBF_UL_ASS_EV_ASS_POLL_TIMEOUT) | + X(TBF_UL_ASS_EV_ABORT), .out_state_mask = X(TBF_UL_ASS_NONE) | X(TBF_UL_ASS_SEND_ASS), diff --git a/src/tbf_ul_ass_fsm.h b/src/tbf_ul_ass_fsm.h index 67bb2f4..34b81a7 100644 --- a/src/tbf_ul_ass_fsm.h +++ b/src/tbf_ul_ass_fsm.h @@ -32,6 +32,7 @@ TBF_UL_ASS_EV_CREATE_RLCMAC_MSG, /* Scheduler wants to gen+Tx the Ass (rej): data=tbf_ul_ass_ev_create_rlcmac_msg_ctx */ TBF_UL_ASS_EV_RX_ASS_CTRL_ACK, /* Received CTRL ACK answering poll set on Pkt Ul Ass */ TBF_UL_ASS_EV_ASS_POLL_TIMEOUT, /* Pdch Ul Controller signals timeout for poll set on Pkt Ul Ass */ + TBF_UL_ASS_EV_ABORT, /* TBF is starting to be RELEASED, drop in progress assignment */ }; enum tbf_ul_ass_fsm_states { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I20bab79070274b1d8f6b4e1867b30de61983ab54 Gerrit-Change-Number: 25799 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:29:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 17:29:50 +0000 Subject: Change in osmo-pcu[master]: tbf: Drop pending polls during free also on states != ASSIGN References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25800 ) Change subject: tbf: Drop pending polls during free also on states != ASSIGN ...................................................................... tbf: Drop pending polls during free also on states != ASSIGN The situation holds true as long as the assignment is resolved. Hence, it can also happen that the TBF is in RELEASE state, because it was unable to do the assignment (and after retrying, MAX_N3105 moved it into RELEASING). Let's not explicitly check states, the other conditions should be enough. Related: SYS#5647 Change-Id: I05fb0ea44aeb3fbda9e8e1c449e9366efaa2c511 --- M src/tbf.cpp 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/00/25800/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index 0331a80..2343862 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -245,11 +245,12 @@ /* During assignment (state=ASSIGN), tbf may be temporarily using * tbf->control_ts from a previous TBF/SBA to transmit the UL/DL - * Assignment, which may not be necessarly be a TS where the current TBF - * is attached to. Hence, we may have ULC pollings ongoing and we need - * to make sure we drop all reserved nodes there: */ - if (tbf_state(tbf) == TBF_ST_ASSIGN && - tbf->control_ts != TBF_CONTROL_TS_UNSET && !tbf->pdch[tbf->control_ts]) + * Assignment, which may not be necessarily be a TS where the current TBF + * is attached to. This will be the case until a TBF receives proper + * confirmation from the MS and goes through the FLOW state. Hence, we + * may have ULC pollings ongoing and we need to make sure we drop all + * reserved nodes there: */ + if (tbf->control_ts != TBF_CONTROL_TS_UNSET && !tbf->pdch[tbf->control_ts]) pdch_ulc_release_tbf(tbf->trx->pdch[tbf->control_ts].ulc, tbf); /* Now simply detach from all attached PDCHs */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I05fb0ea44aeb3fbda9e8e1c449e9366efaa2c511 Gerrit-Change-Number: 25800 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:31:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 17:31:21 +0000 Subject: Change in osmo-pcu[master]: tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, laforge, fixeria, keith, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25797 to look at the new patch set (#2). Change subject: tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN ...................................................................... tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN It doesn't make sense to keep asking the scheduler to retransmit Pkt Ul Ass if the tbf_fsm already decided we are going to release the TBF. It can be seen in following log extract: """ tbf_ul_ass_fsm.c:112 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=ASSIGN EGPRS) start Packet Uplink Assignment (PACCH) tbf_ul_ass_fsm.c:131 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=ASSIGN EGPRS) Scheduled UL Assignment polling on PACCH (FN=612941, TS=7) tbf_ul_ass_fsm.c:188 UL_ASS_TBF(UL-TFI_1)[849e50]{SEND_ASS}: state_chg to WAIT_ACK pdch_ul_controller.c:330 PDCH(bts=0,trx=1,ts=7) Timeout for registered POLL (FN=612937, reason=DL_ASS): TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=ASSIGN EGPRS) tbf.cpp:550 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=612937, TS=7 (curr FN 612937) tbf.cpp:392 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=ASSIGN EGPRS) N3105 exceeded MAX (8) tbf.cpp:602 TBF(UL-TFI_1)[7bd530]{ASSIGN}: Received Event MAX_N3105 tbf_fsm.c:194 TBF(UL-TFI_1)[7bd530]{ASSIGN}: state_chg to RELEASING pdch_ul_controller.c:330 PDCH(bts=0,trx=1,ts=7) Timeout for registered POLL (FN=612941, reason=UL_ASS): TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=RELEASING EGPRS) tbf.cpp:550 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=RELEASING EGPRS) poll timeout for FN=612941, TS=7 (curr FN 612941) tbf.cpp:589 UL_ASS_TBF(UL-TFI_1)[849e50]{WAIT_ACK}: Received Event ASS_POLL_TIMEOUT tbf_ul_ass_fsm.c:224 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=RELEASING EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT: |Assignment was on PACCH|No uplink data received yet| tbf_ul_ass_fsm.c:226 UL_ASS_TBF(UL-TFI_1)[849e50]{WAIT_ACK}: state_chg to SEND_ASS tbf_ul_ass_fsm.c:308 UL_ASS_TBF(UL-TFI_1)[849e50]{SEND_ASS}: Received Event CREATE_RLCMAC_MSG tbf_ul_ass_fsm.c:112 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=RELEASING EGPRS) start Packet Uplink Assignment (PACCH) tbf_ul_ass_fsm.c:131 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=RELEASING EGPRS) Scheduled UL Assignment polling on PACCH (FN=612976, TS=7) tbf_ul_ass_fsm.c:188 UL_ASS_TBF(UL-TFI_1)[849e50]{SEND_ASS}: state_chg to WAIT_ACK """ Change-Id: I94243ff99dfaf3664a1a4b3c4c87b5104ba4f7d1 --- M src/tbf_ul_ass_fsm.c 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/97/25797/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I94243ff99dfaf3664a1a4b3c4c87b5104ba4f7d1 Gerrit-Change-Number: 25797 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:37:12 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 14 Oct 2021 17:37:12 +0000 Subject: Change in osmo-pcu[master]: tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25797 ) Change subject: tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I94243ff99dfaf3664a1a4b3c4c87b5104ba4f7d1 Gerrit-Change-Number: 25797 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 14 Oct 2021 17:37:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:39:55 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 14 Oct 2021 17:39:55 +0000 Subject: Change in osmo-pcu[master]: Abort scheduling of pending Pkt Ul Ass if tbf goes into RELEASE step In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25799 ) Change subject: Abort scheduling of pending Pkt Ul Ass if tbf goes into RELEASE step ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I20bab79070274b1d8f6b4e1867b30de61983ab54 Gerrit-Change-Number: 25799 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 14 Oct 2021 17:39:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:45:13 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 14 Oct 2021 17:45:13 +0000 Subject: Change in osmo-pcu[master]: tbf: Drop pending polls during free also on states != ASSIGN In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25800 ) Change subject: tbf: Drop pending polls during free also on states != ASSIGN ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I05fb0ea44aeb3fbda9e8e1c449e9366efaa2c511 Gerrit-Change-Number: 25800 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 14 Oct 2021 17:45:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:47:52 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 14 Oct 2021 17:47:52 +0000 Subject: Change in pysim[master]: commands: fix update_binary() with non-zero offset In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25798 ) Change subject: commands: fix update_binary() with non-zero offset ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie1aeaab29701946233ed73db3331039690d695da Gerrit-Change-Number: 25798 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 14 Oct 2021 17:47:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:48:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 17:48:36 +0000 Subject: Change in pysim[master]: commands: fix update_binary() with non-zero offset In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25798 ) Change subject: commands: fix update_binary() with non-zero offset ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie1aeaab29701946233ed73db3331039690d695da Gerrit-Change-Number: 25798 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 14 Oct 2021 17:48:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:48:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 17:48:38 +0000 Subject: Change in pysim[master]: commands: fix update_binary() with non-zero offset In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25798 ) Change subject: commands: fix update_binary() with non-zero offset ...................................................................... commands: fix update_binary() with non-zero offset In Icc240d5c8c04198640eb118565ea99f10ba27466 we introduced support for writing files > 255 bytes by splitting the write into multiple chunks. However, at the same time, that commit broke support for writing data at non-zero offsets. Unfortunately, this is used extensively within pySim-prog e.g. for writing K + OP/OPc data to sysmoISIM-SJA2 and sysmoUSIM-SJS1 cards. This commit fixes the related problem. Change-Id: Ie1aeaab29701946233ed73db3331039690d695da Fixes: Icc240d5c8c04198640eb118565ea99f10ba27466 Closes: OS#5254 --- M pySim/commands.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim/commands.py b/pySim/commands.py index eb8217d..cd2b5b3 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -172,11 +172,11 @@ self.select_path(ef) total_data = '' total_sw = "9000" - chunk_offset = offset + chunk_offset = 0 while chunk_offset < data_length: chunk_len = min(255, data_length - chunk_offset) # chunk_offset is bytes, but data slicing is hex chars, so we need to multiply by 2 - pdu = self.cla_byte + 'd6%04x%02x' % (chunk_offset, chunk_len) + data[chunk_offset*2 : (chunk_offset+chunk_len)*2] + pdu = self.cla_byte + 'd6%04x%02x' % (offset + chunk_offset, chunk_len) + data[chunk_offset*2 : (chunk_offset+chunk_len)*2] chunk_data, chunk_sw = self._tp.send_apdu(pdu) if chunk_sw == total_sw: total_data += chunk_data -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie1aeaab29701946233ed73db3331039690d695da Gerrit-Change-Number: 25798 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:51:19 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 14 Oct 2021 17:51:19 +0000 Subject: Change in pysim[master]: pySim-shell: allow card insertion at runtime In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25549 ) Change subject: pySim-shell: allow card insertion at runtime ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 Gerrit-Change-Number: 25549 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 14 Oct 2021 17:51:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 17:56:13 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Thu, 14 Oct 2021 17:56:13 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25552 ) Change subject: pySim-shell: add bulk provisioning support ...................................................................... Patch Set 8: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 8 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 17:56:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 18:43:00 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 14 Oct 2021 18:43:00 +0000 Subject: Change in osmo-pcu[master]: tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25797 ) Change subject: tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I94243ff99dfaf3664a1a4b3c4c87b5104ba4f7d1 Gerrit-Change-Number: 25797 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 14 Oct 2021 18:43:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 18:47:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 18:47:41 +0000 Subject: Change in pysim[master]: commands: Fix read_binary() for non-zero offset References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25801 ) Change subject: commands: Fix read_binary() for non-zero offset ...................................................................... commands: Fix read_binary() for non-zero offset Similar to the fix in Ie1aeaab29701946233ed73db3331039690d695da for update_binary(), read_binary() also contained a bug when treating non-zero offsets. Change-Id: Ic5c2f0ad1c1ec9c4e9c97e72895382f7b6fa9470 Related: OS#5254 --- M pySim/commands.py 1 file changed, 5 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/01/25801/1 diff --git a/pySim/commands.py b/pySim/commands.py index cd2b5b3..d53cb3e 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -141,13 +141,14 @@ if length is None: length = self.__len(r) - offset total_data = '' - while offset < length: - chunk_len = min(255, length-offset) - pdu = self.cla_byte + 'b0%04x%02x' % (offset, chunk_len) + chunk_offset = 0 + while chunk_offset < length: + chunk_len = min(255, length-chunk_offset) + pdu = self.cla_byte + 'b0%04x%02x' % (offset + chunk_offset, chunk_len) data,sw = self._tp.send_apdu(pdu) if sw == '9000': total_data += data - offset += chunk_len + chunk_offset += chunk_len else: raise ValueError('Failed to read (offset %d)' % (offset)) return total_data, sw -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic5c2f0ad1c1ec9c4e9c97e72895382f7b6fa9470 Gerrit-Change-Number: 25801 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 18:47:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 18:47:42 +0000 Subject: Change in pysim[master]: ts_51_011: Add encoder for EF.SST References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25802 ) Change subject: ts_51_011: Add encoder for EF.SST ...................................................................... ts_51_011: Add encoder for EF.SST We already have those for EF.UST, let's add them for EF.SST, too Change-Id: Ib51bfffaf8444ec30415aad42e3a0f4f3f7598cb --- M pySim/ts_51_011.py 1 file changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/02/25802/1 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 70629f7..bb76574 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -505,6 +505,12 @@ def __init__(self, fid, sfid, name, desc, size, table): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) self.table = table + @staticmethod + def _bit_byte_offset_for_service(service:int) -> (int, int): + i = service - 1 + byte_offset = i//4 + bit_offset = (i % 4) * 2 + return (byte_offset, bit_offset) def _decode_bin(self, raw_bin): ret = {} for i in range(0, len(raw_bin)*4): @@ -518,7 +524,26 @@ 'activated': True if bits & 2 else False, } return ret - # TODO: encoder + def _encode_bin(self, in_json): + # compute the required binary size + bin_len = 0 + for srv in in_json.keys(): + service_nr = int(srv) + (byte_offset, bit_offset) = EF_ServiceTable._bit_byte_offset_for_service(service_nr) + if byte_offset >= bin_len: + bin_len = byte_offset+1 + # encode the actual data + out = bytearray(b'\x00' * bin_len) + for srv in in_json.keys(): + service_nr = int(srv) + (byte_offset, bit_offset) = EF_ServiceTable._bit_byte_offset_for_service(service_nr) + bits = 0 + if in_json[srv]['allocated'] == True: + bits |= 1 + if in_json[srv]['activated'] == True: + bits |= 2 + out[byte_offset] |= ((bits & 3) << bit_offset) + return out # TS 51.011 Section 10.3.11 class EF_SPN(TransparentEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib51bfffaf8444ec30415aad42e3a0f4f3f7598cb Gerrit-Change-Number: 25802 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 18:58:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 14 Oct 2021 18:58:54 +0000 Subject: Change in pysim[master]: pySim-shell: allow card insertion at runtime In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25549 ) Change subject: pySim-shell: allow card insertion at runtime ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 Gerrit-Change-Number: 25549 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 14 Oct 2021 18:58:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 21:00:23 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 21:00:23 +0000 Subject: Change in osmo-bts[master]: Move lchan_deactivate() to lchan.c In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25796 ) Change subject: Move lchan_deactivate() to lchan.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If75ed432fa9dcb10159a0dac9b8ba7efe6958b35 Gerrit-Change-Number: 25796 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 14 Oct 2021 21:00:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 21:07:06 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 21:07:06 +0000 Subject: Change in osmo-bts[master]: Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE) In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25791 ) Change subject: Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE) ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7a9c3660b9aab57ff8765e2f1526349599630cd9 Gerrit-Change-Number: 25791 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 14 Oct 2021 21:07:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 21:08:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 21:08:24 +0000 Subject: Change in osmo-bts[master]: lchan: Call lapdm_channel_exit() when state changes to NONE In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25792 ) Change subject: lchan: Call lapdm_channel_exit() when state changes to NONE ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If0ec5f0c7be4d15c8d684d33e15e24d68bd5192e Gerrit-Change-Number: 25792 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 14 Oct 2021 21:08:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 21:19:19 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 21:19:19 +0000 Subject: Change in osmo-pcu[master]: tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25797 ) Change subject: tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I94243ff99dfaf3664a1a4b3c4c87b5104ba4f7d1 Gerrit-Change-Number: 25797 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 14 Oct 2021 21:19:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 21:20:17 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 21:20:17 +0000 Subject: Change in osmo-pcu[master]: Abort scheduling of pending Pkt Ul Ass if tbf goes into RELEASE step In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25799 ) Change subject: Abort scheduling of pending Pkt Ul Ass if tbf goes into RELEASE step ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I20bab79070274b1d8f6b4e1867b30de61983ab54 Gerrit-Change-Number: 25799 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 14 Oct 2021 21:20:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 21:20:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 21:20:29 +0000 Subject: Change in osmo-bts[master]: Move lchan_deactivate() to lchan.c In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25796 ) Change subject: Move lchan_deactivate() to lchan.c ...................................................................... Move lchan_deactivate() to lchan.c Change-Id: If75ed432fa9dcb10159a0dac9b8ba7efe6958b35 --- M include/osmo-bts/lchan.h M include/osmo-bts/rsl.h M src/common/lchan.c M src/common/rsl.c 4 files changed, 10 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 665bb44..ccc6760 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -331,6 +331,7 @@ void gsm_lchan_name_update(struct gsm_lchan *lchan); int lchan_init_lapdm(struct gsm_lchan *lchan); void gsm_lchan_release(struct gsm_lchan *lchan, enum lchan_rel_act_kind rel_kind); +int lchan_deactivate(struct gsm_lchan *lchan); const char *gsm_lchans_name(enum gsm_lchan_state s); static inline char *gsm_lchan_name(const struct gsm_lchan *lchan) diff --git a/include/osmo-bts/rsl.h b/include/osmo-bts/rsl.h index 1663006..9d5ec31 100644 --- a/include/osmo-bts/rsl.h +++ b/include/osmo-bts/rsl.h @@ -17,8 +17,6 @@ int rsl_tx_rf_rel_ack(struct gsm_lchan *lchan); int rsl_tx_hando_det(struct gsm_lchan *lchan, uint8_t *ho_delay); -int lchan_deactivate(struct gsm_lchan *lchan); - /* call-back for LAPDm code, called when it wants to send msgs UP */ int lapdm_rll_tx_cb(struct msgb *msg, struct lapdm_entity *le, void *ctx); diff --git a/src/common/lchan.c b/src/common/lchan.c index e06ea5c..5d12952 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -30,6 +30,7 @@ #include #include #include +#include #include static const struct value_string lchan_s_names[] = { @@ -234,6 +235,14 @@ lapdm_channel_exit(&lchan->lapdm_ch); } +int lchan_deactivate(struct gsm_lchan *lchan) +{ + OSMO_ASSERT(lchan); + + lchan->ciph_state = 0; + return bts_model_lchan_deactivate(lchan); +} + const char *gsm_lchans_name(enum gsm_lchan_state s) { return get_value_string(lchan_s_names, s); diff --git a/src/common/rsl.c b/src/common/rsl.c index b186adf..99e8195 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3832,14 +3832,6 @@ return ret; } -int lchan_deactivate(struct gsm_lchan *lchan) -{ - OSMO_ASSERT(lchan); - - lchan->ciph_state = 0; - return bts_model_lchan_deactivate(lchan); -} - int down_rsl(struct gsm_bts_trx *trx, struct msgb *msg) { struct abis_rsl_common_hdr *rslh; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If75ed432fa9dcb10159a0dac9b8ba7efe6958b35 Gerrit-Change-Number: 25796 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 21:20:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 21:20:53 +0000 Subject: Change in osmo-pcu[master]: tbf: Drop pending polls during free also on states != ASSIGN In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25800 ) Change subject: tbf: Drop pending polls during free also on states != ASSIGN ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I05fb0ea44aeb3fbda9e8e1c449e9366efaa2c511 Gerrit-Change-Number: 25800 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 14 Oct 2021 21:20:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 21:21:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 21:21:05 +0000 Subject: Change in osmo-pcu[master]: tbf: Drop pending polls during free also on states != ASSIGN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25800 ) Change subject: tbf: Drop pending polls during free also on states != ASSIGN ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I05fb0ea44aeb3fbda9e8e1c449e9366efaa2c511 Gerrit-Change-Number: 25800 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 14 Oct 2021 21:21:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 21:21:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 21:21:08 +0000 Subject: Change in osmo-pcu[master]: tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25797 ) Change subject: tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN ...................................................................... tbf_ul_ass_fsm: Avoid retrying Pkt Ul Ass if tbf is not in state ASSIGN It doesn't make sense to keep asking the scheduler to retransmit Pkt Ul Ass if the tbf_fsm already decided we are going to release the TBF. It can be seen in following log extract: """ tbf_ul_ass_fsm.c:112 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=ASSIGN EGPRS) start Packet Uplink Assignment (PACCH) tbf_ul_ass_fsm.c:131 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=ASSIGN EGPRS) Scheduled UL Assignment polling on PACCH (FN=612941, TS=7) tbf_ul_ass_fsm.c:188 UL_ASS_TBF(UL-TFI_1)[849e50]{SEND_ASS}: state_chg to WAIT_ACK pdch_ul_controller.c:330 PDCH(bts=0,trx=1,ts=7) Timeout for registered POLL (FN=612937, reason=DL_ASS): TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=ASSIGN EGPRS) tbf.cpp:550 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=ASSIGN EGPRS) poll timeout for FN=612937, TS=7 (curr FN 612937) tbf.cpp:392 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=ASSIGN EGPRS) N3105 exceeded MAX (8) tbf.cpp:602 TBF(UL-TFI_1)[7bd530]{ASSIGN}: Received Event MAX_N3105 tbf_fsm.c:194 TBF(UL-TFI_1)[7bd530]{ASSIGN}: state_chg to RELEASING pdch_ul_controller.c:330 PDCH(bts=0,trx=1,ts=7) Timeout for registered POLL (FN=612941, reason=UL_ASS): TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=RELEASING EGPRS) tbf.cpp:550 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=RELEASING EGPRS) poll timeout for FN=612941, TS=7 (curr FN 612941) tbf.cpp:589 UL_ASS_TBF(UL-TFI_1)[849e50]{WAIT_ACK}: Received Event ASS_POLL_TIMEOUT tbf_ul_ass_fsm.c:224 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=RELEASING EGPRS) Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT: |Assignment was on PACCH|No uplink data received yet| tbf_ul_ass_fsm.c:226 UL_ASS_TBF(UL-TFI_1)[849e50]{WAIT_ACK}: state_chg to SEND_ASS tbf_ul_ass_fsm.c:308 UL_ASS_TBF(UL-TFI_1)[849e50]{SEND_ASS}: Received Event CREATE_RLCMAC_MSG tbf_ul_ass_fsm.c:112 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=RELEASING EGPRS) start Packet Uplink Assignment (PACCH) tbf_ul_ass_fsm.c:131 TBF(TFI=1 TLLI=0xe1c12303 DIR=UL STATE=RELEASING EGPRS) Scheduled UL Assignment polling on PACCH (FN=612976, TS=7) tbf_ul_ass_fsm.c:188 UL_ASS_TBF(UL-TFI_1)[849e50]{SEND_ASS}: state_chg to WAIT_ACK """ Change-Id: I94243ff99dfaf3664a1a4b3c4c87b5104ba4f7d1 --- M src/tbf_ul_ass_fsm.c 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/tbf_ul_ass_fsm.c b/src/tbf_ul_ass_fsm.c index 791bab7..bf70a14 100644 --- a/src/tbf_ul_ass_fsm.c +++ b/src/tbf_ul_ass_fsm.c @@ -222,8 +222,13 @@ LOGPTBF(ctx->tbf, LOGL_NOTICE, "Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ASSIGNMENT: %s\n", tbf_rlcmac_diag(ctx->tbf)); - /* Reschedule Pkt Ul Ass */ - tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_SEND_ASS); + if (tbf_state(ctx->tbf) == TBF_ST_ASSIGN) { + /* Reschedule Pkt Ul Ass */ + tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_SEND_ASS); + } else { + /* We are most probably in RELEASING, so stop retrying. */ + tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_NONE); + } break; default: OSMO_ASSERT(0); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I94243ff99dfaf3664a1a4b3c4c87b5104ba4f7d1 Gerrit-Change-Number: 25797 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 21:21:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 21:21:08 +0000 Subject: Change in osmo-pcu[master]: Abort scheduling of pending Pkt Ul Ass if tbf goes into RELEASE step In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25799 ) Change subject: Abort scheduling of pending Pkt Ul Ass if tbf goes into RELEASE step ...................................................................... Abort scheduling of pending Pkt Ul Ass if tbf goes into RELEASE step Change-Id: I20bab79070274b1d8f6b4e1867b30de61983ab54 --- M src/tbf_fsm.c M src/tbf_ul_ass_fsm.c M src/tbf_ul_ass_fsm.h 3 files changed, 31 insertions(+), 4 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c index 36981e6..fb947b2 100644 --- a/src/tbf_fsm.c +++ b/src/tbf_fsm.c @@ -190,6 +190,8 @@ tbf_fsm_state_chg(fi, TBF_ST_FLOW); break; case TBF_EV_MAX_N3105: + /* We are going to release, so abort any Pkt Ul Ass pending to be scheduled: */ + osmo_fsm_inst_dispatch(tbf_ul_ass_fi(ctx->tbf), TBF_UL_ASS_EV_ABORT, NULL); ctx->T_release = 3195; tbf_fsm_state_chg(fi, TBF_ST_RELEASING); break; diff --git a/src/tbf_ul_ass_fsm.c b/src/tbf_ul_ass_fsm.c index bf70a14..ab23fbd 100644 --- a/src/tbf_ul_ass_fsm.c +++ b/src/tbf_ul_ass_fsm.c @@ -48,6 +48,7 @@ { TBF_UL_ASS_EV_CREATE_RLCMAC_MSG, "CREATE_RLCMAC_MSG" }, { TBF_UL_ASS_EV_RX_ASS_CTRL_ACK, "RX_ASS_CTRL_ACK" }, { TBF_UL_ASS_EV_ASS_POLL_TIMEOUT, "ASS_POLL_TIMEOUT" }, + { TBF_UL_ASS_EV_ABORT, "ABORT" }, { 0, NULL } }; @@ -169,6 +170,9 @@ case TBF_UL_ASS_EV_SCHED_ASS_REJ: tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_SEND_ASS_REJ); break; + case TBF_UL_ASS_EV_ABORT: + /* Nothing to do, we are already in proper state */ + break; default: OSMO_ASSERT(0); } @@ -187,6 +191,10 @@ return; tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_WAIT_ACK); break; + case TBF_UL_ASS_EV_ABORT: + /* Cancel pending schedule for Pkt Ul Ass: */ + tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_NONE); + break; default: OSMO_ASSERT(0); } @@ -205,6 +213,10 @@ return; tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_NONE); break; + case TBF_UL_ASS_EV_ABORT: + /* Cancel pending schedule for Pkt Ul Ass Rej: */ + tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_NONE); + break; default: OSMO_ASSERT(0); } @@ -230,6 +242,12 @@ tbf_ul_ass_fsm_state_chg(fi, TBF_UL_ASS_NONE); } break; + case TBF_UL_ASS_EV_ABORT: + /* There's nothing we can do here, we already transmitted and + * hence we must keep the POLL since the MS is already expected + * to transmit there. Whenever we receive event CTRL_ACK or + * TIMEOUT above, it will move back to ST_NONE autoamtically */ + break; default: OSMO_ASSERT(0); } @@ -252,7 +270,8 @@ [TBF_UL_ASS_NONE] = { .in_event_mask = X(TBF_UL_ASS_EV_SCHED_ASS) | - X(TBF_UL_ASS_EV_SCHED_ASS_REJ), + X(TBF_UL_ASS_EV_SCHED_ASS_REJ) | + X(TBF_UL_ASS_EV_ABORT), .out_state_mask = X(TBF_UL_ASS_SEND_ASS) | X(TBF_UL_ASS_SEND_ASS_REJ), @@ -261,7 +280,9 @@ .onenter = st_none_on_enter, }, [TBF_UL_ASS_SEND_ASS] = { - .in_event_mask = X(TBF_UL_ASS_EV_CREATE_RLCMAC_MSG), + .in_event_mask = + X(TBF_UL_ASS_EV_CREATE_RLCMAC_MSG) | + X(TBF_UL_ASS_EV_ABORT), .out_state_mask = X(TBF_UL_ASS_WAIT_ACK) | X(TBF_UL_ASS_NONE), @@ -269,7 +290,9 @@ .action = st_send_ass, }, [TBF_UL_ASS_SEND_ASS_REJ] = { - .in_event_mask = X(TBF_UL_ASS_EV_CREATE_RLCMAC_MSG), + .in_event_mask = + X(TBF_UL_ASS_EV_CREATE_RLCMAC_MSG) | + X(TBF_UL_ASS_EV_ABORT), .out_state_mask = X(TBF_UL_ASS_NONE), .name = "SEND_ASS_REJ", .action = st_send_ass_rej, @@ -277,7 +300,8 @@ [TBF_UL_ASS_WAIT_ACK] = { .in_event_mask = X(TBF_UL_ASS_EV_RX_ASS_CTRL_ACK) | - X(TBF_UL_ASS_EV_ASS_POLL_TIMEOUT), + X(TBF_UL_ASS_EV_ASS_POLL_TIMEOUT) | + X(TBF_UL_ASS_EV_ABORT), .out_state_mask = X(TBF_UL_ASS_NONE) | X(TBF_UL_ASS_SEND_ASS), diff --git a/src/tbf_ul_ass_fsm.h b/src/tbf_ul_ass_fsm.h index 67bb2f4..34b81a7 100644 --- a/src/tbf_ul_ass_fsm.h +++ b/src/tbf_ul_ass_fsm.h @@ -32,6 +32,7 @@ TBF_UL_ASS_EV_CREATE_RLCMAC_MSG, /* Scheduler wants to gen+Tx the Ass (rej): data=tbf_ul_ass_ev_create_rlcmac_msg_ctx */ TBF_UL_ASS_EV_RX_ASS_CTRL_ACK, /* Received CTRL ACK answering poll set on Pkt Ul Ass */ TBF_UL_ASS_EV_ASS_POLL_TIMEOUT, /* Pdch Ul Controller signals timeout for poll set on Pkt Ul Ass */ + TBF_UL_ASS_EV_ABORT, /* TBF is starting to be RELEASED, drop in progress assignment */ }; enum tbf_ul_ass_fsm_states { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I20bab79070274b1d8f6b4e1867b30de61983ab54 Gerrit-Change-Number: 25799 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 21:21:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 21:21:08 +0000 Subject: Change in osmo-pcu[master]: tbf: Drop pending polls during free also on states != ASSIGN In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25800 ) Change subject: tbf: Drop pending polls during free also on states != ASSIGN ...................................................................... tbf: Drop pending polls during free also on states != ASSIGN The situation holds true as long as the assignment is resolved. Hence, it can also happen that the TBF is in RELEASE state, because it was unable to do the assignment (and after retrying, MAX_N3105 moved it into RELEASING). Let's not explicitly check states, the other conditions should be enough. Related: SYS#5647 Change-Id: I05fb0ea44aeb3fbda9e8e1c449e9366efaa2c511 --- M src/tbf.cpp 1 file changed, 6 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/tbf.cpp b/src/tbf.cpp index 0331a80..2343862 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -245,11 +245,12 @@ /* During assignment (state=ASSIGN), tbf may be temporarily using * tbf->control_ts from a previous TBF/SBA to transmit the UL/DL - * Assignment, which may not be necessarly be a TS where the current TBF - * is attached to. Hence, we may have ULC pollings ongoing and we need - * to make sure we drop all reserved nodes there: */ - if (tbf_state(tbf) == TBF_ST_ASSIGN && - tbf->control_ts != TBF_CONTROL_TS_UNSET && !tbf->pdch[tbf->control_ts]) + * Assignment, which may not be necessarily be a TS where the current TBF + * is attached to. This will be the case until a TBF receives proper + * confirmation from the MS and goes through the FLOW state. Hence, we + * may have ULC pollings ongoing and we need to make sure we drop all + * reserved nodes there: */ + if (tbf->control_ts != TBF_CONTROL_TS_UNSET && !tbf->pdch[tbf->control_ts]) pdch_ulc_release_tbf(tbf->trx->pdch[tbf->control_ts].ulc, tbf); /* Now simply detach from all attached PDCHs */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25800 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I05fb0ea44aeb3fbda9e8e1c449e9366efaa2c511 Gerrit-Change-Number: 25800 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 21:22:49 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 21:22:49 +0000 Subject: Change in osmo-bts[master]: Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE) In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25791 ) Change subject: Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE) ...................................................................... Patch Set 2: Did you run ttcn3-bts-test with this change applied? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7a9c3660b9aab57ff8765e2f1526349599630cd9 Gerrit-Change-Number: 25791 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 21:22:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 22:22:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 14 Oct 2021 22:22:07 +0000 Subject: Change in osmo-bts[master]: Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE) In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25791 ) Change subject: Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE) ...................................................................... Patch Set 2: > Patch Set 2: > > Did you run ttcn3-bts-test with this change applied? Yup, looks good afaict: https://pastebin.com/xxJEDcmN some tests fail anyway on current jenkins master and some extra on my laptop also in master (like the 200percent ones) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7a9c3660b9aab57ff8765e2f1526349599630cd9 Gerrit-Change-Number: 25791 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 22:22:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 14 22:32:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 14 Oct 2021 22:32:53 +0000 Subject: Change in osmo-bts[master]: Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE) In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25791 ) Change subject: Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7a9c3660b9aab57ff8765e2f1526349599630cd9 Gerrit-Change-Number: 25791 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 14 Oct 2021 22:32:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 06:55:01 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 15 Oct 2021 06:55:01 +0000 Subject: Change in pysim[master]: commands: Fix read_binary() for non-zero offset In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25801 ) Change subject: commands: Fix read_binary() for non-zero offset ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic5c2f0ad1c1ec9c4e9c97e72895382f7b6fa9470 Gerrit-Change-Number: 25801 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 15 Oct 2021 06:55:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 07:00:35 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 15 Oct 2021 07:00:35 +0000 Subject: Change in pysim[master]: ts_51_011: Add encoder for EF.SST In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25802 ) Change subject: ts_51_011: Add encoder for EF.SST ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib51bfffaf8444ec30415aad42e3a0f4f3f7598cb Gerrit-Change-Number: 25802 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 15 Oct 2021 07:00:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 07:02:12 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 15 Oct 2021 07:02:12 +0000 Subject: Change in libosmocore[master]: logging: Change LLAPD category color to purple-like one In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25795 ) Change subject: logging: Change LLAPD category color to purple-like one ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia5c0860dd8d756bb24eb8972f94590bfba5bc865 Gerrit-Change-Number: 25795 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 15 Oct 2021 07:02:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 07:03:33 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 15 Oct 2021 07:03:33 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: reformat find cmds in Makefile In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/25736 ) Change subject: gen_makefile.py: reformat find cmds in Makefile ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/25736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ic2fad22fdbf0fec4abfaeae60b4ebd74563a9392 Gerrit-Change-Number: 25736 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 15 Oct 2021 07:03:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 07:03:34 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 15 Oct 2021 07:03:34 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: reformat find cmds in Makefile In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/25736 ) Change subject: gen_makefile.py: reformat find cmds in Makefile ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/25736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ic2fad22fdbf0fec4abfaeae60b4ebd74563a9392 Gerrit-Change-Number: 25736 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 15 Oct 2021 07:03:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 07:03:37 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 15 Oct 2021 07:03:37 +0000 Subject: Change in osmo-dev[master]: gen_makefile.py: reformat find cmds in Makefile In-Reply-To: References: Message-ID: osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/25736 ) Change subject: gen_makefile.py: reformat find cmds in Makefile ...................................................................... gen_makefile.py: reformat find cmds in Makefile Change-Id: Ic2fad22fdbf0fec4abfaeae60b4ebd74563a9392 --- M gen_makefile.py 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve osmith: Looks good to me, approved; Verified diff --git a/gen_makefile.py b/gen_makefile.py index c08ca4e..e6a9480 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -167,8 +167,17 @@ return r''' ### {proj} ### -{proj}_configure_files := $(shell find {src_proj} -name "Makefile.am" -or -name "*.in" -and -not -name "Makefile.in" -and -not -name "config.h.in" ) -{proj}_files := $(shell find {src_proj} -name "*.[hc]" -or -name "*.py" -or -name "*.cpp" -or -name "*.tpl" -or -name "*.map") +{proj}_configure_files := $(shell find {src_proj} \ + -name "Makefile.am" \ + -or -name "*.in" \ + -and -not -name "Makefile.in" \ + -and -not -name "config.h.in" ) +{proj}_files := $(shell find {src_proj} \ + -name "*.[hc]" \ + -or -name "*.py" \ + -or -name "*.cpp" \ + -or -name "*.tpl" \ + -or -name "*.map") .make.{proj}.clone: @echo -e "\n\n\n===== $@\n" -- To view, visit https://gerrit.osmocom.org/c/osmo-dev/+/25736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-dev Gerrit-Branch: master Gerrit-Change-Id: Ic2fad22fdbf0fec4abfaeae60b4ebd74563a9392 Gerrit-Change-Number: 25736 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Fri Oct 15 08:36:56 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 15 Oct 2021 08:36:56 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_10/i586 In-Reply-To: References: Message-ID: <61693db813aa6_54862abfe1e885fc249020@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_10/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 130s] [COMPILING ./atmel_softpack_libraries/usb/device/core/USBDDriverCallbacks.c] [ 130s] [COMPILING libcommon/source/string.c] [ 130s] [COMPILING libcommon/source/stdio.c] [ 130s] [COMPILING libcommon/source/fputs.c] [ 130s] [COMPILING libcommon/source/usb_buf.c] [ 130s] [COMPILING libcommon/source/ringbuffer.c] [ 130s] [COMPILING libcommon/source/pseudo_talloc.c] [ 130s] [COMPILING libcommon/source/host_communication.c] [ 131s] [COMPILING libcommon/source/main_common.c] [ 131s] [COMPILING libcommon/source/stack_check.c] [ 131s] [COMPILING libboard/common/source/board_cstartup_gnu.c] [ 131s] [COMPILING libboard/common/source/board_lowlevel.c] [ 131s] [COMPILING libboard/common/source/uart_console.c] [ 131s] [COMPILING libboard/common/source/led.c] [ 131s] [COMPILING libboard/common/source/boardver_adc.c] [ 131s] [COMPILING libboard/common/source/manifest.c] [ 131s] [COMPILING libboard/simtrace/source/sim_switch.c] [ 132s] [COMPILING libboard/simtrace/source/board_simtrace.c] [ 132s] [COMPILING apps/trace/main.c] [ 132s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 132s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_runtime.c] [ 132s] [COMPILING libcommon/source/card_emu.c] [28937s] qemu-kvm: terminating on signal 15 from pid 18393 (fuser) Job seems to be stuck here, killed. (after 28800 seconds of inactivity) [28938s] ### VM INTERACTION END ### [28938s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [28938s] or the build host has a kernel or hardware problem... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 15 08:37:13 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 15 Oct 2021 08:37:13 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_Testing/x86_64 In-Reply-To: References: Message-ID: <61693dd186fd3_54862abfe1e885fc2491e5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_Testing/x86_64 Package network:osmocom:nightly/simtrace2 failed to build in Debian_Testing/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 150s] [COMPILING libboard/common/source/board_cstartup_gnu.c] [ 150s] [COMPILING libboard/common/source/board_lowlevel.c] [ 150s] [COMPILING libboard/common/source/boardver_adc.c] [ 151s] [COMPILING libboard/common/source/led.c] [ 151s] [COMPILING libboard/common/source/manifest.c] [ 151s] [COMPILING libboard/common/source/uart_console.c] [ 151s] [COMPILING libboard/qmod/source/board_qmod.c] [ 151s] [COMPILING libboard/qmod/source/card_pres.c] [ 151s] [COMPILING libboard/qmod/source/i2c.c] [ 151s] [COMPILING libboard/qmod/source/sim_switch.c] [ 151s] [COMPILING libboard/qmod/source/wwan_led.c] [ 151s] [COMPILING libboard/qmod/source/wwan_perst.c] [ 152s] [COMPILING apps/dfu/main.c] [ 152s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu.c] [ 152s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_desc.c] [ 152s] [COMPILING ./atmel_softpack_libraries/usb/device/dfu/dfu_driver.c] [ 152s] Memory region Used Size Region Size %age Used [ 152s] rom: 13488 B 16 KB 82.32% [ 152s] ram: 11680 B 48 KB 23.76/usr/lib/gcc/arm-none-eabi/8.3.1/../../../arm-none-eabi/bin/ld: warning: start of section .stack changed by 4 [ 152s] % [ 152s] text data bss dec hex filename [ 152s] 55 0 0 55 37 obj/qmod/flash_backtrace.o [ 152s] 822 0 0 822 336 obj/qmod/flash_bits.o [ 152s] 1166 0 4104 5270 1496 obj/qmod/flash_msgb.o [ 152s] 68 0 4 72 48 obj/qmod/flash_panic.o [ 152s] 1000 0 0 1000 3e8 obj/qmod/flash_rbtree.o [ 152s] 396 Job seems to be stuck here, killed. (after 28800 seconds of inactivity) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Oct 15 09:49:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 15 Oct 2021 09:49:46 +0000 Subject: Change in osmo-bts[master]: Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE) In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25791 ) Change subject: Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE) ...................................................................... Move lchan_init_lapdm inside lchan_set_state(LCHAN_S_ACTIVE) osmo-bts-trx/l1_if.c lchan_init_lapdm() for CCCH is already done when trx_set_ts_as_pchan() calls: "lchan_set_state(&ts->lchan[CCCH_LCHAN], LCHAN_S_ACTIVE);" Change-Id: I7a9c3660b9aab57ff8765e2f1526349599630cd9 --- M src/common/lchan.c M src/osmo-bts-lc15/oml.c M src/osmo-bts-oc2g/oml.c M src/osmo-bts-octphy/l1_oml.c M src/osmo-bts-sysmo/oml.c M src/osmo-bts-trx/l1_if.c M src/osmo-bts-virtual/l1_if.c 7 files changed, 21 insertions(+), 41 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/common/lchan.c b/src/common/lchan.c index 5d12952..28ea943 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -272,29 +272,34 @@ gsm_lchans_name(lchan->state), gsm_lchans_name(state)); lchan->state = state; - /* Early Immediate Assignment: if we have a cached early IA pending, send it upon becoming active, or discard it - * when releasing. */ - if (lchan->early_rr_ia) { - switch (lchan->state) { - case LCHAN_S_ACT_REQ: - /* Activation is requested, keep the early IA until active. This allows the BSC to send the IA - * even before a dynamic timeslot is done switching to a different pchan kind (experimental). */ - break; - case LCHAN_S_ACTIVE: - /* Activation is done, send the RR IA now. Delay a bit more to give Um time to let the lchan - * light up for the MS */ + switch (lchan->state) { + case LCHAN_S_ACT_REQ: + /* Early Immediate Assignment: Activation is requested, keep the + * early IA until active. This allows the BSC to send the IA + * even before a dynamic timeslot is done switching to a + * different pchan kind (experimental). */ + break; + case LCHAN_S_ACTIVE: + lchan_init_lapdm(lchan); + if (lchan->early_rr_ia) { + /* Early Immediate Assignment: Activation is done, send + * the RR IA now. Delay a bit more to give Um time to + * let the lchan light up for the MS */ osmo_timer_del(&lchan->early_rr_ia_delay); osmo_timer_schedule(&lchan->early_rr_ia_delay, 0, osmo_tdef_get(abis_T_defs, -15, OSMO_TDEF_US, -1)); - break; - default: - /* Transition to any other state means whatever IA the BSC has sent shall now not be relevant - * anymore. */ + } + break; + default: + if (lchan->early_rr_ia) { + /* Early Immediate Assignment: Transition to any other + * state means whatever IA the BSC has sent shall now + * not be relevant anymore. */ osmo_timer_del(&lchan->early_rr_ia_delay); msgb_free(lchan->early_rr_ia); lchan->early_rr_ia = NULL; - break; } + break; } } diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c index 6169ef7..675e3fe 100644 --- a/src/osmo-bts-lc15/oml.c +++ b/src/osmo-bts-lc15/oml.c @@ -1197,10 +1197,6 @@ enqueue_sapi_act_cmd(lchan, sapi, dir); } - -#warning "FIXME: Should this be in sapi_activate_cb?" - lchan_init_lapdm(lchan); - return 0; } diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c index ba85f36..d12571b 100644 --- a/src/osmo-bts-oc2g/oml.c +++ b/src/osmo-bts-oc2g/oml.c @@ -1212,10 +1212,6 @@ enqueue_sapi_act_cmd(lchan, sapi, dir); } - -#warning "FIXME: Should this be in sapi_activate_cb?" - lchan_init_lapdm(lchan); - return 0; } diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c index 73ab9bd..5894c21 100644 --- a/src/osmo-bts-octphy/l1_oml.c +++ b/src/osmo-bts-octphy/l1_oml.c @@ -1107,9 +1107,6 @@ } enqueue_sapi_act_cmd(lchan, sapi, dir); } - - lchan_init_lapdm(lchan); - return 0; } diff --git a/src/osmo-bts-sysmo/oml.c b/src/osmo-bts-sysmo/oml.c index 74af56b..ba60b76 100644 --- a/src/osmo-bts-sysmo/oml.c +++ b/src/osmo-bts-sysmo/oml.c @@ -1204,10 +1204,6 @@ continue; enqueue_sapi_act_cmd(lchan, sapi, dir); } - -#warning "FIXME: Should this be in sapi_activate_cb?" - lchan_init_lapdm(lchan); - return 0; } diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c index 9faae88..5ac3e31 100644 --- a/src/osmo-bts-trx/l1_if.c +++ b/src/osmo-bts-trx/l1_if.c @@ -165,10 +165,6 @@ if (rc != 0) return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_NACK, (void*)(intptr_t)NM_NACK_CANT_PERFORM); - - if (trx == trx->bts->c0) - lchan_init_lapdm(&trx->ts[0].lchan[CCCH_LCHAN]); - /* Send OPSTART ack */ return osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL); } @@ -438,8 +434,6 @@ lchan->tch.amr_mr.bts_mode[3].mode, amr_get_initial_mode(lchan), (lchan->ho.active == 1)); - /* init lapdm */ - lchan_init_lapdm(lchan); /* set lchan active */ lchan_set_state(lchan, LCHAN_S_ACTIVE); /* set initial ciphering */ diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c index a4a81bd..0d36db1 100644 --- a/src/osmo-bts-virtual/l1_if.c +++ b/src/osmo-bts-virtual/l1_if.c @@ -224,8 +224,6 @@ * / PRIM_INFO_ACTIVATE */ if (pinst->trx == pinst->trx->bts->c0) { vbts_sched_start(pinst->trx->bts); - /* init lapdm layer 3 callback for the trx on timeslot 0 == BCCH */ - lchan_init_lapdm(&pinst->trx->ts[0].lchan[CCCH_LCHAN]); /* FIXME: This is probably the wrong location to set the CCCH to active... the OML link def. needs to be reworked and fixed. */ pinst->trx->ts[0].lchan[CCCH_LCHAN].rel_act_kind = LCHAN_REL_ACT_OML; lchan_set_state(&pinst->trx->ts[0].lchan[CCCH_LCHAN], LCHAN_S_ACTIVE); @@ -392,8 +390,6 @@ lchan->tch.amr_mr.bts_mode[3].mode, amr_get_initial_mode(lchan), (lchan->ho.active == 1)); - /* init lapdm */ - lchan_init_lapdm(lchan); /* set lchan active */ lchan_set_state(lchan, LCHAN_S_ACTIVE); /* set initial ciphering */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25791 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7a9c3660b9aab57ff8765e2f1526349599630cd9 Gerrit-Change-Number: 25791 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 09:49:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 15 Oct 2021 09:49:47 +0000 Subject: Change in osmo-bts[master]: lchan: Call lapdm_channel_exit() when state changes to NONE In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25792 ) Change subject: lchan: Call lapdm_channel_exit() when state changes to NONE ...................................................................... lchan: Call lapdm_channel_exit() when state changes to NONE Fixes crash when TTCN3 BTS_Tests_LAPDm TC_rr_response_frame_loss runs run after TC_t200_n200. The BTS was shutdown after TC_t200_n200 failed (drop oml link), and lchan was moved ACTIVE->NONE without lapdm_channel_exit() being called on it. Hence, on next test (TC_rr_response_frame_loss), when lchan_init_lapdm() was called again, some memory corruption was caused. The lapdm_channel_exit can be dropped from gsm_lchan_release() and rsl_tx_rf_rel_ack() since it's already called in the same path: """ rsl_rx_rf_chan_rel gsm_lchan_release(lchan, LCHAN_REL_ACT_RSL); l1sap_chan_rel(lchan->ts->trx, gsm_lchan2chan_nr(lchan)); l1sap_chan_act_dact_modify(trx, chan_nr, PRIM_INFO_DEACTIVATE) bts_model_l1sap_down bts_model_lchan_deactivate_sacch(lchan); - lchan_deactivate(lchan); bts_model_lchan_deactivate lchan_set_state(lchan, LCHAN_S_NONE); <--------- mph_info_chan_confirm(trx, chan_nr, PRIM_INFO_DEACTIVATE, 0); l1sap_info_rel_cnf rsl_tx_rf_rel_ack(lchan); lapdm_channel_exit(&lchan->lapdm_ch); lapdm_channel_exit(&lchan->lapdm_ch); """ Related: SYS#5262 Change-Id: If0ec5f0c7be4d15c8d684d33e15e24d68bd5192e --- M src/common/lchan.c M src/common/rsl.c 2 files changed, 11 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/common/lchan.c b/src/common/lchan.c index 28ea943..a3be4ee 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -231,8 +231,6 @@ } l1sap_chan_rel(lchan->ts->trx, gsm_lchan2chan_nr(lchan)); - - lapdm_channel_exit(&lchan->lapdm_ch); } int lchan_deactivate(struct gsm_lchan *lchan) @@ -290,6 +288,17 @@ osmo_tdef_get(abis_T_defs, -15, OSMO_TDEF_US, -1)); } break; + case LCHAN_S_NONE: + lapdm_channel_exit(&lchan->lapdm_ch); + /* Also ensure that there are no leftovers from repeated FACCH or + * repeated SACCH that might cause memory leakage. */ + msgb_free(lchan->tch.rep_facch[0].msg); + msgb_free(lchan->tch.rep_facch[1].msg); + lchan->tch.rep_facch[0].msg = NULL; + lchan->tch.rep_facch[1].msg = NULL; + msgb_free(lchan->rep_sacch); + lchan->rep_sacch = NULL; + /* fall through */ default: if (lchan->early_rr_ia) { /* Early Immediate Assignment: Transition to any other diff --git a/src/common/rsl.c b/src/common/rsl.c index 99e8195..145cc8a 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1296,21 +1296,6 @@ gsm_ts_and_pchan_name(lchan->ts), lchan->nr, gsm_lchant_name(lchan->type)); - /* - * Free the LAPDm resources now that the BTS - * has released all the resources. - */ - lapdm_channel_exit(&lchan->lapdm_ch); - - /* Also ensure that there are no leftovers from repeated FACCH or - * repeated SACCH that might cause memory leakage. */ - msgb_free(lchan->tch.rep_facch[0].msg); - msgb_free(lchan->tch.rep_facch[1].msg); - lchan->tch.rep_facch[0].msg = NULL; - lchan->tch.rep_facch[1].msg = NULL; - msgb_free(lchan->rep_sacch); - lchan->rep_sacch = NULL; - return tx_rf_rel_ack(lchan, chan_nr); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25792 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If0ec5f0c7be4d15c8d684d33e15e24d68bd5192e Gerrit-Change-Number: 25792 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 11:23:42 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 15 Oct 2021 11:23:42 +0000 Subject: Change in libosmocore[master]: ns2: don't forward an invalid RESET PDU to the FSM In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25774 ) Change subject: ns2: don't forward an invalid RESET PDU to the FSM ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6e562def9c5a1e4534d42884215272b1e66d26c2 Gerrit-Change-Number: 25774 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 15 Oct 2021 11:23:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 11:27:37 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 15 Oct 2021 11:27:37 +0000 Subject: Change in libosmocore[master]: ns2: correct parse a BLOCK PDU which was received over a different NSVC In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25558 ) Change subject: ns2: correct parse a BLOCK PDU which was received over a different NSVC ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I483e3a1d3b8c43bbb0cc6185b7f7f772bcb264bf Gerrit-Change-Number: 25558 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 15 Oct 2021 11:27:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 12:40:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 15 Oct 2021 12:40:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Add missing test TC_ul_tbf_reestablish_with_pkt_resource_req in ... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25803 ) Change subject: pcu: Add missing test TC_ul_tbf_reestablish_with_pkt_resource_req in control() ...................................................................... pcu: Add missing test TC_ul_tbf_reestablish_with_pkt_resource_req in control() Fixes: cdbe90306bce1373ee13782432eacdf5c4b6dfa6 Change-Id: I1c0bd188ec972e6224c980bf96d7f6da1de98fbc --- M pcu/PCU_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/03/25803/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 0324439..4b8035c 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -6242,6 +6242,7 @@ execute( TC_dl_multislot_tbf_ms_class_from_sgsn() ); execute( TC_dl_multislot_tbf_ms_class_from_2phase() ); execute( TC_ul_multislot_tbf_ms_class_from_2phase() ); + execute( TC_ul_tbf_reestablish_with_pkt_resource_req() ); execute( TC_multiplex_dl_gprs_egprs() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1c0bd188ec972e6224c980bf96d7f6da1de98fbc Gerrit-Change-Number: 25803 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 13:31:31 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 15 Oct 2021 13:31:31 +0000 Subject: Change in pysim[master]: pySim-shell: do not use usim/isim APDUs in the beginnning References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25804 ) Change subject: pySim-shell: do not use usim/isim APDUs in the beginnning ...................................................................... pySim-shell: do not use usim/isim APDUs in the beginnning Some simcards like sysmo-usim-sjs1 and sysmo-usim-sja2 might tolerate it when USIM or ISIM APDUs are used without selecting either the ISIM or USIM application first. However, this tolerance is not specified. As long as no USIM or ISIM application is selected it is not guaranteed that the card will accept APDUs with class byte 0x00. It might be that only class 0x0A APDUs are accepted. To make pySim-shell more spec complient lets start with 0x0A class byte and 0x00 for p1 and p2 during select. With this setting we will read out the application identifiers. Then we select the first USIM or ISIM application on the card. For this we will change to 0x00 and 0x04 for p2 during select. Change-Id: I985261a1bddae60ffeaccb9c8d8d1b8a2ae4d0fc --- M pySim-shell.py 1 file changed, 23 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/04/25804/1 diff --git a/pySim-shell.py b/pySim-shell.py index 9258bd6..a0031a5 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -78,8 +78,13 @@ card = card_detect("auto", scc) if card is None: - print("Could not detect card type!") - return None, None; + print("Warning: Could not detect card type, assuming generic SIM card type!") + card = SimCard(scc); + + # Until no USIM or ISIM application is selected, we will use only + # classic 3GPP TS 51.011 class APDUs. + scc.cla_byte = "a0" + scc.sel_ctrl = "0000" # Create runtime state with card profile profile = CardProfileUICC() @@ -87,6 +92,19 @@ profile.add_application(CardApplicationISIM) rs = RuntimeState(card, profile) + # Select the first application on the card. + aids_card = card.read_aids() + apps_profile = profile.applications + app_name = None + for f in apps_profile: + if f.aid in aids_card[0]: + app_name = f.name + if app_name: + print("Selecting first application on card: " + app_name) + card._scc.cla_byte = "00" + card._scc.sel_ctrl = "0004" #request an FCP + rs.select("ADF." + app_name) + # FIXME: do this dynamically rs.mf.add_file(DF_TELECOM()) rs.mf.add_file(DF_GSM()) @@ -96,6 +114,9 @@ # inform the transport that we can do context-specific SW interpretation sl.set_sw_interpreter(rs) + # Make sure the MF is selected after the initialization is done. + rs.select('MF') + return rs, card class PysimApp(cmd2.Cmd): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I985261a1bddae60ffeaccb9c8d8d1b8a2ae4d0fc Gerrit-Change-Number: 25804 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 13:31:32 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 15 Oct 2021 13:31:32 +0000 Subject: Change in pysim[master]: pySim-shell: add cardinfo command References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25805 ) Change subject: pySim-shell: add cardinfo command ...................................................................... pySim-shell: add cardinfo command It may sometimes be helpful to get a bit of general information about the card. To sort out problems it sometomes helps to get an idea what card type an ICCID pySim-shell pySim-shell has in memory. Change-Id: If31ed17102dc0108e27a5eb0344aabaaf19b19f9 --- M pySim-shell.py 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/05/25805/1 diff --git a/pySim-shell.py b/pySim-shell.py index a0031a5..6ec6ae6 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -605,6 +605,17 @@ else: raise ValueError("error: cannot authenticate, no adm-pin!") + def do_cardinfo(self, opts): + """Display information about the currently inserted card""" + self._cmd.poutput("Card info:") + self._cmd.poutput(" Name: %s" % self._cmd.card.name) + self._cmd.poutput(" ICCID: %s" % self._cmd.iccid) + self._cmd.poutput(" Class-Byte: %s" % self._cmd.card._scc.cla_byte) + self._cmd.poutput(" Select-Ctrl: %s" % self._cmd.card._scc.sel_ctrl) + self._cmd.poutput(" AIDs:") + for a in self._cmd.card._aids: + print(" %s" % a) + @with_default_category('ISO7816 Commands') class Iso7816Commands(CommandSet): def __init__(self): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If31ed17102dc0108e27a5eb0344aabaaf19b19f9 Gerrit-Change-Number: 25805 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 13:39:31 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 15 Oct 2021 13:39:31 +0000 Subject: Change in libosmocore[master]: ns2: improve log line when receving a PDU with wrong NSE In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25773 ) Change subject: ns2: improve log line when receving a PDU with wrong NSE ...................................................................... ns2: improve log line when receving a PDU with wrong NSE Change-Id: I072510461fb426fa62ca20c5103764b0efd25f82 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index aa6613b..726fc0c 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -876,7 +876,7 @@ if (nsh->pdu_type == NS_PDUT_RESET) ns2_tx_reset_ack(nsvc); - LOG_NS_SIGNAL(nsvc, "Rx", nsh->pdu_type, LOGL_ERROR, " with wrong NSEI=%05u. Ignoring PDU.\n", nsei); + LOG_NS_SIGNAL(nsvc, "Rx", nsh->pdu_type, LOGL_ERROR, " with wrong NSEI (exp: %05u, got %05u). Ignoring PDU.\n", nsvc->nse->nsei, nsei); goto out; } } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25773 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I072510461fb426fa62ca20c5103764b0efd25f82 Gerrit-Change-Number: 25773 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 13:39:32 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 15 Oct 2021 13:39:32 +0000 Subject: Change in libosmocore[master]: ns2: don't forward an invalid RESET PDU to the FSM In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25774 ) Change subject: ns2: don't forward an invalid RESET PDU to the FSM ...................................................................... ns2: don't forward an invalid RESET PDU to the FSM When receiving an invalid RESET (e.g. wrong NSEI or NSVCI) do not forward the PDU to the NSVC fsm. Answer it with correct NSEI & NSVCI, log the PDU, then ignore it. Fixes: OS#5258 Change-Id: I6e562def9c5a1e4534d42884215272b1e66d26c2 --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index 726fc0c..d28897e 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -887,6 +887,8 @@ /* 48.016 ? 7.3.1 send RESET_ACK to wrong NSVCI + ignore */ if (nsh->pdu_type == NS_PDUT_RESET) { ns2_tx_reset_ack(nsvc); + LOG_NS_SIGNAL(nsvc, "Rx", nsh->pdu_type, LOGL_ERROR, " with wrong NSVCI (exp: %05u, got %05u). Ignoring PDU.\n", nsvc->nsvci, nsvci); + goto out; } else if (nsh->pdu_type == NS_PDUT_STATUS) { /* this is a PDU received over a NSVC and reports a status for another NSVC */ target_nsvc = gprs_ns2_nsvc_by_nsvci(nsvc->nse->nsi, nsvci); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6e562def9c5a1e4534d42884215272b1e66d26c2 Gerrit-Change-Number: 25774 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 13:39:32 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 15 Oct 2021 13:39:32 +0000 Subject: Change in libosmocore[master]: ns2: correct parse a BLOCK PDU which was received over a different NSVC In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25558 ) Change subject: ns2: correct parse a BLOCK PDU which was received over a different NSVC ...................................................................... ns2: correct parse a BLOCK PDU which was received over a different NSVC BLOCK PDU can be send over a different NSVC than the NSVC. E.g. informing a NSVC got blocked in case of a lower-layer failure. Change-Id: I483e3a1d3b8c43bbb0cc6185b7f7f772bcb264bf --- M src/gb/gprs_ns2_vc_fsm.c 1 file changed, 36 insertions(+), 10 deletions(-) Approvals: daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/gb/gprs_ns2_vc_fsm.c b/src/gb/gprs_ns2_vc_fsm.c index d28897e..1db2a8e 100644 --- a/src/gb/gprs_ns2_vc_fsm.c +++ b/src/gb/gprs_ns2_vc_fsm.c @@ -118,6 +118,7 @@ GPRS_NS2_EV_REQ_OM_RESET, /* vty cmd: reset */ GPRS_NS2_EV_REQ_OM_BLOCK, /* vty cmd: block */ GPRS_NS2_EV_REQ_OM_UNBLOCK, /* vty cmd: unblock*/ + GPRS_NS2_EV_RX_BLOCK_FOREIGN, /* received a BLOCK over another NSVC */ }; static const struct value_string ns2_vc_event_names[] = { @@ -127,6 +128,7 @@ { GPRS_NS2_EV_RX_UNBLOCK, "RX-UNBLOCK" }, { GPRS_NS2_EV_RX_UNBLOCK_ACK, "RX-UNBLOCK_ACK" }, { GPRS_NS2_EV_RX_BLOCK, "RX-BLOCK" }, + { GPRS_NS2_EV_RX_BLOCK_FOREIGN, "RX-BLOCK_FOREIGN" }, { GPRS_NS2_EV_RX_BLOCK_ACK, "RX-BLOCK_ACK" }, { GPRS_NS2_EV_RX_ALIVE, "RX-ALIVE" }, { GPRS_NS2_EV_RX_ALIVE_ACK, "RX-ALIVE_ACK" }, @@ -368,8 +370,12 @@ osmo_timer_del(&fi->timer); break; case GPRS_NS2_EV_RX_BLOCK: - priv->accept_unitdata = false; ns2_tx_block_ack(priv->nsvc, NULL); + /* fall through */ + case GPRS_NS2_EV_RX_BLOCK_FOREIGN: + /* the BLOCK ACK for foreign BLOCK PDUs (rx over another nsvc) will be sent + * from the receiving nsvc */ + priv->accept_unitdata = false; osmo_timer_del(&fi->timer); break; case GPRS_NS2_EV_RX_UNBLOCK: @@ -380,6 +386,9 @@ } } else if (priv->initiate_block) { switch (event) { + case GPRS_NS2_EV_RX_BLOCK_FOREIGN: + /* the block ack will be sent by the rx NSVC */ + break; case GPRS_NS2_EV_RX_BLOCK: /* TODO: BLOCK is a UNBLOCK_NACK */ ns2_tx_block_ack(priv->nsvc, NULL); @@ -396,6 +405,9 @@ } else { /* we are on the receiving end. The initiator who sent RESET is responsible to UNBLOCK! */ switch (event) { + case GPRS_NS2_EV_RX_BLOCK_FOREIGN: + /* the block ack will be sent by the rx NSVC */ + break; case GPRS_NS2_EV_RX_BLOCK: ns2_tx_block_ack(priv->nsvc, NULL); break; @@ -439,9 +451,13 @@ ns2_tx_unblock_ack(priv->nsvc); break; case GPRS_NS2_EV_RX_BLOCK: + ns2_tx_block_ack(priv->nsvc, NULL); + /* fall through */ + case GPRS_NS2_EV_RX_BLOCK_FOREIGN: + /* the BLOCK ACK for foreign BLOCK PDUs (rx over another nsvc) will be sent + * from the receiving nsvc */ priv->initiate_block = false; priv->accept_unitdata = false; - ns2_tx_block_ack(priv->nsvc, NULL); osmo_fsm_inst_state_chg(fi, GPRS_NS2_ST_BLOCKED, 0, 2); break; @@ -493,7 +509,8 @@ }, [GPRS_NS2_ST_BLOCKED] = { .in_event_mask = S(GPRS_NS2_EV_RX_BLOCK) | S(GPRS_NS2_EV_RX_BLOCK_ACK) | - S(GPRS_NS2_EV_RX_UNBLOCK) | S(GPRS_NS2_EV_RX_UNBLOCK_ACK), + S(GPRS_NS2_EV_RX_UNBLOCK) | S(GPRS_NS2_EV_RX_UNBLOCK_ACK) | + S(GPRS_NS2_EV_RX_BLOCK_FOREIGN), .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_UNBLOCKED) | S(GPRS_NS2_ST_BLOCKED) | @@ -504,7 +521,7 @@ }, [GPRS_NS2_ST_UNBLOCKED] = { .in_event_mask = S(GPRS_NS2_EV_RX_BLOCK) | S(GPRS_NS2_EV_RX_UNBLOCK_ACK) | - S(GPRS_NS2_EV_RX_UNBLOCK), + S(GPRS_NS2_EV_RX_UNBLOCK) | S(GPRS_NS2_EV_RX_BLOCK_FOREIGN), .out_state_mask = S(GPRS_NS2_ST_RESET) | S(GPRS_NS2_ST_RECOVERING) | S(GPRS_NS2_ST_BLOCKED) | S(GPRS_NS2_ST_UNCONFIGURED), @@ -889,20 +906,24 @@ ns2_tx_reset_ack(nsvc); LOG_NS_SIGNAL(nsvc, "Rx", nsh->pdu_type, LOGL_ERROR, " with wrong NSVCI (exp: %05u, got %05u). Ignoring PDU.\n", nsvc->nsvci, nsvci); goto out; - } else if (nsh->pdu_type == NS_PDUT_STATUS) { - /* this is a PDU received over a NSVC and reports a status for another NSVC */ + } else if (nsh->pdu_type == NS_PDUT_BLOCK || nsh->pdu_type == NS_PDUT_STATUS) { + /* this is a PDU received over a NSVC and reports a status/block for another NSVC */ target_nsvc = gprs_ns2_nsvc_by_nsvci(nsvc->nse->nsi, nsvci); if (!target_nsvc) { - LOGPFSML(fi, LOGL_ERROR, "Received a STATUS PDU for unknown NSVC (NSVCI %d)\n", nsvci); + LOGPFSML(fi, LOGL_ERROR, "Received a %s PDU for unknown NSVC (NSVCI %d)\n", + get_value_string(gprs_ns_pdu_strings, nsh->pdu_type), nsvci); + if (nsh->pdu_type == NS_PDUT_BLOCK) + ns2_tx_status(nsvc, NS_CAUSE_NSVC_UNKNOWN, 0, msg, &nsvci); goto out; } if (target_nsvc->nse != nsvc->nse) { - LOGPFSML(fi, LOGL_ERROR, "Received a STATUS PDU for a NSVC (NSVCI %d) but it belongs to a different NSE!\n", nsvci); + LOGPFSML(fi, LOGL_ERROR, "Received a %s PDU for a NSVC (NSVCI %d) but it belongs to a different NSE!\n", + get_value_string(gprs_ns_pdu_strings, nsh->pdu_type), nsvci); goto out; } - /* the status will be passed to the nsvc/target nsvc in the switch */ + /* the status/block will be passed to the nsvc/target nsvc in the switch */ } else { LOG_NS_SIGNAL(nsvc, "Rx", nsh->pdu_type, LOGL_ERROR, " with wrong NSVCI=%05u. Ignoring PDU.\n", nsvci); goto out; @@ -918,7 +939,12 @@ osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_RESET_ACK, tp); break; case NS_PDUT_BLOCK: - osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_BLOCK, tp); + if (target_nsvc != nsvc) { + osmo_fsm_inst_dispatch(target_nsvc->fi, GPRS_NS2_EV_RX_BLOCK_FOREIGN, tp); + ns2_tx_block_ack(nsvc, &nsvci); + } else { + osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_BLOCK, tp); + } break; case NS_PDUT_BLOCK_ACK: osmo_fsm_inst_dispatch(fi, GPRS_NS2_EV_RX_BLOCK_ACK, tp); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25558 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I483e3a1d3b8c43bbb0cc6185b7f7f772bcb264bf Gerrit-Change-Number: 25558 Gerrit-PatchSet: 5 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 15:09:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 15 Oct 2021 15:09:48 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 ) Change subject: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105_max ...................................................................... pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105_max Change-Id: I3a50445c707430900c78623c7093ff7eb1f3ed95 --- M pcu/PCU_Tests.ttcn 1 file changed, 124 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/25806/1 diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 4b8035c..75e4627 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3058,6 +3058,129 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Test scenario where MS wants to request a new TBF once the current one is + * ending, by means of sending a Packet Resource Request on ul slot provided by + * last Pkt Ul ACK's RRBP. new Pkt Ul Ass is never confirmed by the MS in this test. + * See 3GPP TS 44.060 sec 9.3.2.4.2 "Non-extended uplink TBF mode" */ +testcase TC_ul_tbf_reestablish_with_pkt_resource_req_n3105_max() runs on RAW_PCU_Test_CT { + var PCUIF_info_ind info_ind; + var RlcmacDlBlock dl_block; + var octetstring data := f_rnd_octstring(10); + var uint32_t sched_fn; + var uint32_t dl_fn; + var template (value) TsTrxBtsNum nr; + var BTS_PDTCH_Block data_msg; + var template RlcmacDlBlock acknack_tmpl; + var GprsMS ms; + const integer N3105_MAX := 2; + var integer N3105 := 0; + timer T_3195 := 1.0 + 0.5; /* 0.5: extra offset since we cannot match exactly */ + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + info_ind := valueof(ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS)); + /* Speedup test: */ + info_ind.n3105 := N3105_MAX; + info_ind.t3195 := 1; + f_init_raw(testcasename(), info_ind); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Establish an Uplink TBF */ + f_ms_establish_ul_tbf(ms); + + /* Send one UL block (with TLLI since we are in One-Phase Access + contention resoultion) and make sure it is ACKED fine */ + f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := true, fn := ms.ul_tbf.start_time_fn); + + /* UL block should be received in SGSN */ + BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.bvc[0].cell_id)); + + acknack_tmpl := tr_RLCMAC_UL_ACK_NACK_GPRS(ms.ul_tbf.tfi, + tr_UlAckNackGprs(ms.tlli, + tr_AckNackDescription(final_ack := '1'B), + tr_UlAckNackGprsAdditionsRel99(tbf_est := true))) + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn, acknack_tmpl); + + /* TODO: verify TBF_EST and FinalACK are both '1' above */ + + /* Send PACKET RESOURCE REQUEST to request a new UL TBF */ + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit)), sched_fn); + + /* Now Keep ignoring the Pkt Ul Ass on PACCH: */ + /* Now we go on receiving DL data and not answering RRBP: */ + nr := ts_TsTrxBtsNum; + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + alt { + [not T_3195.running] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + tr_RLCMAC_UL_PACKET_ASS)) -> value data_msg { + if (f_dl_block_rrbp_valid(data_msg.dl_block)) { + log("Ignoring RRBP N3105 ", N3105); + N3105 := N3105 + 1; + } + nr := ts_TsTrxBtsNum; + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + repeat; + } + /* At this point in time (N3105_MAX reached), PCU already moved TBF to + * RELEASE state so no data for it is tx'ed, hence the dummy blocks: + */ + [N3105 == N3105_MAX] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + tr_RLCMAC_DUMMY_CTRL)) -> value data_msg { + if (not T_3195.running) { + T_3195.start; + } + nr := ts_TsTrxBtsNum; + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + repeat; + } + /* We receive Dummy blocks in between Pkt Ul Ass while PCU waits for us to ack it */ + [not T_3195.running] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + tr_RLCMAC_DUMMY_CTRL)) -> value data_msg { + log("Ignoring Dummy block FN ", data_msg.raw.fn); + nr := ts_TsTrxBtsNum; + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + repeat; + } + [T_3195.running] T_3195.timeout { + log("T_3195 timeout"); + /* Done in alt, wait for pending RTS initiated previously in + * above case before continuing (expect nothing to be sent since there's no active TBF): */ + BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + omit)); + } + [] BTS.receive { + setverdict(fail, "Unexpected BTS message"); + f_shutdown(__BFILE__, __LINE__); + } + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + /* Test CS paging over the BTS<->PCU socket. * When a (class B or C, not A) MS has an active TBF (or is on the PDCH), the MS can not react on CS paging over CCCH. * Paging should be send on the PACCH. @@ -6243,6 +6366,7 @@ execute( TC_dl_multislot_tbf_ms_class_from_2phase() ); execute( TC_ul_multislot_tbf_ms_class_from_2phase() ); execute( TC_ul_tbf_reestablish_with_pkt_resource_req() ); + execute( TC_ul_tbf_reestablish_with_pkt_resource_req_n3105_max() ); execute( TC_multiplex_dl_gprs_egprs() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3a50445c707430900c78623c7093ff7eb1f3ed95 Gerrit-Change-Number: 25806 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 15:10:08 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 15 Oct 2021 15:10:08 +0000 Subject: Change in pysim[master]: ts_51_011: fix select response decoder In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25794 ) Change subject: ts_51_011: fix select response decoder ...................................................................... ts_51_011: fix select response decoder The select response decoder is using b2h() wrongly. b2h expects a bytearray but we call it with an integer. In the following two lines we try to convert an integer to an integer. Change-Id: Ib6448d3bd7a0dc7f25e5ee82a42266b3313e2a95 --- M pySim/ts_51_011.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 70629f7..5d1197c 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -937,9 +937,9 @@ file_type = type_of_file_map[resp_bin[6]] if resp_bin[6] in type_of_file_map else resp_bin[6] ret['file_descriptor']['file_type'] = file_type if file_type in ['mf', 'df']: - ret['file_characteristics'] = b2h(resp_bin[13]) - ret['num_direct_child_df'] = int(resp_bin[14], 16) - ret['num_direct_child_ef'] = int(resp_bin[15], 16) + ret['file_characteristics'] = b2h(resp_bin[13:14]) + ret['num_direct_child_df'] = resp_bin[14] + ret['num_direct_child_ef'] = resp_bin[15] ret['num_chv_unblock_adm_codes'] = int(resp_bin[16]) # CHV / UNBLOCK CHV stats elif file_type in ['working_ef']: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib6448d3bd7a0dc7f25e5ee82a42266b3313e2a95 Gerrit-Change-Number: 25794 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 15:11:31 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 15 Oct 2021 15:11:31 +0000 Subject: Change in pysim[master]: pySim-shell: allow card insertion at runtime In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25549 ) Change subject: pySim-shell: allow card insertion at runtime ...................................................................... pySim-shell: allow card insertion at runtime Currently a card must be present in the reader until the user can enter pySim-shell. Removing and plugging another card is in theory already possible, but then the new card will operate on the old card and runtime state object. It might also be useful to enter pySim-shell before the card is plugged to execute some other commands for preperation before. So lets allow to "equip" pySim-shell with a card and rs object at runtime. Related: SYS#5617 Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 --- M pySim-shell.py M pySim/filesystem.py 2 files changed, 80 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index 5aa311c..a57aa66 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -20,6 +20,7 @@ from typing import List import json +import traceback import cmd2 from cmd2 import style, fg, bg @@ -99,15 +100,12 @@ class PysimApp(cmd2.Cmd): CUSTOM_CATEGORY = 'pySim Commands' def __init__(self, card, rs, script = None): - basic_commands = [Iso7816Commands(), PySimCommands()] super().__init__(persistent_history_file='~/.pysim_shell_history', allow_cli_args=False, - use_ipython=True, auto_load_commands=False, command_sets=basic_commands, startup_script=script) + use_ipython=True, auto_load_commands=False, startup_script=script) self.intro = style('Welcome to pySim-shell!', fg=fg.red) self.default_category = 'pySim-shell built-in commands' - self.card = card - iccid, sw = self.card.read_iccid() - self.iccid = iccid - self.rs = rs + self.card = None + self.rs = None self.py_locals = { 'card': self.card, 'rs' : self.rs } self.numeric_path = False self.add_settable(cmd2.Settable('numeric_path', bool, 'Print File IDs instead of names', @@ -115,13 +113,47 @@ self.conserve_write = True self.add_settable(cmd2.Settable('conserve_write', bool, 'Read and compare before write', onchange_cb=self._onchange_conserve_write)) - self.update_prompt() self.json_pretty_print = True self.add_settable(cmd2.Settable('json_pretty_print', bool, 'Pretty-Print JSON output')) self.apdu_trace = False self.add_settable(cmd2.Settable('apdu_trace', bool, 'Trace and display APDUs exchanged with card', onchange_cb=self._onchange_apdu_trace)) + self.equip(card, rs) + + def equip(self, card, rs): + """ + Equip pySim-shell with the supplied card and runtime state, add (or remove) all required settables and + and commands to enable card operations. + """ + + # Unequip everything from pySim-shell that would not work in unequipped state + if self.rs: + self.rs.unregister_cmds(self) + cmd_set = self.find_commandsets(Iso7816Commands) + if cmd_set: + self.unregister_command_set(cmd_set[0]) + cmd_set = self.find_commandsets(PySimCommands) + if cmd_set: + self.unregister_command_set(cmd_set[0]) + + self.card = card + self.rs = rs + + # When a card object and a runtime state is present, (re)equip pySim-shell with everything that is + # needed to operate on cards. + if self.card and self.rs: + self._onchange_conserve_write('conserve_write', False, self.conserve_write) + self._onchange_apdu_trace('apdu_trace', False, self.apdu_trace) + self.register_command_set(Iso7816Commands()) + self.register_command_set(PySimCommands()) + self.iccid, sw = self.card.read_iccid() + rs.select('MF', self) + else: + self.poutput("pySim-shell not equipped!") + + self.update_prompt() + def poutput_json(self, data, force_no_pretty = False): """like cmd2.poutput() but for a JSON serializable dict.""" if force_no_pretty or self.json_pretty_print == False: @@ -134,13 +166,15 @@ self.update_prompt() def _onchange_conserve_write(self, param_name, old, new): - self.rs.conserve_write = new + if self.rs: + self.rs.conserve_write = new def _onchange_apdu_trace(self, param_name, old, new): - if new == True: - self.card._scc._tp.apdu_tracer = self.Cmd2ApduTracer(self) - else: - self.card._scc._tp.apdu_tracer = None + if self.card: + if new == True: + self.card._scc._tp.apdu_tracer = self.Cmd2ApduTracer(self) + else: + self.card._scc._tp.apdu_tracer = None class Cmd2ApduTracer(ApduTracer): def __init__(self, cmd2_app): @@ -151,14 +185,23 @@ self.cmd2.poutput("<- %s: %s" % (sw, resp)) def update_prompt(self): - path_list = self.rs.selected_file.fully_qualified_path(not self.numeric_path) - self.prompt = 'pySIM-shell (%s)> ' % ('/'.join(path_list)) + if self.rs: + path_list = self.rs.selected_file.fully_qualified_path(not self.numeric_path) + self.prompt = 'pySIM-shell (%s)> ' % ('/'.join(path_list)) + else: + self.prompt = 'pySIM-shell (no card)> ' @cmd2.with_category(CUSTOM_CATEGORY) def do_intro(self, _): """Display the intro banner""" self.poutput(self.intro) + @cmd2.with_category(CUSTOM_CATEGORY) + def do_equip(self, opts): + """Equip pySim-shell with card""" + rs, card = init_card(sl); + self.equip(card, rs) + @with_default_category('pySim Commands') class PySimCommands(CommandSet): @@ -538,16 +581,29 @@ # Create command layer scc = SimCardCommands(transport=sl) - rs, card = init_card(sl) - if (rs is None or card is None): - exit(1) - app = PysimApp(card, rs, opts.script) - rs.select('MF', app) + # Detect and initialize the card in the reader. This may fail when there + # is no card in the reader or the card is unresponsive. PysimApp is + # able to tolerate and recover from that. + try: + rs, card = init_card(sl) + app = PysimApp(card, rs, opts.script) + except: + print("Card initialization failed with an exception:") + print("---------------------8<---------------------") + traceback.print_exc() + print("---------------------8<---------------------") + print("(you may still try to recover from this manually by using the 'equip' command.)") + print(" it should also be noted that some readers may behave strangely when no card") + print(" is inserted.)") + print("") + app = PysimApp(None, None, opts.script) # If the user supplies an ADM PIN at via commandline args authenticate # immediately so that the user does not have to use the shell commands pin_adm = sanitize_pin_adm(opts.pin_adm, opts.pin_adm_hex) if pin_adm: + if not card: + print("Card error, cannot do ADM verification with supplied ADM pin now.") try: card.verify_adm(h2b(pin_adm)) except Exception as e: diff --git a/pySim/filesystem.py b/pySim/filesystem.py index fe781de..cc9176f 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1329,6 +1329,11 @@ raise TypeError("Only works with BER-TLV EF") return self.card._scc.set_data(self.selected_file.fid, tag, data_hex, conserve=self.conserve_write) + def unregister_cmds(self, cmd_app=None): + """Unregister all file specific commands.""" + if cmd_app and self.selected_file.shell_commands: + for c in self.selected_file.shell_commands: + cmd_app.unregister_command_set(c) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25549 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9cf532d9da8203065463c7201e7064de6c7ab1b5 Gerrit-Change-Number: 25549 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 15:12:08 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 15 Oct 2021 15:12:08 +0000 Subject: Change in pysim[master]: pySim-shell: add echo command In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25551 ) Change subject: pySim-shell: add echo command ...................................................................... pySim-shell: add echo command There is no convinient way to echo strings from scripts. Change-Id: Iaed1d24eeb7f887e46957971083cd30d8d1bea6c Related: SYS#5617 --- M pySim-shell.py 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/pySim-shell.py b/pySim-shell.py index a57aa66..d24a881 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -202,6 +202,13 @@ rs, card = init_card(sl); self.equip(card, rs) + echo_parser = argparse.ArgumentParser() + echo_parser.add_argument('string', help="string to echo on the shell") + + @cmd2.with_argparser(echo_parser) + @cmd2.with_category(CUSTOM_CATEGORY) + def do_echo(self, opts): + self.poutput(opts.string) @with_default_category('pySim Commands') class PySimCommands(CommandSet): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25551 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaed1d24eeb7f887e46957971083cd30d8d1bea6c Gerrit-Change-Number: 25551 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 15:26:24 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 15 Oct 2021 15:26:24 +0000 Subject: Change in pysim[master]: pySim-shell: add cardinfo command In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25805 to look at the new patch set (#2). Change subject: pySim-shell: add cardinfo command ...................................................................... pySim-shell: add cardinfo command It may sometimes be helpful to get a bit of general information about the card. To sort out problems it sometimes helps to get an idea what card type and ICCID pySim-shell has in memory. Change-Id: If31ed17102dc0108e27a5eb0344aabaaf19b19f9 --- M pySim-shell.py 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/05/25805/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If31ed17102dc0108e27a5eb0344aabaaf19b19f9 Gerrit-Change-Number: 25805 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 15:51:55 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 15 Oct 2021 15:51:55 +0000 Subject: Change in pysim[master]: ts_51_011: Add encoder for EF.SST In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25802 ) Change subject: ts_51_011: Add encoder for EF.SST ...................................................................... Patch Set 1: Verified+1 Code-Review+2 I have tried it out - works. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib51bfffaf8444ec30415aad42e3a0f4f3f7598cb Gerrit-Change-Number: 25802 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 15 Oct 2021 15:51:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 15:58:49 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 15 Oct 2021 15:58:49 +0000 Subject: Change in pysim[master]: commands: Fix read_binary() for non-zero offset In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25801 ) Change subject: commands: Fix read_binary() for non-zero offset ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic5c2f0ad1c1ec9c4e9c97e72895382f7b6fa9470 Gerrit-Change-Number: 25801 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 15 Oct 2021 15:58:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 16:09:49 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 15 Oct 2021 16:09:49 +0000 Subject: Change in pysim[master]: pySim-shell: do not use usim/isim APDUs in the beginnning In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25804 ) Change subject: pySim-shell: do not use usim/isim APDUs in the beginnning ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I985261a1bddae60ffeaccb9c8d8d1b8a2ae4d0fc Gerrit-Change-Number: 25804 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 15 Oct 2021 16:09:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 16:10:33 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Fri, 15 Oct 2021 16:10:33 +0000 Subject: Change in pysim[master]: pySim-shell: add cardinfo command In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25805 ) Change subject: pySim-shell: add cardinfo command ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If31ed17102dc0108e27a5eb0344aabaaf19b19f9 Gerrit-Change-Number: 25805 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 15 Oct 2021 16:10:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 16:53:45 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 15 Oct 2021 16:53:45 +0000 Subject: Change in docker-playground[master]: ttcn3-ns-test: add second NSVC to allow TC_tx_blocked_foreign_nsvc to... In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/25561 ) Change subject: ttcn3-ns-test: add second NSVC to allow TC_tx_blocked_foreign_nsvc to work ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/25561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3a4baaacdbaab245ba10a1857f0183e56defcdf4 Gerrit-Change-Number: 25561 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 15 Oct 2021 16:53:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 16:53:48 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 15 Oct 2021 16:53:48 +0000 Subject: Change in docker-playground[master]: ttcn3-ns-test: add second NSVC to allow TC_tx_blocked_foreign_nsvc to... In-Reply-To: References: Message-ID: lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/25561 ) Change subject: ttcn3-ns-test: add second NSVC to allow TC_tx_blocked_foreign_nsvc to work ...................................................................... ttcn3-ns-test: add second NSVC to allow TC_tx_blocked_foreign_nsvc to work TC_tx_blocked_foreign_nsvc requires to ipa NSVCs Change-Id: I3a4baaacdbaab245ba10a1857f0183e56defcdf4 --- M ttcn3-ns-test/NS_Tests.cfg M ttcn3-ns-test/osmo-ns-dummy.cfg 2 files changed, 16 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved dexter: Looks good to me, but someone else must approve lynxis lazus: Verified diff --git a/ttcn3-ns-test/NS_Tests.cfg b/ttcn3-ns-test/NS_Tests.cfg index 1bb202d..1ba93ab 100644 --- a/ttcn3-ns-test/NS_Tests.cfg +++ b/ttcn3-ns-test/NS_Tests.cfg @@ -22,6 +22,18 @@ } }, nsvci := 1234 + }, + { + provider := { + ip := { + address_family := AF_INET, + local_ip := "172.18.28.10", + local_udp_port := 22001, + remote_ip := "172.18.28.101", + remote_udp_port := 23001 + } + }, + nsvci := 1235 } } } diff --git a/ttcn3-ns-test/osmo-ns-dummy.cfg b/ttcn3-ns-test/osmo-ns-dummy.cfg index 1da041d..b839252 100644 --- a/ttcn3-ns-test/osmo-ns-dummy.cfg +++ b/ttcn3-ns-test/osmo-ns-dummy.cfg @@ -90,5 +90,9 @@ bind udp local listen 172.18.28.101 23000 accept-ipaccess + bind udp local2 + listen 172.18.28.101 23001 + accept-ipaccess nse 1234 nsvc ipa local 172.18.28.10 22000 nsvci 1234 + nsvc ipa local2 172.18.28.10 22001 nsvci 1235 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/25561 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3a4baaacdbaab245ba10a1857f0183e56defcdf4 Gerrit-Change-Number: 25561 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 16:54:47 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Fri, 15 Oct 2021 16:54:47 +0000 Subject: Change in libosmocore[master]: gprs_ns2_vc_fsm: rename state UNCONFIGURED -> DISABLED In-Reply-To: References: Message-ID: lynxis lazus has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/24685 ) Change subject: gprs_ns2_vc_fsm: rename state UNCONFIGURED -> DISABLED ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/24685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5f46ce5e27d7556d5e17bc236f1765d42aecbe0c Gerrit-Change-Number: 24685 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 18:18:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 15 Oct 2021 18:18:17 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25552 ) Change subject: pySim-shell: add bulk provisioning support ...................................................................... Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 15 Oct 2021 18:18:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 18:21:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 15 Oct 2021 18:21:14 +0000 Subject: Change in pysim[master]: pySim-shell: do not use usim/isim APDUs in the beginnning In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25804 ) Change subject: pySim-shell: do not use usim/isim APDUs in the beginnning ...................................................................... Patch Set 1: (1 comment) I am not sure this is the right way to go about this. The Class 0x00 / 0x80 are _not_ a feature of the USIM/ISIM application (and their ADF), but a feature of the TS 102 221 UICC. So if you have an UICC in front of you, then you can use those class values. Only the classic SIM card will require you to use 0xA0. I have also seen UICC/USIM cards that do _not_ have a SIM application and that hence will reject any A0 APDUs in the MF or anywhere else. The reason is simple: IF an operator never had a 2G access network, he does not need the 2G SIM function. Classic 2G phones will not even attempt to ever register as they will not even be able to read the SIM card. You need at least a 3G phone to access the USIM on the UICC. So I think the only reliable way to go about this is to try either way and then decide. https://gerrit.osmocom.org/c/pysim/+/25804/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/pysim/+/25804/1//COMMIT_MSG at 14 PS1, Line 14: 0x0A 0xA0 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I985261a1bddae60ffeaccb9c8d8d1b8a2ae4d0fc Gerrit-Change-Number: 25804 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 15 Oct 2021 18:21:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 18:21:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 15 Oct 2021 18:21:47 +0000 Subject: Change in pysim[master]: pySim-shell: add cardinfo command In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25805 ) Change subject: pySim-shell: add cardinfo command ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/pysim/+/25805/2/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/25805/2/pySim-shell.py at 611 PS2, Line 611: p the ATR should also be printed -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If31ed17102dc0108e27a5eb0344aabaaf19b19f9 Gerrit-Change-Number: 25805 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 15 Oct 2021 18:21:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 18:23:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 15 Oct 2021 18:23:46 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25552 ) Change subject: pySim-shell: add bulk provisioning support ...................................................................... Patch Set 9: Code-Review-1 (1 comment) I've commented in patchset 5 on the use of print vs poutput and the option to use colorized output via cmd2.poutput. I've again sent a reminder many patch versions laster, but still no response. Please either implement it or provide an argument why you don't like this proposal. https://gerrit.osmocom.org/c/pysim/+/25552/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/pysim/+/25552/3//COMMIT_MSG at 1 PS3, Line 1: Parent: b8b87fbe (pySim-shell: add echo command) > not yet adressed still not adressed? I don't see any response at all. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 9 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 15 Oct 2021 18:23:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 18:24:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 15 Oct 2021 18:24:00 +0000 Subject: Change in pysim[master]: commands: Fix read_binary() for non-zero offset In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25801 ) Change subject: commands: Fix read_binary() for non-zero offset ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic5c2f0ad1c1ec9c4e9c97e72895382f7b6fa9470 Gerrit-Change-Number: 25801 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 15 Oct 2021 18:24:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 18:24:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 15 Oct 2021 18:24:28 +0000 Subject: Change in pysim[master]: commands: Fix read_binary() for non-zero offset In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25801 ) Change subject: commands: Fix read_binary() for non-zero offset ...................................................................... commands: Fix read_binary() for non-zero offset Similar to the fix in Ie1aeaab29701946233ed73db3331039690d695da for update_binary(), read_binary() also contained a bug when treating non-zero offsets. Change-Id: Ic5c2f0ad1c1ec9c4e9c97e72895382f7b6fa9470 Related: OS#5254 --- M pySim/commands.py 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved dexter: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pySim/commands.py b/pySim/commands.py index cd2b5b3..d53cb3e 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -141,13 +141,14 @@ if length is None: length = self.__len(r) - offset total_data = '' - while offset < length: - chunk_len = min(255, length-offset) - pdu = self.cla_byte + 'b0%04x%02x' % (offset, chunk_len) + chunk_offset = 0 + while chunk_offset < length: + chunk_len = min(255, length-chunk_offset) + pdu = self.cla_byte + 'b0%04x%02x' % (offset + chunk_offset, chunk_len) data,sw = self._tp.send_apdu(pdu) if sw == '9000': total_data += data - offset += chunk_len + chunk_offset += chunk_len else: raise ValueError('Failed to read (offset %d)' % (offset)) return total_data, sw -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25801 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic5c2f0ad1c1ec9c4e9c97e72895382f7b6fa9470 Gerrit-Change-Number: 25801 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 18:24:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 15 Oct 2021 18:24:28 +0000 Subject: Change in pysim[master]: ts_51_011: Add encoder for EF.SST In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25802 ) Change subject: ts_51_011: Add encoder for EF.SST ...................................................................... ts_51_011: Add encoder for EF.SST We already have those for EF.UST, let's add them for EF.SST, too Change-Id: Ib51bfffaf8444ec30415aad42e3a0f4f3f7598cb --- M pySim/ts_51_011.py 1 file changed, 26 insertions(+), 1 deletion(-) Approvals: dexter: Looks good to me, approved; Verified osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 5d1197c..3492a8d 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -505,6 +505,12 @@ def __init__(self, fid, sfid, name, desc, size, table): super().__init__(fid, sfid=sfid, name=name, desc=desc, size=size) self.table = table + @staticmethod + def _bit_byte_offset_for_service(service:int) -> (int, int): + i = service - 1 + byte_offset = i//4 + bit_offset = (i % 4) * 2 + return (byte_offset, bit_offset) def _decode_bin(self, raw_bin): ret = {} for i in range(0, len(raw_bin)*4): @@ -518,7 +524,26 @@ 'activated': True if bits & 2 else False, } return ret - # TODO: encoder + def _encode_bin(self, in_json): + # compute the required binary size + bin_len = 0 + for srv in in_json.keys(): + service_nr = int(srv) + (byte_offset, bit_offset) = EF_ServiceTable._bit_byte_offset_for_service(service_nr) + if byte_offset >= bin_len: + bin_len = byte_offset+1 + # encode the actual data + out = bytearray(b'\x00' * bin_len) + for srv in in_json.keys(): + service_nr = int(srv) + (byte_offset, bit_offset) = EF_ServiceTable._bit_byte_offset_for_service(service_nr) + bits = 0 + if in_json[srv]['allocated'] == True: + bits |= 1 + if in_json[srv]['activated'] == True: + bits |= 2 + out[byte_offset] |= ((bits & 3) << bit_offset) + return out # TS 51.011 Section 10.3.11 class EF_SPN(TransparentEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib51bfffaf8444ec30415aad42e3a0f4f3f7598cb Gerrit-Change-Number: 25802 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 18:25:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 15 Oct 2021 18:25:04 +0000 Subject: Change in libosmocore[master]: logging: Change LLAPD category color to purple-like one In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25795 ) Change subject: logging: Change LLAPD category color to purple-like one ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia5c0860dd8d756bb24eb8972f94590bfba5bc865 Gerrit-Change-Number: 25795 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Fri, 15 Oct 2021 18:25:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 18:25:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 15 Oct 2021 18:25:06 +0000 Subject: Change in libosmocore[master]: logging: Change LLAPD category color to purple-like one In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25795 ) Change subject: logging: Change LLAPD category color to purple-like one ...................................................................... logging: Change LLAPD category color to purple-like one Previous dark shiny blue one is really difficult to read on the terminal. Let's change it for some purpleish color which is far easier to read. Change-Id: Ia5c0860dd8d756bb24eb8972f94590bfba5bc865 --- M src/logging.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/logging.c b/src/logging.c index 4517afc..1d139d5 100644 --- a/src/logging.c +++ b/src/logging.c @@ -159,7 +159,7 @@ .description = "LAPD in libosmogsm", .loglevel = LOGL_NOTICE, .enabled = 1, - .color = "\033[38;5;21m", + .color = "\033[38;5;12m", }, [INT2IDX(DLINP)] = { .name = "DLINP", -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia5c0860dd8d756bb24eb8972f94590bfba5bc865 Gerrit-Change-Number: 25795 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 18:26:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 15 Oct 2021 18:26:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Add missing test TC_ul_tbf_reestablish_with_pkt_resource_req in ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25803 ) Change subject: pcu: Add missing test TC_ul_tbf_reestablish_with_pkt_resource_req in control() ...................................................................... Patch Set 1: Code-Review+1 contrary to the commit log it's not adding the test, but it is starting to execute an already-existing test in the default control clause. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1c0bd188ec972e6224c980bf96d7f6da1de98fbc Gerrit-Change-Number: 25803 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 15 Oct 2021 18:26:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 15 18:26:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 15 Oct 2021 18:26:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 ) Change subject: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105_max ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3a50445c707430900c78623c7093ff7eb1f3ed95 Gerrit-Change-Number: 25806 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 15 Oct 2021 18:26:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 16 08:46:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 16 Oct 2021 08:46:14 +0000 Subject: Change in pysim[master]: sysmocom_sja2: Properly decode EF.USIM_SQN freshness References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25807 ) Change subject: sysmocom_sja2: Properly decode EF.USIM_SQN freshness ...................................................................... sysmocom_sja2: Properly decode EF.USIM_SQN freshness The freshness parameter is not one opaque bytestring, but an array of 6-byte integer values. before: "freshness": "000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" after: "freshness": [ 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] Change-Id: I53edbcdb40652eb0e2bc4c982cf7b6f7d585cab9 --- M pySim/sysmocom_sja2.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/07/25807/1 diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index 337eca7..263999d 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -166,7 +166,7 @@ 'aus_concealed'/Bit, 'autn_concealed'/Bit) self._construct = Struct('flag1'/Flag1, 'flag2'/Flag2, 'delta_max'/BytesInteger(6), 'age_limit'/BytesInteger(6), - 'freshness'/HexAdapter(GreedyBytes)) + 'freshness'/GreedyRange(BytesInteger(6))) class EF_USIM_AUTH_KEY(TransparentEF): def __init__(self, fid='af20', name='EF.USIM_AUTH_KEY'): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I53edbcdb40652eb0e2bc4c982cf7b6f7d585cab9 Gerrit-Change-Number: 25807 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 16 08:46:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 16 Oct 2021 08:46:14 +0000 Subject: Change in pysim[master]: pySim-shell: add example script to dump authentication config References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25808 ) Change subject: pySim-shell: add example script to dump authentication config ...................................................................... pySim-shell: add example script to dump authentication config you can use this like that: ./pySim-shell.py -p0 --script ./scripts/sysmoISIM-SJA2/dump-auth-cfg.pysim Change-Id: I5eac1af63d586f2371f519a160e1005fcbb27bfb --- A scripts/sysmoISIM-SJA2/dump-auth-cfg.pysim 1 file changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/08/25808/1 diff --git a/scripts/sysmoISIM-SJA2/dump-auth-cfg.pysim b/scripts/sysmoISIM-SJA2/dump-auth-cfg.pysim new file mode 100644 index 0000000..bfba6e7 --- /dev/null +++ b/scripts/sysmoISIM-SJA2/dump-auth-cfg.pysim @@ -0,0 +1,41 @@ +# script to be used with pySim-shell.py which is part of the Osmocom pysim package, +# found at https://osmocom.org/projects/pysim/wiki +set echo true + +# TODO: add your card-specific ADM pin at the end of the verify_adm line below +verify_adm + +select DF.SYSTEM + +# Milenage configuration (constants) +select EF.MILENAGE_CFG +read_binary_decoded + +# 2G authentication kay / algorithm +select EF.SIM_AUTH_KEY +read_binary_decoded + +# OTA keys +#select EF.0348_KEY +#read_records_decoded + +select ADF.USIM +# USIM authentication key / algoritmh in 3G security context +select EF.USIM_AUTH_KEY +read_binary_decoded +# USIM authentication key / algorithm in 2G security context +select EF.USIM_AUTH_KEY_2G +read_binary_decoded +# USIM SQN numbers +select EF.USIM_SQN +read_binary_decoded + +select ADF.ISIM +# ISIM authentication key / algorithm +select EF.ISIM_AUTH_KEY +read_binary_decoded +# ISIM SQN numbers +select EF.ISIM_SQN +read_binary_decoded + +quit -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5eac1af63d586f2371f519a160e1005fcbb27bfb Gerrit-Change-Number: 25808 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 16 08:55:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 16 Oct 2021 08:55:41 +0000 Subject: Change in osmocom-bb[master]: layer23/osmocon: require libosmocore >= 1.5.0 in configure.ac References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/25809 ) Change subject: layer23/osmocon: require libosmocore >= 1.5.0 in configure.ac ...................................................................... layer23/osmocon: require libosmocore >= 1.5.0 in configure.ac This should give a meaningful error message if people use too old libosmocore. Change-Id: I7d9950b5eaa836ed1ac86045bd5364fed221e369 --- M src/host/layer23/configure.ac M src/host/osmocon/configure.ac 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/09/25809/1 diff --git a/src/host/layer23/configure.ac b/src/host/layer23/configure.ac index 3e69610..34dcbff 100644 --- a/src/host/layer23/configure.ac +++ b/src/host/layer23/configure.ac @@ -39,7 +39,7 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm) PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec) diff --git a/src/host/osmocon/configure.ac b/src/host/osmocon/configure.ac index a42f487..7fa2692 100644 --- a/src/host/osmocon/configure.ac +++ b/src/host/osmocon/configure.ac @@ -14,7 +14,7 @@ AC_PROG_INSTALL dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) dnl checks for header files AC_HEADER_STDC -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/25809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7d9950b5eaa836ed1ac86045bd5364fed221e369 Gerrit-Change-Number: 25809 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 16 09:14:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 16 Oct 2021 09:14:35 +0000 Subject: Change in osmocom-bb[master]: layer23/osmocon: require libosmocore >= 1.5.0 in configure.ac In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/25809 ) Change subject: layer23/osmocon: require libosmocore >= 1.5.0 in configure.ac ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/25809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7d9950b5eaa836ed1ac86045bd5364fed221e369 Gerrit-Change-Number: 25809 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 16 Oct 2021 09:14:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 16 09:15:27 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 16 Oct 2021 09:15:27 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Add missing test TC_ul_tbf_reestablish_with_pkt_resource_req in ... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25803 ) Change subject: pcu: Add missing test TC_ul_tbf_reestablish_with_pkt_resource_req in control() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1c0bd188ec972e6224c980bf96d7f6da1de98fbc Gerrit-Change-Number: 25803 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 16 Oct 2021 09:15:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 16 09:23:44 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 16 Oct 2021 09:23:44 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 ) Change subject: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105_max ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806/1/pcu/PCU_Tests.ttcn at 3120 PS1, Line 3120: BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, We definitely need something like f_pcuif_send_rts(). https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806/1/pcu/PCU_Tests.ttcn at 3132 PS1, Line 3132: nr := ts_TsTrxBtsNum Why are you doing this? The value does not change, so it makes no sense to execute this template again and again. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806/1/pcu/PCU_Tests.ttcn at 3148 PS1, Line 3148: nr := ts_TsTrxBtsNum Same here. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806/1/pcu/PCU_Tests.ttcn at 3160 PS1, Line 3160: nr := ts_TsTrxBtsNum Same here. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3a50445c707430900c78623c7093ff7eb1f3ed95 Gerrit-Change-Number: 25806 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Sat, 16 Oct 2021 09:23:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 16 10:07:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 16 Oct 2021 10:07:21 +0000 Subject: Change in pysim[master]: pySim-shell: add example script to dump authentication config In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25808 ) Change subject: pySim-shell: add example script to dump authentication config ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5eac1af63d586f2371f519a160e1005fcbb27bfb Gerrit-Change-Number: 25808 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 16 Oct 2021 10:07:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 16 10:07:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 16 Oct 2021 10:07:32 +0000 Subject: Change in pysim[master]: sysmocom_sja2: Properly decode EF.USIM_SQN freshness In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25807 ) Change subject: sysmocom_sja2: Properly decode EF.USIM_SQN freshness ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I53edbcdb40652eb0e2bc4c982cf7b6f7d585cab9 Gerrit-Change-Number: 25807 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 16 Oct 2021 10:07:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 16 10:07:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 16 Oct 2021 10:07:37 +0000 Subject: Change in pysim[master]: sysmocom_sja2: Properly decode EF.USIM_SQN freshness In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25807 ) Change subject: sysmocom_sja2: Properly decode EF.USIM_SQN freshness ...................................................................... sysmocom_sja2: Properly decode EF.USIM_SQN freshness The freshness parameter is not one opaque bytestring, but an array of 6-byte integer values. before: "freshness": "000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" after: "freshness": [ 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] Change-Id: I53edbcdb40652eb0e2bc4c982cf7b6f7d585cab9 --- M pySim/sysmocom_sja2.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index 337eca7..263999d 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -166,7 +166,7 @@ 'aus_concealed'/Bit, 'autn_concealed'/Bit) self._construct = Struct('flag1'/Flag1, 'flag2'/Flag2, 'delta_max'/BytesInteger(6), 'age_limit'/BytesInteger(6), - 'freshness'/HexAdapter(GreedyBytes)) + 'freshness'/GreedyRange(BytesInteger(6))) class EF_USIM_AUTH_KEY(TransparentEF): def __init__(self, fid='af20', name='EF.USIM_AUTH_KEY'): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25807 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I53edbcdb40652eb0e2bc4c982cf7b6f7d585cab9 Gerrit-Change-Number: 25807 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 16 10:07:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 16 Oct 2021 10:07:38 +0000 Subject: Change in pysim[master]: pySim-shell: add example script to dump authentication config In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25808 ) Change subject: pySim-shell: add example script to dump authentication config ...................................................................... pySim-shell: add example script to dump authentication config you can use this like that: ./pySim-shell.py -p0 --script ./scripts/sysmoISIM-SJA2/dump-auth-cfg.pysim Change-Id: I5eac1af63d586f2371f519a160e1005fcbb27bfb --- A scripts/sysmoISIM-SJA2/dump-auth-cfg.pysim 1 file changed, 41 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/scripts/sysmoISIM-SJA2/dump-auth-cfg.pysim b/scripts/sysmoISIM-SJA2/dump-auth-cfg.pysim new file mode 100644 index 0000000..bfba6e7 --- /dev/null +++ b/scripts/sysmoISIM-SJA2/dump-auth-cfg.pysim @@ -0,0 +1,41 @@ +# script to be used with pySim-shell.py which is part of the Osmocom pysim package, +# found at https://osmocom.org/projects/pysim/wiki +set echo true + +# TODO: add your card-specific ADM pin at the end of the verify_adm line below +verify_adm + +select DF.SYSTEM + +# Milenage configuration (constants) +select EF.MILENAGE_CFG +read_binary_decoded + +# 2G authentication kay / algorithm +select EF.SIM_AUTH_KEY +read_binary_decoded + +# OTA keys +#select EF.0348_KEY +#read_records_decoded + +select ADF.USIM +# USIM authentication key / algoritmh in 3G security context +select EF.USIM_AUTH_KEY +read_binary_decoded +# USIM authentication key / algorithm in 2G security context +select EF.USIM_AUTH_KEY_2G +read_binary_decoded +# USIM SQN numbers +select EF.USIM_SQN +read_binary_decoded + +select ADF.ISIM +# ISIM authentication key / algorithm +select EF.ISIM_AUTH_KEY +read_binary_decoded +# ISIM SQN numbers +select EF.ISIM_SQN +read_binary_decoded + +quit -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25808 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5eac1af63d586f2371f519a160e1005fcbb27bfb Gerrit-Change-Number: 25808 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 16 10:08:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sat, 16 Oct 2021 10:08:17 +0000 Subject: Change in osmocom-bb[master]: layer23/osmocon: require libosmocore >= 1.5.0 in configure.ac In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/25809 ) Change subject: layer23/osmocon: require libosmocore >= 1.5.0 in configure.ac ...................................................................... layer23/osmocon: require libosmocore >= 1.5.0 in configure.ac This should give a meaningful error message if people use too old libosmocore. Change-Id: I7d9950b5eaa836ed1ac86045bd5364fed221e369 --- M src/host/layer23/configure.ac M src/host/osmocon/configure.ac 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/host/layer23/configure.ac b/src/host/layer23/configure.ac index 3e69610..34dcbff 100644 --- a/src/host/layer23/configure.ac +++ b/src/host/layer23/configure.ac @@ -39,7 +39,7 @@ fi dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.10.0) PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm) PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec) diff --git a/src/host/osmocon/configure.ac b/src/host/osmocon/configure.ac index a42f487..7fa2692 100644 --- a/src/host/osmocon/configure.ac +++ b/src/host/osmocon/configure.ac @@ -14,7 +14,7 @@ AC_PROG_INSTALL dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) dnl checks for header files AC_HEADER_STDC -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/25809 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7d9950b5eaa836ed1ac86045bd5364fed221e369 Gerrit-Change-Number: 25809 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 08:57:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 08:57:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 ) Change subject: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105_max ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806/1/pcu/PCU_Tests.ttcn File pcu/PCU_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806/1/pcu/PCU_Tests.ttcn at 3132 PS1, Line 3132: nr := ts_TsTrxBtsNum > Why are you doing this? The value does not change, so it makes no sense to execute this template aga [?] On practical side it doesn't change right now, but conceptually it's the place where need to ask for next TS we are interested in, and that should be independent from what we did last. I prefer keep it this way so that later on if we want to improve test infra to tor instance follow an MS over several TS we can do it easily. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3a50445c707430900c78623c7093ff7eb1f3ed95 Gerrit-Change-Number: 25806 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 08:57:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 08:57:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 08:57:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Add missing test TC_ul_tbf_reestablish_with_pkt_resource_req in ... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25803 ) Change subject: pcu: Add missing test TC_ul_tbf_reestablish_with_pkt_resource_req in control() ...................................................................... pcu: Add missing test TC_ul_tbf_reestablish_with_pkt_resource_req in control() Fixes: cdbe90306bce1373ee13782432eacdf5c4b6dfa6 Change-Id: I1c0bd188ec972e6224c980bf96d7f6da1de98fbc --- M pcu/PCU_Tests.ttcn 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 0324439..4b8035c 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -6242,6 +6242,7 @@ execute( TC_dl_multislot_tbf_ms_class_from_sgsn() ); execute( TC_dl_multislot_tbf_ms_class_from_2phase() ); execute( TC_ul_multislot_tbf_ms_class_from_2phase() ); + execute( TC_ul_tbf_reestablish_with_pkt_resource_req() ); execute( TC_multiplex_dl_gprs_egprs() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I1c0bd188ec972e6224c980bf96d7f6da1de98fbc Gerrit-Change-Number: 25803 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 10:26:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 10:26:34 +0000 Subject: Change in osmo-pcu[master]: pdch: Simplify code path allocating UL TBF References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25810 ) Change subject: pdch: Simplify code path allocating UL TBF ...................................................................... pdch: Simplify code path allocating UL TBF There's no real need to pass a tlli per separate, the information is already contained in the MS. Furthermore, when doing so, it becomes clear the TLLI was only passed to set it again on the MS, so actually that ms_update() can be totally dropped since it will act as a no-op. Change-Id: Ie761c3c7c222458ab0514117ae637ad3267139a0 --- M src/pdch.cpp M src/tbf_ul.cpp M src/tbf_ul.h 3 files changed, 4 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/10/25810/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index 68bc69d..7d70958 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -119,7 +119,7 @@ bts_do_rate_ctr_inc(bts, CTR_CHANNEL_REQUEST_DESCRIPTION); /* This call will register the new TBF with the MS on success */ - gprs_rlcmac_ul_tbf *ul_tbf = tbf_alloc_ul_pacch(bts, tbf->ms(), tbf->trx->trx_no, tbf->tlli()); + gprs_rlcmac_ul_tbf *ul_tbf = tbf_alloc_ul_pacch(bts, tbf->ms(), tbf->trx->trx_no); /* schedule uplink assignment or reject */ if (ul_tbf) { @@ -707,7 +707,7 @@ ms_set_egprs_ms_class(ms, egprs_ms_class); } - ul_tbf = tbf_alloc_ul_pacch(bts(), ms, trx_no(), tlli); + ul_tbf = tbf_alloc_ul_pacch(bts(), ms, trx_no()); if (!ul_tbf) { handle_tbf_reject(bts(), ms, trx_no(), ts_no); goto return_unref; diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index d4f2093..74b2636 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -152,8 +152,7 @@ } /* Alloc a UL TBF to be assigned over PACCH */ -gprs_rlcmac_ul_tbf *tbf_alloc_ul_pacch(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, - uint32_t tlli) +gprs_rlcmac_ul_tbf *tbf_alloc_ul_pacch(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx) { struct gprs_rlcmac_ul_tbf *tbf; @@ -165,8 +164,6 @@ } tbf->m_contention_resolution_done = 1; osmo_fsm_inst_dispatch(tbf->state_fsm.fi, TBF_EV_ASSIGN_ADD_PACCH, NULL); - tbf->update_ms(tlli, GPRS_RLCMAC_UL_TBF); - OSMO_ASSERT(tbf->ms()); return tbf; } diff --git a/src/tbf_ul.h b/src/tbf_ul.h index defdfba..0dc2336 100644 --- a/src/tbf_ul.h +++ b/src/tbf_ul.h @@ -126,8 +126,7 @@ } struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, bool single_slot); -struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_pacch(struct gprs_rlcmac_bts *bts, GprsMs *ms, - int8_t use_trx, uint32_t tlli); +struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_pacch(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx); struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_ccch(struct gprs_rlcmac_bts *bts, struct GprsMs *ms); struct gprs_rlcmac_ul_tbf *handle_tbf_reject(struct gprs_rlcmac_bts *bts, GprsMs *ms, uint8_t trx_no, uint8_t ts_no); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25810 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie761c3c7c222458ab0514117ae637ad3267139a0 Gerrit-Change-Number: 25810 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 10:37:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 10:37:56 +0000 Subject: Change in osmo-pcu[master]: pdch: Log reason of expected POLL when receiving unexpected UL data References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25811 ) Change subject: pdch: Log reason of expected POLL when receiving unexpected UL data ...................................................................... pdch: Log reason of expected POLL when receiving unexpected UL data Change-Id: I914e38154029f57cbf38120495220cd860877c45 --- M src/pdch.cpp 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/11/25811/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index 7d70958..5d8658a 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -991,8 +991,9 @@ break; case PDCH_ULC_NODE_TBF_POLL: LOGPDCH(this, DRLCMACUL, LOGL_NOTICE, "FN=%" PRIu32 " " - "Rx UL DATA from unexpected %s vs expected POLL %s\n", - fn, tbf_name(tbf), tbf_name(node->tbf_poll.poll_tbf)); + "Rx UL DATA from unexpected %s vs expected POLL %s reason=%s\n", + fn, tbf_name(tbf), tbf_name(node->tbf_poll.poll_tbf), + get_value_string(pdch_ulc_tbf_poll_reason_names, node->tbf_poll.reason)); break; case PDCH_ULC_NODE_SBA: LOGPDCH(this, DRLCMACUL, LOGL_NOTICE, "FN=%" PRIu32 " " -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I914e38154029f57cbf38120495220cd860877c45 Gerrit-Change-Number: 25811 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 11:32:18 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 18 Oct 2021 11:32:18 +0000 Subject: Change in osmo-sip-connector[master]: MNCC v8: Implement Basic Support for Global Call Reference. In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 ) Change subject: MNCC v8: Implement Basic Support for Global Call Reference. ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Id40d7e0fed9356f801b3627c118150055e7232b1 Gerrit-Change-Number: 25675 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 18 Oct 2021 11:32:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 11:40:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 11:40:31 +0000 Subject: Change in osmo-pcu[master]: bts_rcv_rach(): Gather pointers to data objects early and use them later References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25812 ) Change subject: bts_rcv_rach(): Gather pointers to data objects early and use them later ...................................................................... bts_rcv_rach(): Gather pointers to data objects early and use them later Change-Id: I476814d0f7be4b53f66211bb472700fee4f2caa9 --- M src/bts.cpp 1 file changed, 11 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/12/25812/1 diff --git a/src/bts.cpp b/src/bts.cpp index cad6c90..8d98fe4 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -867,7 +867,8 @@ struct chan_req_params chan_req = { 0 }; struct gprs_rlcmac_ul_tbf *tbf = NULL; struct gprs_rlcmac_sba *sba; - uint8_t trx_no = 0, ts_no = 0; /* initialize to avoid uninitialized false warnings on some gcc versions (11.1.0) */ + struct gprs_rlcmac_pdch *pdch = NULL; + struct gprs_rlcmac_trx *trx = NULL; uint32_t sb_fn = 0; uint8_t usf = 7; uint8_t tsc = 0; @@ -917,12 +918,11 @@ goto send_imm_ass_rej; } - trx_no = sba->pdch->trx_no(); - ts_no = sba->pdch->ts_no; + pdch = sba->pdch; sb_fn = sba->fn; - tsc = bts->trx[trx_no].pdch[ts_no].tsc; + tsc = pdch->tsc; LOGP(DRLCMAC, LOGL_DEBUG, "Allocated a single block at " - "SBFn=%u TRX=%u TS=%u\n", sb_fn, trx_no, ts_no); + "SBFn=%u TRX=%u TS=%u\n", sb_fn, pdch->trx->trx_no, pdch->ts_no); } else { GprsMs *ms = bts_alloc_ms(bts, 0, chan_req.egprs_mslot_class); tbf = tbf_alloc_ul_ccch(bts, ms); @@ -932,11 +932,11 @@ goto send_imm_ass_rej; } tbf->set_ta(ta); - trx_no = tbf->trx->trx_no; - ts_no = tbf->first_ts; - usf = tbf->m_usf[ts_no]; + pdch = &tbf->trx->pdch[tbf->first_ts]; + usf = tbf->m_usf[pdch->ts_no]; tsc = tbf->tsc(); } + trx = pdch->trx; send_imm_ass_rej: /* Allocate a bit-vector for RR Immediate Assignment [Reject] */ @@ -952,10 +952,9 @@ } else { LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment on AGCH: " "TRX=%u (ARFCN %u) TS=%u TA=%u TSC=%u TFI=%d USF=%d\n", - trx_no, bts->trx[trx_no].arfcn & ~ARFCN_FLAG_MASK, - ts_no, ta, tsc, tbf ? tbf->tfi() : -1, usf); - plen = Encoding::write_immediate_assignment( - &bts->trx[trx_no].pdch[ts_no], tbf, bv, + trx->trx_no, trx->arfcn & ~ARFCN_FLAG_MASK, + pdch->ts_no, ta, tsc, tbf ? tbf->tfi() : -1, usf); + plen = Encoding::write_immediate_assignment(pdch, tbf, bv, false, rip->ra, Fn, ta, usf, false, sb_fn, bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1, rip->burst_type); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I476814d0f7be4b53f66211bb472700fee4f2caa9 Gerrit-Change-Number: 25812 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 11:40:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 11:40:31 +0000 Subject: Change in osmo-pcu[master]: bts_rcv_rach(): Split code paths for Ass and Ass Rej References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25813 ) Change subject: bts_rcv_rach(): Split code paths for Ass and Ass Rej ...................................................................... bts_rcv_rach(): Split code paths for Ass and Ass Rej The function becomes a bit more long but it's a lot easier to follow. Change-Id: I80e554315d36a515a7edc9ae51057ce31eb9110d --- M src/bts.cpp 1 file changed, 28 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/13/25813/1 diff --git a/src/bts.cpp b/src/bts.cpp index 8d98fe4..aa713fe 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -867,13 +867,17 @@ struct chan_req_params chan_req = { 0 }; struct gprs_rlcmac_ul_tbf *tbf = NULL; struct gprs_rlcmac_sba *sba; - struct gprs_rlcmac_pdch *pdch = NULL; - struct gprs_rlcmac_trx *trx = NULL; + struct gprs_rlcmac_pdch *pdch; + struct gprs_rlcmac_trx *trx; uint32_t sb_fn = 0; uint8_t usf = 7; uint8_t tsc = 0; int plen, rc; + /* Allocate a bit-vector for RR Immediate Assignment [Reject] */ + struct bitvec *bv = bitvec_alloc(22, tall_pcu_ctx); /* without plen */ + bitvec_unhex(bv, DUMMY_VEC); /* standard '2B'O padding */ + bts_do_rate_ctr_inc(bts, CTR_RACH_REQUESTS); if (rip->is_11bit) @@ -938,36 +942,34 @@ } trx = pdch->trx; -send_imm_ass_rej: - /* Allocate a bit-vector for RR Immediate Assignment [Reject] */ - struct bitvec *bv = bitvec_alloc(22, tall_pcu_ctx); /* without plen */ - bitvec_unhex(bv, DUMMY_VEC); /* standard '2B'O padding */ - - if (rc != 0) { - LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment Reject on AGCH\n"); - plen = Encoding::write_immediate_assignment_reject( - bv, rip->ra, Fn, rip->burst_type, - (uint8_t)osmo_tdef_get(bts->T_defs_bts, 3142, OSMO_TDEF_S, -1)); - bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_REJ); + LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment on AGCH: " + "TRX=%u (ARFCN %u) TS=%u TA=%u TSC=%u TFI=%d USF=%d\n", + trx->trx_no, trx->arfcn & ~ARFCN_FLAG_MASK, + pdch->ts_no, ta, tsc, tbf ? tbf->tfi() : -1, usf); + plen = Encoding::write_immediate_assignment(pdch, tbf, bv, + false, rip->ra, Fn, ta, usf, false, sb_fn, + bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1, + rip->burst_type); + bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_UL_TBF); + if (plen >= 0) { + pcu_l1if_tx_agch(bts, bv, plen); + rc = 0; } else { - LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment on AGCH: " - "TRX=%u (ARFCN %u) TS=%u TA=%u TSC=%u TFI=%d USF=%d\n", - trx->trx_no, trx->arfcn & ~ARFCN_FLAG_MASK, - pdch->ts_no, ta, tsc, tbf ? tbf->tfi() : -1, usf); - plen = Encoding::write_immediate_assignment(pdch, tbf, bv, - false, rip->ra, Fn, ta, usf, false, sb_fn, - bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1, - rip->burst_type); - bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_UL_TBF); + rc = plen; } + bitvec_free(bv); + return rc; +send_imm_ass_rej: + LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment Reject on AGCH\n"); + plen = Encoding::write_immediate_assignment_reject( + bv, rip->ra, Fn, rip->burst_type, + (uint8_t)osmo_tdef_get(bts->T_defs_bts, 3142, OSMO_TDEF_S, -1)); + bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_REJ); if (plen >= 0) pcu_l1if_tx_agch(bts, bv, plen); - else - rc = plen; - bitvec_free(bv); - + /* rc was already properly set before goto */ return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I80e554315d36a515a7edc9ae51057ce31eb9110d Gerrit-Change-Number: 25813 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 11:40:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 11:40:31 +0000 Subject: Change in osmo-pcu[master]: Get rid of tbf tsc field References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25814 ) Change subject: Get rid of tbf tsc field ...................................................................... Get rid of tbf tsc field TSC is not really a property of TSC, so let's drop it in order to avoid confusing and possible misuse of that accessor. Change-Id: I105eb65d507e45631faddb23420c42bc9560e580 --- M src/bts.cpp M src/tbf.cpp M src/tbf.h 3 files changed, 1 insertion(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/14/25814/1 diff --git a/src/bts.cpp b/src/bts.cpp index aa713fe..50df92e 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -871,7 +871,6 @@ struct gprs_rlcmac_trx *trx; uint32_t sb_fn = 0; uint8_t usf = 7; - uint8_t tsc = 0; int plen, rc; /* Allocate a bit-vector for RR Immediate Assignment [Reject] */ @@ -924,7 +923,6 @@ pdch = sba->pdch; sb_fn = sba->fn; - tsc = pdch->tsc; LOGP(DRLCMAC, LOGL_DEBUG, "Allocated a single block at " "SBFn=%u TRX=%u TS=%u\n", sb_fn, pdch->trx->trx_no, pdch->ts_no); } else { @@ -938,14 +936,13 @@ tbf->set_ta(ta); pdch = &tbf->trx->pdch[tbf->first_ts]; usf = tbf->m_usf[pdch->ts_no]; - tsc = tbf->tsc(); } trx = pdch->trx; LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment on AGCH: " "TRX=%u (ARFCN %u) TS=%u TA=%u TSC=%u TFI=%d USF=%d\n", trx->trx_no, trx->arfcn & ~ARFCN_FLAG_MASK, - pdch->ts_no, ta, tsc, tbf ? tbf->tfi() : -1, usf); + pdch->ts_no, ta, pdch->tsc, tbf ? tbf->tfi() : -1, usf); plen = Encoding::write_immediate_assignment(pdch, tbf, bv, false, rip->ra, Fn, ta, usf, false, sb_fn, bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1, diff --git a/src/tbf.cpp b/src/tbf.cpp index 2343862..361e631 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -758,11 +758,6 @@ llist_add(tbf_trx_list((struct gprs_rlcmac_tbf *)this), &trx->dl_tbfs); } -uint8_t gprs_rlcmac_tbf::tsc() const -{ - return trx->pdch[first_ts].tsc; -} - uint8_t gprs_rlcmac_tbf::dl_slots() const { uint8_t slots = 0; diff --git a/src/tbf.h b/src/tbf.h index cab9364..4013ab0 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -180,8 +180,6 @@ GprsMs *ms() const; void set_ms(GprsMs *ms); - uint8_t tsc() const; - bool n_inc(enum tbf_counters n); void n_reset(enum tbf_counters n); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I105eb65d507e45631faddb23420c42bc9560e580 Gerrit-Change-Number: 25814 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 11:45:41 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Mon, 18 Oct 2021 11:45:41 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/24236 ) Change subject: Add support for LCLS to the MSC ...................................................................... Patch Set 7: Code-Review+1 (3 comments) it would be nice to have the MNCC protocol version change in a separate patch, so that it is easy to read what parts relate to the bare protocol change, and what parts relate to functional change in osmo-msc https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/include/osmocom/msc/gsm_data.h File include/osmocom/msc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/include/osmocom/msc/gsm_data.h at 264 PS7, Line 264: bool lcls_disable; > A long long time ago, in a land far far away, (https://gerrit.osmocom.org/c/osmo-msc/+/13421) [?] i generally dislike reverse logic booleans, the double negation can make reading logic a nightmare... disabled = (foo() != 0); it's better to choose the boolean name as an affirmative, so that "true" does not mean "off". so here i'd indeed go for "lcls_permitted" https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/include/osmocom/msc/mncc.h File include/osmocom/msc/mncc.h: https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/include/osmocom/msc/mncc.h at 164 PS7, Line 164: struct osmo_gcr_parsed gcr; > There is probably a better place for this. [?] this is a good place, besides the SDP always being in the end, this leaves previous version MNCC unchanged. https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/src/libmsc/msc_vty.c at 511 PS7, Line 511: "no lcls-disable", also here i would much perfer 'lcls-permitted' to avoid double negation -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 18 Oct 2021 11:45:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: keith Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 12:01:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 12:01:12 +0000 Subject: Change in osmo-pcu[master]: ts_alloc: Rename s/tbf_/tbf/ References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25815 ) Change subject: ts_alloc: Rename s/tbf_/tbf/ ...................................................................... ts_alloc: Rename s/tbf_/tbf/ My the top of my head: The tbf_ was kept during a previous refactoring a while ago to avoid changing lots of more lines in the same patch. Change-Id: I8ae689a272b7c4d244576ff157f6019a87041abc --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 24 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/15/25815/1 diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 3c16d8a..5b3b355 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -338,12 +338,12 @@ * Assign single slot for uplink and downlink * * \param[in,out] bts Pointer to BTS struct - * \param[in,out] tbf_ Pointer to TBF struct + * \param[in,out] tbf Pointer to TBF struct * \param[in] single flag indicating if we should force single-slot allocation * \param[in] use_trx which TRX to use or -1 if it should be selected during allocation * \returns negative error code or 0 on success */ -int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf_, bool single, +int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool single, int8_t use_trx) { struct gprs_rlcmac_pdch *pdch; @@ -354,8 +354,7 @@ int usf = -1; uint8_t mask = 0xff; const char *mask_reason = NULL; - struct GprsMs *ms = tbf_->ms(); - const gprs_rlcmac_tbf *tbf = tbf_; + struct GprsMs *ms = tbf->ms(); gprs_rlcmac_trx *trx = ms_current_trx(ms); LOGPAL(tbf, "A", single, use_trx, LOGL_DEBUG, "Alloc start\n"); @@ -404,24 +403,24 @@ pdch = &trx->pdch[ts]; - /* The allocation will be successful, so the system state and tbf_/ms_ + /* The allocation will be successful, so the system state and tbf/ms * may be modified from now on. */ if (tbf->direction == GPRS_RLCMAC_UL_TBF) { - struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf_); + struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf); LOGPSL(tbf, LOGL_DEBUG, "Assign uplink TS=%d TFI=%d USF=%d\n", ts, tfi, usf); assign_uplink_tbf_usf(pdch, ul_tbf, tfi, usf); } else { - struct gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf_); + struct gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf); LOGPSL(tbf, LOGL_DEBUG, "Assign downlink TS=%d TFI=%d\n", ts, tfi); assign_dlink_tbf(pdch, dl_tbf, tfi); } - tbf_->trx = trx; + tbf->trx = trx; /* the only one TS is the common TS */ - tbf_->first_ts = tbf_->first_common_ts = ts; + tbf->first_ts = tbf->first_common_ts = ts; ms_set_reserved_slots(ms, trx, 1 << ts, 1 << ts); - tbf_->upgrade_to_multislot = false; + tbf->upgrade_to_multislot = false; bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_ALGO_A); return 0; } @@ -856,12 +855,12 @@ * Assign one uplink slot. (With free USF) * * \param[in,out] bts Pointer to BTS struct - * \param[in,out] tbf_ Pointer to TBF struct + * \param[in,out] tbf Pointer to TBF struct * \param[in] single flag indicating if we should force single-slot allocation * \param[in] use_trx which TRX to use or -1 if it should be selected during allocation * \returns negative error code or 0 on success */ -int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf_, bool single, +int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool single, int8_t use_trx) { uint8_t dl_slots; @@ -875,8 +874,7 @@ int usf[8] = {-1, -1, -1, -1, -1, -1, -1, -1}; int rc; int tfi; - struct GprsMs *ms = tbf_->ms(); - const gprs_rlcmac_tbf *tbf = tbf_; + struct GprsMs *ms = tbf->ms(); gprs_rlcmac_trx *trx; LOGPAL(tbf, "B", single, use_trx, LOGL_DEBUG, "Alloc start\n"); @@ -942,28 +940,28 @@ } if (single && slotcount) { - tbf_->upgrade_to_multislot = (avail_count > slotcount); + tbf->upgrade_to_multislot = (avail_count > slotcount); LOGPAL(tbf, "B", single, use_trx, LOGL_INFO, "using single slot at TS %d\n", first_ts); } else { - tbf_->upgrade_to_multislot = false; + tbf->upgrade_to_multislot = false; LOGPAL(tbf, "B", single, use_trx, LOGL_INFO, "using %d slots\n", slotcount); } - /* The allocation will be successful, so the system state and tbf_/ms_ + /* The allocation will be successful, so the system state and tbf/ms * may be modified from now on. */ /* Step 4: Update MS and TBF and really allocate the resources */ update_ms_reserved_slots(trx, ms, reserved_ul_slots, reserved_dl_slots, ul_slots, dl_slots); - tbf_->trx = trx; - tbf_->first_common_ts = first_common_ts; - tbf_->first_ts = first_ts; + tbf->trx = trx; + tbf->first_common_ts = first_common_ts; + tbf->first_ts = first_ts; if (tbf->direction == GPRS_RLCMAC_DL_TBF) - assign_dl_tbf_slots(as_dl_tbf(tbf_), trx, dl_slots, tfi); + assign_dl_tbf_slots(as_dl_tbf(tbf), trx, dl_slots, tfi); else - assign_ul_tbf_slots(as_ul_tbf(tbf_), trx, ul_slots, tfi, usf); + assign_ul_tbf_slots(as_ul_tbf(tbf), trx, ul_slots, tfi, usf); bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_ALGO_B); @@ -979,12 +977,12 @@ * goal is to provide the highest possible bandwidth per MS. * * \param[in,out] bts Pointer to BTS struct - * \param[in,out] tbf_ Pointer to TBF struct + * \param[in,out] tbf Pointer to TBF struct * \param[in] single flag indicating if we should force single-slot allocation * \param[in] use_trx which TRX to use or -1 if it should be selected during allocation * \returns negative error code or 0 on success */ -int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf_, bool single, +int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool single, int8_t use_trx) { int rc; @@ -997,7 +995,7 @@ } if (!bts->multislot_disabled) { - rc = alloc_algorithm_b(bts, tbf_, single, use_trx); + rc = alloc_algorithm_b(bts, tbf, single, use_trx); if (rc >= 0) return rc; @@ -1006,7 +1004,7 @@ bts->multislot_disabled = 1; } - return alloc_algorithm_a(bts, tbf_, single, use_trx); + return alloc_algorithm_a(bts, tbf, single, use_trx); } int gprs_alloc_max_dl_slots_per_ms(const struct gprs_rlcmac_bts *bts, uint8_t ms_class) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8ae689a272b7c4d244576ff157f6019a87041abc Gerrit-Change-Number: 25815 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 12:28:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 12:28:49 +0000 Subject: Change in osmo-pcu[master]: tbf: Update FSM names when TFI change during tbf_update() References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25816 ) Change subject: tbf: Update FSM names when TFI change during tbf_update() ...................................................................... tbf: Update FSM names when TFI change during tbf_update() In that function, previous PDCHs are unlinked and then alloc_algorithm is expected to assign new TFIs. Change-Id: I7bcbb223ca32400bede7ab638695ba3c015c9946 --- M src/tbf.cpp 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/16/25816/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index 361e631..2e2e388 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -334,6 +334,8 @@ dl_tbf->set_window_size(); } + tbf_update_state_fsm_name(this); + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7bcbb223ca32400bede7ab638695ba3c015c9946 Gerrit-Change-Number: 25816 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 12:28:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 12:28:49 +0000 Subject: Change in osmo-pcu[master]: tbf_fsm: Add assert verifying X2002 only triggers for DL TBF References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25817 ) Change subject: tbf_fsm: Add assert verifying X2002 only triggers for DL TBF ...................................................................... tbf_fsm: Add assert verifying X2002 only triggers for DL TBF Code above setting the timer in same tbf_fsm already has this kind of assert, but it helps understanding the code having this assert here. Change-Id: I7588deef5073694eb5fecdb516c241a04594e2b0 --- M src/tbf_fsm.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/17/25817/1 diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c index fb947b2..af2b34e 100644 --- a/src/tbf_fsm.c +++ b/src/tbf_fsm.c @@ -352,6 +352,9 @@ { struct gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(ctx->tbf); + /* X2002 is used only for DL TBF */ + OSMO_ASSERT(dl_tbf); + if (ctx->fi->state == TBF_ST_ASSIGN) { tbf_assign_control_ts(ctx->tbf); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7588deef5073694eb5fecdb516c241a04594e2b0 Gerrit-Change-Number: 25817 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 12:30:59 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 18 Oct 2021 12:30:59 +0000 Subject: Change in osmo-pcu[master]: pdch: Simplify code path allocating UL TBF In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25810 ) Change subject: pdch: Simplify code path allocating UL TBF ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25810 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie761c3c7c222458ab0514117ae637ad3267139a0 Gerrit-Change-Number: 25810 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 12:30:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 12:37:39 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 18 Oct 2021 12:37:39 +0000 Subject: Change in pysim[master]: pySim-shell: do not use usim/isim APDUs in the beginnning In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25804 ) Change subject: pySim-shell: do not use usim/isim APDUs in the beginnning ...................................................................... Patch Set 1: > Patch Set 1: > > (1 comment) > > I am not sure this is the right way to go about this. > > The Class 0x00 / 0x80 are _not_ a feature of the USIM/ISIM application (and their ADF), but a feature of the TS 102 221 UICC. So if you have an UICC in front of you, then you can use those class values. > > Only the classic SIM card will require you to use 0xA0. > > I have also seen UICC/USIM cards that do _not_ have a SIM application and that hence will reject any A0 APDUs in the MF or anywhere else. The reason is simple: IF an operator never had a 2G access network, he does not need the 2G SIM function. Classic 2G phones will not even attempt to ever register as they will not even be able to read the SIM card. You need at least a 3G phone to access the USIM on the UICC. > > So I think the only reliable way to go about this is to try either way and then decide. I am a bit confused by this. I have a LycaMobile sim here that starts up fine with 2G APDUs but does not allow UICC APDUs until I have selected at least ADF.USIM and I have to do the select of ADF.USIM also with UICC APDUs. I wonder how this works in real life. Maybe I should take some traces to learn how real phones figure this out. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I985261a1bddae60ffeaccb9c8d8d1b8a2ae4d0fc Gerrit-Change-Number: 25804 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 18 Oct 2021 12:37:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 12:38:38 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 18 Oct 2021 12:38:38 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25552 to look at the new patch set (#10). Change subject: pySim-shell: add bulk provisioning support ...................................................................... pySim-shell: add bulk provisioning support There are scenarios where multiple cards need to get the same change. Lets add a new command that takes a script as parameter and executes the secript in a loop on multiple cards while prompting the user to change the card before starting the next cycle. Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Related: SYS#5617 --- M pySim-shell.py 1 file changed, 188 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/52/25552/10 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 12:38:40 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 18 Oct 2021 12:38:40 +0000 Subject: Change in pysim[master]: ts_31_10x: add a class for CardApplicationXSIM References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25818 ) Change subject: ts_31_10x: add a class for CardApplicationXSIM ...................................................................... ts_31_10x: add a class for CardApplicationXSIM In change Id410489841bb9020ddbf74de9114d808b1d5adb6, the RuntimeState class automatically adds additional files to the CardApplications for ISIM and USIM. This works only once. The second time an exception will be thrown because the added files are already in the CardApplication. Currently there is no way generate new card applications during initialization because the card applications are just objects that are created once in ts_31_10x.py. Lets turn them into classes and create the objects during initialization. This way we get fresh objects when we re-initialize. Change-Id: Ibb4f6242e7a92af84a905daa727b1b87016e7819 --- M pySim-shell.py M pySim/ts_31_102.py M pySim/ts_31_103.py 3 files changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/18/25818/1 diff --git a/pySim-shell.py b/pySim-shell.py index d24a881..594ad97 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -82,8 +82,8 @@ # Create runtime state with card profile profile = CardProfileUICC() - profile.add_application(CardApplicationUSIM) - profile.add_application(CardApplicationISIM) + profile.add_application(CardApplicationUSIM()) + profile.add_application(CardApplicationISIM()) rs = RuntimeState(card, profile) # FIXME: do this dynamically diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index faf0f38..14d7ec1 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1115,4 +1115,6 @@ } } -CardApplicationUSIM = CardApplication('USIM', adf=ADF_USIM(), sw=sw_usim) +class CardApplicationUSIM(CardApplication): + def __init__(self): + super().__init__('USIM', adf=ADF_USIM(), sw=sw_usim) diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index e1f552f..63ef99e 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -223,4 +223,6 @@ } } -CardApplicationISIM = CardApplication('ISIM', adf=ADF_ISIM(), sw=sw_isim) +class CardApplicationISIM(CardApplication): + def __init__(self): + super().__init__('ISIM', adf=ADF_ISIM(), sw=sw_isim) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibb4f6242e7a92af84a905daa727b1b87016e7819 Gerrit-Change-Number: 25818 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 12:38:57 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 18 Oct 2021 12:38:57 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25552 ) Change subject: pySim-shell: add bulk provisioning support ...................................................................... Patch Set 10: (1 comment) https://gerrit.osmocom.org/c/pysim/+/25552/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/pysim/+/25552/3//COMMIT_MSG at 1 PS3, Line 1: Parent: b8b87fbe (pySim-shell: add echo command) > still not adressed? I don't see any response at all. I did not see this comment. Thanks for pointing this out. The print() This is of course a bug. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 18 Oct 2021 12:38:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 12:39:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 18 Oct 2021 12:39:53 +0000 Subject: Change in osmo-pcu[master]: pdch: Log reason of expected POLL when receiving unexpected UL data In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25811 ) Change subject: pdch: Log reason of expected POLL when receiving unexpected UL data ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I914e38154029f57cbf38120495220cd860877c45 Gerrit-Change-Number: 25811 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 12:39:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 12:41:38 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 18 Oct 2021 12:41:38 +0000 Subject: Change in osmo-pcu[master]: bts_rcv_rach(): Gather pointers to data objects early and use them later In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25812 ) Change subject: bts_rcv_rach(): Gather pointers to data objects early and use them later ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I476814d0f7be4b53f66211bb472700fee4f2caa9 Gerrit-Change-Number: 25812 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 12:41:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 12:57:15 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 18 Oct 2021 12:57:15 +0000 Subject: Change in osmo-pcu[master]: bts_rcv_rach(): Split code paths for Ass and Ass Rej In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25813 ) Change subject: bts_rcv_rach(): Split code paths for Ass and Ass Rej ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/25813/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/25813/1//COMMIT_MSG at 9 PS1, Line 9: a lot easier to follow I would not say it's hard to follow the current variant of this function. Please add more arguments why. Currently it feels like you're refactoring the code to satisfy your personal/subjective coding preferences. https://gerrit.osmocom.org/c/osmo-pcu/+/25813/1/src/bts.cpp File src/bts.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25813/1/src/bts.cpp at 870 PS1, Line 870: struct gprs_rlcmac_pdch *pdch; Unrelated change. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I80e554315d36a515a7edc9ae51057ce31eb9110d Gerrit-Change-Number: 25813 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 12:57:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 12:58:11 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 18 Oct 2021 12:58:11 +0000 Subject: Change in osmo-pcu[master]: bts_rcv_rach(): Split code paths for Ass and Ass Rej In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25813 ) Change subject: bts_rcv_rach(): Split code paths for Ass and Ass Rej ...................................................................... Patch Set 1: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I80e554315d36a515a7edc9ae51057ce31eb9110d Gerrit-Change-Number: 25813 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 12:58:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 12:59:30 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 18 Oct 2021 12:59:30 +0000 Subject: Change in osmo-pcu[master]: Get rid of tbf tsc field In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25814 ) Change subject: Get rid of tbf tsc field ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I105eb65d507e45631faddb23420c42bc9560e580 Gerrit-Change-Number: 25814 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 12:59:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 13:00:14 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 18 Oct 2021 13:00:14 +0000 Subject: Change in osmo-pcu[master]: Get rid of tbf tsc field In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25814 ) Change subject: Get rid of tbf tsc field ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25814/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/25814/1//COMMIT_MSG at 9 PS1, Line 9: TSC I guess you meant 'of a TBF'? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I105eb65d507e45631faddb23420c42bc9560e580 Gerrit-Change-Number: 25814 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 13:00:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 13:01:54 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 18 Oct 2021 13:01:54 +0000 Subject: Change in osmo-pcu[master]: ts_alloc: Rename s/tbf_/tbf/ In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25815 ) Change subject: ts_alloc: Rename s/tbf_/tbf/ ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25815/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/25815/1//COMMIT_MSG at 9 PS1, Line 9: My On -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8ae689a272b7c4d244576ff157f6019a87041abc Gerrit-Change-Number: 25815 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 13:01:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 13:02:13 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 18 Oct 2021 13:02:13 +0000 Subject: Change in osmo-pcu[master]: tbf: Update FSM names when TFI change during tbf_update() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25816 ) Change subject: tbf: Update FSM names when TFI change during tbf_update() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7bcbb223ca32400bede7ab638695ba3c015c9946 Gerrit-Change-Number: 25816 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 13:02:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 13:02:48 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 18 Oct 2021 13:02:48 +0000 Subject: Change in osmo-pcu[master]: tbf_fsm: Add assert verifying X2002 only triggers for DL TBF In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25817 ) Change subject: tbf_fsm: Add assert verifying X2002 only triggers for DL TBF ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7588deef5073694eb5fecdb516c241a04594e2b0 Gerrit-Change-Number: 25817 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 13:02:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 13:35:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 13:35:11 +0000 Subject: Change in osmo-pcu[master]: bts_rcv_rach(): Split code paths for Ass and Ass Rej In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25813 ) Change subject: bts_rcv_rach(): Split code paths for Ass and Ass Rej ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/25813/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/25813/1//COMMIT_MSG at 9 PS1, Line 9: a lot easier to follow > I would not say it's hard to follow the current variant of this function. [?] I'm happy you find it's not hard to follow the function, but it is to me. It's not the first time I have to spend time looking at that function for a while to make sure everything is fine and not faulty, due to final path being shared with some parts of the code jumping (goto) into it with some varaibles not set, etc. Even gcc had problems tracking variable dependencies there. I think it's "generally" understood a good practice to avoid goto jumping to one place or another while it's a usual good practice to use them for error handling + return paths. https://gerrit.osmocom.org/c/osmo-pcu/+/25813/1/src/bts.cpp File src/bts.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25813/1/src/bts.cpp at 870 PS1, Line 870: struct gprs_rlcmac_pdch *pdch; > Unrelated change. It's not unrelated: Due to untangling the final path, I expect gcc being able to follow variable initialization properly now. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I80e554315d36a515a7edc9ae51057ce31eb9110d Gerrit-Change-Number: 25813 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 13:35:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 13:35:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 13:35:41 +0000 Subject: Change in osmo-pcu[master]: Get rid of tbf tsc field In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25814 ) Change subject: Get rid of tbf tsc field ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-pcu/+/25814/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/25814/1//COMMIT_MSG at 9 PS1, Line 9: TSC > I guess you meant 'of a TBF'? Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I105eb65d507e45631faddb23420c42bc9560e580 Gerrit-Change-Number: 25814 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 13:35:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 13:37:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 13:37:17 +0000 Subject: Change in osmo-pcu[master]: Get rid of tbf tsc field In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25814 to look at the new patch set (#2). Change subject: Get rid of tbf tsc field ...................................................................... Get rid of tbf tsc field TSC is not really a property of a TBF, so let's drop it in order to avoid confusing and possible misuse of that accessor. Change-Id: I105eb65d507e45631faddb23420c42bc9560e580 --- M src/bts.cpp M src/tbf.cpp M src/tbf.h 3 files changed, 1 insertion(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/14/25814/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I105eb65d507e45631faddb23420c42bc9560e580 Gerrit-Change-Number: 25814 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 13:37:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 13:37:17 +0000 Subject: Change in osmo-pcu[master]: ts_alloc: Rename s/tbf_/tbf/ In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25815 to look at the new patch set (#2). Change subject: ts_alloc: Rename s/tbf_/tbf/ ...................................................................... ts_alloc: Rename s/tbf_/tbf/ Off the top of my head: The tbf_ was kept during a previous refactoring a while ago to avoid changing lots of more lines in the same patch. Change-Id: I8ae689a272b7c4d244576ff157f6019a87041abc --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 24 insertions(+), 26 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/15/25815/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8ae689a272b7c4d244576ff157f6019a87041abc Gerrit-Change-Number: 25815 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 13:37:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 13:37:17 +0000 Subject: Change in osmo-pcu[master]: tbf: Update FSM names when TFI change during tbf_update() In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25816 to look at the new patch set (#2). Change subject: tbf: Update FSM names when TFI change during tbf_update() ...................................................................... tbf: Update FSM names when TFI change during tbf_update() In that function, previous PDCHs are unlinked and then alloc_algorithm is expected to assign new TFIs. Change-Id: I7bcbb223ca32400bede7ab638695ba3c015c9946 --- M src/tbf.cpp 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/16/25816/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7bcbb223ca32400bede7ab638695ba3c015c9946 Gerrit-Change-Number: 25816 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 13:37:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 13:37:17 +0000 Subject: Change in osmo-pcu[master]: tbf_fsm: Add assert verifying X2002 only triggers for DL TBF In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25817 to look at the new patch set (#2). Change subject: tbf_fsm: Add assert verifying X2002 only triggers for DL TBF ...................................................................... tbf_fsm: Add assert verifying X2002 only triggers for DL TBF Code above setting the timer in same tbf_fsm already has this kind of assert, but it helps understanding the code having this assert here. Change-Id: I7588deef5073694eb5fecdb516c241a04594e2b0 --- M src/tbf_fsm.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/17/25817/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7588deef5073694eb5fecdb516c241a04594e2b0 Gerrit-Change-Number: 25817 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 14:14:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 14:14:11 +0000 Subject: Change in osmo-pcu[master]: tbf: Assert if update() is called on UL TBF References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25819 ) Change subject: tbf: Assert if update() is called on UL TBF ...................................................................... tbf: Assert if update() is called on UL TBF This function is expected to be used only on DL TBF so far, so let's really assert to avoid going through if something is wrong and ending up later with other issues. Change-Id: If398ee48364fce5b5e38830b2b278b3bad9a48a2 --- M src/tbf.cpp 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/19/25819/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index 2e2e388..3e190b4 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -314,10 +314,8 @@ { int rc; - if (direction != GPRS_RLCMAC_DL_TBF) - return -EINVAL; - LOGP(DTBF, LOGL_DEBUG, "********** DL-TBF update **********\n"); + OSMO_ASSERT(direction == GPRS_RLCMAC_DL_TBF); tbf_unlink_pdch(this); rc = the_pcu->alloc_algorithm(bts, this, false, -1); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If398ee48364fce5b5e38830b2b278b3bad9a48a2 Gerrit-Change-Number: 25819 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 14:14:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 14:14:13 +0000 Subject: Change in osmo-pcu[master]: tbf: update(): return negative val on error References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25820 ) Change subject: tbf: update(): return negative val on error ...................................................................... tbf: update(): return negative val on error Let's follow usual convention where errors are returned as negative values. Change-Id: Ib4f4dc37ae82ba8efdc212ed85af7934e16a8a8d --- M src/tbf.cpp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/20/25820/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index 3e190b4..50940c8 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -323,7 +323,7 @@ if (rc < 0) { LOGPTBF(this, LOGL_ERROR, "No resource after update???\n"); bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_FAIL); - return -rc; + return rc; } if (is_egprs_enabled()) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib4f4dc37ae82ba8efdc212ed85af7934e16a8a8d Gerrit-Change-Number: 25820 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 14:44:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 14:44:21 +0000 Subject: Change in osmo-pcu[master]: tbf: Drop unneeded braces in one line condition References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25821 ) Change subject: tbf: Drop unneeded braces in one line condition ...................................................................... tbf: Drop unneeded braces in one line condition Change-Id: Ief5e0ea0b7146d3330a17d5f0d171755b576fca3 --- M src/tbf.cpp 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/21/25821/1 diff --git a/src/tbf.cpp b/src/tbf.cpp index 50940c8..07732dc 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -206,9 +206,8 @@ if (m_ms == ms) return; - if (m_ms) { + if (m_ms) ms_detach_tbf(m_ms, this); - } m_ms = ms; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ief5e0ea0b7146d3330a17d5f0d171755b576fca3 Gerrit-Change-Number: 25821 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 16:03:45 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 18 Oct 2021 16:03:45 +0000 Subject: Change in osmo-pcu[master]: tbf: Drop unneeded braces in one line condition In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25821 ) Change subject: tbf: Drop unneeded braces in one line condition ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ief5e0ea0b7146d3330a17d5f0d171755b576fca3 Gerrit-Change-Number: 25821 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 18 Oct 2021 16:03:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 16:12:40 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 18 Oct 2021 16:12:40 +0000 Subject: Change in osmo-pcu[master]: tbf: update(): return negative val on error In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25820 ) Change subject: tbf: update(): return negative val on error ...................................................................... Patch Set 1: Code-Review+1 This seems plausible. From what I can see the return code is not used anyway. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib4f4dc37ae82ba8efdc212ed85af7934e16a8a8d Gerrit-Change-Number: 25820 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 18 Oct 2021 16:12:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 16:13:49 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 18 Oct 2021 16:13:49 +0000 Subject: Change in osmo-pcu[master]: tbf: Assert if update() is called on UL TBF In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25819 ) Change subject: tbf: Assert if update() is called on UL TBF ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If398ee48364fce5b5e38830b2b278b3bad9a48a2 Gerrit-Change-Number: 25819 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Mon, 18 Oct 2021 16:13:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 16:24:01 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 18 Oct 2021 16:24:01 +0000 Subject: Change in osmo-pcu[master]: bts_rcv_rach(): Split code paths for Ass and Ass Rej In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25813 ) Change subject: bts_rcv_rach(): Split code paths for Ass and Ass Rej ...................................................................... Patch Set 1: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-pcu/+/25813/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-pcu/+/25813/1//COMMIT_MSG at 9 PS1, Line 9: a lot easier to follow > I'm happy you find it's not hard to follow the function, but it is to me. [?] I have tried to read the section that was changed. I find it more readable how it is now. label "send_imm_ass_rej" suggests that the code is already at the point where it will sed the send_imm_ass_rej, but in the old version the first few lines after send_imm_ass_rej serve also the non reject case. This is very confusing. I think the new version makes more sense. https://gerrit.osmocom.org/c/osmo-pcu/+/25813/1/src/bts.cpp File src/bts.cpp: https://gerrit.osmocom.org/c/osmo-pcu/+/25813/1/src/bts.cpp at 870 PS1, Line 870: struct gprs_rlcmac_pdch *pdch; > It's not unrelated: Due to untangling the final path, I expect gcc being able to follow variable ini [?] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I80e554315d36a515a7edc9ae51057ce31eb9110d Gerrit-Change-Number: 25813 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 18 Oct 2021 16:24:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 16:26:42 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 18 Oct 2021 16:26:42 +0000 Subject: Change in osmo-pcu[master]: tbf: Update FSM names when TFI change during tbf_update() In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25816 ) Change subject: tbf: Update FSM names when TFI change during tbf_update() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7bcbb223ca32400bede7ab638695ba3c015c9946 Gerrit-Change-Number: 25816 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 16:26:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 16:28:22 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 18 Oct 2021 16:28:22 +0000 Subject: Change in osmo-pcu[master]: tbf_fsm: Add assert verifying X2002 only triggers for DL TBF In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25817 ) Change subject: tbf_fsm: Add assert verifying X2002 only triggers for DL TBF ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7588deef5073694eb5fecdb516c241a04594e2b0 Gerrit-Change-Number: 25817 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 16:28:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 16:31:13 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 18 Oct 2021 16:31:13 +0000 Subject: Change in osmo-pcu[master]: ts_alloc: Rename s/tbf_/tbf/ In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25815 ) Change subject: ts_alloc: Rename s/tbf_/tbf/ ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8ae689a272b7c4d244576ff157f6019a87041abc Gerrit-Change-Number: 25815 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 16:31:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 16:42:16 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 18 Oct 2021 16:42:16 +0000 Subject: Change in osmo-pcu[master]: Get rid of tbf tsc field In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25814 ) Change subject: Get rid of tbf tsc field ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I105eb65d507e45631faddb23420c42bc9560e580 Gerrit-Change-Number: 25814 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 16:42:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 16:50:58 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 18 Oct 2021 16:50:58 +0000 Subject: Change in osmo-pcu[master]: bts_rcv_rach(): Gather pointers to data objects early and use them later In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25812 ) Change subject: bts_rcv_rach(): Gather pointers to data objects early and use them later ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I476814d0f7be4b53f66211bb472700fee4f2caa9 Gerrit-Change-Number: 25812 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 16:50:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 16:52:15 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Mon, 18 Oct 2021 16:52:15 +0000 Subject: Change in osmo-pcu[master]: pdch: Log reason of expected POLL when receiving unexpected UL data In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25811 ) Change subject: pdch: Log reason of expected POLL when receiving unexpected UL data ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I914e38154029f57cbf38120495220cd860877c45 Gerrit-Change-Number: 25811 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 18 Oct 2021 16:52:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 16:55:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 16:55:09 +0000 Subject: Change in osmo-pcu[master]: tbf: Update FSM names when TFI change during tbf_update() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25816 ) Change subject: tbf: Update FSM names when TFI change during tbf_update() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7bcbb223ca32400bede7ab638695ba3c015c9946 Gerrit-Change-Number: 25816 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 18 Oct 2021 16:55:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 16:55:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 18 Oct 2021 16:55:12 +0000 Subject: Change in osmo-pcu[master]: tbf_fsm: Add assert verifying X2002 only triggers for DL TBF In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25817 ) Change subject: tbf_fsm: Add assert verifying X2002 only triggers for DL TBF ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7588deef5073694eb5fecdb516c241a04594e2b0 Gerrit-Change-Number: 25817 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 18 Oct 2021 16:55:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 20:05:36 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 18 Oct 2021 20:05:36 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/24236 ) Change subject: Add support for LCLS to the MSC ...................................................................... Patch Set 7: (1 comment) > Patch Set 7: Code-Review+1 > > (3 comments) > > it would be nice to have the MNCC protocol version change in a separate patch, so that it is easy to read what parts relate to the bare protocol change, and what parts relate to functional change in osmo-msc The protocol change is 3 lines in mncc.h (in fact the commit would just be mncc.h from this patchset and nothing else. I can do it, but does it really make a difference? https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/include/osmocom/msc/mncc.h File include/osmocom/msc/mncc.h: https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/include/osmocom/msc/mncc.h at 164 PS7, Line 164: struct osmo_gcr_parsed gcr; > this is a good place, besides the SDP always being in the end, this leaves previous version MNCC unc [?] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 7 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 18 Oct 2021 20:05:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 20:24:52 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 18 Oct 2021 20:24:52 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: Hello Jenkins Builder, neels, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 to look at the new patch set (#8). Change subject: Add support for LCLS to the MSC ...................................................................... Add support for LCLS to the MSC This commit is largely based on work by Max Adds LCLS parameters for A-interface transactions This commit also adds a vty option to facilitate globally disabling LCLS for all calls on this MSC. Add a global call reference (GCR) to MNCC and therefore bump the MNCC version to version 8. (This commit has to be merged at the same time as the corresponing commit in the osmo-sip-connector for mncc-external use.) Depends: osmo-sip-connector Id40d7e0fed9356f801b3627c118150055e7232b1 Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b --- M include/osmocom/msc/debug.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/mncc.h M include/osmocom/msc/ran_msg.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_a.c M src/libmsc/msc_vty.c M src/libmsc/ran_msg_a.c M src/libmsc/transaction.c M src/osmo-msc/msc_main.c M tests/mncc/mncc_test.ok M tests/test_nodes.vty 13 files changed, 135 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/36/24236/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 8 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 20:27:34 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 18 Oct 2021 20:27:34 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: Hello Jenkins Builder, neels, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 to look at the new patch set (#9). Change subject: Add support for LCLS to the MSC ...................................................................... Add support for LCLS to the MSC This commit is largely based on work by Max Adds LCLS parameters for A-interface transactions This commit also adds a vty option to facilitate globally disabling LCLS for all calls on this MSC. Add a global call reference (GCR) to MNCC and therefore bump the MNCC version to version 8. (This commit has to be merged at the same time as the corresponing commit in the osmo-sip-connector for mncc-external use.) Depends: osmo-sip-connector Id40d7e0fed9356f801b3627c118150055e7232b1 Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b --- M include/osmocom/msc/debug.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/mncc.h M include/osmocom/msc/ran_msg.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_a.c M src/libmsc/msc_vty.c M src/libmsc/ran_msg_a.c M src/libmsc/transaction.c M src/osmo-msc/msc_main.c M tests/mncc/mncc_test.ok M tests/test_nodes.vty 13 files changed, 135 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/36/24236/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 9 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 20:29:30 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 18 Oct 2021 20:29:30 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/24236 ) Change subject: Add support for LCLS to the MSC ...................................................................... Patch Set 9: (2 comments) https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/include/osmocom/msc/gsm_data.h File include/osmocom/msc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-msc/+/24236/7/include/osmocom/msc/gsm_data.h at 264 PS7, Line 264: bool lcls_disable; > i generally dislike reverse logic booleans, the double negation can make reading logic a nightmare.. [?] Done https://gerrit.osmocom.org/c/osmo-msc/+/24236/9/include/osmocom/msc/transaction.h File include/osmocom/msc/transaction.h: https://gerrit.osmocom.org/c/osmo-msc/+/24236/9/include/osmocom/msc/transaction.h at 103 PS9, Line 103: struct osmo_lcls *lcls; I had some conversation with @neels before about not having this here as a pointer, which requires quite a lot of changes; - I think then trans_lcls_compose() would modify the member directly and return a status int ? I have a branch where I was working on it that way, but I never got it quite right. I don't know how important it would be to do this. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 9 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 18 Oct 2021 20:29:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: keith Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 20:34:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 18 Oct 2021 20:34:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix a minor coding style issue References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25822 ) Change subject: BSC_Tests: fix a minor coding style issue ...................................................................... BSC_Tests: fix a minor coding style issue Change-Id: Ife5d37ebb7850f050c7db0723dfbda4d60d2db1a --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/22/25822/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index d64ccc0..a65871b 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -10517,7 +10517,7 @@ execute( TC_dyn_pdch_osmo_act_nack() ); if (mp_enable_dyn_sdcch8_test) { execute( TC_dyn_ts_sdcch8_act_deact() ); - execute (TC_dyn_ts_sdcch8_tch_call_act_deact() ); + execute( TC_dyn_ts_sdcch8_tch_call_act_deact() ); execute( TC_dyn_ts_sdcch8_act_nack() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ife5d37ebb7850f050c7db0723dfbda4d60d2db1a Gerrit-Change-Number: 25822 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 20:42:02 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Mon, 18 Oct 2021 20:42:02 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: Hello Jenkins Builder, neels, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 to look at the new patch set (#10). Change subject: Add support for LCLS to the MSC ...................................................................... Add support for LCLS to the MSC This commit is largely based on work by Max Adds LCLS parameters for A-interface transactions This commit also adds a vty option to facilitate globally disabling LCLS for all calls on this MSC. Add a global call reference (GCR) to MNCC and therefore bump the MNCC version to version 8. (This commit has to be merged at the same time as the corresponing commit in the osmo-sip-connector for mncc-external use.) Depends: osmo-sip-connector Id40d7e0fed9356f801b3627c118150055e7232b1 Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b --- M include/osmocom/msc/debug.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/mncc.h M include/osmocom/msc/ran_msg.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_a.c M src/libmsc/msc_vty.c M src/libmsc/ran_msg_a.c M src/libmsc/transaction.c M src/osmo-msc/msc_main.c M tests/mncc/mncc_test.ok M tests/test_nodes.vty 13 files changed, 134 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/36/24236/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 10 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 18 20:52:25 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 18 Oct 2021 20:52:25 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/24236 ) Change subject: Add support for LCLS to the MSC ...................................................................... Patch Set 10: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 10 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 18 Oct 2021 20:52:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 08:15:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 08:15:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix a minor coding style issue In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25822 ) Change subject: BSC_Tests: fix a minor coding style issue ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ife5d37ebb7850f050c7db0723dfbda4d60d2db1a Gerrit-Change-Number: 25822 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 08:15:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 08:36:10 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 08:36:10 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix a minor coding style issue In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25822 ) Change subject: BSC_Tests: fix a minor coding style issue ...................................................................... BSC_Tests: fix a minor coding style issue Change-Id: Ife5d37ebb7850f050c7db0723dfbda4d60d2db1a --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index d64ccc0..a65871b 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -10517,7 +10517,7 @@ execute( TC_dyn_pdch_osmo_act_nack() ); if (mp_enable_dyn_sdcch8_test) { execute( TC_dyn_ts_sdcch8_act_deact() ); - execute (TC_dyn_ts_sdcch8_tch_call_act_deact() ); + execute( TC_dyn_ts_sdcch8_tch_call_act_deact() ); execute( TC_dyn_ts_sdcch8_act_nack() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25822 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ife5d37ebb7850f050c7db0723dfbda4d60d2db1a Gerrit-Change-Number: 25822 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 09:18:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 09:18:29 +0000 Subject: Change in osmo-bts[master]: bts_shutdown_fsm: Make sure pending power ramping are aborted before ... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25823 ) Change subject: bts_shutdown_fsm: Make sure pending power ramping are aborted before closing TRX ...................................................................... bts_shutdown_fsm: Make sure pending power ramping are aborted before closing TRX It can happen when using several TRX that all of them go alreadyunder shutdown target tx power level, but that due to configuration the BTS still may want to keep pushing the tx power level even lower. Hence, we end up in a situation where the FSM is trying to close all the TRX while the power ramp procedure is ongoing for some of them. As a result, race conditions can happen where for instance the power ramping procedure for one TRX ends and calls the cb to send SETPOWER after the TRX PHY has been closed (and hence TRXC link is unavaialble). If that happens, the trx_if lower layers store the SETPOWER and attempt a later retransmit, which may take up to 2 seconds after TRX becomes active if BTS reconnects immediatelly. Hence, we end up in some test cases where BTS reconnects and configures some TRX while others are kep unconfigured for a while due to the mentioned delay, hence the test attempting to use the TS while it hasn't been yet configured. The solution is to avoid this kind of unexpected events with ongoing powe ramp once we have decided tx power is lower enough to shutdown the TRX completely. Hence we abort the pending power ramp procedure. Change-Id: Ibca581131eb142d7c38c917a0d6990efec03123c --- M include/osmo-bts/tx_power.h M src/common/bts_shutdown_fsm.c M src/common/tx_power.c 3 files changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/23/25823/1 diff --git a/include/osmo-bts/tx_power.h b/include/osmo-bts/tx_power.h index 8f68d8a..a7f846e 100644 --- a/include/osmo-bts/tx_power.h +++ b/include/osmo-bts/tx_power.h @@ -78,6 +78,7 @@ int get_p_trxout_actual_mdBm_lchan(const struct gsm_lchan *lchan); int power_ramp_start(struct gsm_bts_trx *trx, int p_total_tgt_mdBm, int bypass, ramp_compl_cb_t ramp_compl_cb); +void power_ramp_abort(struct gsm_bts_trx *trx); void power_trx_change_compl(struct gsm_bts_trx *trx, int p_trxout_cur_mdBm); diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c index a663f5b..0c6d80c 100644 --- a/src/common/bts_shutdown_fsm.c +++ b/src/common/bts_shutdown_fsm.c @@ -112,8 +112,15 @@ LOGPFSML(fi, LOGL_INFO, "%s Ramping down complete, %u TRX remaining\n", gsm_trx_name(src_trx), remaining); - if (remaining == 0) + if (remaining == 0) { + /* Make sure we end up any remaining ongoing power ramp + * down under target shutdown tx power level, then + * finally transit to next state: + */ + llist_for_each_entry(trx, &bts->trx_list, list) + power_ramp_abort(trx); bts_shutdown_fsm_state_chg(fi, BTS_SHUTDOWN_ST_WAIT_TRX_CLOSED); + } break; } } diff --git a/src/common/tx_power.c b/src/common/tx_power.c index 348aba5..0307422 100644 --- a/src/common/tx_power.c +++ b/src/common/tx_power.c @@ -259,7 +259,7 @@ } /* Cancel any pending request */ - osmo_timer_del(&tpp->ramp.step_timer); + power_ramp_abort(trx); /* set the new target */ tpp->p_total_tgt_mdBm = p_total_tgt_mdBm; @@ -297,6 +297,12 @@ return 0; } +/* Cancel any pending request */ +void power_ramp_abort(struct gsm_bts_trx *trx) +{ + osmo_timer_del(&trx->power_params.ramp.step_timer); +} + /* determine the initial transceiver output power at start-up time */ int power_ramp_initial_power_mdBm(const struct gsm_bts_trx *trx) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibca581131eb142d7c38c917a0d6990efec03123c Gerrit-Change-Number: 25823 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 09:49:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 09:49:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: also [re]set band in f_TC_fh_params_[un]set() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25824 ) Change subject: BSC_Tests: also [re]set band in f_TC_fh_params_[un]set() ...................................................................... BSC_Tests: also [re]set band in f_TC_fh_params_[un]set() In f_TC_fh_params_set() we use ARFCN values from the GSM900 band, while by default osmo-bsc is using DCS1800. Let's set GSM900 before executing FH test cases, and then reset back to DCS1800. Change-Id: Ia7d2f87c62e6fda06ade78bd1a57a442acf659bd Related: SYS#5369 --- M bsc/BSC_Tests.ttcn 1 file changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/25824/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index a65871b..9fb9272 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -8497,8 +8497,14 @@ uint8_t bts_nr := 0, uint8_t trx_nr := 0) runs on test_CT { - /* Enter the configuration node for the given BTS/TRX numbers */ - f_vty_enter_cfg_trx(BSCVTY, bts_nr, trx_nr); + /* Enter the configuration node for the given BTS number */ + f_vty_enter_cfg_bts(BSCVTY, bts_nr); + + /* We do use ARFCN values from the 900 MHz band, so set it */ + f_vty_transceive(BSCVTY, "band GSM900"); + + /* Enter the configuration node for the given TRX number */ + f_vty_transceive(BSCVTY, "trx " & int2str(trx_nr)); f_vty_transceive(BSCVTY, "arfcn " & int2str(fhp.arfcn)); @@ -8533,8 +8539,14 @@ uint8_t trx_nr := 0, GsmArfcn arfcn := 871) runs on test_CT { - /* Enter the configuration node for the given BTS/TRX numbers */ - f_vty_enter_cfg_trx(BSCVTY, bts_nr, trx_nr); + /* Enter the configuration node for the given BTS number */ + f_vty_enter_cfg_bts(BSCVTY, bts_nr); + + /* Reset back to the 1800 MHz band */ + f_vty_transceive(BSCVTY, "band DSC1800"); + + /* Enter the configuration node for the given TRX number */ + f_vty_transceive(BSCVTY, "trx " & int2str(trx_nr)); f_vty_transceive(BSCVTY, "arfcn " & int2str(arfcn)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia7d2f87c62e6fda06ade78bd1a57a442acf659bd Gerrit-Change-Number: 25824 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 09:52:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 09:52:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: also [re]set band in f_TC_fh_params_[un]set() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25824 ) Change subject: BSC_Tests: also [re]set band in f_TC_fh_params_[un]set() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25824/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25824/1/bsc/BSC_Tests.ttcn at 8504 PS1, Line 8504: f_vty_transceive(BSCVTY, "band GSM900"); If all other tests seem to be using band 1800, is there a reason to use 900 here instead of keeping 1800 to avoid this kind of issues? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia7d2f87c62e6fda06ade78bd1a57a442acf659bd Gerrit-Change-Number: 25824 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 09:52:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 09:59:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 09:59:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: also [re]set band in f_TC_fh_params_[un]set() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25824 ) Change subject: BSC_Tests: also [re]set band in f_TC_fh_params_[un]set() ...................................................................... Patch Set 1: (1 comment) Keeping WIP for now, because we need some feedback from dexter. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25824/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25824/1/bsc/BSC_Tests.ttcn at 8504 PS1, Line 8504: f_vty_transceive(BSCVTY, "band GSM900"); > If all other tests seem to be using band 1800, is there a reason to use 900 here instead of keeping [?] Yes, the reason is that GSM900 has ARFCN 0, which is kind of special and requires special encoding. I wanted the test cases to cover this special case too (and actually found a bug in osmo-bsc). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25824 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia7d2f87c62e6fda06ade78bd1a57a442acf659bd Gerrit-Change-Number: 25824 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 09:59:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 10:06:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 10:06:28 +0000 Subject: Change in osmo-bts[master]: bts_shutdown_fsm: Make sure pending power ramping are aborted before ... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25823 ) Change subject: bts_shutdown_fsm: Make sure pending power ramping are aborted before closing TRX ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibca581131eb142d7c38c917a0d6990efec03123c Gerrit-Change-Number: 25823 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 19 Oct 2021 10:06:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 10:39:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 10:39:50 +0000 Subject: Change in osmo-bts[master]: gsm_pchan2chan_nr(): Properly asser if unexpectes pchan is passed References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25825 ) Change subject: gsm_pchan2chan_nr(): Properly asser if unexpectes pchan is passed ...................................................................... gsm_pchan2chan_nr(): Properly asser if unexpectes pchan is passed A bit of archeology, history & recap: ec1b5a0e9e2b6549e0ede48e803095e569997355 (openbsc.git) Adds assert in gsm_ts2chan_nr() 2f44693fad8505255293d3ed37dbd4e7cabebd37 (openbsc.git) ASSERT is disabled due to reported hit in octphy and litecell in gerrit for ec1b5a0e9e2b6549e0ede48e803095e569997355 5cef0623ef64bc641d2d29edb1ebaaafcc7c0df6 (osmo-bts,git) minor fixes to gsm_ts2chan_nr() regarding the pragma c9079d91069eaadf181a6e26e3c7205f1f05cbda (osmo-bts.git) GSM_PCHAN_NONE case is introduced in gsm_ts2chan_nr() This code has long evolved and robustness has improved, it's not even part of openbsc.git for several years now. Let's always assert if we receive an unexpected value there, since they are all internally handled values and hence we have control over them. Related: OS#2906 Change-Id: I25e2cf0c922bc9902336e9add75a47535b9355bf --- M src/common/lchan.c 1 file changed, 1 insertion(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/25/25825/1 diff --git a/src/common/lchan.c b/src/common/lchan.c index a3be4ee..e532615 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -364,14 +364,7 @@ default: LOGP(DRSL, LOGL_ERROR, "Physical channel %s (0x%02x) not expected!\n", gsm_pchan_name(pchan), (int)pchan); - /* OSMO_ASSERT(lchan_nr == 0); - * FIXME: On octphy and litecell, we hit above assertion (see - * Max's comment at https://gerrit.osmocom.org/589 ); disabled - * for BTS until this is clarified; remove the #ifdef when it - * is fixed. Tracked in OS#2906. - */ -#pragma message "fix caller that passes lchan_nr != 0" - cbits = 0x10; + OSMO_ASSERT(0); break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I25e2cf0c922bc9902336e9add75a47535b9355bf Gerrit-Change-Number: 25825 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 10:40:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 10:40:03 +0000 Subject: Change in osmo-bts[master]: gsm_pchan2chan_nr(): Properly assert if unexpected pchan is passed In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/25825 ) Change subject: gsm_pchan2chan_nr(): Properly assert if unexpected pchan is passed ...................................................................... gsm_pchan2chan_nr(): Properly assert if unexpected pchan is passed A bit of archeology, history & recap: ec1b5a0e9e2b6549e0ede48e803095e569997355 (openbsc.git) Adds assert in gsm_ts2chan_nr() 2f44693fad8505255293d3ed37dbd4e7cabebd37 (openbsc.git) ASSERT is disabled due to reported hit in octphy and litecell in gerrit for ec1b5a0e9e2b6549e0ede48e803095e569997355 5cef0623ef64bc641d2d29edb1ebaaafcc7c0df6 (osmo-bts,git) minor fixes to gsm_ts2chan_nr() regarding the pragma c9079d91069eaadf181a6e26e3c7205f1f05cbda (osmo-bts.git) GSM_PCHAN_NONE case is introduced in gsm_ts2chan_nr() This code has long evolved and robustness has improved, it's not even part of openbsc.git for several years now. Let's always assert if we receive an unexpected value there, since they are all internally handled values and hence we have control over them. Related: OS#2906 Change-Id: I25e2cf0c922bc9902336e9add75a47535b9355bf --- M src/common/lchan.c 1 file changed, 1 insertion(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/25/25825/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I25e2cf0c922bc9902336e9add75a47535b9355bf Gerrit-Change-Number: 25825 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 10:56:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 10:56:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Adapt tests to pass with new idle blocks from PCU In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25537 ) Change subject: pcu: Adapt tests to pass with new idle blocks from PCU ...................................................................... Patch Set 1: so what is the solution here? Marging this would break latest? Then separate tests for latest and master until the next tag? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6e96a7569640695ccfaa94b471384fa301bccd62 Gerrit-Change-Number: 25537 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 19 Oct 2021 10:56:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 10:57:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 10:57:25 +0000 Subject: Change in osmo-bts[master]: bts_shutdown_fsm: Make sure pending power ramping are aborted before ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25823 ) Change subject: bts_shutdown_fsm: Make sure pending power ramping are aborted before closing TRX ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibca581131eb142d7c38c917a0d6990efec03123c Gerrit-Change-Number: 25823 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 19 Oct 2021 10:57:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 10:58:11 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 10:58:11 +0000 Subject: Change in osmo-bts[master]: gsm_pchan2chan_nr(): Properly assert if unexpected pchan is passed In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25825 ) Change subject: gsm_pchan2chan_nr(): Properly assert if unexpected pchan is passed ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I25e2cf0c922bc9902336e9add75a47535b9355bf Gerrit-Change-Number: 25825 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 19 Oct 2021 10:58:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:06:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 11:06:50 +0000 Subject: Change in pysim[master]: ts_31_10x: add a class for CardApplicationXSIM In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25818 ) Change subject: ts_31_10x: add a class for CardApplicationXSIM ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibb4f6242e7a92af84a905daa727b1b87016e7819 Gerrit-Change-Number: 25818 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 19 Oct 2021 11:06:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:08:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 11:08:38 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25552 ) Change subject: pySim-shell: add bulk provisioning support ...................................................................... Patch Set 10: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/pysim/+/25552/10/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/25552/10/pySim-shell.py at 226 PS10, Line 226: self.poutput("\033[91m") I would have expected to use cmd2.ansi rather than hard-coded sequences here (https://cmd2.readthedocs.io/en/latest/api/ansi.html#module-cmd2.ansi) but this is not a blocker. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 10 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 19 Oct 2021 11:08:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:09:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 11:09:37 +0000 Subject: Change in pysim[master]: pySim-shell: add cardinfo command In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25805 ) Change subject: pySim-shell: add cardinfo command ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/pysim/+/25805/2/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/25805/2/pySim-shell.py at 611 PS2, Line 611: p > the ATR should also be printed ping? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25805 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If31ed17102dc0108e27a5eb0344aabaaf19b19f9 Gerrit-Change-Number: 25805 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 11:09:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:10:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 11:10:21 +0000 Subject: Change in osmo-bts[master]: bts_shutdown_fsm: Make sure pending power ramping are aborted before ... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25823 ) Change subject: bts_shutdown_fsm: Make sure pending power ramping are aborted before closing TRX ...................................................................... bts_shutdown_fsm: Make sure pending power ramping are aborted before closing TRX It can happen when using several TRX that all of them go alreadyunder shutdown target tx power level, but that due to configuration the BTS still may want to keep pushing the tx power level even lower. Hence, we end up in a situation where the FSM is trying to close all the TRX while the power ramp procedure is ongoing for some of them. As a result, race conditions can happen where for instance the power ramping procedure for one TRX ends and calls the cb to send SETPOWER after the TRX PHY has been closed (and hence TRXC link is unavaialble). If that happens, the trx_if lower layers store the SETPOWER and attempt a later retransmit, which may take up to 2 seconds after TRX becomes active if BTS reconnects immediatelly. Hence, we end up in some test cases where BTS reconnects and configures some TRX while others are kep unconfigured for a while due to the mentioned delay, hence the test attempting to use the TS while it hasn't been yet configured. The solution is to avoid this kind of unexpected events with ongoing powe ramp once we have decided tx power is lower enough to shutdown the TRX completely. Hence we abort the pending power ramp procedure. Change-Id: Ibca581131eb142d7c38c917a0d6990efec03123c --- M include/osmo-bts/tx_power.h M src/common/bts_shutdown_fsm.c M src/common/tx_power.c 3 files changed, 16 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmo-bts/tx_power.h b/include/osmo-bts/tx_power.h index 8f68d8a..a7f846e 100644 --- a/include/osmo-bts/tx_power.h +++ b/include/osmo-bts/tx_power.h @@ -78,6 +78,7 @@ int get_p_trxout_actual_mdBm_lchan(const struct gsm_lchan *lchan); int power_ramp_start(struct gsm_bts_trx *trx, int p_total_tgt_mdBm, int bypass, ramp_compl_cb_t ramp_compl_cb); +void power_ramp_abort(struct gsm_bts_trx *trx); void power_trx_change_compl(struct gsm_bts_trx *trx, int p_trxout_cur_mdBm); diff --git a/src/common/bts_shutdown_fsm.c b/src/common/bts_shutdown_fsm.c index a663f5b..0c6d80c 100644 --- a/src/common/bts_shutdown_fsm.c +++ b/src/common/bts_shutdown_fsm.c @@ -112,8 +112,15 @@ LOGPFSML(fi, LOGL_INFO, "%s Ramping down complete, %u TRX remaining\n", gsm_trx_name(src_trx), remaining); - if (remaining == 0) + if (remaining == 0) { + /* Make sure we end up any remaining ongoing power ramp + * down under target shutdown tx power level, then + * finally transit to next state: + */ + llist_for_each_entry(trx, &bts->trx_list, list) + power_ramp_abort(trx); bts_shutdown_fsm_state_chg(fi, BTS_SHUTDOWN_ST_WAIT_TRX_CLOSED); + } break; } } diff --git a/src/common/tx_power.c b/src/common/tx_power.c index 348aba5..0307422 100644 --- a/src/common/tx_power.c +++ b/src/common/tx_power.c @@ -259,7 +259,7 @@ } /* Cancel any pending request */ - osmo_timer_del(&tpp->ramp.step_timer); + power_ramp_abort(trx); /* set the new target */ tpp->p_total_tgt_mdBm = p_total_tgt_mdBm; @@ -297,6 +297,12 @@ return 0; } +/* Cancel any pending request */ +void power_ramp_abort(struct gsm_bts_trx *trx) +{ + osmo_timer_del(&trx->power_params.ramp.step_timer); +} + /* determine the initial transceiver output power at start-up time */ int power_ramp_initial_power_mdBm(const struct gsm_bts_trx *trx) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25823 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibca581131eb142d7c38c917a0d6990efec03123c Gerrit-Change-Number: 25823 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:10:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 11:10:48 +0000 Subject: Change in pysim[master]: pySim-shell: do not use usim/isim APDUs in the beginnning In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25804 ) Change subject: pySim-shell: do not use usim/isim APDUs in the beginnning ...................................................................... Patch Set 2: > I am a bit confused by this. I have a LycaMobile sim here that starts up fine with 2G APDUs but does not allow UICC APDUs until I have selected at least ADF.USIM and I have to do the select of ADF.USIM also with UICC APDUs. I wonder how this works in real life. Maybe I should take some traces to learn how real phones figure this out. thanks for sharing. I'm sure this is specified somewhere, maybe even in the UE conformance testing specs. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I985261a1bddae60ffeaccb9c8d8d1b8a2ae4d0fc Gerrit-Change-Number: 25804 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 11:10:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:25:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 11:25:10 +0000 Subject: Change in pysim[master]: pySim-shell: do not use usim/isim APDUs in the beginnning In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25804 ) Change subject: pySim-shell: do not use usim/isim APDUs in the beginnning ...................................................................... Patch Set 2: see section 7.5 of TR 31.900 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I985261a1bddae60ffeaccb9c8d8d1b8a2ae4d0fc Gerrit-Change-Number: 25804 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 11:25:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:32:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 11:32:12 +0000 Subject: Change in pysim[master]: pySim-shell: do not use usim/isim APDUs in the beginnning In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25804 ) Change subject: pySim-shell: do not use usim/isim APDUs in the beginnning ...................................................................... Patch Set 2: > I am a bit confused by this. I have a LycaMobile sim here that starts up fine with 2G APDUs but does not allow UICC APDUs until I have selected at least ADF.USIM and I have to do the select of ADF.USIM also with UICC APDUs. I wonder how this works in real life. Maybe I should take some traces to learn how real phones figure this out. Based on everything I've read, this LycaMobile card is broken. If it hosts an USIM application, it is required to accept CLA=0x00/0x80 immediately after reset. In the end, as I stated, we may need to do trial+error. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I985261a1bddae60ffeaccb9c8d8d1b8a2ae4d0fc Gerrit-Change-Number: 25804 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 11:32:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:33:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 11:33:07 +0000 Subject: Change in osmo-pcu[master]: pdch: Simplify code path allocating UL TBF In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25810 ) Change subject: pdch: Simplify code path allocating UL TBF ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25810 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie761c3c7c222458ab0514117ae637ad3267139a0 Gerrit-Change-Number: 25810 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 19 Oct 2021 11:33:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:34:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 11:34:51 +0000 Subject: Change in osmo-pcu[master]: bts_rcv_rach(): Split code paths for Ass and Ass Rej In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25813 ) Change subject: bts_rcv_rach(): Split code paths for Ass and Ass Rej ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I80e554315d36a515a7edc9ae51057ce31eb9110d Gerrit-Change-Number: 25813 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 19 Oct 2021 11:34:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:35:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 11:35:13 +0000 Subject: Change in osmo-pcu[master]: Get rid of tbf tsc field In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25814 ) Change subject: Get rid of tbf tsc field ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I105eb65d507e45631faddb23420c42bc9560e580 Gerrit-Change-Number: 25814 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 19 Oct 2021 11:35:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:35:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 11:35:31 +0000 Subject: Change in osmo-pcu[master]: ts_alloc: Rename s/tbf_/tbf/ In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25815 ) Change subject: ts_alloc: Rename s/tbf_/tbf/ ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8ae689a272b7c4d244576ff157f6019a87041abc Gerrit-Change-Number: 25815 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 19 Oct 2021 11:35:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:35:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 11:35:54 +0000 Subject: Change in osmo-pcu[master]: tbf: Assert if update() is called on UL TBF In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25819 ) Change subject: tbf: Assert if update() is called on UL TBF ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If398ee48364fce5b5e38830b2b278b3bad9a48a2 Gerrit-Change-Number: 25819 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 19 Oct 2021 11:35:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:36:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 11:36:12 +0000 Subject: Change in osmo-pcu[master]: tbf: update(): return negative val on error In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25820 ) Change subject: tbf: update(): return negative val on error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib4f4dc37ae82ba8efdc212ed85af7934e16a8a8d Gerrit-Change-Number: 25820 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 19 Oct 2021 11:36:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:41:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 11:41:50 +0000 Subject: Change in osmo-pcu[master]: pdch: Simplify code path allocating UL TBF In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25810 ) Change subject: pdch: Simplify code path allocating UL TBF ...................................................................... pdch: Simplify code path allocating UL TBF There's no real need to pass a tlli per separate, the information is already contained in the MS. Furthermore, when doing so, it becomes clear the TLLI was only passed to set it again on the MS, so actually that ms_update() can be totally dropped since it will act as a no-op. Change-Id: Ie761c3c7c222458ab0514117ae637ad3267139a0 --- M src/pdch.cpp M src/tbf_ul.cpp M src/tbf_ul.h 3 files changed, 4 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/pdch.cpp b/src/pdch.cpp index 68bc69d..7d70958 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -119,7 +119,7 @@ bts_do_rate_ctr_inc(bts, CTR_CHANNEL_REQUEST_DESCRIPTION); /* This call will register the new TBF with the MS on success */ - gprs_rlcmac_ul_tbf *ul_tbf = tbf_alloc_ul_pacch(bts, tbf->ms(), tbf->trx->trx_no, tbf->tlli()); + gprs_rlcmac_ul_tbf *ul_tbf = tbf_alloc_ul_pacch(bts, tbf->ms(), tbf->trx->trx_no); /* schedule uplink assignment or reject */ if (ul_tbf) { @@ -707,7 +707,7 @@ ms_set_egprs_ms_class(ms, egprs_ms_class); } - ul_tbf = tbf_alloc_ul_pacch(bts(), ms, trx_no(), tlli); + ul_tbf = tbf_alloc_ul_pacch(bts(), ms, trx_no()); if (!ul_tbf) { handle_tbf_reject(bts(), ms, trx_no(), ts_no); goto return_unref; diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index d4f2093..74b2636 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -152,8 +152,7 @@ } /* Alloc a UL TBF to be assigned over PACCH */ -gprs_rlcmac_ul_tbf *tbf_alloc_ul_pacch(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, - uint32_t tlli) +gprs_rlcmac_ul_tbf *tbf_alloc_ul_pacch(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx) { struct gprs_rlcmac_ul_tbf *tbf; @@ -165,8 +164,6 @@ } tbf->m_contention_resolution_done = 1; osmo_fsm_inst_dispatch(tbf->state_fsm.fi, TBF_EV_ASSIGN_ADD_PACCH, NULL); - tbf->update_ms(tlli, GPRS_RLCMAC_UL_TBF); - OSMO_ASSERT(tbf->ms()); return tbf; } diff --git a/src/tbf_ul.h b/src/tbf_ul.h index defdfba..0dc2336 100644 --- a/src/tbf_ul.h +++ b/src/tbf_ul.h @@ -126,8 +126,7 @@ } struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx, bool single_slot); -struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_pacch(struct gprs_rlcmac_bts *bts, GprsMs *ms, - int8_t use_trx, uint32_t tlli); +struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_pacch(struct gprs_rlcmac_bts *bts, GprsMs *ms, int8_t use_trx); struct gprs_rlcmac_ul_tbf *tbf_alloc_ul_ccch(struct gprs_rlcmac_bts *bts, struct GprsMs *ms); struct gprs_rlcmac_ul_tbf *handle_tbf_reject(struct gprs_rlcmac_bts *bts, GprsMs *ms, uint8_t trx_no, uint8_t ts_no); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25810 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie761c3c7c222458ab0514117ae637ad3267139a0 Gerrit-Change-Number: 25810 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:41:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 11:41:52 +0000 Subject: Change in osmo-pcu[master]: pdch: Log reason of expected POLL when receiving unexpected UL data In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25811 ) Change subject: pdch: Log reason of expected POLL when receiving unexpected UL data ...................................................................... pdch: Log reason of expected POLL when receiving unexpected UL data Change-Id: I914e38154029f57cbf38120495220cd860877c45 --- M src/pdch.cpp 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved dexter: Looks good to me, but someone else must approve diff --git a/src/pdch.cpp b/src/pdch.cpp index 7d70958..5d8658a 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -991,8 +991,9 @@ break; case PDCH_ULC_NODE_TBF_POLL: LOGPDCH(this, DRLCMACUL, LOGL_NOTICE, "FN=%" PRIu32 " " - "Rx UL DATA from unexpected %s vs expected POLL %s\n", - fn, tbf_name(tbf), tbf_name(node->tbf_poll.poll_tbf)); + "Rx UL DATA from unexpected %s vs expected POLL %s reason=%s\n", + fn, tbf_name(tbf), tbf_name(node->tbf_poll.poll_tbf), + get_value_string(pdch_ulc_tbf_poll_reason_names, node->tbf_poll.reason)); break; case PDCH_ULC_NODE_SBA: LOGPDCH(this, DRLCMACUL, LOGL_NOTICE, "FN=%" PRIu32 " " -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I914e38154029f57cbf38120495220cd860877c45 Gerrit-Change-Number: 25811 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:41:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 11:41:52 +0000 Subject: Change in osmo-pcu[master]: bts_rcv_rach(): Gather pointers to data objects early and use them later In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25812 ) Change subject: bts_rcv_rach(): Gather pointers to data objects early and use them later ...................................................................... bts_rcv_rach(): Gather pointers to data objects early and use them later Change-Id: I476814d0f7be4b53f66211bb472700fee4f2caa9 --- M src/bts.cpp 1 file changed, 11 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved dexter: Looks good to me, but someone else must approve diff --git a/src/bts.cpp b/src/bts.cpp index cad6c90..8d98fe4 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -867,7 +867,8 @@ struct chan_req_params chan_req = { 0 }; struct gprs_rlcmac_ul_tbf *tbf = NULL; struct gprs_rlcmac_sba *sba; - uint8_t trx_no = 0, ts_no = 0; /* initialize to avoid uninitialized false warnings on some gcc versions (11.1.0) */ + struct gprs_rlcmac_pdch *pdch = NULL; + struct gprs_rlcmac_trx *trx = NULL; uint32_t sb_fn = 0; uint8_t usf = 7; uint8_t tsc = 0; @@ -917,12 +918,11 @@ goto send_imm_ass_rej; } - trx_no = sba->pdch->trx_no(); - ts_no = sba->pdch->ts_no; + pdch = sba->pdch; sb_fn = sba->fn; - tsc = bts->trx[trx_no].pdch[ts_no].tsc; + tsc = pdch->tsc; LOGP(DRLCMAC, LOGL_DEBUG, "Allocated a single block at " - "SBFn=%u TRX=%u TS=%u\n", sb_fn, trx_no, ts_no); + "SBFn=%u TRX=%u TS=%u\n", sb_fn, pdch->trx->trx_no, pdch->ts_no); } else { GprsMs *ms = bts_alloc_ms(bts, 0, chan_req.egprs_mslot_class); tbf = tbf_alloc_ul_ccch(bts, ms); @@ -932,11 +932,11 @@ goto send_imm_ass_rej; } tbf->set_ta(ta); - trx_no = tbf->trx->trx_no; - ts_no = tbf->first_ts; - usf = tbf->m_usf[ts_no]; + pdch = &tbf->trx->pdch[tbf->first_ts]; + usf = tbf->m_usf[pdch->ts_no]; tsc = tbf->tsc(); } + trx = pdch->trx; send_imm_ass_rej: /* Allocate a bit-vector for RR Immediate Assignment [Reject] */ @@ -952,10 +952,9 @@ } else { LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment on AGCH: " "TRX=%u (ARFCN %u) TS=%u TA=%u TSC=%u TFI=%d USF=%d\n", - trx_no, bts->trx[trx_no].arfcn & ~ARFCN_FLAG_MASK, - ts_no, ta, tsc, tbf ? tbf->tfi() : -1, usf); - plen = Encoding::write_immediate_assignment( - &bts->trx[trx_no].pdch[ts_no], tbf, bv, + trx->trx_no, trx->arfcn & ~ARFCN_FLAG_MASK, + pdch->ts_no, ta, tsc, tbf ? tbf->tfi() : -1, usf); + plen = Encoding::write_immediate_assignment(pdch, tbf, bv, false, rip->ra, Fn, ta, usf, false, sb_fn, bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1, rip->burst_type); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25812 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I476814d0f7be4b53f66211bb472700fee4f2caa9 Gerrit-Change-Number: 25812 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:41:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 11:41:53 +0000 Subject: Change in osmo-pcu[master]: bts_rcv_rach(): Split code paths for Ass and Ass Rej In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25813 ) Change subject: bts_rcv_rach(): Split code paths for Ass and Ass Rej ...................................................................... bts_rcv_rach(): Split code paths for Ass and Ass Rej The function becomes a bit more long but it's a lot easier to follow. Change-Id: I80e554315d36a515a7edc9ae51057ce31eb9110d --- M src/bts.cpp 1 file changed, 28 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve laforge: Looks good to me, approved Objections: fixeria: I would prefer this is not merged as is diff --git a/src/bts.cpp b/src/bts.cpp index 8d98fe4..aa713fe 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -867,13 +867,17 @@ struct chan_req_params chan_req = { 0 }; struct gprs_rlcmac_ul_tbf *tbf = NULL; struct gprs_rlcmac_sba *sba; - struct gprs_rlcmac_pdch *pdch = NULL; - struct gprs_rlcmac_trx *trx = NULL; + struct gprs_rlcmac_pdch *pdch; + struct gprs_rlcmac_trx *trx; uint32_t sb_fn = 0; uint8_t usf = 7; uint8_t tsc = 0; int plen, rc; + /* Allocate a bit-vector for RR Immediate Assignment [Reject] */ + struct bitvec *bv = bitvec_alloc(22, tall_pcu_ctx); /* without plen */ + bitvec_unhex(bv, DUMMY_VEC); /* standard '2B'O padding */ + bts_do_rate_ctr_inc(bts, CTR_RACH_REQUESTS); if (rip->is_11bit) @@ -938,36 +942,34 @@ } trx = pdch->trx; -send_imm_ass_rej: - /* Allocate a bit-vector for RR Immediate Assignment [Reject] */ - struct bitvec *bv = bitvec_alloc(22, tall_pcu_ctx); /* without plen */ - bitvec_unhex(bv, DUMMY_VEC); /* standard '2B'O padding */ - - if (rc != 0) { - LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment Reject on AGCH\n"); - plen = Encoding::write_immediate_assignment_reject( - bv, rip->ra, Fn, rip->burst_type, - (uint8_t)osmo_tdef_get(bts->T_defs_bts, 3142, OSMO_TDEF_S, -1)); - bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_REJ); + LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment on AGCH: " + "TRX=%u (ARFCN %u) TS=%u TA=%u TSC=%u TFI=%d USF=%d\n", + trx->trx_no, trx->arfcn & ~ARFCN_FLAG_MASK, + pdch->ts_no, ta, tsc, tbf ? tbf->tfi() : -1, usf); + plen = Encoding::write_immediate_assignment(pdch, tbf, bv, + false, rip->ra, Fn, ta, usf, false, sb_fn, + bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1, + rip->burst_type); + bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_UL_TBF); + if (plen >= 0) { + pcu_l1if_tx_agch(bts, bv, plen); + rc = 0; } else { - LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment on AGCH: " - "TRX=%u (ARFCN %u) TS=%u TA=%u TSC=%u TFI=%d USF=%d\n", - trx->trx_no, trx->arfcn & ~ARFCN_FLAG_MASK, - pdch->ts_no, ta, tsc, tbf ? tbf->tfi() : -1, usf); - plen = Encoding::write_immediate_assignment(pdch, tbf, bv, - false, rip->ra, Fn, ta, usf, false, sb_fn, - bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1, - rip->burst_type); - bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_UL_TBF); + rc = plen; } + bitvec_free(bv); + return rc; +send_imm_ass_rej: + LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment Reject on AGCH\n"); + plen = Encoding::write_immediate_assignment_reject( + bv, rip->ra, Fn, rip->burst_type, + (uint8_t)osmo_tdef_get(bts->T_defs_bts, 3142, OSMO_TDEF_S, -1)); + bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_REJ); if (plen >= 0) pcu_l1if_tx_agch(bts, bv, plen); - else - rc = plen; - bitvec_free(bv); - + /* rc was already properly set before goto */ return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I80e554315d36a515a7edc9ae51057ce31eb9110d Gerrit-Change-Number: 25813 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:41:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 11:41:53 +0000 Subject: Change in osmo-pcu[master]: Get rid of tbf tsc field In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25814 ) Change subject: Get rid of tbf tsc field ...................................................................... Get rid of tbf tsc field TSC is not really a property of a TBF, so let's drop it in order to avoid confusing and possible misuse of that accessor. Change-Id: I105eb65d507e45631faddb23420c42bc9560e580 --- M src/bts.cpp M src/tbf.cpp M src/tbf.h 3 files changed, 1 insertion(+), 11 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/bts.cpp b/src/bts.cpp index aa713fe..50df92e 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -871,7 +871,6 @@ struct gprs_rlcmac_trx *trx; uint32_t sb_fn = 0; uint8_t usf = 7; - uint8_t tsc = 0; int plen, rc; /* Allocate a bit-vector for RR Immediate Assignment [Reject] */ @@ -924,7 +923,6 @@ pdch = sba->pdch; sb_fn = sba->fn; - tsc = pdch->tsc; LOGP(DRLCMAC, LOGL_DEBUG, "Allocated a single block at " "SBFn=%u TRX=%u TS=%u\n", sb_fn, pdch->trx->trx_no, pdch->ts_no); } else { @@ -938,14 +936,13 @@ tbf->set_ta(ta); pdch = &tbf->trx->pdch[tbf->first_ts]; usf = tbf->m_usf[pdch->ts_no]; - tsc = tbf->tsc(); } trx = pdch->trx; LOGP(DRLCMAC, LOGL_DEBUG, "Tx Immediate Assignment on AGCH: " "TRX=%u (ARFCN %u) TS=%u TA=%u TSC=%u TFI=%d USF=%d\n", trx->trx_no, trx->arfcn & ~ARFCN_FLAG_MASK, - pdch->ts_no, ta, tsc, tbf ? tbf->tfi() : -1, usf); + pdch->ts_no, ta, pdch->tsc, tbf ? tbf->tfi() : -1, usf); plen = Encoding::write_immediate_assignment(pdch, tbf, bv, false, rip->ra, Fn, ta, usf, false, sb_fn, bts_get_ms_pwr_alpha(bts), bts->pcu->vty.gamma, -1, diff --git a/src/tbf.cpp b/src/tbf.cpp index 2343862..361e631 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -758,11 +758,6 @@ llist_add(tbf_trx_list((struct gprs_rlcmac_tbf *)this), &trx->dl_tbfs); } -uint8_t gprs_rlcmac_tbf::tsc() const -{ - return trx->pdch[first_ts].tsc; -} - uint8_t gprs_rlcmac_tbf::dl_slots() const { uint8_t slots = 0; diff --git a/src/tbf.h b/src/tbf.h index cab9364..4013ab0 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -180,8 +180,6 @@ GprsMs *ms() const; void set_ms(GprsMs *ms); - uint8_t tsc() const; - bool n_inc(enum tbf_counters n); void n_reset(enum tbf_counters n); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I105eb65d507e45631faddb23420c42bc9560e580 Gerrit-Change-Number: 25814 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:41:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 11:41:54 +0000 Subject: Change in osmo-pcu[master]: ts_alloc: Rename s/tbf_/tbf/ In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25815 ) Change subject: ts_alloc: Rename s/tbf_/tbf/ ...................................................................... ts_alloc: Rename s/tbf_/tbf/ Off the top of my head: The tbf_ was kept during a previous refactoring a while ago to avoid changing lots of more lines in the same patch. Change-Id: I8ae689a272b7c4d244576ff157f6019a87041abc --- M src/gprs_rlcmac_ts_alloc.cpp 1 file changed, 24 insertions(+), 26 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 3c16d8a..5b3b355 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -338,12 +338,12 @@ * Assign single slot for uplink and downlink * * \param[in,out] bts Pointer to BTS struct - * \param[in,out] tbf_ Pointer to TBF struct + * \param[in,out] tbf Pointer to TBF struct * \param[in] single flag indicating if we should force single-slot allocation * \param[in] use_trx which TRX to use or -1 if it should be selected during allocation * \returns negative error code or 0 on success */ -int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf_, bool single, +int alloc_algorithm_a(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool single, int8_t use_trx) { struct gprs_rlcmac_pdch *pdch; @@ -354,8 +354,7 @@ int usf = -1; uint8_t mask = 0xff; const char *mask_reason = NULL; - struct GprsMs *ms = tbf_->ms(); - const gprs_rlcmac_tbf *tbf = tbf_; + struct GprsMs *ms = tbf->ms(); gprs_rlcmac_trx *trx = ms_current_trx(ms); LOGPAL(tbf, "A", single, use_trx, LOGL_DEBUG, "Alloc start\n"); @@ -404,24 +403,24 @@ pdch = &trx->pdch[ts]; - /* The allocation will be successful, so the system state and tbf_/ms_ + /* The allocation will be successful, so the system state and tbf/ms * may be modified from now on. */ if (tbf->direction == GPRS_RLCMAC_UL_TBF) { - struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf_); + struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf); LOGPSL(tbf, LOGL_DEBUG, "Assign uplink TS=%d TFI=%d USF=%d\n", ts, tfi, usf); assign_uplink_tbf_usf(pdch, ul_tbf, tfi, usf); } else { - struct gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf_); + struct gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf); LOGPSL(tbf, LOGL_DEBUG, "Assign downlink TS=%d TFI=%d\n", ts, tfi); assign_dlink_tbf(pdch, dl_tbf, tfi); } - tbf_->trx = trx; + tbf->trx = trx; /* the only one TS is the common TS */ - tbf_->first_ts = tbf_->first_common_ts = ts; + tbf->first_ts = tbf->first_common_ts = ts; ms_set_reserved_slots(ms, trx, 1 << ts, 1 << ts); - tbf_->upgrade_to_multislot = false; + tbf->upgrade_to_multislot = false; bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_ALGO_A); return 0; } @@ -856,12 +855,12 @@ * Assign one uplink slot. (With free USF) * * \param[in,out] bts Pointer to BTS struct - * \param[in,out] tbf_ Pointer to TBF struct + * \param[in,out] tbf Pointer to TBF struct * \param[in] single flag indicating if we should force single-slot allocation * \param[in] use_trx which TRX to use or -1 if it should be selected during allocation * \returns negative error code or 0 on success */ -int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf_, bool single, +int alloc_algorithm_b(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool single, int8_t use_trx) { uint8_t dl_slots; @@ -875,8 +874,7 @@ int usf[8] = {-1, -1, -1, -1, -1, -1, -1, -1}; int rc; int tfi; - struct GprsMs *ms = tbf_->ms(); - const gprs_rlcmac_tbf *tbf = tbf_; + struct GprsMs *ms = tbf->ms(); gprs_rlcmac_trx *trx; LOGPAL(tbf, "B", single, use_trx, LOGL_DEBUG, "Alloc start\n"); @@ -942,28 +940,28 @@ } if (single && slotcount) { - tbf_->upgrade_to_multislot = (avail_count > slotcount); + tbf->upgrade_to_multislot = (avail_count > slotcount); LOGPAL(tbf, "B", single, use_trx, LOGL_INFO, "using single slot at TS %d\n", first_ts); } else { - tbf_->upgrade_to_multislot = false; + tbf->upgrade_to_multislot = false; LOGPAL(tbf, "B", single, use_trx, LOGL_INFO, "using %d slots\n", slotcount); } - /* The allocation will be successful, so the system state and tbf_/ms_ + /* The allocation will be successful, so the system state and tbf/ms * may be modified from now on. */ /* Step 4: Update MS and TBF and really allocate the resources */ update_ms_reserved_slots(trx, ms, reserved_ul_slots, reserved_dl_slots, ul_slots, dl_slots); - tbf_->trx = trx; - tbf_->first_common_ts = first_common_ts; - tbf_->first_ts = first_ts; + tbf->trx = trx; + tbf->first_common_ts = first_common_ts; + tbf->first_ts = first_ts; if (tbf->direction == GPRS_RLCMAC_DL_TBF) - assign_dl_tbf_slots(as_dl_tbf(tbf_), trx, dl_slots, tfi); + assign_dl_tbf_slots(as_dl_tbf(tbf), trx, dl_slots, tfi); else - assign_ul_tbf_slots(as_ul_tbf(tbf_), trx, ul_slots, tfi, usf); + assign_ul_tbf_slots(as_ul_tbf(tbf), trx, ul_slots, tfi, usf); bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_ALGO_B); @@ -979,12 +977,12 @@ * goal is to provide the highest possible bandwidth per MS. * * \param[in,out] bts Pointer to BTS struct - * \param[in,out] tbf_ Pointer to TBF struct + * \param[in,out] tbf Pointer to TBF struct * \param[in] single flag indicating if we should force single-slot allocation * \param[in] use_trx which TRX to use or -1 if it should be selected during allocation * \returns negative error code or 0 on success */ -int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf_, bool single, +int alloc_algorithm_dynamic(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf, bool single, int8_t use_trx) { int rc; @@ -997,7 +995,7 @@ } if (!bts->multislot_disabled) { - rc = alloc_algorithm_b(bts, tbf_, single, use_trx); + rc = alloc_algorithm_b(bts, tbf, single, use_trx); if (rc >= 0) return rc; @@ -1006,7 +1004,7 @@ bts->multislot_disabled = 1; } - return alloc_algorithm_a(bts, tbf_, single, use_trx); + return alloc_algorithm_a(bts, tbf, single, use_trx); } int gprs_alloc_max_dl_slots_per_ms(const struct gprs_rlcmac_bts *bts, uint8_t ms_class) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I8ae689a272b7c4d244576ff157f6019a87041abc Gerrit-Change-Number: 25815 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:41:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 11:41:54 +0000 Subject: Change in osmo-pcu[master]: tbf: Update FSM names when TFI change during tbf_update() In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25816 ) Change subject: tbf: Update FSM names when TFI change during tbf_update() ...................................................................... tbf: Update FSM names when TFI change during tbf_update() In that function, previous PDCHs are unlinked and then alloc_algorithm is expected to assign new TFIs. Change-Id: I7bcbb223ca32400bede7ab638695ba3c015c9946 --- M src/tbf.cpp 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/tbf.cpp b/src/tbf.cpp index 361e631..2e2e388 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -334,6 +334,8 @@ dl_tbf->set_window_size(); } + tbf_update_state_fsm_name(this); + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25816 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7bcbb223ca32400bede7ab638695ba3c015c9946 Gerrit-Change-Number: 25816 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:41:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 11:41:54 +0000 Subject: Change in osmo-pcu[master]: tbf_fsm: Add assert verifying X2002 only triggers for DL TBF In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25817 ) Change subject: tbf_fsm: Add assert verifying X2002 only triggers for DL TBF ...................................................................... tbf_fsm: Add assert verifying X2002 only triggers for DL TBF Code above setting the timer in same tbf_fsm already has this kind of assert, but it helps understanding the code having this assert here. Change-Id: I7588deef5073694eb5fecdb516c241a04594e2b0 --- M src/tbf_fsm.c 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c index fb947b2..af2b34e 100644 --- a/src/tbf_fsm.c +++ b/src/tbf_fsm.c @@ -352,6 +352,9 @@ { struct gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(ctx->tbf); + /* X2002 is used only for DL TBF */ + OSMO_ASSERT(dl_tbf); + if (ctx->fi->state == TBF_ST_ASSIGN) { tbf_assign_control_ts(ctx->tbf); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25817 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7588deef5073694eb5fecdb516c241a04594e2b0 Gerrit-Change-Number: 25817 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:41:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 11:41:55 +0000 Subject: Change in osmo-pcu[master]: tbf: Assert if update() is called on UL TBF In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25819 ) Change subject: tbf: Assert if update() is called on UL TBF ...................................................................... tbf: Assert if update() is called on UL TBF This function is expected to be used only on DL TBF so far, so let's really assert to avoid going through if something is wrong and ending up later with other issues. Change-Id: If398ee48364fce5b5e38830b2b278b3bad9a48a2 --- M src/tbf.cpp 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/tbf.cpp b/src/tbf.cpp index 2e2e388..3e190b4 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -314,10 +314,8 @@ { int rc; - if (direction != GPRS_RLCMAC_DL_TBF) - return -EINVAL; - LOGP(DTBF, LOGL_DEBUG, "********** DL-TBF update **********\n"); + OSMO_ASSERT(direction == GPRS_RLCMAC_DL_TBF); tbf_unlink_pdch(this); rc = the_pcu->alloc_algorithm(bts, this, false, -1); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25819 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If398ee48364fce5b5e38830b2b278b3bad9a48a2 Gerrit-Change-Number: 25819 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:41:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 11:41:55 +0000 Subject: Change in osmo-pcu[master]: tbf: update(): return negative val on error In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25820 ) Change subject: tbf: update(): return negative val on error ...................................................................... tbf: update(): return negative val on error Let's follow usual convention where errors are returned as negative values. Change-Id: Ib4f4dc37ae82ba8efdc212ed85af7934e16a8a8d --- M src/tbf.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/tbf.cpp b/src/tbf.cpp index 3e190b4..50940c8 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -323,7 +323,7 @@ if (rc < 0) { LOGPTBF(this, LOGL_ERROR, "No resource after update???\n"); bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_FAIL); - return -rc; + return rc; } if (is_egprs_enabled()) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25820 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ib4f4dc37ae82ba8efdc212ed85af7934e16a8a8d Gerrit-Change-Number: 25820 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:41:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 11:41:57 +0000 Subject: Change in osmo-pcu[master]: tbf: Drop unneeded braces in one line condition In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25821 ) Change subject: tbf: Drop unneeded braces in one line condition ...................................................................... tbf: Drop unneeded braces in one line condition Change-Id: Ief5e0ea0b7146d3330a17d5f0d171755b576fca3 --- M src/tbf.cpp 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved diff --git a/src/tbf.cpp b/src/tbf.cpp index 50940c8..07732dc 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -206,9 +206,8 @@ if (m_ms == ms) return; - if (m_ms) { + if (m_ms) ms_detach_tbf(m_ms, this); - } m_ms = ms; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25821 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ief5e0ea0b7146d3330a17d5f0d171755b576fca3 Gerrit-Change-Number: 25821 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:47:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 11:47:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Adapt tests to pass with new idle blocks from PCU In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25537 to look at the new patch set (#2). Change subject: pcu: Adapt tests to pass with new idle blocks from PCU ...................................................................... pcu: Adapt tests to pass with new idle blocks from PCU Depends: osmo-pcu.git Ife718eeed2af011479c03099ea109518f04567bc Change-Id: I6e96a7569640695ccfaa94b471384fa301bccd62 --- M pcu/PCU_Tests.ttcn 1 file changed, 76 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/25537/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6e96a7569640695ccfaa94b471384fa301bccd62 Gerrit-Change-Number: 25537 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:57:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 11:57:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105... In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 to look at the new patch set (#2). Change subject: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105_max ...................................................................... pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105_max Change-Id: I3a50445c707430900c78623c7093ff7eb1f3ed95 --- M pcu/PCU_Tests.ttcn 1 file changed, 136 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/25806/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3a50445c707430900c78623c7093ff7eb1f3ed95 Gerrit-Change-Number: 25806 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 11:58:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 11:58:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Adapt tests to pass with new idle blocks from PCU In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25537 ) Change subject: pcu: Adapt tests to pass with new idle blocks from PCU ...................................................................... Patch Set 2: I submitted a new version of the patch which makes the modified tests which used to pass in latest still pass there. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6e96a7569640695ccfaa94b471384fa301bccd62 Gerrit-Change-Number: 25537 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 19 Oct 2021 11:58:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 12:20:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 12:20:15 +0000 Subject: Change in osmo-pcu[master]: cosmetic: Fix typo in comment References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25826 ) Change subject: cosmetic: Fix typo in comment ...................................................................... cosmetic: Fix typo in comment Change-Id: I9e6d0963533e15e73fb51bed11af563a62b92ecb --- M src/gsm_rlcmac.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/26/25826/1 diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c index e4ff0f8..f676645 100644 --- a/src/gsm_rlcmac.c +++ b/src/gsm_rlcmac.c @@ -6167,7 +6167,7 @@ csnStreamInit(&ar, 0, 8 * vector->data_len); - /* recursive csnStreamEncoder call uses LOGPC everywhere, so we need to start the log somewhere... */ + /* recursive csnStreamDecoder call uses LOGPC everywhere, so we need to start the log somewhere... */ LOGP(DCSN1, LOGL_INFO, "csnStreamDecoder (RAcap): "); ret = csnStreamDecoder(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, &readIndex, data); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9e6d0963533e15e73fb51bed11af563a62b92ecb Gerrit-Change-Number: 25826 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 12:48:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 12:48:36 +0000 Subject: Change in osmo-pcu[master]: Split csn1.c into common, enc and dec files References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25827 ) Change subject: Split csn1.c into common, enc and dec files ...................................................................... Split csn1.c into common, enc and dec files The CSN1 encoder/decoder code is already lengthy and complex enough, there's no need to keep it in the same file, specially because when debugging, only is interested in one of the 2 functions, and they both look really similar (long spaghetti switches). This patch should also be ported to wireshark in order to keep similar code structure. It is kept the same as much as possible here for the same reason. Change-Id: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 --- M debian/copyright M src/Makefile.am M src/csn1.c M src/csn1.h A src/csn1_dec.c A src/csn1_enc.c 6 files changed, 2,718 insertions(+), 2,627 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/27/25827/1 diff --git a/debian/copyright b/debian/copyright index 99ea408..4e9347e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -81,7 +81,9 @@ License: GPL-2.0+ Files: src/csn1.h - src/csn1.cpp + src/csn1.c + src/csn1_dec.c + src/csn1_enc.c src/gsm_rlcmac.cpp src/gsm_rlcmac.h Copyright: 2011 Vincent Helfre diff --git a/src/Makefile.am b/src/Makefile.am index 08b3309..25fdab2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,6 +41,8 @@ libgprs_la_SOURCES = \ gprs_debug.cpp \ csn1.c \ + csn1_dec.c \ + csn1_enc.c \ gsm_rlcmac.c \ gprs_bssgp_pcu.c \ gprs_bssgp_rim.c \ diff --git a/src/csn1.c b/src/csn1.c index 2be0392..e165e92 100644 --- a/src/csn1.c +++ b/src/csn1.c @@ -1,4 +1,4 @@ -/* csn1.cpp +/* csn1_enc.c * Routines for CSN1 dissection in wireshark. * * Copyright (C) 2011 Ivan Klyuchnikov @@ -38,20 +38,10 @@ #include #include -#define pvDATA(_pv, _offset) ((void*) ((unsigned char*)_pv + _offset)) -#define pui8DATA(_pv, _offset) ((guint8*) pvDATA(_pv, _offset)) -#define pui16DATA(_pv, _offset) ((guint16*) pvDATA(_pv, _offset)) -#define pui32DATA(_pv, _offset) ((guint32*) pvDATA(_pv, _offset)) -#define pui64DATA(_pv, _offset) ((guint64*) pvDATA(_pv, _offset)) -/* used to tag existence of next element in variable length lists */ -#define STANDARD_TAG 1 -#define REVERSED_TAG 0 - -static const unsigned char ixBitsTab[] = {0, 1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5}; - +const unsigned char ixBitsTab[] = {0, 1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5}; /* Returns no_of_bits (up to 8) masked with 0x2B */ -static guint8 +guint8 get_masked_bits8(struct bitvec *vector, unsigned *readIndex, gint bit_offset, const gint no_of_bits) { static const guint8 maskBits[] = {0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, 0xFF}; @@ -105,7 +95,7 @@ }; -static gint16 ProcessError_impl(const char *file, int line, unsigned *readIndex, +gint16 ProcessError_impl(const char *file, int line, unsigned *readIndex, const char* sz, gint16 err, const CSN_DESCR* pDescr) { /* Don't add trailing newline, top caller is responsible for appending it */ @@ -115,2615 +105,3 @@ pDescr ? pDescr->sz : "-", *readIndex); return err; } - -#define ProcessError(readIndex, sz, err, pDescr) \ - ProcessError_impl(__FILE__, __LINE__, readIndex, sz, err, pDescr) - - -/** - * ================================================================================================ - * Return TRUE if tag in bit stream indicates existence of next list element, - * otherwise return FALSE. - * Will work for tag values equal to both 0 and 1. - * ================================================================================================ - */ - -static gboolean -existNextElement(struct bitvec *vector, unsigned *readIndex, guint8 Tag) -{ - int res = bitvec_get_bit_pos(vector, (*readIndex)++); - if (Tag == STANDARD_TAG) - { - return (res > 0); - } - return (res == 0); -} - - -gint16 -csnStreamDecoder(csnStream_t* ar, const CSN_DESCR* pDescr, struct bitvec *vector, unsigned *readIndex, void* data) -{ - gint remaining_bits_len = ar->remaining_bits_len; - gint bit_offset = ar->bit_offset; - guint8* pui8 = NULL; - guint16* pui16; - guint32* pui32; - guint64* pui64; - guint8 Tag = STANDARD_TAG; - unsigned ib; - - if (remaining_bits_len < 0) - { - return ProcessError(readIndex, __func__, CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - do - { - switch (pDescr->type) - { - case CSN_BIT: - { - if (remaining_bits_len > 0) - { - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = bitvec_read_field(vector, readIndex, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - /* end add the bit value to protocol tree */ - } - else if (pDescr->may_be_null) - { - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = 0; - LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - pDescr++; - remaining_bits_len--; - bit_offset++; - break; - } - - case CSN_NULL: - { /* Empty member! */ - bit_offset += pDescr->i; - pDescr++; - break; - } - - case CSN_UINT: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = ui8; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else if (no_of_bits <= 16) - { - guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); - pui16 = pui16DATA(data, pDescr->offset); - *pui16 = ui16; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); - } - else if (no_of_bits <= 32) - { - guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); - pui32 = pui32DATA(data, pDescr->offset); - *pui32 = ui32; - LOGPC(DCSN1, LOGL_DEBUG, "%s = 0x%08x | ", pDescr->sz , *pui32); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } - else if (pDescr->may_be_null) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = 0; - } - else if (no_of_bits <= 16) - { - pui16 = pui16DATA(data, pDescr->offset); - *pui16 = 0; - } - else if (no_of_bits <= 32) - { - pui32 = pui32DATA(data, pDescr->offset); - *pui32 = 0; - } - LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - pDescr++; - break; - } - - case CSN_UINT_OFFSET: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = ui8 + (guint8)pDescr->descr.value; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else if (no_of_bits <= 16) - { - guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); - pui16 = pui16DATA(data, pDescr->offset); - *pui16 = ui16 + (guint16)pDescr->descr.value; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); - } - else if (no_of_bits <= 32) - { - guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); - pui32 = pui32DATA(data, pDescr->offset); - *pui32 = ui32 + (guint16)pDescr->descr.value; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_LH: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - guint8 ui8 = get_masked_bits8(vector, readIndex, bit_offset, no_of_bits); - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = ui8; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else - {/* Maybe we should support more than 8 bits ? */ - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_ARRAY: - { - guint8 no_of_bits = (guint8) pDescr->i; - guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - - if (pDescr->value != 0) - { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ - nCount = *pui16DATA(data, nCount); - } - - if (remaining_bits_len >= (no_of_bits * nCount)) - { - remaining_bits_len -= (no_of_bits*nCount); - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - do - { - *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - bit_offset += no_of_bits; - } while (--nCount > 0); - } - else if (no_of_bits <= 16) - { - return ProcessError(readIndex,"csnStreamDecoder NOTIMPLEMENTED", 999, pDescr); - } - else if (no_of_bits <= 32) - { - return ProcessError(readIndex,"csnStreamDecoder NOTIMPLEMENTED", 999, pDescr); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - pDescr++; - break; - } - - case CSN_VARIABLE_TARRAY_OFFSET: - case CSN_VARIABLE_TARRAY: - case CSN_TYPE_ARRAY: - { - gint16 Status; - csnStream_t arT = *ar; - gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->value; - - pui8 = pui8DATA(data, pDescr->offset); - if (pDescr->type == CSN_VARIABLE_TARRAY) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - } - else if (pDescr->type == CSN_VARIABLE_TARRAY_OFFSET) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - /* nCount--; the 1 offset is already taken into account in CSN_UINT_OFFSET */ - } - - while (nCount > 0) - { /* resulting array of length 0 is possible - * but no bits shall be read from bitstream - */ - - LOGPC(DCSN1, LOGL_DEBUG, "%s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); - if (Status >= 0) - { - pui8 += nSize; - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { - return Status; - } - nCount--; - } - - pDescr++; - break; - } - - case CSN_BITMAP: - { /* bitmap with given length. The result is left aligned! */ - guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ - - if (no_of_bits > 0) - { - if (no_of_bits > remaining_bits_len) - { - return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - if (no_of_bits <= 32) - { - for(ib = 0; ib < 4; ib++) - { - guint8 ui8 = bitvec_read_field(vector, readIndex, 8); - pui8 = pui8DATA(data, pDescr->offset+ib); - *pui8 = ui8; - LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); - } - } - else if (no_of_bits <= 64) - { - for(ib = 0; ib < 8; ib++) - { - guint8 ui8 = bitvec_read_field(vector, readIndex, 8); - pui8 = pui8DATA(data, pDescr->offset+ib); - *pui8 = ui8; - LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder NOT IMPLEMENTED", 999, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } - /* bitmap was successfully extracted or it was empty */ - - pDescr++; - break; - } - - case CSN_TYPE: - { - gint16 Status; - csnStream_t arT = *ar; - LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); - LOGPC(DCSN1, LOGL_DEBUG, ": End %s | ", pDescr->sz); - if (Status >= 0) - { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - pDescr++; - } - else - { - /* Has already been processed: ProcessError("csnStreamDecoder", Status, pDescr); */ - return Status; - } - - break; - } - - case CSN_CHOICE: - { - gint16 count = pDescr->i; - guint8 i = 0; - CSN_ChoiceElement_t* pChoice = (CSN_ChoiceElement_t*) pDescr->descr.ptr; - - /* Make sure that the list of choice items is not empty */ - if (!count) - return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_IN_SCRIPT, pDescr); - else if (count > 255) /* We can handle up to 256 (UCHAR_MAX) selectors */ - return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_IN_SCRIPT, pDescr); - - while (count > 0) - { - guint8 no_of_bits = pChoice->bits; - guint8 value = bitvec_read_field(vector, readIndex, no_of_bits); - if (value == pChoice->value) - { - CSN_DESCR descr[2]; - gint16 Status; - csnStream_t arT = *ar; - - descr[0] = pChoice->descr; - memset(&descr[1], 0x00, sizeof(CSN_DESCR)); - descr[1].type = CSN_END; - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = i; - LOGPC(DCSN1, LOGL_DEBUG, "Choice %s = %u | ", pDescr->sz , (unsigned)value); - if (!pChoice->keep_bits) { - bit_offset += no_of_bits; - remaining_bits_len -= no_of_bits; - } - - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, descr, vector, readIndex, data); - - if (Status >= 0) - { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { - return Status; - } - break; - } - - *readIndex -= no_of_bits; - count--; - pChoice++; - i++; - } - - /* Neither of the choice items matched => unknown value */ - if (!count) - return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_STREAM_NOT_SUPPORTED, pDescr); - - pDescr++; - break; - } - - case CSN_SERIALIZE: - { - StreamSerializeFcn_t serialize = (StreamSerializeFcn_t)pDescr->aux_fn; - csnStream_t arT = *ar; - guint8 length_len = pDescr->i; - gint16 Status = -1; - - guint8 length = bitvec_read_field(vector, readIndex, length_len); - - LOGPC(DCSN1, LOGL_DEBUG, "%s length = %u | ", pDescr->sz , length); - bit_offset += length_len; - remaining_bits_len -= length_len; - - csnStreamInit(&arT, bit_offset, length > 0 ? length : remaining_bits_len); - arT.direction = 1; - LOGPC(DCSN1, LOGL_DEBUG, "offset = %u | ", pDescr->offset); - Status = serialize(&arT, vector, readIndex, pvDATA(data, pDescr->offset)); - - if (Status >= 0) - { - if (length > 0) { - remaining_bits_len -= length; - bit_offset += length; - } else { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - - /* Skip bits not handled by serialize(), if any */ - if (Status > 0) { - LOGPC(DCSN1, LOGL_DEBUG, "skipped = %d | ", Status); - *readIndex += Status; - } - - pDescr++; - } - else - { - /* Has already been processed: */ - return Status; - } - - break; - } - - case CSN_UNION_LH: - case CSN_UNION: - { - gint16 Bits; - guint8 index; - gint16 count = pDescr->i; - const CSN_DESCR* pDescrNext = pDescr; - - pDescrNext += count + 1; /* now this is next after the union */ - if ((count <= 0) || (count > 16)) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_INVALID_UNION_INDEX, pDescr); - } - - /* Now get the bits to extract the index */ - Bits = ixBitsTab[count]; - index = 0; - - while (Bits > 0) - { - index <<= 1; - - if (CSN_UNION_LH == pDescr->type) - { - index |= get_masked_bits8(vector, readIndex, bit_offset, 1); - } - else - { - index |= bitvec_read_field(vector, readIndex, 1); - } - remaining_bits_len--; - bit_offset++; - Bits--; - } - - /* Assign UnionType */ - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = index; - - - /* script index to continue on, limited in case we do not have a power of 2 */ - pDescr += (MIN(index + 1, count)); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - - switch (pDescr->type) - { /* get the right element of the union based on computed index */ - - case CSN_BIT: - { - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = 0x00; - if (bitvec_read_field(vector, readIndex, 1) > 0) - { - *pui8 = 0x01; - } - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - remaining_bits_len -= 1; - bit_offset++; - pDescr++; - break; - } - - case CSN_NULL: - { /* Empty member! */ - bit_offset += pDescr->i; - pDescr++; - break; - } - - case CSN_UINT: - { - guint8 no_of_bits = (guint8) pDescr->i; - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = ui8; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else if (no_of_bits <= 16) - { - guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); - pui16 = pui16DATA(data, pDescr->offset); - *pui16 = ui16; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); - } - else if (no_of_bits <= 32) - { - guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); - pui32 = pui32DATA(data, pDescr->offset); - *pui32 = ui32; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_OFFSET: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = ui8 + (guint8)pDescr->descr.value; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else if (no_of_bits <= 16) - { - guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); - pui16 = pui16DATA(data, pDescr->offset); - *pui16 = ui16 + (guint16)pDescr->descr.value; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); - } - else if (no_of_bits <= 32) - { - guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); - pui32 = pui32DATA(data, pDescr->offset); - *pui32 = ui32 + (guint16)pDescr->descr.value; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_LH: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - guint8 ui8 = get_masked_bits8(vector, readIndex, bit_offset, no_of_bits); - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = ui8; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else - { /* Maybe we should support more than 8 bits ? */ - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_ARRAY: - { - guint8 no_of_bits = (guint8) pDescr->i; - guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - - if (pDescr->value != 0) - { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ - nCount = *pui16DATA(data, nCount); - } - - if (remaining_bits_len >= (no_of_bits * nCount)) - { - remaining_bits_len -= (no_of_bits * nCount); - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - - while (nCount > 0) - { - *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - bit_offset += no_of_bits; - nCount--; - } - } - else if (no_of_bits <= 16) - { - pui16 = pui16DATA(data, pDescr->offset); - - while (nCount > 0) - { - *pui16 = bitvec_read_field(vector, readIndex, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); - pui16++; - bit_offset += no_of_bits; - nCount--; - } - } - else if (no_of_bits <= 32) - { /* not supported */ - return ProcessError(readIndex,"csnStreamDecoder NOT IMPLEMENTED", 999, pDescr); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - pDescr++; - break; - } - - case CSN_VARIABLE_TARRAY_OFFSET: - case CSN_VARIABLE_TARRAY: - case CSN_TYPE_ARRAY: - { - gint16 Status; - csnStream_t arT = *ar; - guint16 nCount = (guint16) pDescr->i; - guint16 nSize = (guint16)(guint32)pDescr->value; - - pui8 = pui8DATA(data, pDescr->offset); - - if (CSN_VARIABLE_TARRAY == pDescr->type) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - } - else if (CSN_VARIABLE_TARRAY_OFFSET == pDescr->type) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - nCount--; /* Offset 1 */ - } - - while (nCount--) /* Changed to handle length = 0. */ - { - LOGPC(DCSN1, LOGL_DEBUG, "%s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); - if (Status >= 0) - { - pui8 += nSize; - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { - return Status; - } - } - - pDescr++; - break; - } - - case CSN_BITMAP: - { /* bitmap with given length. The result is left aligned! */ - guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ - - if (no_of_bits > 0) - { - if (no_of_bits > remaining_bits_len) - { - return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - if (no_of_bits <= 32) - { - guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); - pui32 = pui32DATA(data, pDescr->offset); - *pui32 = ui32; - } - else if (no_of_bits <= 64) - { - guint64 ui64 = bitvec_read_field(vector, readIndex, no_of_bits); - pui64 = pui64DATA(data, pDescr->offset); - *pui64 = ui64; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %lu | ", pDescr->sz , *pui64); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder NOT IMPLEMENTED", 999, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } - /* bitmap was successfully extracted or it was empty */ - - pDescr++; - break; - } - - case CSN_TYPE: - { - gint16 Status; - csnStream_t arT = *ar; - LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); - LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); - if (Status >= 0) - { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - pDescr++; - } - else - { /* return error code Has already been processed: */ - return Status; - } - - break; - } - - default: - { /* descriptions of union elements other than above are illegal */ - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_IN_SCRIPT, pDescr); - } - } - - pDescr = pDescrNext; - break; - } - - case CSN_EXIST: - case CSN_EXIST_LH: - { - guint8 fExist; - - pui8 = pui8DATA(data, pDescr->offset); - - if (CSN_EXIST_LH == pDescr->type) - { - fExist = get_masked_bits8(vector, readIndex, bit_offset, 1); - } - else - { - fExist = bitvec_read_field(vector, readIndex, 1); - } - - *pui8 = fExist; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pDescr++; - bit_offset++; - remaining_bits_len -= 1; - - if (!fExist) - { - ar->remaining_bits_len = remaining_bits_len; - ar->bit_offset = bit_offset; - return remaining_bits_len; - } - - break; - } - - case CSN_NEXT_EXIST: - { - guint8 fExist; - - pui8 = pui8DATA(data, pDescr->offset); - - /* this if-statement represents the M_NEXT_EXIST_OR_NULL description element */ - if ((pDescr->may_be_null) && (remaining_bits_len == 0)) - { /* no more bits to decode is fine here - end of message detected and allowed */ - - /* Skip i entries + this entry */ - pDescr += pDescr->i + 1; - - /* Set the data member to "not exist" */ - *pui8 = 0; - break; - } - - /* the "regular" M_NEXT_EXIST description element */ - - fExist = 0x00; - if (bitvec_read_field(vector, readIndex, 1)) - { - fExist = 0x01; - } - - *pui8 = fExist; - remaining_bits_len -= 1; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - ++bit_offset; - - if (fExist == 0) - { /* Skip 'i' entries */ - pDescr += pDescr->i; - } - - pDescr++; - break; - } - - case CSN_NEXT_EXIST_LH: - { - guint8 fExist; - pui8 = pui8DATA(data, pDescr->offset); - - /* this if-statement represents the M_NEXT_EXIST_OR_NULL_LH description element */ - if ((pDescr->descr.ptr != NULL) && (remaining_bits_len == 0)) - { /* no more bits to decode is fine here - end of message detected and allowed */ - - /* skip 'i' entries + this entry */ - pDescr += pDescr->i + 1; - - /* set the data member to "not exist" */ - *pui8 = 0; - break; - } - - /* the "regular" M_NEXT_EXIST_LH description element */ - fExist = get_masked_bits8(vector, readIndex, bit_offset, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)fExist); - *pui8++ = fExist; - remaining_bits_len -= 1; - - bit_offset++; - - if (fExist == 0) - { /* Skip 'i' entries */ - pDescr += pDescr->i; - } - pDescr++; - - break; - } - - case CSN_VARIABLE_BITMAP_1: - { /* Bitmap from here and to the end of message */ - - *pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ - - /*no break - - * with a length set we have a regular variable length bitmap so we continue */ - } - /* FALL THROUGH */ - case CSN_VARIABLE_BITMAP: - { /* {CSN_VARIABLE_BITMAP, 0, offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * - * Bit array with length (in bits) specified in parameter (pDescr->descr) - * The result is right aligned! - */ - gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value); - - no_of_bits += pDescr->i; /* adjusted by offset */ - - if (no_of_bits > 0) - { - remaining_bits_len -= no_of_bits; - - if (remaining_bits_len < 0) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - { /* extract bits */ - guint8* pui8 = pui8DATA(data, pDescr->offset); - gint16 nB1 = no_of_bits & 0x07;/* no_of_bits Mod 8 */ - - if (nB1 > 0) - { /* take care of the first byte - it will be right aligned */ - *pui8 = bitvec_read_field(vector, readIndex, nB1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - no_of_bits -= nB1; - bit_offset += nB1; /* (nB1 is no_of_bits Mod 8) */ - } - - /* remaining no_of_bits is a multiple of 8 or 0 */ - while (no_of_bits > 0) - { - *pui8 = bitvec_read_field(vector, readIndex, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - no_of_bits -= 8; - } - } - } - pDescr++; - break; - } - - case CSN_LEFT_ALIGNED_VAR_BMP_1: - { /* Bitmap from here and to the end of message */ - - *pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ - - /* no break - - * with a length set we have a regular left aligned variable length bitmap so we continue - */ - } - /* FALL THROUGH */ - case CSN_LEFT_ALIGNED_VAR_BMP: - { /* {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * - * bit array with length (in bits) specified in parameter (pDescr->descr) - */ - gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value);/* Size of bitmap */ - - no_of_bits += pDescr->i;/* size adjusted by offset */ - - if (no_of_bits > 0) - { - remaining_bits_len -= no_of_bits; - - if (remaining_bits_len < 0) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - { /* extract bits */ - guint8* pui8 = pui8DATA(data, pDescr->offset); - - while (no_of_bits >= 8) - { - *pui8 = bitvec_read_field(vector, readIndex, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - no_of_bits -= 8; - } - if (no_of_bits > 0) - { - *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - bit_offset += no_of_bits; - no_of_bits = 0; - } - } - } - - /* bitmap was successfully extracted or it was empty */ - pDescr++; - break; - } - - case CSN_PADDING_BITS: - { /* Padding from here and to the end of message */ - LOGPC(DCSN1, LOGL_DEBUG, "%s = ", pDescr->sz); - if (remaining_bits_len > 0) - { - while (remaining_bits_len > 0) - { - guint bits_to_handle = remaining_bits_len%8; - if (bits_to_handle > 0) - { - LOGPC(DCSN1, LOGL_DEBUG, "%d|", bitvec_get_uint(vector, bits_to_handle)); - remaining_bits_len -= bits_to_handle; - bit_offset += bits_to_handle; - } - else if (bits_to_handle == 0) - { - LOGPC(DCSN1, LOGL_DEBUG, "%d|", bitvec_get_uint(vector, 8)); - remaining_bits_len -= 8; - bit_offset += 8; - } - } - } - if (remaining_bits_len < 0) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - /* Padding was successfully extracted or it was empty */ - pDescr++; - break; - } - - case CSN_VARIABLE_ARRAY: - { /* {int type; int i; void* descr; int offset; const char* sz; } CSN_DESCR; - * {CSN_VARIABLE_ARRAY, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * Array with length specified in parameter: - * - * - */ - gint16 count = *pui8DATA(data, (gint16)pDescr->descr.value); - - count += pDescr->i; /* Adjusted by offset */ - - if (count > 0) - { - remaining_bits_len -= count * 8; - - if (remaining_bits_len < 0) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - pui8 = pui8DATA(data, pDescr->offset); - - while (count > 0) - { - *pui8 = bitvec_read_field(vector, readIndex, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s = 0x%x | ", pDescr->sz , (unsigned)*pui8); - pui8++; - bit_offset += 8; - count--; - } - } - - pDescr++; - break; - } - - case CSN_RECURSIVE_ARRAY: - { /* Recursive way to specify an array: ::= {1 | 0} - * or more generally: ::= { | } - * where ::= bit(value) - * ::= 0 | 1 - * ::= reversed tag i.e. tag == 1 -> EndTag == 0 and vice versa - * {CSN_RECURSIVE_ARRAY, _BITS, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * REMARK: recursive way to specify an array but an iterative implementation! - */ - gint16 no_of_bits = pDescr->i; - guint8 ElementCount = 0; - - pui8 = pui8DATA(data, pDescr->offset); - - while (existNextElement(vector, readIndex, Tag)) - { /* tag control shows existence of next list elements */ - LOGPC(DCSN1, LOGL_DEBUG, "%s = Exist | ", pDescr->sz); - bit_offset++; - remaining_bits_len--; - - /* extract and store no_of_bits long element from bitstream */ - *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - remaining_bits_len -= no_of_bits; - ElementCount++; - - if (remaining_bits_len < 0) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - bit_offset += no_of_bits; - } - - LOGPC(DCSN1, LOGL_DEBUG, "%s = %d | ", pDescr->sz , bitvec_get_uint(vector, 1)); - /* existNextElement() returned FALSE, 1 bit consumed */ - bit_offset++; - remaining_bits_len--; - - /* Store the counted number of elements of the array */ - *pui8DATA(data, (gint16)pDescr->descr.value) = ElementCount; - - pDescr++; - break; - } - - case CSN_RECURSIVE_TARRAY: - { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; - * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) - * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE), (void_fn_t)ElementsOf(((_STRUCT*)0)->_MEMBER)} - */ - gint16 nSizeElement = (gint16)(gint32)pDescr->value; - guint32 nSizeArray = (guint32)((uintptr_t)pDescr->aux_fn); - guint8 ElementCount = 0; - pui8 = pui8DATA(data, pDescr->offset); - - while (existNextElement(vector, readIndex, Tag)) - { /* tag control shows existence of next list elements */ - LOGPC(DCSN1, LOGL_DEBUG, "%s = Exist | ", pDescr->sz); - /* existNextElement() returned TRUE, 1 bit consumed */ - bit_offset++; - remaining_bits_len--; - ElementCount++; - - if (ElementCount > nSizeArray) - { - LOGPC(DCSN1, LOGL_ERROR, "error: %s: too many elements (>%u) in recursive array. Increase its size! } |", pDescr->sz, nSizeArray); - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_STREAM_NOT_SUPPORTED, pDescr); - } - - { /* unpack the following data structure */ - csnStream_t arT = *ar; - gint16 Status; - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); - - if (Status >= 0) - { /* successful completion */ - pui8 += nSizeElement; /* -> to next data element */ - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { /* something went awry */ - return Status; - } - } - - if (remaining_bits_len < 0) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - } - - LOGPC(DCSN1, LOGL_DEBUG, "%s = %d | ", pDescr->sz , bitvec_get_uint(vector, 1)); - - /* existNextElement() returned FALSE, 1 bit consumed */ - remaining_bits_len--; - bit_offset++; - - /* Store the counted number of elements of the array */ - *pui8DATA(data, (gint16)(gint32)pDescr->i) = ElementCount; - - pDescr++; - break; - } - - case CSN_RECURSIVE_TARRAY_2: - { /* Recursive way to specify an array of type: ::= { 0 } ** 1 ; */ - - Tag = REVERSED_TAG; - - /* NO break - - * handling is exactly the same as for CSN_RECURSIVE_TARRAY_1 so we continue - */ - } - /* FALL THROUGH */ - case CSN_RECURSIVE_TARRAY_1: - { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; - * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) - * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE), (void_fn_t)ElementsOf(((_STRUCT*)0)->_MEMBER)} - */ - gint16 nSizeElement = (gint16)(gint32)pDescr->value; - guint32 nSizeArray = (guint32)((uintptr_t)pDescr->aux_fn); - guint8 ElementCount = 0; - csnStream_t arT = *ar; - gboolean EndOfList = FALSE; - gint16 Status; - pui8 = pui8DATA(data, pDescr->offset); - - do - { /* get data element */ - ElementCount++; - - if (ElementCount > nSizeArray) - { - LOGPC(DCSN1, LOGL_ERROR, "error: %s: too many elements (>%u) in recursive array. Increase its size! } |", pDescr->sz, nSizeArray); - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_STREAM_NOT_SUPPORTED, pDescr); - } - - LOGPC(DCSN1, LOGL_DEBUG, "%s { | ", pDescr->sz); - - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); - - if (Status >= 0) - { /* successful completion */ - pui8 += nSizeElement; /* -> to next */ - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { /* something went awry */ - return Status; - } - - if (remaining_bits_len < 0) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - /* control of next element's tag */ - LOGPC(DCSN1, LOGL_DEBUG, "%s } | ", pDescr->sz); - EndOfList = !(existNextElement(vector, readIndex, Tag)); - - bit_offset++; - remaining_bits_len--; /* 1 bit consumed (tag) */ - } while (!EndOfList); - - - /* Store the count of the array */ - *pui8DATA(data, pDescr->i) = ElementCount; - Tag = STANDARD_TAG; /* in case it was set to "reversed" */ - pDescr++; - break; - } - - case CSN_FIXED: - { /* Verify the fixed bits */ - guint8 no_of_bits = (guint8) pDescr->i; - guint32 ui32; - - if (no_of_bits <= 32) - { - ui32 = bitvec_read_field(vector, readIndex, no_of_bits); - } - else - { - return ProcessError(readIndex,"no_of_bits > 32", -1, pDescr); - } - if (ui32 != (unsigned)(gint32)pDescr->offset) - { - return ProcessError(readIndex,"csnStreamDecoder FIXED value does not match", -1, pDescr); - } - - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned int)ui32); - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_CALLBACK: - { - guint16 no_of_bits; - DissectorCallbackFcn_t callback = (DissectorCallbackFcn_t)pDescr->aux_fn; - LOGPC(DCSN1, LOGL_DEBUG, "CSN_CALLBACK(%s) | ", pDescr->sz); - no_of_bits = callback(vector, readIndex, pvDATA(data, pDescr->i), pvDATA(data, pDescr->offset)); - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_TRAP_ERROR: - { - return ProcessError(readIndex,"csnStreamDecoder", pDescr->i, pDescr); - } - - case CSN_END: - { - ar->remaining_bits_len = remaining_bits_len; - ar->bit_offset = bit_offset; - return remaining_bits_len; - } - - default: - { - assert(0); - } - - - } - - } while (remaining_bits_len >= 0); - - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); -} - - - - -gint16 csnStreamEncoder(csnStream_t* ar, const CSN_DESCR* pDescr, struct bitvec *vector, unsigned *writeIndex, void* data) -{ - gint remaining_bits_len = ar->remaining_bits_len; - gint bit_offset = ar->bit_offset; - guint8* pui8; - guint16* pui16; - guint32* pui32; - guint64* pui64; - unsigned ib; - - guint8 Tag = STANDARD_TAG; - - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex, __func__, CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - do - { - switch (pDescr->type) - { - case CSN_BIT: - { - if (remaining_bits_len > 0) - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - /* end add the bit value to protocol tree */ - } - else if (pDescr->may_be_null) - { - LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - pDescr++; - remaining_bits_len--; - bit_offset++; - break; - } - - case CSN_NULL: - { /* Empty member! */ - pDescr++; - break; - } - - case CSN_UINT: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else if (no_of_bits <= 16) - { - pui16 = pui16DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui16, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); - } - else if (no_of_bits <= 32) - { - pui32 = pui32DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui32, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } - else if (pDescr->may_be_null) - { - LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - pDescr++; - break; - } - - case CSN_UINT_OFFSET: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8 - (guint8)pDescr->descr.value, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(*pui8 - (guint8)pDescr->descr.value)); - } - else if (no_of_bits <= 16) - { - pui16 = pui16DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui16 - (guint16)pDescr->descr.value, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned short)(*pui16 - (guint16)pDescr->descr.value)); - } - else if (no_of_bits <= 32) - { - pui32 = pui32DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui32 - (guint16)pDescr->descr.value, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned int)(*pui32 - (guint16)pDescr->descr.value)); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_LH: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); - // TODO : Change get_masked_bits8() - *writeIndex -= no_of_bits; - guint8 ui8 = get_masked_bits8(vector, writeIndex, bit_offset, no_of_bits); - *writeIndex -= no_of_bits; - bitvec_write_field(vector, writeIndex, ui8, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - - } - else - {/* Maybe we should support more than 8 bits ? */ - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_ARRAY: - { - guint8 no_of_bits = (guint8) pDescr->i; - guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - - if (pDescr->value != 0) - { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ - nCount = *pui16DATA(data, nCount); - } - - if (remaining_bits_len >= (no_of_bits * nCount)) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - do - { - bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } while (--nCount > 0); - } - else if (no_of_bits <= 16) - { - return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); - } - else if (no_of_bits <= 32) - { - return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - pDescr++; - break; - } - - case CSN_VARIABLE_TARRAY_OFFSET: - case CSN_VARIABLE_TARRAY: - case CSN_TYPE_ARRAY: - { - gint16 Status; - csnStream_t arT = *ar; - gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->value; - - pui8 = pui8DATA(data, pDescr->offset); - if (pDescr->type == CSN_VARIABLE_TARRAY) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - } - else if (pDescr->type == CSN_VARIABLE_TARRAY_OFFSET) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - /* nCount--; the 1 offset is already taken into account in CSN_UINT_OFFSET */ - } - - while (nCount > 0) - { /* resulting array of length 0 is possible - * but no bits shall be read from bitstream - */ - - LOGPC(DCSN1, LOGL_DEBUG, "%s : | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); - if (Status >= 0) - { - pui8 += nSize; - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - - } - else - { - return Status; - } - nCount--; - } - - pDescr++; - break; - } - - case CSN_BITMAP: - { /* bitmap with given length. The result is left aligned! */ - guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ - - if (no_of_bits > 0) - { - if (no_of_bits > remaining_bits_len) - { - return ProcessError(writeIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - if (no_of_bits <= 32) - { - for(ib = 0; ib < 4; ib++) - { - pui8 = pui8DATA(data, pDescr->offset+ib); - bitvec_write_field(vector, writeIndex, *pui8, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); - } - } - else if (no_of_bits <= 64) - { - for(ib = 0; ib < 8; ib++) - { - pui8 = pui8DATA(data, pDescr->offset+ib); - bitvec_write_field(vector, writeIndex, *pui8, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder NOT IMPLEMENTED", 999, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } - /* bitmap was successfully extracted or it was empty */ - - pDescr++; - break; - } - - case CSN_TYPE: - { - gint16 Status; - csnStream_t arT = *ar; - LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pvDATA(data, pDescr->offset)); - LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); - if (Status >= 0) - { - - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - pDescr++; - } - else - { - /* Has already been processed: ProcessError("csnStreamEncoder", Status, pDescr); */ - return Status; - } - - break; - } - - case CSN_CHOICE: - { - gint16 count = pDescr->i; - const CSN_ChoiceElement_t* pChoice = (const CSN_ChoiceElement_t*) pDescr->descr.ptr; - - /* Make sure that the list of choice items is not empty */ - if (!count) - return ProcessError(writeIndex, "csnStreamEncoder", CSN_ERROR_IN_SCRIPT, pDescr); - else if (count > 255) /* We can handle up to 256 (UCHAR_MAX) selectors */ - return ProcessError(writeIndex, "csnStreamEncoder", CSN_ERROR_IN_SCRIPT, pDescr); - - /* Make sure that choice index is not out of range */ - pui8 = pui8DATA(data, pDescr->offset); - if (*pui8 >= count) - return ProcessError(writeIndex, "csnStreamEncoder", CSN_ERROR_INVALID_UNION_INDEX, pDescr); - - pChoice += *pui8; - guint8 no_of_bits = pChoice->bits; - guint8 value = pChoice->value; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pChoice->descr.sz , (unsigned)value); - bitvec_write_field(vector, writeIndex, value, no_of_bits); - - CSN_DESCR descr[2]; - gint16 Status; - csnStream_t arT = *ar; - - descr[0] = pChoice->descr; - memset(&descr[1], 0x00, sizeof(CSN_DESCR)); - descr[1].type = CSN_END; - bit_offset += no_of_bits; - remaining_bits_len -= no_of_bits; - - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamEncoder(&arT, descr, vector, writeIndex, data); - - if (Status >= 0) - { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { - return Status; - } - - pDescr++; - break; - } - - case CSN_SERIALIZE: - { - StreamSerializeFcn_t serialize = (StreamSerializeFcn_t)pDescr->aux_fn; - csnStream_t arT = *ar; - guint8 length_len = pDescr->i; - gint16 Status = -1; - unsigned lengthIndex; - - // store writeIndex for length value (7 bit) - lengthIndex = *writeIndex; - *writeIndex += length_len; - bit_offset += length_len; - remaining_bits_len -= length_len; - arT.direction = 0; - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = serialize(&arT, vector, writeIndex, pvDATA(data, pDescr->offset)); - - bitvec_write_field(vector, &lengthIndex, *writeIndex - lengthIndex - length_len, length_len); - LOGPC(DCSN1, LOGL_DEBUG, "%s length = %u | ", pDescr->sz , (unsigned)(*writeIndex - lengthIndex)); - - if (Status >= 0) - { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - pDescr++; - } - else - { - // Has already been processed: - return Status; - } - - break; - } - - case CSN_UNION_LH: - case CSN_UNION: - { - gint16 Bits; - guint8 index; - gint16 count = pDescr->i; - const CSN_DESCR* pDescrNext = pDescr; - - pDescrNext += count + 1; /* now this is next after the union */ - if ((count <= 0) || (count > 16)) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_INVALID_UNION_INDEX, pDescr); - } - - /* Now get the bits to extract the index */ - Bits = ixBitsTab[count]; - index = 0; - - /* Assign UnionType */ - pui8 = pui8DATA(data, pDescr->offset); - //read index from data and write to vector - bitvec_write_field(vector, writeIndex, *pui8, Bits); - - //decode index - *writeIndex -= Bits; - - while (Bits > 0) - { - index <<= 1; - - if (CSN_UNION_LH == pDescr->type) - { - index |= get_masked_bits8(vector, writeIndex, bit_offset, 1); - } - else - { - index |= bitvec_read_field(vector, writeIndex, 1); - } - - remaining_bits_len--; - bit_offset++; - Bits--; - } - - *writeIndex -= Bits; - bitvec_write_field(vector, writeIndex, index, Bits); - - - /* script index to continue on, limited in case we do not have a power of 2 */ - pDescr += (MIN(index + 1, count)); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)index); - - switch (pDescr->type) - { /* get the right element of the union based on computed index */ - - case CSN_BIT: - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - remaining_bits_len--; - bit_offset++; - pDescr++; - break; - } - - case CSN_NULL: - { /* Empty member! */ - pDescr++; - break; - } - - case CSN_UINT: - { - guint8 no_of_bits = (guint8) pDescr->i; - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else if (no_of_bits <= 16) - { - pui16 = pui16DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui16, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); - } - else if (no_of_bits <= 32) - { - pui32 = pui32DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui32, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_OFFSET: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8 - (guint8)pDescr->descr.value, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(*pui8 - (guint8)pDescr->descr.value)); - } - else if (no_of_bits <= 16) - { - pui16 = pui16DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui16 - (guint16)pDescr->descr.value, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned short)(*pui16 - (guint16)pDescr->descr.value)); - } - else if (no_of_bits <= 32) - { - pui32 = pui32DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui32 - (guint16)pDescr->descr.value, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned int)(*pui32 - (guint16)pDescr->descr.value)); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_LH: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - remaining_bits_len -= no_of_bits; - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); - // TODO : Change get_masked_bits8() - *writeIndex -= no_of_bits; - guint8 ui8 = get_masked_bits8(vector, writeIndex, bit_offset, no_of_bits); - *writeIndex -= no_of_bits; - bitvec_write_field(vector, writeIndex, ui8, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - - } - else - {/* Maybe we should support more than 8 bits ? */ - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_ARRAY: - { - guint8 no_of_bits = (guint8) pDescr->i; - guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - - if (pDescr->value != 0) - { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ - nCount = *pui16DATA(data, nCount); - } - - if (remaining_bits_len >= (no_of_bits * nCount)) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - do - { - bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } while (--nCount > 0); - } - else if (no_of_bits <= 16) - { - return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); - } - else if (no_of_bits <= 32) - { - return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - pDescr++; - break; - } - - case CSN_VARIABLE_TARRAY_OFFSET: - case CSN_VARIABLE_TARRAY: - case CSN_TYPE_ARRAY: - { - gint16 Status; - csnStream_t arT = *ar; - gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->value; - - pui8 = pui8DATA(data, pDescr->offset); - if (pDescr->type == CSN_VARIABLE_TARRAY) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - } - else if (pDescr->type == CSN_VARIABLE_TARRAY_OFFSET) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - /* nCount--; the 1 offset is already taken into account in CSN_UINT_OFFSET */ - } - - while (nCount > 0) - { /* resulting array of length 0 is possible - * but no bits shall be read from bitstream - */ - - LOGPC(DCSN1, LOGL_DEBUG, "%s : | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); - if (Status >= 0) - { - pui8 += nSize; - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { - return Status; - } - nCount--; - } - - pDescr++; - break; - } - - case CSN_BITMAP: - { /* bitmap with given length. The result is left aligned! */ - guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ - - if (no_of_bits > 0) - { - if (no_of_bits > remaining_bits_len) - { - return ProcessError(writeIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - if (no_of_bits <= 32) - { - pui32 = pui32DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui32, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); - } - else if (no_of_bits <= 64) - { - pui64 = pui64DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui64, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %lu | ", pDescr->sz , *pui64); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder NOT IMPLEMENTED", 999, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } - /* bitmap was successfully extracted or it was empty */ - - pDescr++; - break; - } - - case CSN_TYPE: - { - gint16 Status; - csnStream_t arT = *ar; - LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pvDATA(data, pDescr->offset)); - LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); - if (Status >= 0) - { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - pDescr++; - } - else - { - /* Has already been processed: ProcessError("csnStreamEncoder", Status, pDescr); */ - return Status; - } - - break; - } - - default: - { /* descriptions of union elements other than above are illegal */ - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_IN_SCRIPT, pDescr); - } - } - - pDescr = pDescrNext; - break; - } - - case CSN_EXIST: - case CSN_EXIST_LH: - { - guint8 fExist; - unsigned exist = 0; - pui8 = pui8DATA(data, pDescr->offset); - exist = *pui8; - bitvec_write_field(vector, writeIndex, *pui8, 1); - writeIndex--; - if (CSN_EXIST_LH == pDescr->type) - { - fExist = get_masked_bits8(vector, writeIndex, bit_offset, 1); - } - else - { - fExist = bitvec_read_field(vector, writeIndex, 1); - } - writeIndex--; - bitvec_write_field(vector, writeIndex, fExist, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz, (unsigned)fExist); - remaining_bits_len--; - bit_offset++; - pDescr++; - - if (!exist) - { - ar->remaining_bits_len = remaining_bits_len; - ar->bit_offset = bit_offset; - return remaining_bits_len; - } - break; - } - - case CSN_NEXT_EXIST: - { - guint8 fExist; - - pui8 = pui8DATA(data, pDescr->offset); - - /* this if-statement represents the M_NEXT_EXIST_OR_NULL description element */ - if ((pDescr->may_be_null) && (remaining_bits_len == 0)) - { /* no more bits to decode is fine here - end of message detected and allowed */ - - /* Skip i entries + this entry */ - pDescr += pDescr->i + 1; - - break; - } - - bitvec_write_field(vector, writeIndex, *pui8, 1); - fExist = *pui8; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - - remaining_bits_len--; - bit_offset++; - - if (fExist == 0) - { /* Skip 'i' entries */ - pDescr += pDescr->i; - } - - pDescr++; - break; - } - - case CSN_NEXT_EXIST_LH: - { - guint8 fExist; - pui8 = pui8DATA(data, pDescr->offset); - - /* this if-statement represents the M_NEXT_EXIST_OR_NULL_LH description element */ - if ((pDescr->descr.ptr != NULL) && (remaining_bits_len == 0)) - { /* no more bits to decode is fine here - end of message detected and allowed */ - - /* skip 'i' entries + this entry */ - pDescr += pDescr->i + 1; - - /* set the data member to "not exist" */ - //*pui8 = 0; - break; - } - - /* the "regular" M_NEXT_EXIST_LH description element */ - bitvec_write_field(vector, writeIndex, *pui8, 1); - writeIndex--; - fExist = get_masked_bits8(vector, writeIndex, bit_offset, 1); - writeIndex--; - bitvec_write_field(vector, writeIndex, fExist, 1); - pui8++; - - remaining_bits_len--; - bit_offset++; - - if (fExist == 0) - { /* Skip 'i' entries */ - pDescr += pDescr->i; - } - pDescr++; - - break; - } - - case CSN_VARIABLE_BITMAP_1: - { /* Bitmap from here and to the end of message */ - - //*pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ - - /*no break - - * with a length set we have a regular variable length bitmap so we continue */ - } - /* FALL THROUGH */ - case CSN_VARIABLE_BITMAP: - { /* {CSN_VARIABLE_BITMAP, 0, offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * - * Bit array with length (in bits) specified in parameter (pDescr->descr) - * The result is right aligned! - */ - gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value); - - no_of_bits += pDescr->i; /* adjusted by offset */ - - if (no_of_bits > 0) - { - - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - { /* extract bits */ - guint8* pui8 = pui8DATA(data, pDescr->offset); - gint16 nB1 = no_of_bits & 0x07;/* no_of_bits Mod 8 */ - - if (nB1 > 0) - { /* take care of the first byte - it will be right aligned */ - bitvec_write_field(vector, writeIndex, *pui8, nB1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - no_of_bits -= nB1; - bit_offset += nB1; /* (nB1 is no_of_bits Mod 8) */ - remaining_bits_len -= nB1; - } - - /* remaining no_of_bits is a multiple of 8 or 0 */ - while (no_of_bits > 0) - { - bitvec_write_field(vector, writeIndex, *pui8, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - no_of_bits -= 8; - remaining_bits_len -= 8; - } - } - } - pDescr++; - break; - } - - case CSN_LEFT_ALIGNED_VAR_BMP_1: - { /* Bitmap from here and to the end of message */ - - //*pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ - - /* no break - - * with a length set we have a regular left aligned variable length bitmap so we continue - */ - } - /* FALL THROUGH */ - case CSN_LEFT_ALIGNED_VAR_BMP: - { /* {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * - * bit array with length (in bits) specified in parameter (pDescr->descr) - */ - - gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value);/* Size of bitmap */ - - no_of_bits += pDescr->i;/* size adjusted by offset */ - - if (no_of_bits > 0) - { - remaining_bits_len -= no_of_bits; - - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - { /* extract bits */ - guint8* pui8 = pui8DATA(data, pDescr->offset); - gint16 nB1 = no_of_bits & 0x07;/* no_of_bits Mod 8 */ - - while (no_of_bits > 0) - { - bitvec_write_field(vector, writeIndex, *pui8, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - no_of_bits -= 8; - } - if (nB1 > 0) - { - bitvec_write_field(vector, writeIndex, *pui8, nB1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - no_of_bits -= nB1; - bit_offset += nB1; /* (nB1 is no_of_bits Mod 8) */ - } - } - - } - - /* bitmap was successfully extracted or it was empty */ - pDescr++; - break; - } - - case CSN_PADDING_BITS: - { /* Padding from here and to the end of message */ - LOGPC(DCSN1, LOGL_DEBUG, "%s = ", pDescr->sz); - guint8 filler = 0x2b; - if (remaining_bits_len > 0) - { - while (remaining_bits_len > 0) - { - guint8 bits_to_handle = remaining_bits_len%8; - if (bits_to_handle > 0) - { - /* section 11 of 44.060 - * The padding bits may be the 'null' string. Otherwise, the - * padding bits starts with bit '0', followed by 'spare padding' - * < padding bits > ::= { null | 0 < spare padding > ! < Ignore : 1 bit** = < no string > > } ; - */ - guint8 fl = filler&(0xff>>(8-bits_to_handle + 1)); - bitvec_write_field(vector, writeIndex, fl, bits_to_handle); - LOGPC(DCSN1, LOGL_DEBUG, "%u|", fl); - remaining_bits_len -= bits_to_handle; - bit_offset += bits_to_handle; - } - else if (bits_to_handle == 0) - { - bitvec_write_field(vector, writeIndex, filler, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%u|", filler); - remaining_bits_len -= 8; - bit_offset += 8; - } - } - } - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - /* Padding was successfully extracted or it was empty */ - pDescr++; - break; - } - - case CSN_VARIABLE_ARRAY: - { /* {int type; int i; void* descr; int offset; const char* sz; } CSN_DESCR; - * {CSN_VARIABLE_ARRAY, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * Array with length specified in parameter: - * - * - */ - gint16 count = *pui8DATA(data, (gint16)pDescr->descr.value); - - count += pDescr->i; /* Adjusted by offset */ - - if (count > 0) - { - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - pui8 = pui8DATA(data, pDescr->offset); - - while (count > 0) - { - bitvec_write_field(vector, writeIndex, *pui8, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s = 0x%x | ", pDescr->sz , (unsigned)*pui8); - pui8++; - bit_offset += 8; - remaining_bits_len -= 8; - count--; - } - } - - pDescr++; - break; - } - - case CSN_RECURSIVE_ARRAY: - { /* Recursive way to specify an array: ::= {1 | 0} - * or more generally: ::= { | } - * where ::= bit(value) - * ::= 0 | 1 - * ::= reversed tag i.e. tag == 1 -> EndTag == 0 and vice versa - * {CSN_RECURSIVE_ARRAY, _BITS, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * REMARK: recursive way to specify an array but an iterative implementation! - */ - gint16 no_of_bits = pDescr->i; - guint8 ElementCount = 0; - pui8 = pui8DATA(data, pDescr->offset); - ElementCount = *pui8DATA(data, (gint16)pDescr->descr.value); - while (ElementCount > 0) - { /* tag control shows existence of next list elements */ - bitvec_write_field(vector, writeIndex, Tag, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)Tag); - bit_offset++; - remaining_bits_len--; - - /* extract and store no_of_bits long element from bitstream */ - bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - ElementCount--; - - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - bit_offset += no_of_bits; - remaining_bits_len -= no_of_bits; - } - - bitvec_write_field(vector, writeIndex, !Tag, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(!Tag)); - bit_offset++; - remaining_bits_len--; - - pDescr++; - break; - } - - case CSN_RECURSIVE_TARRAY: - { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; - * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) - * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} - */ - gint16 nSizeElement = (gint16)(gint32)pDescr->value; - guint8 ElementCount = 0; - pui8 = pui8DATA(data, pDescr->offset); - /* Store the counted number of elements of the array */ - ElementCount = *pui8DATA(data, (gint16)(gint32)pDescr->i); - - while (ElementCount > 0) - { /* tag control shows existence of next list elements */ - bitvec_write_field(vector, writeIndex, Tag, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)Tag); - bit_offset++; - - remaining_bits_len--; - ElementCount--; - - { /* unpack the following data structure */ - csnStream_t arT = *ar; - gint16 Status; - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); - - if (Status >= 0) - { /* successful completion */ - pui8 += nSizeElement; /* -> to next data element */ - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { /* something went awry */ - return Status; - } - } - - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - } - - bitvec_write_field(vector, writeIndex, !Tag, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(!Tag)); - bit_offset++; - - pDescr++; - break; - } - - case CSN_RECURSIVE_TARRAY_2: - { /* Recursive way to specify an array of type: ::= { 0 } ** 1 ; */ - - Tag = REVERSED_TAG; - - /* NO break - - * handling is exactly the same as for CSN_RECURSIVE_TARRAY_1 so we continue - */ - } - /* FALL THROUGH */ - case CSN_RECURSIVE_TARRAY_1: - { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; - * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) - * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} - */ - gint16 nSizeElement = (gint16)(gint32)pDescr->value; - guint8 ElementCount = 0; - guint8 ElementNum = 0; - csnStream_t arT = *ar; - gint16 Status; - - pui8 = pui8DATA(data, pDescr->offset); - /* Store the count of the array */ - ElementCount = *pui8DATA(data, pDescr->i); - ElementNum = ElementCount; - - while (ElementCount > 0) - { /* get data element */ - if (ElementCount != ElementNum) - { - bitvec_write_field(vector, writeIndex, Tag, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)Tag); - bit_offset++; - remaining_bits_len--; - } - ElementCount--; - LOGPC(DCSN1, LOGL_DEBUG, "%s { | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); - LOGPC(DCSN1, LOGL_DEBUG, "%s } | ", pDescr->sz); - if (Status >= 0) - { /* successful completion */ - pui8 += nSizeElement; /* -> to next */ - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { /* something went awry */ - return Status; - } - - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - } - bitvec_write_field(vector, writeIndex, !Tag, 1); - bit_offset++; - remaining_bits_len--; - Tag = STANDARD_TAG; /* in case it was set to "reversed" */ - pDescr++; - break; - } - - case CSN_FIXED: - { /* Verify the fixed bits */ - guint8 no_of_bits = (guint8) pDescr->i; - bitvec_write_field(vector, writeIndex, pDescr->offset, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)pDescr->offset); - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_CALLBACK: - { - guint16 no_of_bits; - DissectorCallbackFcn_t callback = (DissectorCallbackFcn_t)pDescr->aux_fn; - LOGPC(DCSN1, LOGL_DEBUG, "CSN_CALLBACK(%s) | ", pDescr->sz); - no_of_bits = callback(vector, writeIndex, pvDATA(data, pDescr->i), pvDATA(data, pDescr->offset)); - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_TRAP_ERROR: - { - return ProcessError(writeIndex,"csnStreamEncoder", pDescr->i, pDescr); - } - - case CSN_END: - { - ar->remaining_bits_len = remaining_bits_len; - ar->bit_offset = bit_offset; - return remaining_bits_len; - } - - default: - { - assert(0); - } - - } - - } while (remaining_bits_len >= 0); - - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); -} diff --git a/src/csn1.h b/src/csn1.h index 761293d..d470228 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -592,4 +592,18 @@ #define CSNDESCR(_FuncType) CSNDESCR_##_FuncType +#define pvDATA(_pv, _offset) ((void*) ((unsigned char*)_pv + _offset)) +#define pui8DATA(_pv, _offset) ((guint8*) pvDATA(_pv, _offset)) +#define pui16DATA(_pv, _offset) ((guint16*) pvDATA(_pv, _offset)) +#define pui32DATA(_pv, _offset) ((guint32*) pvDATA(_pv, _offset)) +#define pui64DATA(_pv, _offset) ((guint64*) pvDATA(_pv, _offset)) +/* used to tag existence of next element in variable length lists */ +#define STANDARD_TAG 1 +#define REVERSED_TAG 0 + +gint16 ProcessError_impl(const char *file, int line, unsigned *readIndex, + const char* sz, gint16 err, const CSN_DESCR* pDescr); +#define ProcessError(readIndex, sz, err, pDescr) \ + ProcessError_impl(__FILE__, __LINE__, readIndex, sz, err, pDescr) + #endif /*_PACKET_CSN1_H_*/ diff --git a/src/csn1_dec.c b/src/csn1_dec.c new file mode 100644 index 0000000..2d3f242 --- /dev/null +++ b/src/csn1_dec.c @@ -0,0 +1,1390 @@ +/* csn1_dec.c + * Routines for CSN1 dissection in wireshark. + * + * Copyright (C) 2011 Ivan Klyuchnikov + * + * By Vincent Helfre, based on original code by Jari Sassi + * with the gracious authorization of STE + * Copyright (c) 2011 ST-Ericsson + * + * $Id: packet-csn1.c 39140 2011-09-25 22:01:50Z wmeier $ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include +#include +#define __STDC_FORMAT_MACROS +#include +#include "csn1.h" +#include + +#include +#include + +extern const unsigned char ixBitsTab[]; +guint8 get_masked_bits8(struct bitvec *vector, unsigned *readIndex, gint bit_offset, const gint no_of_bits); + +/** + * ================================================================================================ + * Return TRUE if tag in bit stream indicates existence of next list element, + * otherwise return FALSE. + * Will work for tag values equal to both 0 and 1. + * ================================================================================================ + */ + +static gboolean +existNextElement(struct bitvec *vector, unsigned *readIndex, guint8 Tag) +{ + int res = bitvec_get_bit_pos(vector, (*readIndex)++); + if (Tag == STANDARD_TAG) + { + return (res > 0); + } + return (res == 0); +} + + +gint16 +csnStreamDecoder(csnStream_t* ar, const CSN_DESCR* pDescr, struct bitvec *vector, unsigned *readIndex, void* data) +{ + gint remaining_bits_len = ar->remaining_bits_len; + gint bit_offset = ar->bit_offset; + guint8* pui8 = NULL; + guint16* pui16; + guint32* pui32; + guint64* pui64; + guint8 Tag = STANDARD_TAG; + unsigned ib; + + if (remaining_bits_len < 0) + { + return ProcessError(readIndex, __func__, CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + do + { + switch (pDescr->type) + { + case CSN_BIT: + { + if (remaining_bits_len > 0) + { + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = bitvec_read_field(vector, readIndex, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + /* end add the bit value to protocol tree */ + } + else if (pDescr->may_be_null) + { + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = 0; + LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + pDescr++; + remaining_bits_len--; + bit_offset++; + break; + } + + case CSN_NULL: + { /* Empty member! */ + bit_offset += pDescr->i; + pDescr++; + break; + } + + case CSN_UINT: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = ui8; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else if (no_of_bits <= 16) + { + guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); + pui16 = pui16DATA(data, pDescr->offset); + *pui16 = ui16; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); + } + else if (no_of_bits <= 32) + { + guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); + pui32 = pui32DATA(data, pDescr->offset); + *pui32 = ui32; + LOGPC(DCSN1, LOGL_DEBUG, "%s = 0x%08x | ", pDescr->sz , *pui32); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } + else if (pDescr->may_be_null) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = 0; + } + else if (no_of_bits <= 16) + { + pui16 = pui16DATA(data, pDescr->offset); + *pui16 = 0; + } + else if (no_of_bits <= 32) + { + pui32 = pui32DATA(data, pDescr->offset); + *pui32 = 0; + } + LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + pDescr++; + break; + } + + case CSN_UINT_OFFSET: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = ui8 + (guint8)pDescr->descr.value; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else if (no_of_bits <= 16) + { + guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); + pui16 = pui16DATA(data, pDescr->offset); + *pui16 = ui16 + (guint16)pDescr->descr.value; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); + } + else if (no_of_bits <= 32) + { + guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); + pui32 = pui32DATA(data, pDescr->offset); + *pui32 = ui32 + (guint16)pDescr->descr.value; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_LH: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + guint8 ui8 = get_masked_bits8(vector, readIndex, bit_offset, no_of_bits); + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = ui8; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else + {/* Maybe we should support more than 8 bits ? */ + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_ARRAY: + { + guint8 no_of_bits = (guint8) pDescr->i; + guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ + + if (pDescr->value != 0) + { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ + nCount = *pui16DATA(data, nCount); + } + + if (remaining_bits_len >= (no_of_bits * nCount)) + { + remaining_bits_len -= (no_of_bits*nCount); + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + do + { + *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + bit_offset += no_of_bits; + } while (--nCount > 0); + } + else if (no_of_bits <= 16) + { + return ProcessError(readIndex,"csnStreamDecoder NOTIMPLEMENTED", 999, pDescr); + } + else if (no_of_bits <= 32) + { + return ProcessError(readIndex,"csnStreamDecoder NOTIMPLEMENTED", 999, pDescr); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + pDescr++; + break; + } + + case CSN_VARIABLE_TARRAY_OFFSET: + case CSN_VARIABLE_TARRAY: + case CSN_TYPE_ARRAY: + { + gint16 Status; + csnStream_t arT = *ar; + gint16 nCount = pDescr->i; + guint16 nSize = (guint16)(gint32)pDescr->value; + + pui8 = pui8DATA(data, pDescr->offset); + if (pDescr->type == CSN_VARIABLE_TARRAY) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + } + else if (pDescr->type == CSN_VARIABLE_TARRAY_OFFSET) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + /* nCount--; the 1 offset is already taken into account in CSN_UINT_OFFSET */ + } + + while (nCount > 0) + { /* resulting array of length 0 is possible + * but no bits shall be read from bitstream + */ + + LOGPC(DCSN1, LOGL_DEBUG, "%s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); + if (Status >= 0) + { + pui8 += nSize; + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { + return Status; + } + nCount--; + } + + pDescr++; + break; + } + + case CSN_BITMAP: + { /* bitmap with given length. The result is left aligned! */ + guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ + + if (no_of_bits > 0) + { + if (no_of_bits > remaining_bits_len) + { + return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + if (no_of_bits <= 32) + { + for(ib = 0; ib < 4; ib++) + { + guint8 ui8 = bitvec_read_field(vector, readIndex, 8); + pui8 = pui8DATA(data, pDescr->offset+ib); + *pui8 = ui8; + LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); + } + } + else if (no_of_bits <= 64) + { + for(ib = 0; ib < 8; ib++) + { + guint8 ui8 = bitvec_read_field(vector, readIndex, 8); + pui8 = pui8DATA(data, pDescr->offset+ib); + *pui8 = ui8; + LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder NOT IMPLEMENTED", 999, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } + /* bitmap was successfully extracted or it was empty */ + + pDescr++; + break; + } + + case CSN_TYPE: + { + gint16 Status; + csnStream_t arT = *ar; + LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); + LOGPC(DCSN1, LOGL_DEBUG, ": End %s | ", pDescr->sz); + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + pDescr++; + } + else + { + /* Has already been processed: ProcessError("csnStreamDecoder", Status, pDescr); */ + return Status; + } + + break; + } + + case CSN_CHOICE: + { + gint16 count = pDescr->i; + guint8 i = 0; + CSN_ChoiceElement_t* pChoice = (CSN_ChoiceElement_t*) pDescr->descr.ptr; + + /* Make sure that the list of choice items is not empty */ + if (!count) + return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_IN_SCRIPT, pDescr); + else if (count > 255) /* We can handle up to 256 (UCHAR_MAX) selectors */ + return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_IN_SCRIPT, pDescr); + + while (count > 0) + { + guint8 no_of_bits = pChoice->bits; + guint8 value = bitvec_read_field(vector, readIndex, no_of_bits); + if (value == pChoice->value) + { + CSN_DESCR descr[2]; + gint16 Status; + csnStream_t arT = *ar; + + descr[0] = pChoice->descr; + memset(&descr[1], 0x00, sizeof(CSN_DESCR)); + descr[1].type = CSN_END; + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = i; + LOGPC(DCSN1, LOGL_DEBUG, "Choice %s = %u | ", pDescr->sz , (unsigned)value); + if (!pChoice->keep_bits) { + bit_offset += no_of_bits; + remaining_bits_len -= no_of_bits; + } + + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, descr, vector, readIndex, data); + + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { + return Status; + } + break; + } + + *readIndex -= no_of_bits; + count--; + pChoice++; + i++; + } + + /* Neither of the choice items matched => unknown value */ + if (!count) + return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_STREAM_NOT_SUPPORTED, pDescr); + + pDescr++; + break; + } + + case CSN_SERIALIZE: + { + StreamSerializeFcn_t serialize = (StreamSerializeFcn_t)pDescr->aux_fn; + csnStream_t arT = *ar; + guint8 length_len = pDescr->i; + gint16 Status = -1; + + guint8 length = bitvec_read_field(vector, readIndex, length_len); + + LOGPC(DCSN1, LOGL_DEBUG, "%s length = %u | ", pDescr->sz , length); + bit_offset += length_len; + remaining_bits_len -= length_len; + + csnStreamInit(&arT, bit_offset, length > 0 ? length : remaining_bits_len); + arT.direction = 1; + LOGPC(DCSN1, LOGL_DEBUG, "offset = %u | ", pDescr->offset); + Status = serialize(&arT, vector, readIndex, pvDATA(data, pDescr->offset)); + + if (Status >= 0) + { + if (length > 0) { + remaining_bits_len -= length; + bit_offset += length; + } else { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + + /* Skip bits not handled by serialize(), if any */ + if (Status > 0) { + LOGPC(DCSN1, LOGL_DEBUG, "skipped = %d | ", Status); + *readIndex += Status; + } + + pDescr++; + } + else + { + /* Has already been processed: */ + return Status; + } + + break; + } + + case CSN_UNION_LH: + case CSN_UNION: + { + gint16 Bits; + guint8 index; + gint16 count = pDescr->i; + const CSN_DESCR* pDescrNext = pDescr; + + pDescrNext += count + 1; /* now this is next after the union */ + if ((count <= 0) || (count > 16)) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_INVALID_UNION_INDEX, pDescr); + } + + /* Now get the bits to extract the index */ + Bits = ixBitsTab[count]; + index = 0; + + while (Bits > 0) + { + index <<= 1; + + if (CSN_UNION_LH == pDescr->type) + { + index |= get_masked_bits8(vector, readIndex, bit_offset, 1); + } + else + { + index |= bitvec_read_field(vector, readIndex, 1); + } + remaining_bits_len--; + bit_offset++; + Bits--; + } + + /* Assign UnionType */ + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = index; + + + /* script index to continue on, limited in case we do not have a power of 2 */ + pDescr += (MIN(index + 1, count)); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + + switch (pDescr->type) + { /* get the right element of the union based on computed index */ + + case CSN_BIT: + { + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = 0x00; + if (bitvec_read_field(vector, readIndex, 1) > 0) + { + *pui8 = 0x01; + } + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + remaining_bits_len -= 1; + bit_offset++; + pDescr++; + break; + } + + case CSN_NULL: + { /* Empty member! */ + bit_offset += pDescr->i; + pDescr++; + break; + } + + case CSN_UINT: + { + guint8 no_of_bits = (guint8) pDescr->i; + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = ui8; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else if (no_of_bits <= 16) + { + guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); + pui16 = pui16DATA(data, pDescr->offset); + *pui16 = ui16; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); + } + else if (no_of_bits <= 32) + { + guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); + pui32 = pui32DATA(data, pDescr->offset); + *pui32 = ui32; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_OFFSET: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = ui8 + (guint8)pDescr->descr.value; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else if (no_of_bits <= 16) + { + guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); + pui16 = pui16DATA(data, pDescr->offset); + *pui16 = ui16 + (guint16)pDescr->descr.value; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); + } + else if (no_of_bits <= 32) + { + guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); + pui32 = pui32DATA(data, pDescr->offset); + *pui32 = ui32 + (guint16)pDescr->descr.value; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_LH: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + guint8 ui8 = get_masked_bits8(vector, readIndex, bit_offset, no_of_bits); + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = ui8; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else + { /* Maybe we should support more than 8 bits ? */ + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_ARRAY: + { + guint8 no_of_bits = (guint8) pDescr->i; + guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ + + if (pDescr->value != 0) + { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ + nCount = *pui16DATA(data, nCount); + } + + if (remaining_bits_len >= (no_of_bits * nCount)) + { + remaining_bits_len -= (no_of_bits * nCount); + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + + while (nCount > 0) + { + *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + bit_offset += no_of_bits; + nCount--; + } + } + else if (no_of_bits <= 16) + { + pui16 = pui16DATA(data, pDescr->offset); + + while (nCount > 0) + { + *pui16 = bitvec_read_field(vector, readIndex, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); + pui16++; + bit_offset += no_of_bits; + nCount--; + } + } + else if (no_of_bits <= 32) + { /* not supported */ + return ProcessError(readIndex,"csnStreamDecoder NOT IMPLEMENTED", 999, pDescr); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + pDescr++; + break; + } + + case CSN_VARIABLE_TARRAY_OFFSET: + case CSN_VARIABLE_TARRAY: + case CSN_TYPE_ARRAY: + { + gint16 Status; + csnStream_t arT = *ar; + guint16 nCount = (guint16) pDescr->i; + guint16 nSize = (guint16)(guint32)pDescr->value; + + pui8 = pui8DATA(data, pDescr->offset); + + if (CSN_VARIABLE_TARRAY == pDescr->type) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + } + else if (CSN_VARIABLE_TARRAY_OFFSET == pDescr->type) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + nCount--; /* Offset 1 */ + } + + while (nCount--) /* Changed to handle length = 0. */ + { + LOGPC(DCSN1, LOGL_DEBUG, "%s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); + if (Status >= 0) + { + pui8 += nSize; + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { + return Status; + } + } + + pDescr++; + break; + } + + case CSN_BITMAP: + { /* bitmap with given length. The result is left aligned! */ + guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ + + if (no_of_bits > 0) + { + if (no_of_bits > remaining_bits_len) + { + return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + if (no_of_bits <= 32) + { + guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); + pui32 = pui32DATA(data, pDescr->offset); + *pui32 = ui32; + } + else if (no_of_bits <= 64) + { + guint64 ui64 = bitvec_read_field(vector, readIndex, no_of_bits); + pui64 = pui64DATA(data, pDescr->offset); + *pui64 = ui64; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %lu | ", pDescr->sz , *pui64); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder NOT IMPLEMENTED", 999, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } + /* bitmap was successfully extracted or it was empty */ + + pDescr++; + break; + } + + case CSN_TYPE: + { + gint16 Status; + csnStream_t arT = *ar; + LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); + LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + pDescr++; + } + else + { /* return error code Has already been processed: */ + return Status; + } + + break; + } + + default: + { /* descriptions of union elements other than above are illegal */ + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_IN_SCRIPT, pDescr); + } + } + + pDescr = pDescrNext; + break; + } + + case CSN_EXIST: + case CSN_EXIST_LH: + { + guint8 fExist; + + pui8 = pui8DATA(data, pDescr->offset); + + if (CSN_EXIST_LH == pDescr->type) + { + fExist = get_masked_bits8(vector, readIndex, bit_offset, 1); + } + else + { + fExist = bitvec_read_field(vector, readIndex, 1); + } + + *pui8 = fExist; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pDescr++; + bit_offset++; + remaining_bits_len -= 1; + + if (!fExist) + { + ar->remaining_bits_len = remaining_bits_len; + ar->bit_offset = bit_offset; + return remaining_bits_len; + } + + break; + } + + case CSN_NEXT_EXIST: + { + guint8 fExist; + + pui8 = pui8DATA(data, pDescr->offset); + + /* this if-statement represents the M_NEXT_EXIST_OR_NULL description element */ + if ((pDescr->may_be_null) && (remaining_bits_len == 0)) + { /* no more bits to decode is fine here - end of message detected and allowed */ + + /* Skip i entries + this entry */ + pDescr += pDescr->i + 1; + + /* Set the data member to "not exist" */ + *pui8 = 0; + break; + } + + /* the "regular" M_NEXT_EXIST description element */ + + fExist = 0x00; + if (bitvec_read_field(vector, readIndex, 1)) + { + fExist = 0x01; + } + + *pui8 = fExist; + remaining_bits_len -= 1; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + ++bit_offset; + + if (fExist == 0) + { /* Skip 'i' entries */ + pDescr += pDescr->i; + } + + pDescr++; + break; + } + + case CSN_NEXT_EXIST_LH: + { + guint8 fExist; + pui8 = pui8DATA(data, pDescr->offset); + + /* this if-statement represents the M_NEXT_EXIST_OR_NULL_LH description element */ + if ((pDescr->descr.ptr != NULL) && (remaining_bits_len == 0)) + { /* no more bits to decode is fine here - end of message detected and allowed */ + + /* skip 'i' entries + this entry */ + pDescr += pDescr->i + 1; + + /* set the data member to "not exist" */ + *pui8 = 0; + break; + } + + /* the "regular" M_NEXT_EXIST_LH description element */ + fExist = get_masked_bits8(vector, readIndex, bit_offset, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)fExist); + *pui8++ = fExist; + remaining_bits_len -= 1; + + bit_offset++; + + if (fExist == 0) + { /* Skip 'i' entries */ + pDescr += pDescr->i; + } + pDescr++; + + break; + } + + case CSN_VARIABLE_BITMAP_1: + { /* Bitmap from here and to the end of message */ + + *pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ + + /*no break - + * with a length set we have a regular variable length bitmap so we continue */ + } + /* FALL THROUGH */ + case CSN_VARIABLE_BITMAP: + { /* {CSN_VARIABLE_BITMAP, 0, offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * + * Bit array with length (in bits) specified in parameter (pDescr->descr) + * The result is right aligned! + */ + gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value); + + no_of_bits += pDescr->i; /* adjusted by offset */ + + if (no_of_bits > 0) + { + remaining_bits_len -= no_of_bits; + + if (remaining_bits_len < 0) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + { /* extract bits */ + guint8* pui8 = pui8DATA(data, pDescr->offset); + gint16 nB1 = no_of_bits & 0x07;/* no_of_bits Mod 8 */ + + if (nB1 > 0) + { /* take care of the first byte - it will be right aligned */ + *pui8 = bitvec_read_field(vector, readIndex, nB1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + no_of_bits -= nB1; + bit_offset += nB1; /* (nB1 is no_of_bits Mod 8) */ + } + + /* remaining no_of_bits is a multiple of 8 or 0 */ + while (no_of_bits > 0) + { + *pui8 = bitvec_read_field(vector, readIndex, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + no_of_bits -= 8; + } + } + } + pDescr++; + break; + } + + case CSN_LEFT_ALIGNED_VAR_BMP_1: + { /* Bitmap from here and to the end of message */ + + *pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ + + /* no break - + * with a length set we have a regular left aligned variable length bitmap so we continue + */ + } + /* FALL THROUGH */ + case CSN_LEFT_ALIGNED_VAR_BMP: + { /* {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * + * bit array with length (in bits) specified in parameter (pDescr->descr) + */ + gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value);/* Size of bitmap */ + + no_of_bits += pDescr->i;/* size adjusted by offset */ + + if (no_of_bits > 0) + { + remaining_bits_len -= no_of_bits; + + if (remaining_bits_len < 0) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + { /* extract bits */ + guint8* pui8 = pui8DATA(data, pDescr->offset); + + while (no_of_bits >= 8) + { + *pui8 = bitvec_read_field(vector, readIndex, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + no_of_bits -= 8; + } + if (no_of_bits > 0) + { + *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + bit_offset += no_of_bits; + no_of_bits = 0; + } + } + } + + /* bitmap was successfully extracted or it was empty */ + pDescr++; + break; + } + + case CSN_PADDING_BITS: + { /* Padding from here and to the end of message */ + LOGPC(DCSN1, LOGL_DEBUG, "%s = ", pDescr->sz); + if (remaining_bits_len > 0) + { + while (remaining_bits_len > 0) + { + guint bits_to_handle = remaining_bits_len%8; + if (bits_to_handle > 0) + { + LOGPC(DCSN1, LOGL_DEBUG, "%d|", bitvec_get_uint(vector, bits_to_handle)); + remaining_bits_len -= bits_to_handle; + bit_offset += bits_to_handle; + } + else if (bits_to_handle == 0) + { + LOGPC(DCSN1, LOGL_DEBUG, "%d|", bitvec_get_uint(vector, 8)); + remaining_bits_len -= 8; + bit_offset += 8; + } + } + } + if (remaining_bits_len < 0) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + /* Padding was successfully extracted or it was empty */ + pDescr++; + break; + } + + case CSN_VARIABLE_ARRAY: + { /* {int type; int i; void* descr; int offset; const char* sz; } CSN_DESCR; + * {CSN_VARIABLE_ARRAY, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * Array with length specified in parameter: + * + * + */ + gint16 count = *pui8DATA(data, (gint16)pDescr->descr.value); + + count += pDescr->i; /* Adjusted by offset */ + + if (count > 0) + { + remaining_bits_len -= count * 8; + + if (remaining_bits_len < 0) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + pui8 = pui8DATA(data, pDescr->offset); + + while (count > 0) + { + *pui8 = bitvec_read_field(vector, readIndex, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s = 0x%x | ", pDescr->sz , (unsigned)*pui8); + pui8++; + bit_offset += 8; + count--; + } + } + + pDescr++; + break; + } + + case CSN_RECURSIVE_ARRAY: + { /* Recursive way to specify an array: ::= {1 | 0} + * or more generally: ::= { | } + * where ::= bit(value) + * ::= 0 | 1 + * ::= reversed tag i.e. tag == 1 -> EndTag == 0 and vice versa + * {CSN_RECURSIVE_ARRAY, _BITS, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * REMARK: recursive way to specify an array but an iterative implementation! + */ + gint16 no_of_bits = pDescr->i; + guint8 ElementCount = 0; + + pui8 = pui8DATA(data, pDescr->offset); + + while (existNextElement(vector, readIndex, Tag)) + { /* tag control shows existence of next list elements */ + LOGPC(DCSN1, LOGL_DEBUG, "%s = Exist | ", pDescr->sz); + bit_offset++; + remaining_bits_len--; + + /* extract and store no_of_bits long element from bitstream */ + *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + remaining_bits_len -= no_of_bits; + ElementCount++; + + if (remaining_bits_len < 0) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + bit_offset += no_of_bits; + } + + LOGPC(DCSN1, LOGL_DEBUG, "%s = %d | ", pDescr->sz , bitvec_get_uint(vector, 1)); + /* existNextElement() returned FALSE, 1 bit consumed */ + bit_offset++; + remaining_bits_len--; + + /* Store the counted number of elements of the array */ + *pui8DATA(data, (gint16)pDescr->descr.value) = ElementCount; + + pDescr++; + break; + } + + case CSN_RECURSIVE_TARRAY: + { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; + * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) + * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE), (void_fn_t)ElementsOf(((_STRUCT*)0)->_MEMBER)} + */ + gint16 nSizeElement = (gint16)(gint32)pDescr->value; + guint32 nSizeArray = (guint32)((uintptr_t)pDescr->aux_fn); + guint8 ElementCount = 0; + pui8 = pui8DATA(data, pDescr->offset); + + while (existNextElement(vector, readIndex, Tag)) + { /* tag control shows existence of next list elements */ + LOGPC(DCSN1, LOGL_DEBUG, "%s = Exist | ", pDescr->sz); + /* existNextElement() returned TRUE, 1 bit consumed */ + bit_offset++; + remaining_bits_len--; + ElementCount++; + + if (ElementCount > nSizeArray) + { + LOGPC(DCSN1, LOGL_ERROR, "error: %s: too many elements (>%u) in recursive array. Increase its size! } |", pDescr->sz, nSizeArray); + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_STREAM_NOT_SUPPORTED, pDescr); + } + + { /* unpack the following data structure */ + csnStream_t arT = *ar; + gint16 Status; + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); + + if (Status >= 0) + { /* successful completion */ + pui8 += nSizeElement; /* -> to next data element */ + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { /* something went awry */ + return Status; + } + } + + if (remaining_bits_len < 0) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + } + + LOGPC(DCSN1, LOGL_DEBUG, "%s = %d | ", pDescr->sz , bitvec_get_uint(vector, 1)); + + /* existNextElement() returned FALSE, 1 bit consumed */ + remaining_bits_len--; + bit_offset++; + + /* Store the counted number of elements of the array */ + *pui8DATA(data, (gint16)(gint32)pDescr->i) = ElementCount; + + pDescr++; + break; + } + + case CSN_RECURSIVE_TARRAY_2: + { /* Recursive way to specify an array of type: ::= { 0 } ** 1 ; */ + + Tag = REVERSED_TAG; + + /* NO break - + * handling is exactly the same as for CSN_RECURSIVE_TARRAY_1 so we continue + */ + } + /* FALL THROUGH */ + case CSN_RECURSIVE_TARRAY_1: + { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; + * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) + * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE), (void_fn_t)ElementsOf(((_STRUCT*)0)->_MEMBER)} + */ + gint16 nSizeElement = (gint16)(gint32)pDescr->value; + guint32 nSizeArray = (guint32)((uintptr_t)pDescr->aux_fn); + guint8 ElementCount = 0; + csnStream_t arT = *ar; + gboolean EndOfList = FALSE; + gint16 Status; + pui8 = pui8DATA(data, pDescr->offset); + + do + { /* get data element */ + ElementCount++; + + if (ElementCount > nSizeArray) + { + LOGPC(DCSN1, LOGL_ERROR, "error: %s: too many elements (>%u) in recursive array. Increase its size! } |", pDescr->sz, nSizeArray); + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_STREAM_NOT_SUPPORTED, pDescr); + } + + LOGPC(DCSN1, LOGL_DEBUG, "%s { | ", pDescr->sz); + + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); + + if (Status >= 0) + { /* successful completion */ + pui8 += nSizeElement; /* -> to next */ + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { /* something went awry */ + return Status; + } + + if (remaining_bits_len < 0) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + /* control of next element's tag */ + LOGPC(DCSN1, LOGL_DEBUG, "%s } | ", pDescr->sz); + EndOfList = !(existNextElement(vector, readIndex, Tag)); + + bit_offset++; + remaining_bits_len--; /* 1 bit consumed (tag) */ + } while (!EndOfList); + + + /* Store the count of the array */ + *pui8DATA(data, pDescr->i) = ElementCount; + Tag = STANDARD_TAG; /* in case it was set to "reversed" */ + pDescr++; + break; + } + + case CSN_FIXED: + { /* Verify the fixed bits */ + guint8 no_of_bits = (guint8) pDescr->i; + guint32 ui32; + + if (no_of_bits <= 32) + { + ui32 = bitvec_read_field(vector, readIndex, no_of_bits); + } + else + { + return ProcessError(readIndex,"no_of_bits > 32", -1, pDescr); + } + if (ui32 != (unsigned)(gint32)pDescr->offset) + { + return ProcessError(readIndex,"csnStreamDecoder FIXED value does not match", -1, pDescr); + } + + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned int)ui32); + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_CALLBACK: + { + guint16 no_of_bits; + DissectorCallbackFcn_t callback = (DissectorCallbackFcn_t)pDescr->aux_fn; + LOGPC(DCSN1, LOGL_DEBUG, "CSN_CALLBACK(%s) | ", pDescr->sz); + no_of_bits = callback(vector, readIndex, pvDATA(data, pDescr->i), pvDATA(data, pDescr->offset)); + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_TRAP_ERROR: + { + return ProcessError(readIndex,"csnStreamDecoder", pDescr->i, pDescr); + } + + case CSN_END: + { + ar->remaining_bits_len = remaining_bits_len; + ar->bit_offset = bit_offset; + return remaining_bits_len; + } + + default: + { + assert(0); + } + + + } + + } while (remaining_bits_len >= 0); + + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); +} diff --git a/src/csn1_enc.c b/src/csn1_enc.c new file mode 100644 index 0000000..5518d06 --- /dev/null +++ b/src/csn1_enc.c @@ -0,0 +1,1305 @@ +/* csn1_enc.c + * Routines for CSN1 dissection in wireshark. + * + * Copyright (C) 2011 Ivan Klyuchnikov + * + * By Vincent Helfre, based on original code by Jari Sassi + * with the gracious authorization of STE + * Copyright (c) 2011 ST-Ericsson + * + * $Id: packet-csn1.c 39140 2011-09-25 22:01:50Z wmeier $ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include +#include +#define __STDC_FORMAT_MACROS +#include +#include "csn1.h" +#include + +#include +#include + +extern const unsigned char ixBitsTab[]; +guint8 get_masked_bits8(struct bitvec *vector, unsigned *readIndex, gint bit_offset, const gint no_of_bits); + +/** + * ================================================================================================ + * set initial/start values in help data structure used for packing/unpacking operation + * ================================================================================================ + */ + +gint16 csnStreamEncoder(csnStream_t* ar, const CSN_DESCR* pDescr, struct bitvec *vector, unsigned *writeIndex, void* data) +{ + gint remaining_bits_len = ar->remaining_bits_len; + gint bit_offset = ar->bit_offset; + guint8* pui8; + guint16* pui16; + guint32* pui32; + guint64* pui64; + unsigned ib; + + guint8 Tag = STANDARD_TAG; + + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex, __func__, CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + do + { + switch (pDescr->type) + { + case CSN_BIT: + { + if (remaining_bits_len > 0) + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + /* end add the bit value to protocol tree */ + } + else if (pDescr->may_be_null) + { + LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + pDescr++; + remaining_bits_len--; + bit_offset++; + break; + } + + case CSN_NULL: + { /* Empty member! */ + pDescr++; + break; + } + + case CSN_UINT: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else if (no_of_bits <= 16) + { + pui16 = pui16DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui16, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); + } + else if (no_of_bits <= 32) + { + pui32 = pui32DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui32, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } + else if (pDescr->may_be_null) + { + LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + pDescr++; + break; + } + + case CSN_UINT_OFFSET: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8 - (guint8)pDescr->descr.value, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(*pui8 - (guint8)pDescr->descr.value)); + } + else if (no_of_bits <= 16) + { + pui16 = pui16DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui16 - (guint16)pDescr->descr.value, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned short)(*pui16 - (guint16)pDescr->descr.value)); + } + else if (no_of_bits <= 32) + { + pui32 = pui32DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui32 - (guint16)pDescr->descr.value, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned int)(*pui32 - (guint16)pDescr->descr.value)); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_LH: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); + // TODO : Change get_masked_bits8() + *writeIndex -= no_of_bits; + guint8 ui8 = get_masked_bits8(vector, writeIndex, bit_offset, no_of_bits); + *writeIndex -= no_of_bits; + bitvec_write_field(vector, writeIndex, ui8, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + + } + else + {/* Maybe we should support more than 8 bits ? */ + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_ARRAY: + { + guint8 no_of_bits = (guint8) pDescr->i; + guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ + + if (pDescr->value != 0) + { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ + nCount = *pui16DATA(data, nCount); + } + + if (remaining_bits_len >= (no_of_bits * nCount)) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + do + { + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } while (--nCount > 0); + } + else if (no_of_bits <= 16) + { + return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); + } + else if (no_of_bits <= 32) + { + return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + pDescr++; + break; + } + + case CSN_VARIABLE_TARRAY_OFFSET: + case CSN_VARIABLE_TARRAY: + case CSN_TYPE_ARRAY: + { + gint16 Status; + csnStream_t arT = *ar; + gint16 nCount = pDescr->i; + guint16 nSize = (guint16)(gint32)pDescr->value; + + pui8 = pui8DATA(data, pDescr->offset); + if (pDescr->type == CSN_VARIABLE_TARRAY) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + } + else if (pDescr->type == CSN_VARIABLE_TARRAY_OFFSET) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + /* nCount--; the 1 offset is already taken into account in CSN_UINT_OFFSET */ + } + + while (nCount > 0) + { /* resulting array of length 0 is possible + * but no bits shall be read from bitstream + */ + + LOGPC(DCSN1, LOGL_DEBUG, "%s : | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); + if (Status >= 0) + { + pui8 += nSize; + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + + } + else + { + return Status; + } + nCount--; + } + + pDescr++; + break; + } + + case CSN_BITMAP: + { /* bitmap with given length. The result is left aligned! */ + guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ + + if (no_of_bits > 0) + { + if (no_of_bits > remaining_bits_len) + { + return ProcessError(writeIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + if (no_of_bits <= 32) + { + for(ib = 0; ib < 4; ib++) + { + pui8 = pui8DATA(data, pDescr->offset+ib); + bitvec_write_field(vector, writeIndex, *pui8, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); + } + } + else if (no_of_bits <= 64) + { + for(ib = 0; ib < 8; ib++) + { + pui8 = pui8DATA(data, pDescr->offset+ib); + bitvec_write_field(vector, writeIndex, *pui8, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder NOT IMPLEMENTED", 999, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } + /* bitmap was successfully extracted or it was empty */ + + pDescr++; + break; + } + + case CSN_TYPE: + { + gint16 Status; + csnStream_t arT = *ar; + LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pvDATA(data, pDescr->offset)); + LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); + if (Status >= 0) + { + + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + pDescr++; + } + else + { + /* Has already been processed: ProcessError("csnStreamEncoder", Status, pDescr); */ + return Status; + } + + break; + } + + case CSN_CHOICE: + { + gint16 count = pDescr->i; + const CSN_ChoiceElement_t* pChoice = (const CSN_ChoiceElement_t*) pDescr->descr.ptr; + + /* Make sure that the list of choice items is not empty */ + if (!count) + return ProcessError(writeIndex, "csnStreamEncoder", CSN_ERROR_IN_SCRIPT, pDescr); + else if (count > 255) /* We can handle up to 256 (UCHAR_MAX) selectors */ + return ProcessError(writeIndex, "csnStreamEncoder", CSN_ERROR_IN_SCRIPT, pDescr); + + /* Make sure that choice index is not out of range */ + pui8 = pui8DATA(data, pDescr->offset); + if (*pui8 >= count) + return ProcessError(writeIndex, "csnStreamEncoder", CSN_ERROR_INVALID_UNION_INDEX, pDescr); + + pChoice += *pui8; + guint8 no_of_bits = pChoice->bits; + guint8 value = pChoice->value; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pChoice->descr.sz , (unsigned)value); + bitvec_write_field(vector, writeIndex, value, no_of_bits); + + CSN_DESCR descr[2]; + gint16 Status; + csnStream_t arT = *ar; + + descr[0] = pChoice->descr; + memset(&descr[1], 0x00, sizeof(CSN_DESCR)); + descr[1].type = CSN_END; + bit_offset += no_of_bits; + remaining_bits_len -= no_of_bits; + + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamEncoder(&arT, descr, vector, writeIndex, data); + + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { + return Status; + } + + pDescr++; + break; + } + + case CSN_SERIALIZE: + { + StreamSerializeFcn_t serialize = (StreamSerializeFcn_t)pDescr->aux_fn; + csnStream_t arT = *ar; + guint8 length_len = pDescr->i; + gint16 Status = -1; + unsigned lengthIndex; + + // store writeIndex for length value (7 bit) + lengthIndex = *writeIndex; + *writeIndex += length_len; + bit_offset += length_len; + remaining_bits_len -= length_len; + arT.direction = 0; + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = serialize(&arT, vector, writeIndex, pvDATA(data, pDescr->offset)); + + bitvec_write_field(vector, &lengthIndex, *writeIndex - lengthIndex - length_len, length_len); + LOGPC(DCSN1, LOGL_DEBUG, "%s length = %u | ", pDescr->sz , (unsigned)(*writeIndex - lengthIndex)); + + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + pDescr++; + } + else + { + // Has already been processed: + return Status; + } + + break; + } + + case CSN_UNION_LH: + case CSN_UNION: + { + gint16 Bits; + guint8 index; + gint16 count = pDescr->i; + const CSN_DESCR* pDescrNext = pDescr; + + pDescrNext += count + 1; /* now this is next after the union */ + if ((count <= 0) || (count > 16)) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_INVALID_UNION_INDEX, pDescr); + } + + /* Now get the bits to extract the index */ + Bits = ixBitsTab[count]; + index = 0; + + /* Assign UnionType */ + pui8 = pui8DATA(data, pDescr->offset); + //read index from data and write to vector + bitvec_write_field(vector, writeIndex, *pui8, Bits); + + //decode index + *writeIndex -= Bits; + + while (Bits > 0) + { + index <<= 1; + + if (CSN_UNION_LH == pDescr->type) + { + index |= get_masked_bits8(vector, writeIndex, bit_offset, 1); + } + else + { + index |= bitvec_read_field(vector, writeIndex, 1); + } + + remaining_bits_len--; + bit_offset++; + Bits--; + } + + *writeIndex -= Bits; + bitvec_write_field(vector, writeIndex, index, Bits); + + + /* script index to continue on, limited in case we do not have a power of 2 */ + pDescr += (MIN(index + 1, count)); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)index); + + switch (pDescr->type) + { /* get the right element of the union based on computed index */ + + case CSN_BIT: + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + remaining_bits_len--; + bit_offset++; + pDescr++; + break; + } + + case CSN_NULL: + { /* Empty member! */ + pDescr++; + break; + } + + case CSN_UINT: + { + guint8 no_of_bits = (guint8) pDescr->i; + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else if (no_of_bits <= 16) + { + pui16 = pui16DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui16, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); + } + else if (no_of_bits <= 32) + { + pui32 = pui32DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui32, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_OFFSET: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8 - (guint8)pDescr->descr.value, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(*pui8 - (guint8)pDescr->descr.value)); + } + else if (no_of_bits <= 16) + { + pui16 = pui16DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui16 - (guint16)pDescr->descr.value, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned short)(*pui16 - (guint16)pDescr->descr.value)); + } + else if (no_of_bits <= 32) + { + pui32 = pui32DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui32 - (guint16)pDescr->descr.value, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned int)(*pui32 - (guint16)pDescr->descr.value)); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_LH: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + remaining_bits_len -= no_of_bits; + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); + // TODO : Change get_masked_bits8() + *writeIndex -= no_of_bits; + guint8 ui8 = get_masked_bits8(vector, writeIndex, bit_offset, no_of_bits); + *writeIndex -= no_of_bits; + bitvec_write_field(vector, writeIndex, ui8, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + + } + else + {/* Maybe we should support more than 8 bits ? */ + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_ARRAY: + { + guint8 no_of_bits = (guint8) pDescr->i; + guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ + + if (pDescr->value != 0) + { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ + nCount = *pui16DATA(data, nCount); + } + + if (remaining_bits_len >= (no_of_bits * nCount)) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + do + { + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } while (--nCount > 0); + } + else if (no_of_bits <= 16) + { + return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); + } + else if (no_of_bits <= 32) + { + return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + pDescr++; + break; + } + + case CSN_VARIABLE_TARRAY_OFFSET: + case CSN_VARIABLE_TARRAY: + case CSN_TYPE_ARRAY: + { + gint16 Status; + csnStream_t arT = *ar; + gint16 nCount = pDescr->i; + guint16 nSize = (guint16)(gint32)pDescr->value; + + pui8 = pui8DATA(data, pDescr->offset); + if (pDescr->type == CSN_VARIABLE_TARRAY) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + } + else if (pDescr->type == CSN_VARIABLE_TARRAY_OFFSET) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + /* nCount--; the 1 offset is already taken into account in CSN_UINT_OFFSET */ + } + + while (nCount > 0) + { /* resulting array of length 0 is possible + * but no bits shall be read from bitstream + */ + + LOGPC(DCSN1, LOGL_DEBUG, "%s : | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); + if (Status >= 0) + { + pui8 += nSize; + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { + return Status; + } + nCount--; + } + + pDescr++; + break; + } + + case CSN_BITMAP: + { /* bitmap with given length. The result is left aligned! */ + guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ + + if (no_of_bits > 0) + { + if (no_of_bits > remaining_bits_len) + { + return ProcessError(writeIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + if (no_of_bits <= 32) + { + pui32 = pui32DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui32, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); + } + else if (no_of_bits <= 64) + { + pui64 = pui64DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui64, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %lu | ", pDescr->sz , *pui64); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder NOT IMPLEMENTED", 999, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } + /* bitmap was successfully extracted or it was empty */ + + pDescr++; + break; + } + + case CSN_TYPE: + { + gint16 Status; + csnStream_t arT = *ar; + LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pvDATA(data, pDescr->offset)); + LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + pDescr++; + } + else + { + /* Has already been processed: ProcessError("csnStreamEncoder", Status, pDescr); */ + return Status; + } + + break; + } + + default: + { /* descriptions of union elements other than above are illegal */ + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_IN_SCRIPT, pDescr); + } + } + + pDescr = pDescrNext; + break; + } + + case CSN_EXIST: + case CSN_EXIST_LH: + { + guint8 fExist; + unsigned exist = 0; + pui8 = pui8DATA(data, pDescr->offset); + exist = *pui8; + bitvec_write_field(vector, writeIndex, *pui8, 1); + writeIndex--; + if (CSN_EXIST_LH == pDescr->type) + { + fExist = get_masked_bits8(vector, writeIndex, bit_offset, 1); + } + else + { + fExist = bitvec_read_field(vector, writeIndex, 1); + } + writeIndex--; + bitvec_write_field(vector, writeIndex, fExist, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz, (unsigned)fExist); + remaining_bits_len--; + bit_offset++; + pDescr++; + + if (!exist) + { + ar->remaining_bits_len = remaining_bits_len; + ar->bit_offset = bit_offset; + return remaining_bits_len; + } + break; + } + + case CSN_NEXT_EXIST: + { + guint8 fExist; + + pui8 = pui8DATA(data, pDescr->offset); + + /* this if-statement represents the M_NEXT_EXIST_OR_NULL description element */ + if ((pDescr->may_be_null) && (remaining_bits_len == 0)) + { /* no more bits to decode is fine here - end of message detected and allowed */ + + /* Skip i entries + this entry */ + pDescr += pDescr->i + 1; + + break; + } + + bitvec_write_field(vector, writeIndex, *pui8, 1); + fExist = *pui8; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + + remaining_bits_len--; + bit_offset++; + + if (fExist == 0) + { /* Skip 'i' entries */ + pDescr += pDescr->i; + } + + pDescr++; + break; + } + + case CSN_NEXT_EXIST_LH: + { + guint8 fExist; + pui8 = pui8DATA(data, pDescr->offset); + + /* this if-statement represents the M_NEXT_EXIST_OR_NULL_LH description element */ + if ((pDescr->descr.ptr != NULL) && (remaining_bits_len == 0)) + { /* no more bits to decode is fine here - end of message detected and allowed */ + + /* skip 'i' entries + this entry */ + pDescr += pDescr->i + 1; + + /* set the data member to "not exist" */ + //*pui8 = 0; + break; + } + + /* the "regular" M_NEXT_EXIST_LH description element */ + bitvec_write_field(vector, writeIndex, *pui8, 1); + writeIndex--; + fExist = get_masked_bits8(vector, writeIndex, bit_offset, 1); + writeIndex--; + bitvec_write_field(vector, writeIndex, fExist, 1); + pui8++; + + remaining_bits_len--; + bit_offset++; + + if (fExist == 0) + { /* Skip 'i' entries */ + pDescr += pDescr->i; + } + pDescr++; + + break; + } + + case CSN_VARIABLE_BITMAP_1: + { /* Bitmap from here and to the end of message */ + + //*pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ + + /*no break - + * with a length set we have a regular variable length bitmap so we continue */ + } + /* FALL THROUGH */ + case CSN_VARIABLE_BITMAP: + { /* {CSN_VARIABLE_BITMAP, 0, offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * + * Bit array with length (in bits) specified in parameter (pDescr->descr) + * The result is right aligned! + */ + gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value); + + no_of_bits += pDescr->i; /* adjusted by offset */ + + if (no_of_bits > 0) + { + + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + { /* extract bits */ + guint8* pui8 = pui8DATA(data, pDescr->offset); + gint16 nB1 = no_of_bits & 0x07;/* no_of_bits Mod 8 */ + + if (nB1 > 0) + { /* take care of the first byte - it will be right aligned */ + bitvec_write_field(vector, writeIndex, *pui8, nB1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + no_of_bits -= nB1; + bit_offset += nB1; /* (nB1 is no_of_bits Mod 8) */ + remaining_bits_len -= nB1; + } + + /* remaining no_of_bits is a multiple of 8 or 0 */ + while (no_of_bits > 0) + { + bitvec_write_field(vector, writeIndex, *pui8, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + no_of_bits -= 8; + remaining_bits_len -= 8; + } + } + } + pDescr++; + break; + } + + case CSN_LEFT_ALIGNED_VAR_BMP_1: + { /* Bitmap from here and to the end of message */ + + //*pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ + + /* no break - + * with a length set we have a regular left aligned variable length bitmap so we continue + */ + } + /* FALL THROUGH */ + case CSN_LEFT_ALIGNED_VAR_BMP: + { /* {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * + * bit array with length (in bits) specified in parameter (pDescr->descr) + */ + + gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value);/* Size of bitmap */ + + no_of_bits += pDescr->i;/* size adjusted by offset */ + + if (no_of_bits > 0) + { + remaining_bits_len -= no_of_bits; + + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + { /* extract bits */ + guint8* pui8 = pui8DATA(data, pDescr->offset); + gint16 nB1 = no_of_bits & 0x07;/* no_of_bits Mod 8 */ + + while (no_of_bits > 0) + { + bitvec_write_field(vector, writeIndex, *pui8, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + no_of_bits -= 8; + } + if (nB1 > 0) + { + bitvec_write_field(vector, writeIndex, *pui8, nB1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + no_of_bits -= nB1; + bit_offset += nB1; /* (nB1 is no_of_bits Mod 8) */ + } + } + + } + + /* bitmap was successfully extracted or it was empty */ + pDescr++; + break; + } + + case CSN_PADDING_BITS: + { /* Padding from here and to the end of message */ + LOGPC(DCSN1, LOGL_DEBUG, "%s = ", pDescr->sz); + guint8 filler = 0x2b; + if (remaining_bits_len > 0) + { + while (remaining_bits_len > 0) + { + guint8 bits_to_handle = remaining_bits_len%8; + if (bits_to_handle > 0) + { + /* section 11 of 44.060 + * The padding bits may be the 'null' string. Otherwise, the + * padding bits starts with bit '0', followed by 'spare padding' + * < padding bits > ::= { null | 0 < spare padding > ! < Ignore : 1 bit** = < no string > > } ; + */ + guint8 fl = filler&(0xff>>(8-bits_to_handle + 1)); + bitvec_write_field(vector, writeIndex, fl, bits_to_handle); + LOGPC(DCSN1, LOGL_DEBUG, "%u|", fl); + remaining_bits_len -= bits_to_handle; + bit_offset += bits_to_handle; + } + else if (bits_to_handle == 0) + { + bitvec_write_field(vector, writeIndex, filler, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%u|", filler); + remaining_bits_len -= 8; + bit_offset += 8; + } + } + } + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + /* Padding was successfully extracted or it was empty */ + pDescr++; + break; + } + + case CSN_VARIABLE_ARRAY: + { /* {int type; int i; void* descr; int offset; const char* sz; } CSN_DESCR; + * {CSN_VARIABLE_ARRAY, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * Array with length specified in parameter: + * + * + */ + gint16 count = *pui8DATA(data, (gint16)pDescr->descr.value); + + count += pDescr->i; /* Adjusted by offset */ + + if (count > 0) + { + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + pui8 = pui8DATA(data, pDescr->offset); + + while (count > 0) + { + bitvec_write_field(vector, writeIndex, *pui8, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s = 0x%x | ", pDescr->sz , (unsigned)*pui8); + pui8++; + bit_offset += 8; + remaining_bits_len -= 8; + count--; + } + } + + pDescr++; + break; + } + + case CSN_RECURSIVE_ARRAY: + { /* Recursive way to specify an array: ::= {1 | 0} + * or more generally: ::= { | } + * where ::= bit(value) + * ::= 0 | 1 + * ::= reversed tag i.e. tag == 1 -> EndTag == 0 and vice versa + * {CSN_RECURSIVE_ARRAY, _BITS, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * REMARK: recursive way to specify an array but an iterative implementation! + */ + gint16 no_of_bits = pDescr->i; + guint8 ElementCount = 0; + pui8 = pui8DATA(data, pDescr->offset); + ElementCount = *pui8DATA(data, (gint16)pDescr->descr.value); + while (ElementCount > 0) + { /* tag control shows existence of next list elements */ + bitvec_write_field(vector, writeIndex, Tag, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)Tag); + bit_offset++; + remaining_bits_len--; + + /* extract and store no_of_bits long element from bitstream */ + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + ElementCount--; + + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + bit_offset += no_of_bits; + remaining_bits_len -= no_of_bits; + } + + bitvec_write_field(vector, writeIndex, !Tag, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(!Tag)); + bit_offset++; + remaining_bits_len--; + + pDescr++; + break; + } + + case CSN_RECURSIVE_TARRAY: + { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; + * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) + * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} + */ + gint16 nSizeElement = (gint16)(gint32)pDescr->value; + guint8 ElementCount = 0; + pui8 = pui8DATA(data, pDescr->offset); + /* Store the counted number of elements of the array */ + ElementCount = *pui8DATA(data, (gint16)(gint32)pDescr->i); + + while (ElementCount > 0) + { /* tag control shows existence of next list elements */ + bitvec_write_field(vector, writeIndex, Tag, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)Tag); + bit_offset++; + + remaining_bits_len--; + ElementCount--; + + { /* unpack the following data structure */ + csnStream_t arT = *ar; + gint16 Status; + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); + + if (Status >= 0) + { /* successful completion */ + pui8 += nSizeElement; /* -> to next data element */ + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { /* something went awry */ + return Status; + } + } + + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + } + + bitvec_write_field(vector, writeIndex, !Tag, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(!Tag)); + bit_offset++; + + pDescr++; + break; + } + + case CSN_RECURSIVE_TARRAY_2: + { /* Recursive way to specify an array of type: ::= { 0 } ** 1 ; */ + + Tag = REVERSED_TAG; + + /* NO break - + * handling is exactly the same as for CSN_RECURSIVE_TARRAY_1 so we continue + */ + } + /* FALL THROUGH */ + case CSN_RECURSIVE_TARRAY_1: + { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; + * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) + * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} + */ + gint16 nSizeElement = (gint16)(gint32)pDescr->value; + guint8 ElementCount = 0; + guint8 ElementNum = 0; + csnStream_t arT = *ar; + gint16 Status; + + pui8 = pui8DATA(data, pDescr->offset); + /* Store the count of the array */ + ElementCount = *pui8DATA(data, pDescr->i); + ElementNum = ElementCount; + + while (ElementCount > 0) + { /* get data element */ + if (ElementCount != ElementNum) + { + bitvec_write_field(vector, writeIndex, Tag, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)Tag); + bit_offset++; + remaining_bits_len--; + } + ElementCount--; + LOGPC(DCSN1, LOGL_DEBUG, "%s { | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); + LOGPC(DCSN1, LOGL_DEBUG, "%s } | ", pDescr->sz); + if (Status >= 0) + { /* successful completion */ + pui8 += nSizeElement; /* -> to next */ + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { /* something went awry */ + return Status; + } + + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + } + bitvec_write_field(vector, writeIndex, !Tag, 1); + bit_offset++; + remaining_bits_len--; + Tag = STANDARD_TAG; /* in case it was set to "reversed" */ + pDescr++; + break; + } + + case CSN_FIXED: + { /* Verify the fixed bits */ + guint8 no_of_bits = (guint8) pDescr->i; + bitvec_write_field(vector, writeIndex, pDescr->offset, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)pDescr->offset); + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_CALLBACK: + { + guint16 no_of_bits; + DissectorCallbackFcn_t callback = (DissectorCallbackFcn_t)pDescr->aux_fn; + LOGPC(DCSN1, LOGL_DEBUG, "CSN_CALLBACK(%s) | ", pDescr->sz); + no_of_bits = callback(vector, writeIndex, pvDATA(data, pDescr->i), pvDATA(data, pDescr->offset)); + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_TRAP_ERROR: + { + return ProcessError(writeIndex,"csnStreamEncoder", pDescr->i, pDescr); + } + + case CSN_END: + { + ar->remaining_bits_len = remaining_bits_len; + ar->bit_offset = bit_offset; + return remaining_bits_len; + } + + default: + { + assert(0); + } + + } + + } while (remaining_bits_len >= 0); + + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 Gerrit-Change-Number: 25827 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 13:01:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 13:01:32 +0000 Subject: Change in osmo-pcu[master]: Split csn1.c into common, enc and dec files In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25827 ) Change subject: Split csn1.c into common, enc and dec files ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 Gerrit-Change-Number: 25827 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 13:01:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 13:01:43 +0000 Subject: Change in osmo-pcu[master]: Split csn1.c into common, enc and dec files In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25827 ) Change subject: Split csn1.c into common, enc and dec files ...................................................................... Patch Set 1: linter can obviously be ignored in this patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 Gerrit-Change-Number: 25827 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 19 Oct 2021 13:01:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 13:02:12 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 13:02:12 +0000 Subject: Change in osmo-pcu[master]: cosmetic: Fix typo in comment In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25826 ) Change subject: cosmetic: Fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9e6d0963533e15e73fb51bed11af563a62b92ecb Gerrit-Change-Number: 25826 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 19 Oct 2021 13:02:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 13:02:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 13:02:23 +0000 Subject: Change in osmo-pcu[master]: Split csn1.c into common, enc and dec files In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25827 ) Change subject: Split csn1.c into common, enc and dec files ...................................................................... Patch Set 1: > Patch Set 1: > > linter can obviously be ignored in this patch. @osmith after this patch is merged probably the blacklist needs to be updated. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 Gerrit-Change-Number: 25827 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 19 Oct 2021 13:02:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 13:39:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 13:39:18 +0000 Subject: Change in osmo-pcu[master]: cosmetic: Fix typo in comment In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25826 ) Change subject: cosmetic: Fix typo in comment ...................................................................... cosmetic: Fix typo in comment Change-Id: I9e6d0963533e15e73fb51bed11af563a62b92ecb --- M src/gsm_rlcmac.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c index e4ff0f8..f676645 100644 --- a/src/gsm_rlcmac.c +++ b/src/gsm_rlcmac.c @@ -6167,7 +6167,7 @@ csnStreamInit(&ar, 0, 8 * vector->data_len); - /* recursive csnStreamEncoder call uses LOGPC everywhere, so we need to start the log somewhere... */ + /* recursive csnStreamDecoder call uses LOGPC everywhere, so we need to start the log somewhere... */ LOGP(DCSN1, LOGL_INFO, "csnStreamDecoder (RAcap): "); ret = csnStreamDecoder(&ar, CSNDESCR(MS_Radio_Access_capability_t), vector, &readIndex, data); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25826 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9e6d0963533e15e73fb51bed11af563a62b92ecb Gerrit-Change-Number: 25826 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 14:14:32 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 19 Oct 2021 14:14:32 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: set band in f_TC_fh_params_set References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 ) Change subject: BSC_Tests: set band in f_TC_fh_params_set ...................................................................... BSC_Tests: set band in f_TC_fh_params_set The function f_TC_fh_params_set sets frequency hopping parameters. The ARFCN is also part of those parameters. However, this function does not set the respective band for the ARFCN that it configurs. This results in an invalid setting at the BSC that might cause unexpected behavior. Lets make sure we configure the band parameter correctly before setting the ARFCN Change-Id: I447e4145c68c62b11b818e28f0081c19e9107647 Related: SYS#5369 --- M bsc/BSC_Tests.ttcn 1 file changed, 48 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/25828/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index d64ccc0..f5310a8 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -8361,7 +8361,7 @@ /* Hopping parameters per a transceiver */ private type record FHParamsTrx { - GsmArfcn arfcn, + GsmBandArfcn arfcn, FHParamsTs ts[8] }; @@ -8370,8 +8370,10 @@ runs on test_CT return FHParamsTrx { var FHParamsTrx fhp; - /* Generate a random ARFCN, including ARFCN 0 */ - fhp.arfcn := f_rnd_int(3); + /* Generate a random ARFCN in the range of 0 - 3. This ARFCN will + * fall in the GSM900 band. */ + fhp.arfcn.arfcn := f_rnd_int(3); + fhp.arfcn.pcs := false; for (var integer tn := 0; tn < 8; tn := tn + 1) { if (not match(tn, tr_tn)) { @@ -8410,7 +8412,7 @@ tr_maio_hsn := tr_HsnMaio(fhp.ts[tn].hsn, fhp.ts[tn].maio); tr_cd := tr_ChanDescH1(cd.chan_nr, tr_maio_hsn); } else { - tr_cd := tr_ChanDescH0(cd.chan_nr, fhp.arfcn); + tr_cd := tr_ChanDescH0(cd.chan_nr, fhp.arfcn.arfcn); } if (not match(cd, tr_cd)) { @@ -8455,7 +8457,7 @@ } /* Take ARFCN of the TRX itself into account */ - full_mask[fhp.arfcn] := '1'B; + full_mask[fhp.arfcn.arfcn] := '1'B; /* Compose a bit-mask for the given timeslot number */ for (var integer i := 0; i < lengthof(fhp.ts[tn].ma); i := i + 1) { @@ -8492,15 +8494,50 @@ return { len := ma_mask_len, ma := ma_mask }; } +/* Configure the appropiate band for a given arfcn, exc */ +private function f_TC_set_band_by_arfcn(integer bts_nr, GsmBandArfcn arfcn) runs on test_CT +{ + var charstring band; + + if (arfcn.arfcn >= 259 and arfcn.arfcn <= 293) { + band := "GSM450"; + } else if (arfcn.arfcn >= 306 and arfcn.arfcn <= 340) { + band := "GSM480"; + } else if (arfcn.arfcn >= 438 and arfcn.arfcn <= 511) { + band := "GSM750"; + } else if (arfcn.arfcn >= 128 and arfcn.arfcn <= 251) { + band := "GSM850"; + } else if (arfcn.arfcn >= 0 and arfcn.arfcn <= 124) { + band := "GSM900"; + } else if (arfcn.arfcn >= 955 and arfcn.arfcn <= 1023) { + band := "GSM900"; + } else if (arfcn.arfcn >= 512 and arfcn.arfcn <= 885 and arfcn.pcs == false) { + band := "DCS1800"; + } else if (arfcn.arfcn >= 512 and arfcn.arfcn <= 810 and arfcn.pcs == true) { + band := "PCS1900"; + } else { + return; + } + + f_vty_enter_cfg_bts(BSCVTY, bts_nr); + f_vty_transceive(BSCVTY, "band " & band); + f_vty_transceive(BSCVTY, "exit"); + f_vty_transceive(BSCVTY, "exit"); + f_vty_transceive(BSCVTY, "exit"); +} + /* Configure the hopping parameters in accordance with the given record */ private function f_TC_fh_params_set(in FHParamsTrx fhp, uint8_t bts_nr := 0, uint8_t trx_nr := 0) runs on test_CT { + + f_TC_set_band_by_arfcn(bts_nr, fhp.arfcn); + /* Enter the configuration node for the given BTS/TRX numbers */ f_vty_enter_cfg_trx(BSCVTY, bts_nr, trx_nr); - f_vty_transceive(BSCVTY, "arfcn " & int2str(fhp.arfcn)); + f_vty_transceive(BSCVTY, "arfcn " & int2str(fhp.arfcn.arfcn)); for (var integer tn := 0; tn < lengthof(fhp.ts); tn := tn + 1) { f_vty_transceive(BSCVTY, "timeslot " & int2str(tn)); @@ -8531,12 +8568,15 @@ private function f_TC_fh_params_unset(in FHParamsTrx fhp, uint8_t bts_nr := 0, uint8_t trx_nr := 0, - GsmArfcn arfcn := 871) + GsmBandArfcn arfcn := {pcs := false, arfcn := 871}) runs on test_CT { + + f_TC_set_band_by_arfcn(bts_nr, arfcn); + /* Enter the configuration node for the given BTS/TRX numbers */ f_vty_enter_cfg_trx(BSCVTY, bts_nr, trx_nr); - f_vty_transceive(BSCVTY, "arfcn " & int2str(arfcn)); + f_vty_transceive(BSCVTY, "arfcn " & int2str(arfcn.arfcn)); for (var integer tn := 0; tn < lengthof(fhp.ts); tn := tn + 1) { f_vty_transceive(BSCVTY, "timeslot " & int2str(tn)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I447e4145c68c62b11b818e28f0081c19e9107647 Gerrit-Change-Number: 25828 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 14:26:19 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 19 Oct 2021 14:26:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: set band in f_TC_fh_params_set In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 to look at the new patch set (#2). Change subject: BSC_Tests: set band in f_TC_fh_params_set ...................................................................... BSC_Tests: set band in f_TC_fh_params_set The function f_TC_fh_params_set sets frequency hopping parameters. The ARFCN is also part of those parameters. However, this function does not set the respective band for the ARFCN that it configurs. This results in an invalid setting at the BSC that might cause unexpected behavior. Lets make sure we configure the band parameter correctly before setting the ARFCN Change-Id: I447e4145c68c62b11b818e28f0081c19e9107647 Related: SYS#5369 --- M bsc/BSC_Tests.ttcn 1 file changed, 48 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/25828/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I447e4145c68c62b11b818e28f0081c19e9107647 Gerrit-Change-Number: 25828 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 14:31:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 14:31:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: set band in f_TC_fh_params_set In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 ) Change subject: BSC_Tests: set band in f_TC_fh_params_set ...................................................................... Patch Set 2: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828/2/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828/2/bsc/BSC_Tests.ttcn at 8502 PS2, Line 8502: if (arfcn.arfcn >= 259 and arfcn.arfcn <= 293) { iirc ttcn3 has specific syntax to match ranges, @fixeria may remember better the details. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I447e4145c68c62b11b818e28f0081c19e9107647 Gerrit-Change-Number: 25828 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 14:31:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 15:35:57 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Tue, 19 Oct 2021 15:35:57 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25829 ) Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... bsc_ctrl_commands: add ctrl command to resend system information The system information can be modified via the ctrl interface, but there is no way to resend it to the BTS afterwards. At the moment it is only possible to resend the system information via VTY. Lets add a control command that does the same via the control interface. Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Related: SYS#5641 --- M src/osmo-bsc/bsc_ctrl_commands.c 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/29/25829/1 diff --git a/src/osmo-bsc/bsc_ctrl_commands.c b/src/osmo-bsc/bsc_ctrl_commands.c index a94baae..4c8cb99 100644 --- a/src/osmo-bsc/bsc_ctrl_commands.c +++ b/src/osmo-bsc/bsc_ctrl_commands.c @@ -667,6 +667,19 @@ CTRL_CMD_DEFINE(bts_c0_power_red, "c0-power-reduction"); +static int get_bts_resend_si(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + + if (gsm_bts_set_system_infos(bts) != 0) { + return CTRL_CMD_ERROR; + } + + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_RO(bts_resend_si, "resend-si"); + int bsc_base_ctrl_cmds_install(void) { int rc = 0; @@ -691,6 +704,7 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rf_state); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rf_states); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_c0_power_red); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_resend_si); rc |= ctrl_cmd_install(CTRL_NODE_TRX, &cmd_trx_max_power); rc |= ctrl_cmd_install(CTRL_NODE_TRX, &cmd_trx_arfcn); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 15:55:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 15:55:22 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is m... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25830 ) Change subject: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is missing ...................................................................... csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is missing All additional release fields are considered optional, and the CSN_DESCR for Content_t already marks almost all as such, except DownlinkDualCarrierCapability_r7. It has been found that some MS transmits a MS RA Capability with a Length=61 bits where the last bit in the buffer is setting the Exist bit for DownlinkDualCarrierCapability_r7 as 1. Hence, the CSN1 decoder failed to decode the whole message because it expected to keep reading there despite there's no more bytes to read. While this is could actually be considered an MS bug, let's relax our expectancies and simply consider the case { 1 } as it was { 0 }, and mark skip decoding DownlinkDualCarrierCapability_r7. That waht wireshark (packet-gsm_a_gsm.c) or pycrate do for instance. This patch itself doesn't fix the problem where actually the Exist bit is stored as 1 in the output decoded structure, but simply allows keep ongoing with decoding until the end. This issue will be fixed in a follow-up patch. Related: SYS#5552 Related: OS#4955 Related: OS#5020 Change-Id: I9a2541bd3544802a646890f32725201836abb0da --- M src/csn1.h M src/csn1_dec.c M src/gsm_rlcmac.c M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.err M tests/rlcmac/RLCMACTest.ok 6 files changed, 54 insertions(+), 36 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/30/25830/1 diff --git a/src/csn1.h b/src/csn1.h index d470228..285ae99 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -462,6 +462,16 @@ {CSN_TYPE, 0, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** + * M_TYPE_OR_NULL(Par1, Par2, Par3) + * Similar to the M_TYPE except that not only the request set of bits but also the + * end of the message may be encountered when looking for the next element in + * the message. + * Covers the case {null | 0 | 1 < IE >} + *****************************************************************************/ +#define M_TYPE_OR_NULL(_STRUCT, _MEMBER, _MEMBER_TYPE)\ + {CSN_TYPE, 0, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, 0, NULL} + +/****************************************************************************** * M_UNION(Par1, Par2) * Informs the CSN.1 library that a union follows and how many possible choices * there are in the union. The actual value of the choice, which points out the diff --git a/src/csn1_dec.c b/src/csn1_dec.c index 2d3f242..4bc74f3 100644 --- a/src/csn1_dec.c +++ b/src/csn1_dec.c @@ -388,22 +388,26 @@ { gint16 Status; csnStream_t arT = *ar; - LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); - LOGPC(DCSN1, LOGL_DEBUG, ": End %s | ", pDescr->sz); - if (Status >= 0) + if (pDescr->may_be_null && remaining_bits_len == 0) { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - pDescr++; + LOGPC(DCSN1, LOGL_DEBUG, " : %s = NULL | ", pDescr->sz); + } else { + LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); + LOGPC(DCSN1, LOGL_DEBUG, ": End %s | ", pDescr->sz); + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { + /* Has already been processed: ProcessError("csnStreamDecoder", Status, pDescr); */ + return Status; + } } - else - { - /* Has already been processed: ProcessError("csnStreamDecoder", Status, pDescr); */ - return Status; - } - + pDescr++; break; } @@ -838,21 +842,25 @@ { gint16 Status; csnStream_t arT = *ar; - LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); - LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); - if (Status >= 0) + if (pDescr->may_be_null && remaining_bits_len == 0) { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - pDescr++; + LOGPC(DCSN1, LOGL_DEBUG, " : %s = NULL | ", pDescr->sz); + } else { + LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); + LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { /* return error code Has already been processed: */ + return Status; + } } - else - { /* return error code Has already been processed: */ - return Status; - } - + pDescr++; break; } diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c index f676645..6793602 100644 --- a/src/gsm_rlcmac.c +++ b/src/gsm_rlcmac.c @@ -928,7 +928,7 @@ /* additions in release 7 */ M_UINT_OR_NULL (Content_t, DTM_Handover_Capability, 1), M_NEXT_EXIST_OR_NULL(Content_t, Exist_DownlinkDualCarrierCapability_r7, 1), - M_TYPE (Content_t, DownlinkDualCarrierCapability_r7, DownlinkDualCarrierCapability_r7_t), + M_TYPE_OR_NULL (Content_t, DownlinkDualCarrierCapability_r7, DownlinkDualCarrierCapability_r7_t), M_UINT_OR_NULL (Content_t, FlexibleTimeslotAssignment, 1), M_UINT_OR_NULL (Content_t, GAN_PS_HandoverCapability, 1), diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 4875bce..88847de 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -806,14 +806,14 @@ printf("=== Test decoding of MS RA Capability 4===\n"); rc = decode_gsm_ra_cap(bv_dec, &data); printf("decode_gsm_ra_cap() returns %d\n", rc); - OSMO_ASSERT(rc == -5); /* FIXME: should be 0 */ + OSMO_ASSERT(rc == 0); /* Make sure there's 3 values */ - OSMO_ASSERT(data.Count_MS_RA_capability_value == 0); /* FIXME: should be 3 */ + OSMO_ASSERT(data.Count_MS_RA_capability_value == 3); /* Make sure GPRS / EGPRS multislot class is parsed correctly */ - printf("GPRS multislot class = %u\n", get_ms_class_by_capability(&data)); /* FIXME: should be 12 */ - printf("EGPRS multislot class = %u\n", get_egprs_ms_class_by_capability(&data)); /* FIXME: should be 12 */ + printf("GPRS multislot class = %u\n", get_ms_class_by_capability(&data)); + printf("EGPRS multislot class = %u\n", get_egprs_ms_class_by_capability(&data)); bitvec_free(bv_dec); } diff --git a/tests/rlcmac/RLCMACTest.err b/tests/rlcmac/RLCMACTest.err index 045ba78..33a47c3 100644 --- a/tests/rlcmac/RLCMACTest.err +++ b/tests/rlcmac/RLCMACTest.err @@ -58,4 +58,4 @@ DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): Choice EGPRS_PacketChannelRequest_Choice = 51 | : Content | RandomBits = 17 | : End Content | DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): Choice EGPRS_PacketChannelRequest_Choice = 55 | : Content | RandomBits = 25 | : End Content | DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): DCSN1 ERROR csnStreamDecoder: error STREAM_NOT_SUPPORTED (-8) at EGPRS_PacketChannelRequest_Choice (idx 0) -DCSN1 INFO csnStreamDecoder (RAcap): MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 1 | u.Content length = 61 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 1 | A5_bits = 80 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 1 | : Multislot_capability | Exist_HSCSD_multislot_class = 0 | Exist_GPRS_multislot_class = 1 | GPRS_multislot_class = 12 | GPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_SM = 0 | Exist_ECSD_multislot_class = 0 | Exist_EGPRS_multislot_class = 1 | EGPRS_multislot_class = 12 | EGPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_DTM_GPRS_multislot_class = 0 | : End Multislot_capability | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 | : DownlinkDualCarrierCapability_r7 | DCSN1 ERROR csnStreamDecoder: error NEED_MORE BITS TO UNPACK (-5) at MultislotCapabilityReductionForDL_DualCarrier (idx 72): End DownlinkDualCarrierCapability_r7 | +DCSN1 INFO csnStreamDecoder (RAcap): MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 1 | u.Content length = 61 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 1 | A5_bits = 80 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 1 | : Multislot_capability | Exist_HSCSD_multislot_class = 0 | Exist_GPRS_multislot_class = 1 | GPRS_multislot_class = 12 | GPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_SM = 0 | Exist_ECSD_multislot_class = 0 | Exist_EGPRS_multislot_class = 1 | EGPRS_multislot_class = 12 | EGPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_DTM_GPRS_multislot_class = 0 | : End Multislot_capability | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 | : DownlinkDualCarrierCapability_r7 = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 3 | u.Content length = 36 | offset = 1 | RF_Power_Capability = 1 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 | : DownlinkDualCarrierCapability_r7 = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 7 | u.Content length = 36 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 | : DownlinkDualCarrierCapability_r7 = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | Padding = 0| diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 27800b0..86364c4 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -214,6 +214,6 @@ decode_egprs_pkt_ch_req(0x7ea) returns -8 *** testRAcap4 *** === Test decoding of MS RA Capability 4=== -decode_gsm_ra_cap() returns -5 -GPRS multislot class = 0 -EGPRS multislot class = 0 +decode_gsm_ra_cap() returns 0 +GPRS multislot class = 12 +EGPRS multislot class = 12 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9a2541bd3544802a646890f32725201836abb0da Gerrit-Change-Number: 25830 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 15:55:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 15:55:23 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid storing existance bit as true if content was actually NULL References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25831 ) Change subject: csn1: Avoid storing existance bit as true if content was actually NULL ...................................................................... csn1: Avoid storing existance bit as true if content was actually NULL If we decode Exist bit as "1" but we are at the end of the message, and all the Next items we'd read are expected to be possibly NULL, then swap the Exist bit in the decoded structure as "0" in order to tell the decoder user that the related information structure is actually unset, as if "0" was received. Related: SYS#5552 Related: OS#4955 Related: OS#5020 Change-Id: I38602e4b680ed87297c7e440691a494c07cad446 --- M src/csn1_dec.c M tests/rlcmac/RLCMACTest.err 2 files changed, 37 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/31/25831/1 diff --git a/src/csn1_dec.c b/src/csn1_dec.c index 4bc74f3..fa1f0c3 100644 --- a/src/csn1_dec.c +++ b/src/csn1_dec.c @@ -909,6 +909,7 @@ case CSN_NEXT_EXIST: { guint8 fExist; + guint8 isnull; pui8 = pui8DATA(data, pDescr->offset); @@ -927,17 +928,30 @@ /* the "regular" M_NEXT_EXIST description element */ fExist = 0x00; + isnull = 1; if (bitvec_read_field(vector, readIndex, 1)) { fExist = 0x01; + if (remaining_bits_len == 1) { + /* If { 1 < end > } and all next items may be null, store it as { 0 } */ + const CSN_DESCR* pDescrNext = pDescr + 1; + guint8 i; + for (i = 0; i < pDescr->i; i++, pDescrNext++) + { + if (!pDescrNext->may_be_null) + isnull = 0; + } + } else { + isnull = 0; + } } - *pui8 = fExist; + *pui8 = !isnull; remaining_bits_len -= 1; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u%s | ", pDescr->sz, (unsigned)fExist, fExist && isnull ? " (NULL)" : ""); ++bit_offset; - if (fExist == 0) + if (isnull) { /* Skip 'i' entries */ pDescr += pDescr->i; } @@ -949,6 +963,7 @@ case CSN_NEXT_EXIST_LH: { guint8 fExist; + guint8 isnull; pui8 = pui8DATA(data, pDescr->offset); /* this if-statement represents the M_NEXT_EXIST_OR_NULL_LH description element */ @@ -964,14 +979,29 @@ } /* the "regular" M_NEXT_EXIST_LH description element */ - fExist = get_masked_bits8(vector, readIndex, bit_offset, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)fExist); + isnull = 1; + if ((fExist = get_masked_bits8(vector, readIndex, bit_offset, 1))) + { + if (remaining_bits_len == 1) { + /* If { 1 < end > } and all next items may be null, store it as { 0 } */ + const CSN_DESCR* pDescrNext = pDescr + 1; + guint8 i; + for (i = 0; i < pDescr->i; i++, pDescrNext++) + { + if (!pDescrNext->may_be_null) + isnull = 0; + } + } else { + isnull = 0; + } + } + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u%s | ", pDescr->sz , (unsigned)fExist, fExist && isnull ? " (NULL)" : ""); *pui8++ = fExist; remaining_bits_len -= 1; bit_offset++; - if (fExist == 0) + if (isnull) { /* Skip 'i' entries */ pDescr += pDescr->i; } diff --git a/tests/rlcmac/RLCMACTest.err b/tests/rlcmac/RLCMACTest.err index 33a47c3..1dc8d04 100644 --- a/tests/rlcmac/RLCMACTest.err +++ b/tests/rlcmac/RLCMACTest.err @@ -58,4 +58,4 @@ DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): Choice EGPRS_PacketChannelRequest_Choice = 51 | : Content | RandomBits = 17 | : End Content | DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): Choice EGPRS_PacketChannelRequest_Choice = 55 | : Content | RandomBits = 25 | : End Content | DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): DCSN1 ERROR csnStreamDecoder: error STREAM_NOT_SUPPORTED (-8) at EGPRS_PacketChannelRequest_Choice (idx 0) -DCSN1 INFO csnStreamDecoder (RAcap): MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 1 | u.Content length = 61 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 1 | A5_bits = 80 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 1 | : Multislot_capability | Exist_HSCSD_multislot_class = 0 | Exist_GPRS_multislot_class = 1 | GPRS_multislot_class = 12 | GPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_SM = 0 | Exist_ECSD_multislot_class = 0 | Exist_EGPRS_multislot_class = 1 | EGPRS_multislot_class = 12 | EGPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_DTM_GPRS_multislot_class = 0 | : End Multislot_capability | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 | : DownlinkDualCarrierCapability_r7 = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 3 | u.Content length = 36 | offset = 1 | RF_Power_Capability = 1 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 | : DownlinkDualCarrierCapability_r7 = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 7 | u.Content length = 36 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 | : DownlinkDualCarrierCapability_r7 = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | Padding = 0| +DCSN1 INFO csnStreamDecoder (RAcap): MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 1 | u.Content length = 61 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 1 | A5_bits = 80 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 1 | : Multislot_capability | Exist_HSCSD_multislot_class = 0 | Exist_GPRS_multislot_class = 1 | GPRS_multislot_class = 12 | GPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_SM = 0 | Exist_ECSD_multislot_class = 0 | Exist_EGPRS_multislot_class = 1 | EGPRS_multislot_class = 12 | EGPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_DTM_GPRS_multislot_class = 0 | : End Multislot_capability | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 (NULL) | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 3 | u.Content length = 36 | offset = 1 | RF_Power_Capability = 1 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 (NULL) | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 7 | u.Content length = 36 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 (NULL) | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | Padding = 0| -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38602e4b680ed87297c7e440691a494c07cad446 Gerrit-Change-Number: 25831 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 15:57:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 15:57:00 +0000 Subject: Change in osmo-pcu[master]: csn1: Add unit test showing RadioAccess Capability decoding failure In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25716 ) Change subject: csn1: Add unit test showing RadioAccess Capability decoding failure ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I51235e8575f4b992b44078713ec67bbccfd13293 Gerrit-Change-Number: 25716 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 19 Oct 2021 15:57:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 16:08:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 16:08:49 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid storing existence bit as true if content was actually NULL In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25831 to look at the new patch set (#2). Change subject: csn1: Avoid storing existence bit as true if content was actually NULL ...................................................................... csn1: Avoid storing existence bit as true if content was actually NULL If we decode Exist bit as "1" but we are at the end of the message, and all the Next items we'd read are expected to be possibly NULL, then swap the Exist bit in the decoded structure as "0" in order to tell the decoder user that the related information structure is actually unset, as if "0" was received. Related: SYS#5552 Related: OS#4955 Related: OS#5020 Change-Id: I38602e4b680ed87297c7e440691a494c07cad446 --- M src/csn1_dec.c M tests/rlcmac/RLCMACTest.err 2 files changed, 37 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/31/25831/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38602e4b680ed87297c7e440691a494c07cad446 Gerrit-Change-Number: 25831 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 16:09:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 16:09:09 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid storing existence bit as true if content was actually NULL In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25831 ) Change subject: csn1: Avoid storing existence bit as true if content was actually NULL ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38602e4b680ed87297c7e440691a494c07cad446 Gerrit-Change-Number: 25831 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 16:09:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 16:09:12 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid storing existence bit as true if content was actually NULL In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25831 ) Change subject: csn1: Avoid storing existence bit as true if content was actually NULL ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38602e4b680ed87297c7e440691a494c07cad446 Gerrit-Change-Number: 25831 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 16:09:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 16:09:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 16:09:16 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is m... In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25830 ) Change subject: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is missing ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9a2541bd3544802a646890f32725201836abb0da Gerrit-Change-Number: 25830 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 16:09:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 16:09:19 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is m... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25830 ) Change subject: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is missing ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9a2541bd3544802a646890f32725201836abb0da Gerrit-Change-Number: 25830 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 16:09:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 16:09:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 16:09:23 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is m... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25830 ) Change subject: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is missing ...................................................................... Patch Set 1: Verified+1 -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9a2541bd3544802a646890f32725201836abb0da Gerrit-Change-Number: 25830 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 16:09:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 16:09:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 16:09:29 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid storing existence bit as true if content was actually NULL In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25831 ) Change subject: csn1: Avoid storing existence bit as true if content was actually NULL ...................................................................... Patch Set 2: Verified+1 -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38602e4b680ed87297c7e440691a494c07cad446 Gerrit-Change-Number: 25831 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 16:09:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 16:25:31 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 19 Oct 2021 16:25:31 +0000 Subject: Change in osmo-msc[master]: Fix enabling of UMTS UEA encryption In-Reply-To: References: Message-ID: lynxis lazus has uploaded a new patch set (#4) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-msc/+/22757 ) Change subject: Fix enabling of UMTS UEA encryption ...................................................................... Fix enabling of UMTS UEA encryption The existing code allowed the user to configure UMTS encryption in the vty, but we never actually passed this information down to RANAP. As a result, the RAN had no chance of ever enabling encryption on the air interface. Change-Id: Ieaaa6b23b7337b7edb902fad8031e195e0c5e9d2 Related: OS#4144 --- M include/osmocom/msc/ran_msg.h M src/libmsc/msc_a.c M src/libmsc/ran_msg_iu.c 3 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/57/22757/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ieaaa6b23b7337b7edb902fad8031e195e0c5e9d2 Gerrit-Change-Number: 22757 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 16:25:31 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 19 Oct 2021 16:25:31 +0000 Subject: Change in osmo-msc[master]: Make UTRAN encryption algorithms configurable In-Reply-To: References: Message-ID: lynxis lazus has uploaded a new patch set (#4) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/osmo-msc/+/22766 ) Change subject: Make UTRAN encryption algorithms configurable ...................................................................... Make UTRAN encryption algorithms configurable Allow the user fine-grained control over which UMTS encryption algorithms are permitted, rather than always permitting UEA1 and UEA2 or neither. This brings the handling of UEA in line with the handling of A5 for GERAN. Change-Id: I91f9e50f9c1439aa19528f887b83ae9de628fcfd Closes: OS#4144 Depends: osmo-iuh.git I6d2d033b0427bdc84fee61e0f3cb7b29935214bf --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/ran_msg.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_a.c M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c M src/libmsc/ran_msg_iu.c M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/test_nodes.vty 9 files changed, 38 insertions(+), 63 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/66/22766/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I91f9e50f9c1439aa19528f887b83ae9de628fcfd Gerrit-Change-Number: 22766 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 16:25:32 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 19 Oct 2021 16:25:32 +0000 Subject: Change in osmo-msc[master]: Validate the choosen UTRAN encryption algorithm References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/25832 ) Change subject: Validate the choosen UTRAN encryption algorithm ...................................................................... Validate the choosen UTRAN encryption algorithm RANAP Security Command can include an encryption IE. If it includes it the RNC can still ignore it (e.g. unsupported encryption) and return the Security Command Complete with an choosen encryption IE: "no encryption". Validate the encryption element and ensure the encryption is included in the encryption mask. Closes: OS#4144 Change-Id: Icfc135c8b8ae862defe7114db492af600c26407f --- M include/osmocom/msc/ran_msg.h M src/libmsc/msc_a.c M src/libmsc/ran_msg_iu.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 8 files changed, 53 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/25832/1 diff --git a/include/osmocom/msc/ran_msg.h b/include/osmocom/msc/ran_msg.h index 363a299..55b88ea 100644 --- a/include/osmocom/msc/ran_msg.h +++ b/include/osmocom/msc/ran_msg.h @@ -215,6 +215,12 @@ * alg_id == 1 means A5/0 i.e. no encryption, alg_id == 4 means A5/3. * alg_id == 0 means no such IE was present. */ uint8_t alg_id; + /*! utran integrity protection. 0..15 */ + int16_t utran_integrity; + /*! utran_integrity is in encoded format: + * utran_integrity == -1 means no such IE was present + * utran_integrity == 0 means no encryption. */ + int16_t utran_encryption; const char *imeisv; const struct tlv_p_entry *l3_msg; } cipher_mode_complete; diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index a8fa7e0..4104ea7 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -1403,6 +1403,7 @@ int msc_a_ran_dec_from_msc_i(struct msc_a *msc_a, struct msc_a_ran_dec_data *d) { struct vlr_subscr *vsub = msc_a_vsub(msc_a); + struct gsm_network *net = msc_a_net(msc_a); const struct ran_msg *msg = d->ran_dec; int rc = -99; @@ -1458,7 +1459,25 @@ msc_a->geran_encr.alg_id = msg->cipher_mode_complete.alg_id; LOG_MSC_A(msc_a, LOGL_DEBUG, "Cipher Mode Complete: chosen encryption algorithm: A5/%u\n", msc_a->geran_encr.alg_id - 1); - }; + } + + if (msc_a->c.ran->type == OSMO_RAT_UTRAN_IU) { + int16_t utran_encryption; + + /* utran: ensure choosen ciphering mode is allowed + * If the IE is missing (utran_encryption == -1), parse it as no encryption */ + utran_encryption = msg->cipher_mode_complete.utran_encryption; + if (utran_encryption == -1) + utran_encryption = 0; + if ((net->uea_encryption_mask & (1 << utran_encryption)) == 0) { + /* cipher disallowed */ + LOG_MSC_A(msc_a, LOGL_ERROR, "Cipher Mode Complete: RNC choosen forbidden ciphering UEA%d\n", + msg->cipher_mode_complete.utran_encryption); + vlr_subscr_rx_ciph_res(vsub, VLR_CIPH_REJECT); + rc = 0; + break; + } + } vlr_subscr_rx_ciph_res(vsub, VLR_CIPH_COMPL); rc = 0; diff --git a/src/libmsc/ran_msg_iu.c b/src/libmsc/ran_msg_iu.c index 7b3dd1c..77a2700 100644 --- a/src/libmsc/ran_msg_iu.c +++ b/src/libmsc/ran_msg_iu.c @@ -211,12 +211,21 @@ ranap_free_rab_setupormodifieditemies(&setup_ies); } -static void ran_iu_decode_security_mode_complete(struct ran_dec *ran_iu_decode) +static void ran_iu_decode_security_mode_complete(struct ran_dec *ran_iu_decode, const RANAP_SecurityModeCompleteIEs_t *ies) { struct ran_msg ran_dec_msg = { .msg_type = RAN_MSG_CIPHER_MODE_COMPLETE, .msg_name = "RANAP SecurityModeControl successfulOutcome", + .cipher_mode_complete = { + .utran_integrity = ies->chosenIntegrityProtectionAlgorithm, + .utran_encryption = -1, + }, }; + + if (ies->presenceMask & SECURITYMODECOMPLETEIES_RANAP_CHOSENENCRYPTIONALGORITHM_PRESENT) { + ran_dec_msg.cipher_mode_complete.utran_encryption = ies->chosenEncryptionAlgorithm; + } + ran_decoded(ran_iu_decode, &ran_dec_msg); } @@ -272,7 +281,7 @@ case RANAP_ProcedureCode_id_SecurityModeControl: switch (message->direction) { case RANAP_RANAP_PDU_PR_successfulOutcome: - ran_iu_decode_security_mode_complete(ran_iu_decode); + ran_iu_decode_security_mode_complete(ran_iu_decode, &message->msg.securityModeCompleteIEs); return; case RANAP_RANAP_PDU_PR_unsuccessfulOutcome: ran_iu_decode_security_mode_reject(ran_iu_decode); diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c index f8f9383..870f993 100644 --- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c +++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c @@ -99,7 +99,7 @@ btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); - ms_sends_security_mode_complete(); + ms_sends_security_mode_complete(1); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); } @@ -170,7 +170,7 @@ VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts; above Ciphering is an implicit CM Service Accept"); - ms_sends_security_mode_complete(); + ms_sends_security_mode_complete(1); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); } @@ -239,7 +239,7 @@ VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts; above Ciphering is an implicit CM Service Accept"); - ms_sends_security_mode_complete(); + ms_sends_security_mode_complete(1); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); } diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c index 9ab1066..a547935 100644 --- a/tests/msc_vlr/msc_vlr_test_call.c +++ b/tests/msc_vlr/msc_vlr_test_call.c @@ -128,7 +128,7 @@ btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); - ms_sends_security_mode_complete(); + ms_sends_security_mode_complete(1); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); @@ -197,7 +197,7 @@ VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts; above Ciphering is an implicit CM Service Accept"); - ms_sends_security_mode_complete(); + ms_sends_security_mode_complete(1); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); BTW("a call is initiated"); @@ -317,7 +317,7 @@ btw("MS sends SecurityModeControl acceptance, VLR accepts, sends CC Setup"); dtap_expect_tx("0305" /* CC: Setup */); - ms_sends_security_mode_complete(); + ms_sends_security_mode_complete(1); btw("MS confirms call, we create a RAN-side RTP and forward MNCC_CALL_CONF_IND"); expect_crcx(RTP_TO_RAN); @@ -420,7 +420,7 @@ btw("MS sends SecurityModeControl acceptance, VLR accepts, sends CC Setup"); dtap_expect_tx("0305" /* CC: Setup */); - ms_sends_security_mode_complete(); + ms_sends_security_mode_complete(1); btw("MS confirms call, we create a RAN-side RTP and forward MNCC_CALL_CONF_IND"); expect_crcx(RTP_TO_RAN); @@ -509,7 +509,7 @@ VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts; above Ciphering is an implicit CM Service Accept"); - ms_sends_security_mode_complete(); + ms_sends_security_mode_complete(1); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); BTW("a call is initiated"); @@ -605,7 +605,7 @@ VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts; above Ciphering is an implicit CM Service Accept"); - ms_sends_security_mode_complete(); + ms_sends_security_mode_complete(1); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); BTW("a call is initiated"); diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c index e462ef4..655183b 100644 --- a/tests/msc_vlr/msc_vlr_test_umts_authen.c +++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c @@ -138,7 +138,7 @@ btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); - ms_sends_security_mode_complete(); + ms_sends_security_mode_complete(1); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); } @@ -211,7 +211,7 @@ VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); btw("MS sends SecurityModeControl acceptance, VLR accepts; above Ciphering is an implicit CM Service Accept"); - ms_sends_security_mode_complete(); + ms_sends_security_mode_complete(1); VERBOSE_ASSERT(cm_service_result_sent, == RES_NONE, "%d"); } } else { @@ -278,7 +278,7 @@ btw("MS sends SecurityModeControl acceptance, VLR accepts and sends SMS"); dtap_expect_tx(sms); - ms_sends_security_mode_complete(); + ms_sends_security_mode_complete(1); } } else { /* Encryption disabled */ @@ -530,7 +530,7 @@ btw("MS sends SecurityModeControl acceptance, VLR accepts and sends GSUP LU Req to HLR"); gsup_expect_tx("04010809710000000156f0" CN_DOMAIN VLR_TO_HLR); - ms_sends_security_mode_complete(); + ms_sends_security_mode_complete(1); VERBOSE_ASSERT(gsup_tx_confirmed, == true, "%d"); VERBOSE_ASSERT(lu_result_sent, == RES_NONE, "%d"); } diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 102fba7..fbd2540 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -986,12 +986,13 @@ g_msub = NULL; } -void ms_sends_security_mode_complete() +void ms_sends_security_mode_complete(uint8_t utran_encryption) { struct ran_msg ran_dec; ran_dec = (struct ran_msg){ .msg_type = RAN_MSG_CIPHER_MODE_COMPLETE, + .cipher_mode_complete.utran_encryption = utran_encryption, }; fake_msc_a_ran_dec(&ran_dec); diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h index 23dc9da..a2b2f22 100644 --- a/tests/msc_vlr/msc_vlr_tests.h +++ b/tests/msc_vlr/msc_vlr_tests.h @@ -184,7 +184,7 @@ void ms_sends_msg(const char *hex); void ms_sends_classmark_update(const struct osmo_gsm48_classmark *classmark); void ms_sends_ciphering_mode_complete(const char *inner_nas_msg); -void ms_sends_security_mode_complete(); +void ms_sends_security_mode_complete(uint8_t utran_encryption); void ms_sends_assignment_complete(enum mgcp_codecs assigned_codec); void gsup_rx(const char *rx_hex, const char *expect_tx_hex); void send_sms(struct vlr_subscr *receiver, -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icfc135c8b8ae862defe7114db492af600c26407f Gerrit-Change-Number: 25832 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 16:57:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 16:57:31 +0000 Subject: Change in osmo-msc[master]: Make UTRAN encryption algorithms configurable In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22766 ) Change subject: Make UTRAN encryption algorithms configurable ...................................................................... Patch Set 4: Code-Review+1 (2 comments) https://gerrit.osmocom.org/c/osmo-msc/+/22766/4/src/libmsc/gsm_04_08.c File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/c/osmo-msc/+/22766/4/src/libmsc/gsm_04_08.c at 1296 PS4, Line 1296: is_utran ? net->uea_encryption_mask > 0x01 : net->a5_encryption_mask > 0x01, it may make sense to have an msc_a_encryption_enabled(msc_a) function, since you do this complex testing in lots of places. This way all the logic is only present in one place and avoids future possible breakage. https://gerrit.osmocom.org/c/osmo-msc/+/22766/4/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/22766/4/src/libmsc/msc_vty.c at 371 PS4, Line 371: for (i = 0; i < 8; i++) { So in the command above we only support UEA0/1/2, but here we go up to 8. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I91f9e50f9c1439aa19528f887b83ae9de628fcfd Gerrit-Change-Number: 22766 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 16:57:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 16:58:50 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 19 Oct 2021 16:58:50 +0000 Subject: Change in docker-playground[master]: ttcn3-ns-test-fr: fix wrong NS dialect References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/25833 ) Change subject: ttcn3-ns-test-fr: fix wrong NS dialect ...................................................................... ttcn3-ns-test-fr: fix wrong NS dialect The failing test case should never run. The framerelay must run it's test with dialect NS2_DIALECT_STATIC_RESETBLOCK Change-Id: I2b1ae7cbe26c94a4a66b6a456b76b864251e0acb --- M ttcn3-ns-test/fr/NS_Tests.cfg 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/33/25833/1 diff --git a/ttcn3-ns-test/fr/NS_Tests.cfg b/ttcn3-ns-test/fr/NS_Tests.cfg index 5ece397..5d8beb3 100644 --- a/ttcn3-ns-test/fr/NS_Tests.cfg +++ b/ttcn3-ns-test/fr/NS_Tests.cfg @@ -8,7 +8,7 @@ *.NSVTY.CTRL_HOSTNAME := "172.18.30.101" [MODULE_PARAMETERS] -NS_Tests.mp_dialect := NS2_DIALECT_IPACCESS +NS_Tests.mp_dialect := NS2_DIALECT_STATIC_RESETBLOCK NS_Tests.mp_nsconfig := { nsei := 2001, role_sgsn := false, -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/25833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2b1ae7cbe26c94a4a66b6a456b76b864251e0acb Gerrit-Change-Number: 25833 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 16:58:50 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 19 Oct 2021 16:58:50 +0000 Subject: Change in docker-playground[master]: ttcn3-ns-test-fr: set correct ns configuration to match tests References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/25834 ) Change subject: ttcn3-ns-test-fr: set correct ns configuration to match tests ...................................................................... ttcn3-ns-test-fr: set correct ns configuration to match tests Change-Id: I2a5ac42e8861f0176f76bbf5164e990e723a872d --- M ttcn3-ns-test/fr/osmo-ns-dummy.cfg 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/34/25834/1 diff --git a/ttcn3-ns-test/fr/osmo-ns-dummy.cfg b/ttcn3-ns-test/fr/osmo-ns-dummy.cfg index 0a3515d..121bdd5 100644 --- a/ttcn3-ns-test/fr/osmo-ns-dummy.cfg +++ b/ttcn3-ns-test/fr/osmo-ns-dummy.cfg @@ -25,6 +25,16 @@ bind 172.18.30.101 ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 12 + timer tns-alive 3 + timer tns-alive-retries 3 + timer tsns-prov 3 + timer tsns-size-retries 3 + timer tsns-config-retries 3 bind fr hdlcnet1 fr hdlcnet1 frnet bind fr hdlcnet2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/25834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2a5ac42e8861f0176f76bbf5164e990e723a872d Gerrit-Change-Number: 25834 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 16:59:16 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 19 Oct 2021 16:59:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ns: fr: fix ttcn & osmo-ns-dummy.cfg References: Message-ID: lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25835 ) Change subject: ns: fr: fix ttcn & osmo-ns-dummy.cfg ...................................................................... ns: fr: fix ttcn & osmo-ns-dummy.cfg The configuration needs to match the expectation of the test cases. Change-Id: I6fb6265a2e432e8887f5caea8716b95adee7101c --- M ns/NS_Tests.fr.cfg M ns/osmo-ns.fr.cfg 2 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/25835/1 diff --git a/ns/NS_Tests.fr.cfg b/ns/NS_Tests.fr.cfg index 91fb5c5..5e387a9 100644 --- a/ns/NS_Tests.fr.cfg +++ b/ns/NS_Tests.fr.cfg @@ -7,7 +7,7 @@ [LOGGING] [MODULE_PARAMETERS] -NS_Tests.mp_dialect := NS2_DIALECT_IPACCESS +NS_Tests.mp_dialect := NS2_DIALECT_STATIC_RESETBLOCK NS_Tests.mp_nsconfig := { nsei := 2001, role_sgsn := false, diff --git a/ns/osmo-ns.fr.cfg b/ns/osmo-ns.fr.cfg index d1109ab..3f941f1 100644 --- a/ns/osmo-ns.fr.cfg +++ b/ns/osmo-ns.fr.cfg @@ -25,6 +25,16 @@ bind 127.0.0.1 ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 12 + timer tns-alive 3 + timer tns-alive-retries 3 + timer tsns-prov 3 + timer tsns-size-retries 3 + timer tsns-config-retries 3 bind fr hdlcnet1 fr hdlcnet1 frnet bind fr hdlcnet2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6fb6265a2e432e8887f5caea8716b95adee7101c Gerrit-Change-Number: 25835 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 17:00:18 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 19 Oct 2021 17:00:18 +0000 Subject: Change in docker-playground[master]: ttcn3-ns-test-fr: fix wrong NS dialect In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/25833 ) Change subject: ttcn3-ns-test-fr: fix wrong NS dialect ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/25833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2b1ae7cbe26c94a4a66b6a456b76b864251e0acb Gerrit-Change-Number: 25833 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 19 Oct 2021 17:00:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 17:00:21 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 19 Oct 2021 17:00:21 +0000 Subject: Change in docker-playground[master]: ttcn3-ns-test-fr: set correct ns configuration to match tests In-Reply-To: References: Message-ID: lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/25834 ) Change subject: ttcn3-ns-test-fr: set correct ns configuration to match tests ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/25834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2a5ac42e8861f0176f76bbf5164e990e723a872d Gerrit-Change-Number: 25834 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Tue, 19 Oct 2021 17:00:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 17:01:53 2021 From: gerrit-no-reply at lists.osmocom.org (lynxis lazus) Date: Tue, 19 Oct 2021 17:01:53 +0000 Subject: Change in osmo-msc[master]: Validate the choosen UTRAN encryption algorithm In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/25832 to look at the new patch set (#2). Change subject: Validate the choosen UTRAN encryption algorithm ...................................................................... Validate the choosen UTRAN encryption algorithm RANAP Security Command can include an encryption IE. If it includes it the RNC can still ignore it (e.g. unsupported encryption) and return the Security Command Complete with an choosen encryption IE: "no encryption". Validate the encryption element and ensure the encryption is included in the encryption mask. Closes: OS#4144 Change-Id: Icfc135c8b8ae862defe7114db492af600c26407f --- M include/osmocom/msc/ran_msg.h M src/libmsc/msc_a.c M src/libmsc/ran_msg_iu.c M tests/msc_vlr/msc_vlr_test_authen_reuse.c M tests/msc_vlr/msc_vlr_test_call.c M tests/msc_vlr/msc_vlr_test_umts_authen.c M tests/msc_vlr/msc_vlr_tests.c M tests/msc_vlr/msc_vlr_tests.h 8 files changed, 52 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/32/25832/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icfc135c8b8ae862defe7114db492af600c26407f Gerrit-Change-Number: 25832 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 17:02:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 17:02:00 +0000 Subject: Change in osmo-msc[master]: Validate the choosen UTRAN encryption algorithm In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25832 ) Change subject: Validate the choosen UTRAN encryption algorithm ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/25832/1/include/osmocom/msc/ran_msg.h File include/osmocom/msc/ran_msg.h: https://gerrit.osmocom.org/c/osmo-msc/+/25832/1/include/osmocom/msc/ran_msg.h at 220 PS1, Line 220: /*! utran_integrity is in encoded format: and > 0? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icfc135c8b8ae862defe7114db492af600c26407f Gerrit-Change-Number: 25832 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 17:02:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 17:02:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 17:02:33 +0000 Subject: Change in osmo-msc[master]: Validate the choosen UTRAN encryption algorithm In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25832 ) Change subject: Validate the choosen UTRAN encryption algorithm ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icfc135c8b8ae862defe7114db492af600c26407f Gerrit-Change-Number: 25832 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 17:02:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 17:03:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 17:03:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ns: fr: fix ttcn & osmo-ns-dummy.cfg In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25835 ) Change subject: ns: fr: fix ttcn & osmo-ns-dummy.cfg ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6fb6265a2e432e8887f5caea8716b95adee7101c Gerrit-Change-Number: 25835 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 17:03:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 17:03:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 17:03:50 +0000 Subject: Change in docker-playground[master]: ttcn3-ns-test-fr: fix wrong NS dialect In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/25833 ) Change subject: ttcn3-ns-test-fr: fix wrong NS dialect ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/docker-playground/+/25833/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/docker-playground/+/25833/1//COMMIT_MSG at 10 PS1, Line 10: it's test with dialect NS2_DIALECT_STATIC_RESETBLOCK its tests -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/25833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2b1ae7cbe26c94a4a66b6a456b76b864251e0acb Gerrit-Change-Number: 25833 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 17:03:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 17:04:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 17:04:06 +0000 Subject: Change in docker-playground[master]: ttcn3-ns-test-fr: set correct ns configuration to match tests In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/25834 ) Change subject: ttcn3-ns-test-fr: set correct ns configuration to match tests ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/25834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2a5ac42e8861f0176f76bbf5164e990e723a872d Gerrit-Change-Number: 25834 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 17:04:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 18:42:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 18:42:16 +0000 Subject: Change in osmo-msc[master]: Fix enabling of UMTS UEA encryption In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22757 ) Change subject: Fix enabling of UMTS UEA encryption ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ieaaa6b23b7337b7edb902fad8031e195e0c5e9d2 Gerrit-Change-Number: 22757 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 18:42:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 18:43:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 18:43:21 +0000 Subject: Change in osmo-msc[master]: Make UTRAN encryption algorithms configurable In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22766 ) Change subject: Make UTRAN encryption algorithms configurable ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I91f9e50f9c1439aa19528f887b83ae9de628fcfd Gerrit-Change-Number: 22766 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 18:43:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 18:43:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 18:43:44 +0000 Subject: Change in osmo-msc[master]: Validate the choosen UTRAN encryption algorithm In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25832 ) Change subject: Validate the choosen UTRAN encryption algorithm ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icfc135c8b8ae862defe7114db492af600c26407f Gerrit-Change-Number: 25832 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 18:43:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 18:44:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 18:44:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ns: fr: fix ttcn & osmo-ns-dummy.cfg In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25835 ) Change subject: ns: fr: fix ttcn & osmo-ns-dummy.cfg ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6fb6265a2e432e8887f5caea8716b95adee7101c Gerrit-Change-Number: 25835 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 18:44:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 18:44:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 18:44:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: ns: fr: fix ttcn & osmo-ns-dummy.cfg In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25835 ) Change subject: ns: fr: fix ttcn & osmo-ns-dummy.cfg ...................................................................... ns: fr: fix ttcn & osmo-ns-dummy.cfg The configuration needs to match the expectation of the test cases. Change-Id: I6fb6265a2e432e8887f5caea8716b95adee7101c --- M ns/NS_Tests.fr.cfg M ns/osmo-ns.fr.cfg 2 files changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ns/NS_Tests.fr.cfg b/ns/NS_Tests.fr.cfg index 91fb5c5..5e387a9 100644 --- a/ns/NS_Tests.fr.cfg +++ b/ns/NS_Tests.fr.cfg @@ -7,7 +7,7 @@ [LOGGING] [MODULE_PARAMETERS] -NS_Tests.mp_dialect := NS2_DIALECT_IPACCESS +NS_Tests.mp_dialect := NS2_DIALECT_STATIC_RESETBLOCK NS_Tests.mp_nsconfig := { nsei := 2001, role_sgsn := false, diff --git a/ns/osmo-ns.fr.cfg b/ns/osmo-ns.fr.cfg index d1109ab..3f941f1 100644 --- a/ns/osmo-ns.fr.cfg +++ b/ns/osmo-ns.fr.cfg @@ -25,6 +25,16 @@ bind 127.0.0.1 ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 12 + timer tns-alive 3 + timer tns-alive-retries 3 + timer tsns-prov 3 + timer tsns-size-retries 3 + timer tsns-config-retries 3 bind fr hdlcnet1 fr hdlcnet1 frnet bind fr hdlcnet2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25835 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6fb6265a2e432e8887f5caea8716b95adee7101c Gerrit-Change-Number: 25835 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 18:44:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 18:44:30 +0000 Subject: Change in docker-playground[master]: ttcn3-ns-test-fr: fix wrong NS dialect In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/25833 ) Change subject: ttcn3-ns-test-fr: fix wrong NS dialect ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/25833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2b1ae7cbe26c94a4a66b6a456b76b864251e0acb Gerrit-Change-Number: 25833 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 18:44:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 18:44:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 18:44:38 +0000 Subject: Change in docker-playground[master]: ttcn3-ns-test-fr: set correct ns configuration to match tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/25834 ) Change subject: ttcn3-ns-test-fr: set correct ns configuration to match tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/25834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2a5ac42e8861f0176f76bbf5164e990e723a872d Gerrit-Change-Number: 25834 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 18:44:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 18:44:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 18:44:40 +0000 Subject: Change in docker-playground[master]: ttcn3-ns-test-fr: fix wrong NS dialect In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/25833 ) Change subject: ttcn3-ns-test-fr: fix wrong NS dialect ...................................................................... ttcn3-ns-test-fr: fix wrong NS dialect The failing test case should never run. The framerelay must run it's test with dialect NS2_DIALECT_STATIC_RESETBLOCK Change-Id: I2b1ae7cbe26c94a4a66b6a456b76b864251e0acb --- M ttcn3-ns-test/fr/NS_Tests.cfg 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: lynxis lazus: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ttcn3-ns-test/fr/NS_Tests.cfg b/ttcn3-ns-test/fr/NS_Tests.cfg index 5ece397..5d8beb3 100644 --- a/ttcn3-ns-test/fr/NS_Tests.cfg +++ b/ttcn3-ns-test/fr/NS_Tests.cfg @@ -8,7 +8,7 @@ *.NSVTY.CTRL_HOSTNAME := "172.18.30.101" [MODULE_PARAMETERS] -NS_Tests.mp_dialect := NS2_DIALECT_IPACCESS +NS_Tests.mp_dialect := NS2_DIALECT_STATIC_RESETBLOCK NS_Tests.mp_nsconfig := { nsei := 2001, role_sgsn := false, -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/25833 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2b1ae7cbe26c94a4a66b6a456b76b864251e0acb Gerrit-Change-Number: 25833 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 18:44:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 18:44:40 +0000 Subject: Change in docker-playground[master]: ttcn3-ns-test-fr: set correct ns configuration to match tests In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/25834 ) Change subject: ttcn3-ns-test-fr: set correct ns configuration to match tests ...................................................................... ttcn3-ns-test-fr: set correct ns configuration to match tests Change-Id: I2a5ac42e8861f0176f76bbf5164e990e723a872d --- M ttcn3-ns-test/fr/osmo-ns-dummy.cfg 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: lynxis lazus: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ttcn3-ns-test/fr/osmo-ns-dummy.cfg b/ttcn3-ns-test/fr/osmo-ns-dummy.cfg index 0a3515d..121bdd5 100644 --- a/ttcn3-ns-test/fr/osmo-ns-dummy.cfg +++ b/ttcn3-ns-test/fr/osmo-ns-dummy.cfg @@ -25,6 +25,16 @@ bind 172.18.30.101 ns + timer tns-block 3 + timer tns-block-retries 3 + timer tns-reset 3 + timer tns-reset-retries 3 + timer tns-test 12 + timer tns-alive 3 + timer tns-alive-retries 3 + timer tsns-prov 3 + timer tsns-size-retries 3 + timer tsns-config-retries 3 bind fr hdlcnet1 fr hdlcnet1 frnet bind fr hdlcnet2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/25834 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I2a5ac42e8861f0176f76bbf5164e990e723a872d Gerrit-Change-Number: 25834 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 18:45:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 18:45:25 +0000 Subject: Change in osmo-pcu[master]: Split csn1.c into common, enc and dec files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25827 ) Change subject: Split csn1.c into common, enc and dec files ...................................................................... Patch Set 1: I would say the other way around: first get this merged in wireshark and if they accept it, "port" it over here? -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 Gerrit-Change-Number: 25827 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 19 Oct 2021 18:45:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 18:45:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 18:45:40 +0000 Subject: Change in osmo-pcu[master]: csn1: Add unit test showing RadioAccess Capability decoding failure In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25716 ) Change subject: csn1: Add unit test showing RadioAccess Capability decoding failure ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I51235e8575f4b992b44078713ec67bbccfd13293 Gerrit-Change-Number: 25716 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 19 Oct 2021 18:45:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 18:45:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 18:45:59 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is m... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25830 ) Change subject: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is missing ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9a2541bd3544802a646890f32725201836abb0da Gerrit-Change-Number: 25830 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 18:45:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 18:46:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 18:46:13 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid storing existence bit as true if content was actually NULL In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25831 ) Change subject: csn1: Avoid storing existence bit as true if content was actually NULL ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38602e4b680ed87297c7e440691a494c07cad446 Gerrit-Change-Number: 25831 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 18:46:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 18:46:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 18:46:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Adapt tests to pass with new idle blocks from PCU In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25537 ) Change subject: pcu: Adapt tests to pass with new idle blocks from PCU ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6e96a7569640695ccfaa94b471384fa301bccd62 Gerrit-Change-Number: 25537 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 19 Oct 2021 18:46:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 18:47:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 19 Oct 2021 18:47:15 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 ) Change subject: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105_max ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3a50445c707430900c78623c7093ff7eb1f3ed95 Gerrit-Change-Number: 25806 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 19 Oct 2021 18:47:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 19:58:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 19:58:53 +0000 Subject: Change in osmo-msc[master]: Fix enabling of UMTS UEA encryption In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22757 ) Change subject: Fix enabling of UMTS UEA encryption ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ieaaa6b23b7337b7edb902fad8031e195e0c5e9d2 Gerrit-Change-Number: 22757 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 19:58:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 20:06:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 20:06:12 +0000 Subject: Change in osmo-pcu[master]: Split csn1.c into common, enc and dec files In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25827 ) Change subject: Split csn1.c into common, enc and dec files ...................................................................... Patch Set 1: > Patch Set 1: > > I would say the other way around: first get this merged in wireshark and if they accept it, "port" it over here? I actually was wrong here, because I recalled wireshark also had an encoding function despite it was not used. No porting is needed because actually wireshark code doesn't have the Encode function, hence they don't have this kind of problem. So actually having the Encoder function in a different file in our case I think actually helps when comparing against their code. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 Gerrit-Change-Number: 25827 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 19 Oct 2021 20:06:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 20:06:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 19 Oct 2021 20:06:48 +0000 Subject: Change in osmo-pcu[master]: Split csn1.c into common, enc and dec files In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/25827 to look at the new patch set (#2). Change subject: Split csn1.c into common, enc and dec files ...................................................................... Split csn1.c into common, enc and dec files The CSN1 encoder/decoder code is already lengthy and complex enough, there's no need to keep it in the same file, specially because when debugging, only is interested in one of the 2 functions, and they both look really similar (long spaghetti switches). Change-Id: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 --- M debian/copyright M src/Makefile.am M src/csn1.c M src/csn1.h A src/csn1_dec.c A src/csn1_enc.c 6 files changed, 2,718 insertions(+), 2,627 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/27/25827/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 Gerrit-Change-Number: 25827 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 21:49:39 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 21:49:39 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: set band in f_TC_fh_params_set In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 ) Change subject: BSC_Tests: set band in f_TC_fh_params_set ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Looks good to me, and even better than my patch #25824 because it's a more fundamental approach that would allow us to verify handling of ARFCNs belonging to PCS-1900. Just a few rather cosmetic things... https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828/2/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828/2/bsc/BSC_Tests.ttcn at 8502 PS2, Line 8502: if (arfcn.arfcn >= 259 and arfcn.arfcn <= 293) { > iirc ttcn3 has specific syntax to match ranges, @fixeria may remember better the details. Yep, you could use 'select' here: select (arfcn) { case (tr_GsmBandArfcn(306 .. 340)) { band := "GSM450"; } case (tr_GsmBandArfcn(438 .. 511)) { band := "GSM480"; } /* ... */ case (tr_GsmBandArfcn(512 .. 885, pcs := false)) { band := "DCS1800"; } case (tr_GsmBandArfcn(512 .. 810, pcs := true)) { band := "PCS1900"; } case else { return; } } https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828/2/bsc/BSC_Tests.ttcn at 8524 PS2, Line 8524: f_vty_transceive(BSCVTY, "exit"); Just send 'end' command once instead of sending 'exit' three times. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I447e4145c68c62b11b818e28f0081c19e9107647 Gerrit-Change-Number: 25828 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 21:49:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 22:07:17 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 22:07:17 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: set band in f_TC_fh_params_set In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 ) Change subject: BSC_Tests: set band in f_TC_fh_params_set ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828/2/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828/2/bsc/BSC_Tests.ttcn at 8498 PS2, Line 8498: f_TC_set_band_by_arfcn Also, I believe library/ would be a better place for this function. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I447e4145c68c62b11b818e28f0081c19e9107647 Gerrit-Change-Number: 25828 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 22:07:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 22:09:12 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 22:09:12 +0000 Subject: Change in osmo-msc[master]: Fix enabling of UMTS UEA encryption In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22757 ) Change subject: Fix enabling of UMTS UEA encryption ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ieaaa6b23b7337b7edb902fad8031e195e0c5e9d2 Gerrit-Change-Number: 22757 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 22:09:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 22:16:10 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 22:16:10 +0000 Subject: Change in osmo-msc[master]: Make UTRAN encryption algorithms configurable In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/22766 ) Change subject: Make UTRAN encryption algorithms configurable ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/22766/4/src/libmsc/msc_vty.c File src/libmsc/msc_vty.c: https://gerrit.osmocom.org/c/osmo-msc/+/22766/4/src/libmsc/msc_vty.c at 172 PS4, Line 172: /* So far just a boolean switch, a future patch might add individual config for UEA1 and UEA2, see OS#4143 */ This comment is not true anymore. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/22766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I91f9e50f9c1439aa19528f887b83ae9de628fcfd Gerrit-Change-Number: 22766 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Assignee: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 22:16:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 22:24:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 22:24:35 +0000 Subject: Change in osmo-pcu[master]: csn1: Add unit test showing RadioAccess Capability decoding failure In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25716 ) Change subject: csn1: Add unit test showing RadioAccess Capability decoding failure ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I51235e8575f4b992b44078713ec67bbccfd13293 Gerrit-Change-Number: 25716 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 19 Oct 2021 22:24:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 22:29:45 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 22:29:45 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is m... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25830 ) Change subject: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is missing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9a2541bd3544802a646890f32725201836abb0da Gerrit-Change-Number: 25830 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 22:29:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 22:34:41 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 22:34:41 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid storing existence bit as true if content was actually NULL In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25831 ) Change subject: csn1: Avoid storing existence bit as true if content was actually NULL ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38602e4b680ed87297c7e440691a494c07cad446 Gerrit-Change-Number: 25831 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 19 Oct 2021 22:34:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 22:37:52 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 22:37:52 +0000 Subject: Change in osmo-bts[master]: gsm_pchan2chan_nr(): Properly assert if unexpected pchan is passed In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25825 ) Change subject: gsm_pchan2chan_nr(): Properly assert if unexpected pchan is passed ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I25e2cf0c922bc9902336e9add75a47535b9355bf Gerrit-Change-Number: 25825 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 19 Oct 2021 22:37:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 23:02:08 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 23:02:08 +0000 Subject: Change in osmo-msc[master]: VTY: add IPA keepalive parameters for GSUP connection In-Reply-To: References: Message-ID: fixeria has uploaded a new patch set (#5) to the change originally created by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-msc/+/14753 ) Change subject: VTY: add IPA keepalive parameters for GSUP connection ...................................................................... VTY: add IPA keepalive parameters for GSUP connection Change-Id: I7d0beb9357ab9b1baeb030d726f312008f2fc533 --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/gsup_client_mux.h M src/libmsc/gsup_client_mux.c M src/libmsc/msc_net_init.c M src/libmsc/msc_vty.c 5 files changed, 44 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/53/14753/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7d0beb9357ab9b1baeb030d726f312008f2fc533 Gerrit-Change-Number: 14753 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 23:03:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 23:03:56 +0000 Subject: Change in osmo-msc[master]: VTY: add IPA keepalive parameters for GSUP connection In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/14753 ) Change subject: VTY: add IPA keepalive parameters for GSUP connection ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/14753/5/src/libmsc/gsup_client_mux.c File src/libmsc/gsup_client_mux.c: https://gerrit.osmocom.org/c/osmo-msc/+/14753/5/src/libmsc/gsup_client_mux.c at 113 PS5, Line 113: osmo_gsup_client_create2 This looks wrong to me. The API does not seem to accept keepalive parameters? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7d0beb9357ab9b1baeb030d726f312008f2fc533 Gerrit-Change-Number: 14753 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 19 Oct 2021 23:03:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 19 23:14:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 19 Oct 2021 23:14:28 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25829 ) Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... Patch Set 1: Code-Review+1 Feel free to re-apply my CR+1 once the coding style issue is fixed (see linter's warnings). -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 19 Oct 2021 23:14:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 00:02:37 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 00:02:37 +0000 Subject: Change in osmo-bsc[rel-1.7.2]: lchan_fsm: fix potential NULL-pointer dereference References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25836 ) Change subject: lchan_fsm: fix potential NULL-pointer dereference ...................................................................... lchan_fsm: fix potential NULL-pointer dereference Test case TC_lost_sdcch_during_assignment from ttcn3-bsc-test causes osmo-bsc to crash due to for_conn being NULL. Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Related: SYS#5526, OS#5255 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/36/25836/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 9c7ecaf..fb40e00 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -114,6 +114,18 @@ case FOR_ASSIGNMENT: LOG_LCHAN(lchan, LOGL_NOTICE, "Signalling Assignment FSM of error (%s)\n", lchan->last_error ? : "unknown error"); + if (!for_conn) { + LOG_LCHAN(lchan, LOGL_ERROR, + "lchan activation for Assignment failed, but activation request has" + " no conn\n"); + break; + } + if (!for_conn->assignment.fi) { + LOG_LCHAN(lchan, LOGL_ERROR, + "lchan activation for Assignment failed, but conn has no ongoing" + " assignment procedure\n"); + break; + } _osmo_fsm_inst_dispatch(for_conn->assignment.fi, ASSIGNMENT_EV_LCHAN_ERROR, lchan, file, line); return; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.7.2 Gerrit-Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Gerrit-Change-Number: 25836 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 00:08:55 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 00:08:55 +0000 Subject: Change in osmo-bsc[2021q1]: assignment_fsm: Check for conn->lchan References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25837 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... assignment_fsm: Check for conn->lchan When the SDCCH gets released while the TCH still beeing activated, then the ChanActivACK that is received after the TCH is activated will trigger a segmentation fault in the assignment_fsm. The reason for this is that conn->lchan, which holds the SDCCH at that point in time, is now NULL. To prevent osmo-bsc from crashing, the FSM should check for the presence of conn->lchan first. If it does not exist, the FSM should terminate. (Assignment failed) Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Related: SYS#5627, OS#5255 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/37/25837/1 diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index faaec53..3eda129 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -611,6 +611,15 @@ int rc; struct gsm_subscriber_connection *conn = assignment_fi_conn(fi); + /* There may be situations where the SDCCH gets released while the TCH is still being activated. We will then + * receive ChanActivAck message from the BTS when the TCH is ready. Since the SDCCH is already released by + * then conn->lchan will be NULL in this case. */ + if (!conn->lchan) { + assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE, + "Unable to send RR Assignment Command: conn without lchan"); + return; + } + rc = gsm48_send_rr_ass_cmd(conn->lchan, conn->assignment.new_lchan, conn->lchan->ms_power); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25837 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 00:08:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 00:08:56 +0000 Subject: Change in osmo-bsc[2021q1]: lchan_fsm: fix potential NULL-pointer dereference References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25838 ) Change subject: lchan_fsm: fix potential NULL-pointer dereference ...................................................................... lchan_fsm: fix potential NULL-pointer dereference Test case TC_lost_sdcch_during_assignment from ttcn3-bsc-test causes osmo-bsc to crash due to for_conn being NULL. Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Related: SYS#5526, OS#5255 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/38/25838/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 4eb95ff..ccd8858 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -114,6 +114,18 @@ case FOR_ASSIGNMENT: LOG_LCHAN(lchan, LOGL_NOTICE, "Signalling Assignment FSM of error (%s)\n", lchan->last_error ? : "unknown error"); + if (!for_conn) { + LOG_LCHAN(lchan, LOGL_ERROR, + "lchan activation for Assignment failed, but activation request has" + " no conn\n"); + break; + } + if (!for_conn->assignment.fi) { + LOG_LCHAN(lchan, LOGL_ERROR, + "lchan activation for Assignment failed, but conn has no ongoing" + " assignment procedure\n"); + break; + } _osmo_fsm_inst_dispatch(for_conn->assignment.fi, ASSIGNMENT_EV_LCHAN_ERROR, lchan, file, line); return; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Gerrit-Change-Number: 25838 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 07:44:42 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 20 Oct 2021 07:44:42 +0000 Subject: Change in pysim[master]: ts_31_10x: add a class for CardApplicationXSIM In-Reply-To: References: Message-ID: dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25818 ) Change subject: ts_31_10x: add a class for CardApplicationXSIM ...................................................................... ts_31_10x: add a class for CardApplicationXSIM In change Id410489841bb9020ddbf74de9114d808b1d5adb6, the RuntimeState class automatically adds additional files to the CardApplications for ISIM and USIM. This works only once. The second time an exception will be thrown because the added files are already in the CardApplication. Currently there is no way generate new card applications during initialization because the card applications are just objects that are created once in ts_31_10x.py. Lets turn them into classes and create the objects during initialization. This way we get fresh objects when we re-initialize. Change-Id: Ibb4f6242e7a92af84a905daa727b1b87016e7819 --- M pySim-shell.py M pySim/ts_31_102.py M pySim/ts_31_103.py 3 files changed, 8 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index d24a881..594ad97 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -82,8 +82,8 @@ # Create runtime state with card profile profile = CardProfileUICC() - profile.add_application(CardApplicationUSIM) - profile.add_application(CardApplicationISIM) + profile.add_application(CardApplicationUSIM()) + profile.add_application(CardApplicationISIM()) rs = RuntimeState(card, profile) # FIXME: do this dynamically diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index faf0f38..14d7ec1 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -1115,4 +1115,6 @@ } } -CardApplicationUSIM = CardApplication('USIM', adf=ADF_USIM(), sw=sw_usim) +class CardApplicationUSIM(CardApplication): + def __init__(self): + super().__init__('USIM', adf=ADF_USIM(), sw=sw_usim) diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index e1f552f..63ef99e 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -223,4 +223,6 @@ } } -CardApplicationISIM = CardApplication('ISIM', adf=ADF_ISIM(), sw=sw_isim) +class CardApplicationISIM(CardApplication): + def __init__(self): + super().__init__('ISIM', adf=ADF_ISIM(), sw=sw_isim) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25818 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ibb4f6242e7a92af84a905daa727b1b87016e7819 Gerrit-Change-Number: 25818 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 08:16:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 08:16:34 +0000 Subject: Change in pysim[master]: pySim-shell: Add support for GSM-R SIM Cards with DF.EIRENE References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25839 ) Change subject: pySim-shell: Add support for GSM-R SIM Cards with DF.EIRENE ...................................................................... pySim-shell: Add support for GSM-R SIM Cards with DF.EIRENE GSM-R SIM cards have an additional directory (DF.EIRENE) with a number of files. This is all specified in the following document: UIC Reference P38 T 9001 5.0 "FFFIS for GSM-R SIM Cards" Change-Id: I4034d09292a08d277d4abcbed9a0ec2808daaacb --- M pySim-shell.py A pySim/gsm_r.py 2 files changed, 260 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/39/25839/1 diff --git a/pySim-shell.py b/pySim-shell.py index d24a881..3286db2 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -48,6 +48,7 @@ from pySim.ts_102_221 import CardProfileUICC from pySim.ts_31_102 import CardApplicationUSIM from pySim.ts_31_103 import CardApplicationISIM +from pySim.gsm_r import DF_EIRENE # we need to import this module so that the SysmocomSJA2 sub-class of # CardModel is created, which will add the ATR-based matching and @@ -89,6 +90,7 @@ # FIXME: do this dynamically rs.mf.add_file(DF_TELECOM()) rs.mf.add_file(DF_GSM()) + rs.mf.add_file(DF_EIRENE()) CardModel.apply_matching_models(scc, rs) diff --git a/pySim/gsm_r.py b/pySim/gsm_r.py new file mode 100644 index 0000000..3a8ed4e --- /dev/null +++ b/pySim/gsm_r.py @@ -0,0 +1,258 @@ +# -*- coding: utf-8 -*- + +# without this, pylint will fail when inner classes are used +# within the 'nested' kwarg of our TlvMeta metaclass on python 3.7 :( +# pylint: disable=undefined-variable + +""" +The File (and its derived classes) uses the classes of pySim.filesystem in +order to describe the files specified in UIC Reference P38 T 9001 5.0 "FFFIS for GSM-R SIM Cards" +""" + +# +# Copyright (C) 2021 Harald Welte +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + + +from pySim.utils import * +#from pySim.tlv import * +from struct import pack, unpack +from construct import * +from construct import Optional as COptional +from pySim.construct import * +import enum + +from pySim.filesystem import * +import pySim.ts_102_221 +import pySim.ts_51_011 + +###################################################################### +# DF.EIRENE (FFFIS for GSM-R SIM Cards) +###################################################################### + +class FuncNTypeAdapter(Adapter): + def _decode(self, obj, context, path): + bcd = swap_nibbles(b2h(obj)) + last_digit = bcd[-1] + return {'functional_number': bcd[:-1], + 'presentation_of_only_this_fn': last_digit & 4, + 'permanent_fn': last_digit & 8 } + def _encode(self, obj, context, path): + return 'FIXME' + +class EF_FN(LinFixedEF): + """Section 7.2""" + def __init__(self): + super().__init__(fid='6ff1', sfid=None, name='EF.EN', desc='Functional numbers', rec_len={9,9}) + self._construct = Struct('functional_number_and_type'/FuncNTypeAdapter(Bytes(8)), + 'list_number'/Int8ub) + + +class PlConfAdapter(Adapter): + """Section 7.4.3""" + def _decode(self, obj, context, path): + num = int(obj) & 0x7 + if num == 0: + return 'None' + elif num == 1: + return 4 + elif num == 2: + return 3 + elif num == 3: + return 2 + elif num == 4: + return 1 + elif num == 5: + return 0 + def _encode(self, obj, context, path): + if obj == 'None': + return 0 + obj = int(obj) + if obj == 4: + return 1 + elif obj == 3: + return 2 + elif obj == 2: + return 3 + elif obj == 1: + return 4 + elif obj == 0: + return 5 + +class PlCallAdapter(Adapter): + """Section 7.4.12""" + def _decode(self, obj, context, path): + num = int(obj) & 0x7 + if num == 0: + return 'None' + elif num == 1: + return 4 + elif num == 2: + return 3 + elif num == 3: + return 2 + elif num == 4: + return 1 + elif num == 5: + return 0 + elif num == 6: + return 'B' + elif num == 7: + return 'A' + def _encode(self, obj, context, path): + if obj == 'None': + return 0 + if obj == 4: + return 1 + elif obj == 3: + return 2 + elif obj == 2: + return 3 + elif obj == 1: + return 4 + elif obj == 0: + return 5 + elif obj == 'B': + return 6 + elif obj == 'A': + return 7 + +NextTableType = Enum(Byte, decision=0xf0, predefined=0xf1, num_dial_digits=0xf2, ic=0xf3, empty=0xff) + +class EF_CallconfC(TransparentEF): + """Section 7.3""" + def __init__(self): + super().__init__(fid='6ff2', sfid=None, name='EF.CallconfC', size={24,24}, + desc='Call Configuration of emergency calls Configuration') + self._construct = Struct('pl_conf'/PlConfAdapter(Int8ub), + 'conf_nr'/BcdAdapter(Bytes(8)), + 'max_rand'/Int8ub, + 'n_ack_max'/Int16ub, + 'pl_ack'/PlCallAdapter(Int8ub), + 'n_nested_max'/Int8ub, + 'train_emergency_gid'/Int8ub, + 'shunting_emergency_gid'/Int8ub, + 'imei'/BcdAdapter(Bytes(8))) + +class EF_CallconfI(LinFixedEF): + """Section 7.5""" + def __init__(self): + super().__init__(fid='6ff3', sfid=None, name='EF.CallconfI', rec_len={21,21}, + desc='Call Configuration of emergency calls Information') + self._construct = Struct('t_dur'/Int24ub, + 't_relcalc'/Int32ub, + 'pl_call'/PlCallAdapter(Int8ub), + 'cause'/FlagsEnum(Int8ub, powered_off=1, radio_link_error=2, user_command=5), + 'gcr'/BcdAdapter(Bytes(4)), + 'fnr'/BcdAdapter(Bytes(8))) + +class EF_Shunting(TransparentEF): + """Section 7.6""" + def __init__(self): + super().__init__(fid='6ff4', sfid=None, name='EF.Shunting', desc='Shunting', size={8,8}) + self._construct = Struct('common_gid'/Int8ub, + 'shunting_gid'/Bytes(7)) + +class EF_GsmrPLMN(LinFixedEF): + """Section 7.7""" + def __init__(self): + super().__init__(fid='6ff5', sfid=None, name='EF.GsmrPLMN', desc='GSM-R network selection', rec_len={9,9}) + self._construct = Struct('plmn'/BcdAdapter(Bytes(3)), + 'class_of_network'/BitStruct('supported'/FlagsEnum(BitsInteger(5), vbs=1, vgcs=2, emlpp=4, fn=8, eirene=16), + 'preference'/BitsInteger(3)), + 'ic_incoming_ref_tbl'/HexAdapter(Bytes(2)), + 'outgoing_ref_tbl'/HexAdapter(Bytes(2)), + 'ic_table_ref'/HexAdapter(Bytes(1))) + +class EF_IC(LinFixedEF): + """Section 7.8""" + def __init__(self): + super().__init__(fid='6f8d', sfid=None, name='EF.IC', desc='International Code', rec_len={7,7}) + self._construct = Struct('next_table_type'/NextTableType, + 'id_of_next_table'/HexAdapter(Bytes(2)), + 'ic_decision_value'/BcdAdapter(Bytes(2)), + 'network_string_table_index'/Int8ub) + +class EF_NW(LinFixedEF): + """Section 7.9""" + def __init__(self): + super().__init__(fid='6f80', sfid=None, name='EF.NW', desc='Network Name', rec_len={8,8}) + self._construct = GsmString(8) + +class EF_Switching(LinFixedEF): + """Section 8.4""" + def __init__(self, fid, name, desc): + super().__init__(fid=fid, sfid=None, name=name, desc=desc, rec_len={6,6}) + self._construct = Struct('next_table_type'/NextTableType, + 'id_of_next_table'/HexAdapter(Bytes(2)), + 'decision_value'/BcdAdapter(Bytes(2)), + 'string_table_index'/Int8ub) + +class EF_Predefined(LinFixedEF): + """Section 8.5""" + def __init__(self, fid, name, desc): + super().__init__(fid=fid, sfid=None, name=name, desc=desc, rec_len={3,3}) + # header and other records have different structure. WTF !?! + self._construct = Struct('next_table_type'/NextTableType, + 'id_of_next_table'/HexAdapter(Bytes(2)), + 'predefined_value1'/HexAdapter(Bytes(2)), + 'string_table_index1'/Int8ub) + # TODO: predefined value n, ... + +class EF_DialledVals(TransparentEF): + """Section 8.6""" + def __init__(self, fid, name, desc): + super().__init__(fid=fid, sfid=None, name=name, desc=desc, size={4,4}) + self._construct = Struct('next_table_type'/NextTableType, + 'id_of_next_table'/HexAdapter(Bytes(2)), + 'dialed_digits'/BcdAdapter(Bytes(1))) + + +class DF_EIRENE(CardDF): + def __init__(self, fid='7fe0', name='DF.EIRENE', desc='GSM-R EIRENE'): + super().__init__(fid=fid, name=name, desc=desc) + files = [ + # Section 7.1.6 / Table 10 EIRENE GSM EFs + EF_FN(), + EF_CallconfC(), + EF_CallconfI(), + EF_Shunting(), + EF_GsmrPLMN(), + EF_IC(), + EF_NW(), + + # support of the numbering plan + EF_Switching(fid='6f8e', name='EF.CT', desc='Call Type'), + EF_Switching(fid='6f8f', name='EF.SC', desc='Short Code'), + EF_Predefined(fid='6f88', name='EF.FC', desc='Function Code'), + EF_Predefined(fid='6f89', name='EF.Service', desc='VGCS/VBS Service Code'), + EF_Predefined(fid='6f8a', name='EF.Call', desc='First digit of the group ID'), + EF_Predefined(fid='6f8b', name='EF.FctTeam', desc='Call Type 6 Team Type + Team member function'), + EF_Predefined(fid='6f92', name='EF.Controller', desc='Call Type 7 Controller function code'), + EF_Predefined(fid='6f8c', name='EF.Gateway', desc='Access to external networks'), + EF_DialledVals(fid='6f81', name='EF.5to8digits', desc='Call Type 2 User Identity Number length'), + EF_DialledVals(fid='6f82', name='EF.2digits', desc='2 digits input'), + EF_DialledVals(fid='6f83', name='EF.8digits', desc='8 digits input'), + EF_DialledVals(fid='6f84', name='EF.9digits', desc='9 digits input'), + EF_DialledVals(fid='6f85', name='EF.SSSSS', desc='Group call area input'), + EF_DialledVals(fid='6f86', name='EF.LLLLL', desc='Location number Call Type 6'), + EF_DialledVals(fid='6f91', name='EF.Location', desc='Location number Call Type 7'), + EF_DialledVals(fid='6f87', name='EF.FreeNumber', desc='Free Number Call Tyep 0 and 8'), + ] + self.add_files(files) + + def decode_select_response(self, data_hex): + return pySim.ts_51_011.decode_select_response(data_hex) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4034d09292a08d277d4abcbed9a0ec2808daaacb Gerrit-Change-Number: 25839 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 09:00:25 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 20 Oct 2021 09:00:25 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25552 to look at the new patch set (#11). Change subject: pySim-shell: add bulk provisioning support ...................................................................... pySim-shell: add bulk provisioning support There are scenarios where multiple cards need to get the same change. Lets add a new command that takes a script as parameter and executes the secript in a loop on multiple cards while prompting the user to change the card before starting the next cycle. Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Related: SYS#5617 --- M pySim-shell.py 1 file changed, 184 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/52/25552/11 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 09:00:49 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 20 Oct 2021 09:00:49 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25552 ) Change subject: pySim-shell: add bulk provisioning support ...................................................................... Patch Set 11: (1 comment) https://gerrit.osmocom.org/c/pysim/+/25552/10/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/25552/10/pySim-shell.py at 226 PS10, Line 226: self.poutput("\033[91m") > I would have expected to use cmd2.ansi rather than hard-coded sequences here (https://cmd2. [?] Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 20 Oct 2021 09:00:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 11:09:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 11:09:51 +0000 Subject: Change in pysim[master]: pySim-shell: Add suspend_uicc command References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25840 ) Change subject: pySim-shell: Add suspend_uicc command ...................................................................... pySim-shell: Add suspend_uicc command This is an optional command, and it is not supported by e.g. sysmoISIM-SJA2 Change-Id: Icc726ffd672744e56cc8dd3762891af507942c1e --- M pySim-shell.py M pySim/commands.py 2 files changed, 50 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/25840/1 diff --git a/pySim-shell.py b/pySim-shell.py index 3286db2..42ce0a5 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -546,6 +546,19 @@ fcp_dec = self._cmd.rs.status() self._cmd.poutput_json(fcp_dec) + suspend_uicc_parser = argparse.ArgumentParser() + suspend_uicc_parser.add_argument('--min-duration-secs', type=int, default=60, + help='Proposed minimum duration of suspension') + suspend_uicc_parser.add_argument('--max-duration-secs', type=int, default=24*60*60, + help='Proposed maximum duration of suspension') + + # not ISO7816-4 but TS 102 221 + @cmd2.with_argparser(suspend_uicc_parser) + def do_suspend_uicc(self, opts): + (duration, token, sw) = self._cmd.card._scc.suspend_uicc(min_len_secs=opts.min_duration_secs, + max_len_secs=opts.max_duration_secs) + self._cmd.poutput('Negotiated Duration: %u secs, Token: %s, SW: %s' % (duration, token, sw)) + option_parser = argparse.ArgumentParser(prog='pySim-shell', description='interactive SIM card shell', formatter_class=argparse.ArgumentDefaultsHelpFormatter) diff --git a/pySim/commands.py b/pySim/commands.py index d53cb3e..af31e82 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -23,7 +23,7 @@ from construct import * from pySim.construct import LV -from pySim.utils import rpad, b2h, h2b, sw_match, bertlv_encode_len +from pySim.utils import rpad, b2h, h2b, sw_match, bertlv_encode_len, Hexstr from pySim.exceptions import SwMatchError class SimCardCommands(object): @@ -448,3 +448,39 @@ data_length = len(payload) // 2 data, sw = self._tp.send_apdu(('80100000%02x' % data_length) + payload) return (data, sw) + + # ETSI TS 102 221 11.1.22 + def suspend_uicc(self, min_len_secs:int=60, max_len_secs:int=43200): + """Send SUSPEND UICC to the card.""" + def encode_duration(secs:int) -> Hexstr: + if secs >= 10*24*60*60: + return '04%02x' % (secs // (10*24*60*60)) + elif secs >= 24*60*60: + return '03%02x' % (secs // (24*60*60)) + elif secs >= 60*60: + return '02%02x' % (secs // (60*60)) + elif secs >= 60: + return '01%02x' % (secs // 60) + else: + return '00%02x' % secs + def decode_duration(enc:Hexstr) -> int: + time_unit = enc[:2] + length = h2i(enc[2:4]) + if time_unit == '04': + return length * 10*24*60*60 + elif time_unit == '03': + return length * 24*60*60 + elif time_unit == '02': + return length * 60*60 + elif time_unit == '01': + return length * 60 + elif time_unit == '00': + return length + else: + raise ValueError('Time unit must be 0x00..0x04') + min_dur_enc = encode_duration(min_len_secs) + max_dur_enc = encode_duration(max_len_secs) + data, sw = self._tp.send_apdu_checksw('8076000004' + min_dur_enc + max_dur_enc) + negotiated_duration_secs = decode_duration(data[:4]) + resume_token = data[4:] + return (negotiated_duration_secs, resumne_token, sw) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icc726ffd672744e56cc8dd3762891af507942c1e Gerrit-Change-Number: 25840 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:11:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 12:11:27 +0000 Subject: Change in osmo-bts[master]: gsm_pchan2chan_nr(): Properly assert if unexpected pchan is passed In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25825 ) Change subject: gsm_pchan2chan_nr(): Properly assert if unexpected pchan is passed ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I25e2cf0c922bc9902336e9add75a47535b9355bf Gerrit-Change-Number: 25825 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 12:11:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:11:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 12:11:29 +0000 Subject: Change in osmo-bts[master]: gsm_pchan2chan_nr(): Properly assert if unexpected pchan is passed In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25825 ) Change subject: gsm_pchan2chan_nr(): Properly assert if unexpected pchan is passed ...................................................................... gsm_pchan2chan_nr(): Properly assert if unexpected pchan is passed A bit of archeology, history & recap: ec1b5a0e9e2b6549e0ede48e803095e569997355 (openbsc.git) Adds assert in gsm_ts2chan_nr() 2f44693fad8505255293d3ed37dbd4e7cabebd37 (openbsc.git) ASSERT is disabled due to reported hit in octphy and litecell in gerrit for ec1b5a0e9e2b6549e0ede48e803095e569997355 5cef0623ef64bc641d2d29edb1ebaaafcc7c0df6 (osmo-bts,git) minor fixes to gsm_ts2chan_nr() regarding the pragma c9079d91069eaadf181a6e26e3c7205f1f05cbda (osmo-bts.git) GSM_PCHAN_NONE case is introduced in gsm_ts2chan_nr() This code has long evolved and robustness has improved, it's not even part of openbsc.git for several years now. Let's always assert if we receive an unexpected value there, since they are all internally handled values and hence we have control over them. Related: OS#2906 Change-Id: I25e2cf0c922bc9902336e9add75a47535b9355bf --- M src/common/lchan.c 1 file changed, 1 insertion(+), 8 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/lchan.c b/src/common/lchan.c index a3be4ee..e532615 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -364,14 +364,7 @@ default: LOGP(DRSL, LOGL_ERROR, "Physical channel %s (0x%02x) not expected!\n", gsm_pchan_name(pchan), (int)pchan); - /* OSMO_ASSERT(lchan_nr == 0); - * FIXME: On octphy and litecell, we hit above assertion (see - * Max's comment at https://gerrit.osmocom.org/589 ); disabled - * for BTS until this is clarified; remove the #ifdef when it - * is fixed. Tracked in OS#2906. - */ -#pragma message "fix caller that passes lchan_nr != 0" - cbits = 0x10; + OSMO_ASSERT(0); break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25825 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I25e2cf0c922bc9902336e9add75a47535b9355bf Gerrit-Change-Number: 25825 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:11:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 12:11:42 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid storing existence bit as true if content was actually NULL In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25831 ) Change subject: csn1: Avoid storing existence bit as true if content was actually NULL ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38602e4b680ed87297c7e440691a494c07cad446 Gerrit-Change-Number: 25831 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 12:11:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:13:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 12:13:38 +0000 Subject: Change in osmo-bsc[rel-1.7.2]: lchan_fsm: fix potential NULL-pointer dereference In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25836 ) Change subject: lchan_fsm: fix potential NULL-pointer dereference ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.7.2 Gerrit-Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Gerrit-Change-Number: 25836 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 12:13:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:15:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 12:15:01 +0000 Subject: Change in osmo-bsc[2021q1]: assignment_fsm: Check for conn->lchan In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25837 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25837 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 12:15:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:15:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 12:15:27 +0000 Subject: Change in osmo-bsc[2021q1]: lchan_fsm: fix potential NULL-pointer dereference In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25838 ) Change subject: lchan_fsm: fix potential NULL-pointer dereference ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Gerrit-Change-Number: 25838 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 12:15:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:22:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 12:22:18 +0000 Subject: Change in pysim[master]: pySim-shell: Add support for GSM-R SIM Cards with DF.EIRENE In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25839 to look at the new patch set (#2). Change subject: pySim-shell: Add support for GSM-R SIM Cards with DF.EIRENE ...................................................................... pySim-shell: Add support for GSM-R SIM Cards with DF.EIRENE GSM-R SIM cards have an additional directory (DF.EIRENE) with a number of files. This is all specified in the following document: UIC Reference P38 T 9001 5.0 "FFFIS for GSM-R SIM Cards" Change-Id: I4034d09292a08d277d4abcbed9a0ec2808daaacb --- M pySim-shell.py A pySim/gsm_r.py 2 files changed, 260 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/39/25839/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4034d09292a08d277d4abcbed9a0ec2808daaacb Gerrit-Change-Number: 25839 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:22:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 12:22:18 +0000 Subject: Change in pysim[master]: pySim-shell: Add suspend_uicc command In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25840 to look at the new patch set (#2). Change subject: pySim-shell: Add suspend_uicc command ...................................................................... pySim-shell: Add suspend_uicc command This is an optional command, and it is not supported by e.g. sysmoISIM-SJA2 Change-Id: Icc726ffd672744e56cc8dd3762891af507942c1e --- M pySim-shell.py M pySim/commands.py 2 files changed, 50 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/25840/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icc726ffd672744e56cc8dd3762891af507942c1e Gerrit-Change-Number: 25840 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:32:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 12:32:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Adapt tests to pass with new idle blocks from PCU In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25537 ) Change subject: pcu: Adapt tests to pass with new idle blocks from PCU ...................................................................... Patch Set 2: I plan to merge this today after almost a month staying in gerrit. if there's an explicit opposition please say so today and be detailed on what needs to be changed. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6e96a7569640695ccfaa94b471384fa301bccd62 Gerrit-Change-Number: 25537 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 20 Oct 2021 12:32:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:40:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 12:40:16 +0000 Subject: Change in osmo-bsc[2021q1]: assignment_fsm: Check for conn->lchan In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25837 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... Patch Set 1: is this a back-port? if so, it shoul contain the change-id of the original [master] change. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25837 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 12:40:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:40:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 12:40:33 +0000 Subject: Change in osmo-bsc[2021q1]: lchan_fsm: fix potential NULL-pointer dereference In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25838 ) Change subject: lchan_fsm: fix potential NULL-pointer dereference ...................................................................... Patch Set 1: likewise here, if this is a backport, pleas specify the change-id of the original commit -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Gerrit-Change-Number: 25838 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 12:40:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:40:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 12:40:58 +0000 Subject: Change in osmo-pcu[master]: Split csn1.c into common, enc and dec files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25827 ) Change subject: Split csn1.c into common, enc and dec files ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 Gerrit-Change-Number: 25827 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 20 Oct 2021 12:40:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:41:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 12:41:40 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Adapt tests to pass with new idle blocks from PCU In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25537 ) Change subject: pcu: Adapt tests to pass with new idle blocks from PCU ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6e96a7569640695ccfaa94b471384fa301bccd62 Gerrit-Change-Number: 25537 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 20 Oct 2021 12:41:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:41:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 12:41:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 ) Change subject: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105_max ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3a50445c707430900c78623c7093ff7eb1f3ed95 Gerrit-Change-Number: 25806 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 20 Oct 2021 12:41:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:42:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 12:42:55 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25552 ) Change subject: pySim-shell: add bulk provisioning support ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 20 Oct 2021 12:42:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:42:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 12:42:59 +0000 Subject: Change in pysim[master]: pySim-shell: add bulk provisioning support In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25552 ) Change subject: pySim-shell: add bulk provisioning support ...................................................................... pySim-shell: add bulk provisioning support There are scenarios where multiple cards need to get the same change. Lets add a new command that takes a script as parameter and executes the secript in a loop on multiple cards while prompting the user to change the card before starting the next cycle. Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Related: SYS#5617 --- M pySim-shell.py 1 file changed, 184 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index 594ad97..ca47fb3 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -30,6 +30,7 @@ import os import sys from pathlib import Path +from io import StringIO from pySim.ts_51_011 import EF, DF, EF_SST_map from pySim.ts_31_102 import EF_UST_map, EF_USIM_ADF_map @@ -41,7 +42,7 @@ from pySim.cards import card_detect, SimCard from pySim.utils import h2b, swap_nibbles, rpad, b2h, h2s, JsonEncoder, bertlv_parse_one from pySim.utils import dec_st, sanitize_pin_adm, tabulate_str_list, is_hex, boxed_heading_str -from pySim.card_handler import CardHandler +from pySim.card_handler import CardHandler, CardHandlerAuto from pySim.filesystem import CardMF, RuntimeState, CardDF, CardADF, CardModel from pySim.ts_51_011 import CardProfileSIM, DF_TELECOM, DF_GSM @@ -99,7 +100,7 @@ class PysimApp(cmd2.Cmd): CUSTOM_CATEGORY = 'pySim Commands' - def __init__(self, card, rs, script = None): + def __init__(self, card, rs, sl, ch, script = None): super().__init__(persistent_history_file='~/.pysim_shell_history', allow_cli_args=False, use_ipython=True, auto_load_commands=False, startup_script=script) self.intro = style('Welcome to pySim-shell!', fg=fg.red) @@ -107,6 +108,9 @@ self.card = None self.rs = None self.py_locals = { 'card': self.card, 'rs' : self.rs } + self.sl = sl + self.ch = ch + self.numeric_path = False self.add_settable(cmd2.Settable('numeric_path', bool, 'Print File IDs instead of names', onchange_cb=self._onchange_numeric_path)) @@ -127,6 +131,8 @@ and commands to enable card operations. """ + rc = False + # Unequip everything from pySim-shell that would not work in unequipped state if self.rs: self.rs.unregister_cmds(self) @@ -149,10 +155,12 @@ self.register_command_set(PySimCommands()) self.iccid, sw = self.card.read_iccid() rs.select('MF', self) + rc = True else: self.poutput("pySim-shell not equipped!") self.update_prompt() + return rc def poutput_json(self, data, force_no_pretty = False): """like cmd2.poutput() but for a JSON serializable dict.""" @@ -202,6 +210,170 @@ rs, card = init_card(sl); self.equip(card, rs) + class InterceptStderr(list): + def __init__(self): + self._stderr_backup = sys.stderr + def __enter__(self): + self._stringio_stderr = StringIO() + sys.stderr = self._stringio_stderr + return self + def __exit__(self, *args): + self.stderr = self._stringio_stderr.getvalue().strip() + del self._stringio_stderr + sys.stderr = self._stderr_backup + + def _show_failure_sign(self): + self.poutput(style(" +-------------+", fg=fg.bright_red)) + self.poutput(style(" + ## ## +", fg=fg.bright_red)) + self.poutput(style(" + ## ## +", fg=fg.bright_red)) + self.poutput(style(" + ### +", fg=fg.bright_red)) + self.poutput(style(" + ## ## +", fg=fg.bright_red)) + self.poutput(style(" + ## ## +", fg=fg.bright_red)) + self.poutput(style(" +-------------+", fg=fg.bright_red)) + self.poutput("") + + def _show_success_sign(self): + self.poutput(style(" +-------------+", fg=fg.bright_green)) + self.poutput(style(" + ## +", fg=fg.bright_green)) + self.poutput(style(" + ## +", fg=fg.bright_green)) + self.poutput(style(" + # ## +", fg=fg.bright_green)) + self.poutput(style(" + ## # +", fg=fg.bright_green)) + self.poutput(style(" + ## +", fg=fg.bright_green)) + self.poutput(style(" +-------------+", fg=fg.bright_green)) + self.poutput("") + + def _process_card(self, first, script_path): + + # Early phase of card initialzation (this part may fail with an exception) + try: + rs, card = init_card(self.sl) + rc = self.equip(card, rs) + except: + self.poutput("") + self.poutput("Card initialization failed with an exception:") + self.poutput("---------------------8<---------------------") + traceback.print_exc() + self.poutput("---------------------8<---------------------") + self.poutput("") + return -1 + + # Actual card processing step. This part should never fail with an exception since the cmd2 + # do_run_script method will catch any exception that might occur during script execution. + if rc: + self.poutput("") + self.poutput("Transcript stdout:") + self.poutput("---------------------8<---------------------") + with self.InterceptStderr() as logged: + self.do_run_script(script_path) + self.poutput("---------------------8<---------------------") + + self.poutput("") + self.poutput("Transcript stderr:") + if logged.stderr: + self.poutput("---------------------8<---------------------") + self.poutput(logged.stderr) + self.poutput("---------------------8<---------------------") + else: + self.poutput("(none)") + + # Check for exceptions + self.poutput("") + if "EXCEPTION of type" not in logged.stderr: + return 0 + + return -1 + + bulk_script_parser = argparse.ArgumentParser() + bulk_script_parser.add_argument('script_path', help="path to the script file") + bulk_script_parser.add_argument('--halt_on_error', help='stop card handling if an exeption occurs', + action='store_true') + bulk_script_parser.add_argument('--tries', type=int, default=2, + help='how many tries before trying the next card') + bulk_script_parser.add_argument('--on_stop_action', type=str, default=None, + help='commandline to execute when card handling has stopped') + bulk_script_parser.add_argument('--pre_card_action', type=str, default=None, + help='commandline to execute before actually talking to the card') + + @cmd2.with_argparser(bulk_script_parser) + @cmd2.with_category(CUSTOM_CATEGORY) + def do_bulk_script(self, opts): + """Run script on multiple cards (bulk provisioning)""" + + # Make sure that the script file exists and that it is readable. + if not os.access(opts.script_path, os.R_OK): + self.poutput("Invalid script file!") + return + + success_count = 0 + fail_count = 0 + + first = True + while 1: + # TODO: Count consecutive failures, if more than N consecutive failures occur, then stop. + # The ratinale is: There may be a problem with the device, we do want to prevent that + # all remaining cards are fired to the error bin. This is only relevant for situations + # with large stacks, probably we do not need this feature right now. + + try: + # In case of failure, try multiple times. + for i in range(opts.tries): + # fetch card into reader bay + ch.get(first) + + # if necessary execute an action before we start processing the card + if(opts.pre_card_action): + os.system(opts.pre_card_action) + + # process the card + rc = self._process_card(first, opts.script_path) + if rc == 0: + success_count = success_count + 1 + self._show_success_sign() + self.poutput("Statistics: success :%i, failure: %i" % (success_count, fail_count)) + break + else: + fail_count = fail_count + 1 + self._show_failure_sign() + self.poutput("Statistics: success :%i, failure: %i" % (success_count, fail_count)) + + + # Depending on success or failure, the card goes either in the "error" bin or in the + # "done" bin. + if rc < 0: + ch.error() + else: + ch.done() + + # In most cases it is possible to proceed with the next card, but the + # user may decide to halt immediately when an error occurs + if opts.halt_on_error and rc < 0: + return + + except (KeyboardInterrupt): + self.poutput("") + self.poutput("Terminated by user!") + return; + except (SystemExit): + # When all cards are processed the card handler device will throw a SystemExit + # exception. Also Errors that are not recoverable (cards stuck etc.) will end up here. + # The user has the option to execute some action to make aware that the card handler + # needs service. + if(opts.on_stop_action): + os.system(opts.on_stop_action) + return + except: + self.poutput("") + self.poutput("Card handling failed with an exception:") + self.poutput("---------------------8<---------------------") + traceback.print_exc() + self.poutput("---------------------8<---------------------") + self.poutput("") + fail_count = fail_count + 1 + self._show_failure_sign() + self.poutput("Statistics: success :%i, failure: %i" % (success_count, fail_count)) + + first = False + echo_parser = argparse.ArgumentParser() echo_parser.add_argument('string', help="string to echo on the shell") @@ -553,6 +725,8 @@ global_group.add_argument('--script', metavar='PATH', default=None, help='script with pySim-shell commands to be executed automatically at start-up') global_group.add_argument('--csv', metavar='FILE', default=None, help='Read card data from CSV file') +global_group.add_argument("--card_handler", dest="card_handler_config", metavar="FILE", + help="Use automatic card handling machine") adm_group = global_group.add_mutually_exclusive_group() adm_group.add_argument('-a', '--pin-adm', metavar='PIN_ADM1', dest='pin_adm', default=None, @@ -588,12 +762,18 @@ # Create command layer scc = SimCardCommands(transport=sl) + # Create a card handler (for bulk provisioning) + if opts.card_handler_config: + ch = CardHandlerAuto(None, opts.card_handler_config) + else: + ch = CardHandler(sl) + # Detect and initialize the card in the reader. This may fail when there # is no card in the reader or the card is unresponsive. PysimApp is # able to tolerate and recover from that. try: rs, card = init_card(sl) - app = PysimApp(card, rs, opts.script) + app = PysimApp(card, rs, sl, ch, opts.script) except: print("Card initialization failed with an exception:") print("---------------------8<---------------------") @@ -603,7 +783,7 @@ print(" it should also be noted that some readers may behave strangely when no card") print(" is inserted.)") print("") - app = PysimApp(None, None, opts.script) + app = PysimApp(None, None, sl, ch, opts.script) # If the user supplies an ADM PIN at via commandline args authenticate # immediately so that the user does not have to use the shell commands -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I9e4926675c5a497a22fc6a4fefdd388fe18a2b2d Gerrit-Change-Number: 25552 Gerrit-PatchSet: 11 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:48:59 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 12:48:59 +0000 Subject: Change in osmo-pcu[master]: Split csn1.c into common, enc and dec files In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25827 ) Change subject: Split csn1.c into common, enc and dec files ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 Gerrit-Change-Number: 25827 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 20 Oct 2021 12:48:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:52:14 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 12:52:14 +0000 Subject: Change in osmo-bsc[2021q1]: assignment_fsm: Check for conn->lchan In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25837 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... Patch Set 1: > is this a back-port? Yes. > if so, it shoul contain the change-id of the original [master] change. It already contains exactly the same Change-Id, and Gerrit does recognize it as a cherry-pick. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25837 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 12:52:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 12:54:49 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 12:54:49 +0000 Subject: Change in osmo-bsc[2021q1]: lchan_fsm: fix potential NULL-pointer dereference In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25838 ) Change subject: lchan_fsm: fix potential NULL-pointer dereference ...................................................................... Patch Set 1: > Patch Set 1: > > likewise here, if this is a backport, pleas specify the change-id of the original commit Same here, Change-Id of this patch matches Change-Id of the original commit. See: https://gerrit.osmocom.org/q/I373855b95f8bde0ce8f9c2ae7bf95c9135d33484. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Gerrit-Change-Number: 25838 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 12:54:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 13:35:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 13:35:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Adapt tests to pass with new idle blocks from PCU In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25537 ) Change subject: pcu: Adapt tests to pass with new idle blocks from PCU ...................................................................... pcu: Adapt tests to pass with new idle blocks from PCU Depends: osmo-pcu.git Ife718eeed2af011479c03099ea109518f04567bc Change-Id: I6e96a7569640695ccfaa94b471384fa301bccd62 --- M pcu/PCU_Tests.ttcn 1 file changed, 76 insertions(+), 31 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 4b8035c..d023639 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -397,6 +397,7 @@ /* Make sure TBF is released and no data is sent for in after reciving a Suspend Request from that MS. See OS#4761 */ testcase TC_pcuif_suspend_active_tbf() runs on RAW_PCU_Test_CT { var octetstring ra_id := enc_RoutingAreaIdentification(mp_gb_cfg.bvc[0].cell_id.ra_id); + var BTS_PDTCH_Block data_msg; var RlcmacDlBlock dl_block; var octetstring data := f_rnd_octstring(10); var uint32_t sched_fn; @@ -454,9 +455,17 @@ /* Make sure we don't receive data for that TBF since it was released * before. Also check our TBF is not polled for UL. */ - f_rx_rlcmac_dl_block_exp_dummy(dl_block); - if (dl_block.ctrl.mac_hdr.usf != USF_UNUSED) { - setverdict(fail, "Unexpected USF ", dl_block.ctrl.mac_hdr.usf); + f_pcuif_rx_data_req_pdtch(data_msg); + if (mp_osmo_pcu_newer_than_0_9_0 and data_msg.dl_block == omit) { + /* IDLE block, expected on new PCU versions */ + } else if (not mp_osmo_pcu_newer_than_0_9_0 and match(data_msg.dl_block, tr_RLCMAC_DUMMY_CTRL())) { + /* Dummy RLCMAC block, expected on older PCU versions */ + if (data_msg.dl_block.ctrl.mac_hdr.usf != USF_UNUSED) { + setverdict(fail, "Unexpected USF ", data_msg.dl_block.ctrl.mac_hdr.usf); + f_shutdown(__BFILE__, __LINE__); + } + } else { + setverdict(fail, "Unexpected dl_block", data_msg.dl_block); f_shutdown(__BFILE__, __LINE__); } @@ -583,7 +592,7 @@ f_shutdown(__BFILE__, __LINE__, final := true); } -/* Verify that the PCU generates valid PTCCH/D messages +/* Verify that the PCU generates idle blocks in PTCCH/D * while neither Uplink nor Downlink TBF is established. */ testcase TC_ta_ptcch_idle() runs on RAW_PCU_Test_CT { var BTS_PTCCH_Block pcu_msg; @@ -599,10 +608,20 @@ T.start(5.0); alt { - /* Make sure the message is encoded correctly - * TODO: do we expect all TA values to be equal '1111111'B? */ - [] as_rx_ptcch(pcu_msg, tr_PTCCHDownlinkMsg); - + [] BTS.receive(tr_PCUIF_DATA_PTCCH(0, + tr_PCUIF_DATA(0, 7, sapi := PCU_IF_SAPI_PTCCH), + omit)) { + if (not mp_osmo_pcu_newer_than_0_9_0) { + setverdict(fail, "Expected PTCCH/D block instead of IDLE block"); + f_shutdown(__BFILE__, __LINE__); + } + } + [] as_rx_ptcch(pcu_msg, tr_PTCCHDownlinkMsg) { + if (mp_osmo_pcu_newer_than_0_9_0) { + setverdict(fail, "Expected IDLE block instead of PTCCH/D block"); + f_shutdown(__BFILE__, __LINE__); + } + } [] BTS.receive(PCUIF_Message:?) { repeat; } [] T.timeout { setverdict(fail, "Timeout waiting for a PTCCH/D block"); @@ -1886,6 +1905,7 @@ var integer N3105 := 0; timer T_3195 := 1.0; var integer num_poll_recv := 0; + var template RlcmacDlBlock dl_block_exp; /* Initialize NS/BSSGP side */ f_init_bssgp(); @@ -1947,7 +1967,7 @@ repeat; } /* At this point in time (N3105_MAX reached), PCU already moved TBF to - * RELEASE state so no data for it is tx'ed, hence the dummy blocks: + * RELEASE state so no data for it is tx'ed, hence the dummy/idle blocks: */ [N3105 == N3105_MAX] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), @@ -1964,14 +1984,33 @@ block_nr := nr.blk_nr)); repeat; } + [mp_osmo_pcu_newer_than_0_9_0 and N3105 == N3105_MAX] + BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + omit)) -> value data_msg { + /* We may already receive idle blocks before our own TTCN3 timer + * triggers due to the TBF being released. Keep going until our T_3195 triggers. */ + nr := ts_TsTrxBtsNum; + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + repeat; + } [T_3195.running] T_3195.timeout { log("T_3195 timeout"); /* Done in alt, wait for pending RTS initiated previously in - * above case before continuing (expect /* Dummy block): */ + * above case before continuing (expect empty blocks on new + * versions, Dummy block on older versions): */ + if (mp_osmo_pcu_newer_than_0_9_0) { + dl_block_exp := omit; + } else { + dl_block_exp := tr_RLCMAC_DUMMY_CTRL; + } BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), - tr_RLCMAC_DUMMY_CTRL)); - } + dl_block_exp)); + } [] BTS.receive { setverdict(fail, "Unexpected BTS message"); f_shutdown(__BFILE__, __LINE__); @@ -5968,12 +6007,13 @@ f_shutdown(__BFILE__, __LINE__, final := true); } -/* Verify TRX!=C0 don't schedule rlcmac blocks if no TBF attached to it. See OS#4772, SYS#4919 */ +/* Verify PCU schedule idle blocks (len=0) if no TBF attached to it. See OS#4772, SYS#4919 */ testcase TC_pdch_energy_saving() runs on RAW_PCU_Test_CT { var PCUIF_info_ind info_ind; var template (value) TsTrxBtsNum nr; var RlcmacDlBlock dl_block; var BTS_PDTCH_Block data_msg; + var integer ts; timer T; /* Initialize NS/BSSGP side */ @@ -5991,25 +6031,30 @@ /* Establish BSSGP connection to the PCU */ f_bssgp_establish(); - /* Verify C0 gets always dummy blocks: */ - nr := ts_TsTrxBtsNum(ts_nr := 7, trx_nr := 0, bts_nr := 0, blk_nr := 0); - f_rx_rlcmac_dl_block_exp_dummy(dl_block, nr := nr); + for (ts := 0; ts < 2; ts := ts + 1) { + nr := ts_TsTrxBtsNum(ts_nr := 7, trx_nr := ts, bts_nr := 0, blk_nr := 0); - /* TRX1 doesn't send dummy blocks when not needed, in order to honour energy saving: */ - nr.trx_nr := 1; - BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, - sapi := PCU_IF_SAPI_PDTCH, fn := 0, - arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), block_nr := nr.blk_nr)); - T.start(0.5); - alt { - [] as_rx_fail_dummy(nr); - [] BTS.receive { - setverdict(fail, "Unexpected block from BTS"); - f_shutdown(__BFILE__, __LINE__); - } - [] T.timeout { - setverdict(pass); - } + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), block_nr := nr.blk_nr)); + T.start(0.5); + alt { + [] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + omit)) -> value data_msg { + setverdict(pass); + T.stop; + } + [] as_rx_fail_dummy(nr); + [] BTS.receive { + setverdict(fail, "Unexpected block from BTS"); + f_shutdown(__BFILE__, __LINE__); + } + [] T.timeout { + setverdict(fail, "Expected IDLE block from BTS"); + f_shutdown(__BFILE__, __LINE__); + } + } } f_shutdown(__BFILE__, __LINE__, final := true); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25537 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6e96a7569640695ccfaa94b471384fa301bccd62 Gerrit-Change-Number: 25537 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 13:35:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 13:35:05 +0000 Subject: Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 ) Change subject: pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105_max ...................................................................... pcu: Introduce test TC_ul_tbf_reestablish_with_pkt_resource_req_n3105_max Change-Id: I3a50445c707430900c78623c7093ff7eb1f3ed95 --- M pcu/PCU_Tests.ttcn 1 file changed, 136 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index d023639..2daf89b 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3097,6 +3097,141 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Test scenario where MS wants to request a new TBF once the current one is + * ending, by means of sending a Packet Resource Request on ul slot provided by + * last Pkt Ul ACK's RRBP. new Pkt Ul Ass is never confirmed by the MS in this test. + * See 3GPP TS 44.060 sec 9.3.2.4.2 "Non-extended uplink TBF mode" */ +testcase TC_ul_tbf_reestablish_with_pkt_resource_req_n3105_max() runs on RAW_PCU_Test_CT { + var PCUIF_info_ind info_ind; + var RlcmacDlBlock dl_block; + var octetstring data := f_rnd_octstring(10); + var uint32_t sched_fn; + var uint32_t dl_fn; + var template (value) TsTrxBtsNum nr; + var BTS_PDTCH_Block data_msg; + var template RlcmacDlBlock acknack_tmpl; + var GprsMS ms; + const integer N3105_MAX := 2; + var integer N3105 := 0; + timer T_3195 := 1.0 + 0.5; /* 0.5: extra offset since we cannot match exactly */ + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + info_ind := valueof(ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS)); + /* Speedup test: */ + info_ind.n3105 := N3105_MAX; + info_ind.t3195 := 1; + f_init_raw(testcasename(), info_ind); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Establish an Uplink TBF */ + f_ms_establish_ul_tbf(ms); + + /* Send one UL block (with TLLI since we are in One-Phase Access + contention resoultion) and make sure it is ACKED fine */ + f_ms_tx_ul_data_block_multi(ms, 1, with_tlli := true, fn := ms.ul_tbf.start_time_fn); + + /* UL block should be received in SGSN */ + BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.bvc[0].cell_id)); + + acknack_tmpl := tr_RLCMAC_UL_ACK_NACK_GPRS(ms.ul_tbf.tfi, + tr_UlAckNackGprs(ms.tlli, + tr_AckNackDescription(final_ack := '1'B), + tr_UlAckNackGprsAdditionsRel99(tbf_est := true))) + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn, acknack_tmpl); + + /* TODO: verify TBF_EST and FinalACK are both '1' above */ + + /* Send PACKET RESOURCE REQUEST to request a new UL TBF */ + f_ms_tx_ul_block(ms, ts_RLC_UL_CTRL_ACK(ts_RlcMacUlCtrl_PKT_RES_REQ(ms.tlli, omit)), sched_fn); + + /* Now Keep ignoring the Pkt Ul Ass on PACCH: */ + /* Now we go on receiving DL data and not answering RRBP: */ + nr := ts_TsTrxBtsNum; + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + alt { + [not T_3195.running] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + tr_RLCMAC_UL_PACKET_ASS)) -> value data_msg { + if (f_dl_block_rrbp_valid(data_msg.dl_block)) { + log("Ignoring RRBP N3105 ", N3105); + N3105 := N3105 + 1; + } + nr := ts_TsTrxBtsNum; + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + repeat; + } + /* At this point in time (N3105_MAX reached), PCU already moved TBF to + * RELEASE state so no data for it is tx'ed, hence the dummy blocks: + */ + [N3105 == N3105_MAX] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + tr_RLCMAC_DUMMY_CTRL)) -> value data_msg { + if (not T_3195.running) { + T_3195.start; + } + nr := ts_TsTrxBtsNum; + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + repeat; + } + [N3105 == N3105_MAX] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + omit)) -> value data_msg { + /* We may already receive idle blocks before our own TTCN3 timer + * triggers due to the TBF being released. Keep going until our T_3195 triggers. */ + nr := ts_TsTrxBtsNum; + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + repeat; + } + /* We receive Dummy blocks in between Pkt Ul Ass while PCU waits for us to ack it */ + [not T_3195.running] BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + tr_RLCMAC_DUMMY_CTRL)) -> value data_msg { + log("Ignoring Dummy block FN ", data_msg.raw.fn); + nr := ts_TsTrxBtsNum; + BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, + sapi := PCU_IF_SAPI_PDTCH, fn := 0, + arfcn := f_trxnr2arfcn(valueof(nr.trx_nr)), + block_nr := nr.blk_nr)); + repeat; + } + [T_3195.running] T_3195.timeout { + log("T_3195 timeout"); + /* Done in alt, wait for pending RTS initiated previously in + * above case before continuing (expect nothing to be sent since there's no active TBF): */ + BTS.receive(tr_PCUIF_DATA_PDTCH(nr.bts_nr, + tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), + omit)); + } + [] BTS.receive { + setverdict(fail, "Unexpected BTS message"); + f_shutdown(__BFILE__, __LINE__); + } + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + /* Test CS paging over the BTS<->PCU socket. * When a (class B or C, not A) MS has an active TBF (or is on the PDCH), the MS can not react on CS paging over CCCH. * Paging should be send on the PACCH. @@ -6288,6 +6423,7 @@ execute( TC_dl_multislot_tbf_ms_class_from_2phase() ); execute( TC_ul_multislot_tbf_ms_class_from_2phase() ); execute( TC_ul_tbf_reestablish_with_pkt_resource_req() ); + execute( TC_ul_tbf_reestablish_with_pkt_resource_req_n3105_max() ); execute( TC_multiplex_dl_gprs_egprs() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25806 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I3a50445c707430900c78623c7093ff7eb1f3ed95 Gerrit-Change-Number: 25806 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 13:35:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 13:35:10 +0000 Subject: Change in osmo-pcu[master]: pcuif: Submit data_req with len=0 as idle frames In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25535 ) Change subject: pcuif: Submit data_req with len=0 as idle frames ...................................................................... pcuif: Submit data_req with len=0 as idle frames This way PCU always answers DATA.ind and the BTS can still clearly identify idle frames. It also simplifies testing and verification of correct behavior. Related: SYS#4919 Change-Id: Ife718eeed2af011479c03099ea109518f04567bc --- M src/gprs_rlcmac_sched.cpp M src/pcu_l1_if.cpp 2 files changed, 40 insertions(+), 21 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index cdbf70d..8867d43 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -412,7 +412,7 @@ uint8_t usf; struct msgb *msg = NULL; uint32_t poll_fn; - enum pcu_gsmtap_category gsmtap_cat; + enum pcu_gsmtap_category gsmtap_cat = PCU_GSMTAP_C_DL_DUMMY; /* init: make gcc happy */ bool tx_is_egprs = false; bool require_gprs_only; enum mcs_kind req_mcs_kind; /* Restrict CS/MCS if DL Data block is to be sent */ @@ -487,9 +487,9 @@ } /* Prio 3: send dummy control message if need to poll or USF */ else { - /* If there's no TBF attached to this PDCH, we can early skip - * since there's nothing to transmit nor to poll/USF. This way - * we help BTS energy saving (on TRX!=C0) by sending nothing + /* If there's no TBF attached to this PDCH, we can submit an empty + * data_req since there's nothing to transmit nor to poll/USF. This + * way we help BTS energy saving (on TRX!=C0) by sending nothing * instead of a dummy block. The early return is done here and * not at the start of the function because the condition below * (num_tbfs==0) may not be enough, because temporary dummy TBFs @@ -505,13 +505,11 @@ * TRX0, since BTS is not preparing dummy bursts on idle TS for us */ skip_idle = skip_idle && trx != 0; #endif - if (skip_idle) - return 0; - if ((msg = sched_dummy())) { + if (!skip_idle && (msg = sched_dummy())) { /* increase counter */ gsmtap_cat = PCU_GSMTAP_C_DL_DUMMY; } else { - return -ENOMEM; + msg = NULL; /* submit empty frame */ } } @@ -521,21 +519,23 @@ pdch->fn_without_cs14 = 0; } - /* msg is now available */ - bts_do_rate_ctr_add(bts, CTR_RLC_DL_BYTES, msgb_length(msg)); - - /* set USF */ - OSMO_ASSERT(msgb_length(msg) > 0); - usf = usf_tbf ? usf_tbf->m_usf[ts] : USF_UNUSED; - msg->data[0] = (msg->data[0] & 0xf8) | usf; - /* Used to measure the leak rate, count all blocks */ gprs_bssgp_update_frames_sent(); - /* Send to GSMTAP */ - tap_n_acc(msg, bts, trx, ts, fn, gsmtap_cat); + if (msg) { + /* msg is now available */ + bts_do_rate_ctr_add(bts, CTR_RLC_DL_BYTES, msgb_length(msg)); - /* send PDTCH/PACCH to L1 */ + /* set USF */ + OSMO_ASSERT(msgb_length(msg) > 0); + usf = usf_tbf ? usf_tbf->m_usf[ts] : USF_UNUSED; + msg->data[0] = (msg->data[0] & 0xf8) | usf; + + /* Send to GSMTAP */ + tap_n_acc(msg, bts, trx, ts, fn, gsmtap_cat); + } + + /* send PDTCH/PACCH to L1. msg=NULL accepted too (idle block) */ pcu_l1if_tx_pdtch(msg, bts, trx, ts, bts->trx[trx].arfcn, fn, block_nr); return 0; diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 1600da0..8d9defc 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -212,7 +212,8 @@ data_req->trx_nr = trx; data_req->ts_nr = ts; data_req->block_nr = block_nr; - memcpy(data_req->data, data, len); + if (len) + memcpy(data_req->data, data, len); data_req->len = len; return pcu_sock_send(msg); @@ -223,12 +224,20 @@ { #ifdef ENABLE_DIRECT_PHY if (bts->trx[trx].fl1h) { + if (!msg) /* Simply skip sending idle frames to L1 */ + return; l1if_pdch_req(bts->trx[trx].fl1h, ts, 0, fn, arfcn, block_nr, msg->data, msg->len); msgb_free(msg); return; } #endif + if (!msg) { + pcu_tx_data_req(bts, trx, ts, PCU_IF_SAPI_PDTCH, arfcn, fn, block_nr, + NULL, 0); + return; + } + pcu_tx_data_req(bts, trx, ts, PCU_IF_SAPI_PDTCH, arfcn, fn, block_nr, msg->data, msg->len); msgb_free(msg); @@ -243,10 +252,17 @@ gsmtap_send(the_pcu->gsmtap, arfcn, ts, GSMTAP_CHANNEL_PTCCH, 0, fn, 0, 0, data, data_len); #ifdef ENABLE_DIRECT_PHY if (bts->trx[trx].fl1h) { + if (!data_len) /* Simply skip sending idle frames to L1 */ + return; l1if_pdch_req(bts->trx[trx].fl1h, ts, 1, fn, arfcn, block_nr, data, data_len); return; } #endif + if (!data_len) { + pcu_tx_data_req(bts, trx, ts, PCU_IF_SAPI_PTCCH, arfcn, fn, block_nr, NULL, 0); + return; + } + pcu_tx_data_req(bts, trx, ts, PCU_IF_SAPI_PTCCH, arfcn, fn, block_nr, data, data_len); } @@ -544,8 +560,11 @@ * TRX0, since BTS is not preparing dummy bursts on idle TS for us: */ skip_idle = skip_idle && trx != 0; #endif - if (skip_idle) + if (skip_idle) { + pcu_l1if_tx_ptcch(bts, trx, ts, bts->trx[trx].arfcn, fn, block_nr, + NULL, 0); return 0; + } pcu_l1if_tx_ptcch(bts, trx, ts, bts->trx[trx].arfcn, fn, block_nr, pdch->ptcch_msg, GSM_MACBLOCK_LEN); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25535 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ife718eeed2af011479c03099ea109518f04567bc Gerrit-Change-Number: 25535 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Assignee: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 13:35:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 13:35:30 +0000 Subject: Change in osmo-pcu[master]: Split csn1.c into common, enc and dec files In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25827 ) Change subject: Split csn1.c into common, enc and dec files ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 Gerrit-Change-Number: 25827 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 13:35:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 13:35:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 13:35:44 +0000 Subject: Change in osmo-pcu[master]: Split csn1.c into common, enc and dec files In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25827 ) Change subject: Split csn1.c into common, enc and dec files ...................................................................... Split csn1.c into common, enc and dec files The CSN1 encoder/decoder code is already lengthy and complex enough, there's no need to keep it in the same file, specially because when debugging, only is interested in one of the 2 functions, and they both look really similar (long spaghetti switches). Change-Id: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 --- M debian/copyright M src/Makefile.am M src/csn1.c M src/csn1.h A src/csn1_dec.c A src/csn1_enc.c 6 files changed, 2,718 insertions(+), 2,627 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved; Verified diff --git a/debian/copyright b/debian/copyright index 99ea408..4e9347e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -81,7 +81,9 @@ License: GPL-2.0+ Files: src/csn1.h - src/csn1.cpp + src/csn1.c + src/csn1_dec.c + src/csn1_enc.c src/gsm_rlcmac.cpp src/gsm_rlcmac.h Copyright: 2011 Vincent Helfre diff --git a/src/Makefile.am b/src/Makefile.am index 08b3309..25fdab2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,6 +41,8 @@ libgprs_la_SOURCES = \ gprs_debug.cpp \ csn1.c \ + csn1_dec.c \ + csn1_enc.c \ gsm_rlcmac.c \ gprs_bssgp_pcu.c \ gprs_bssgp_rim.c \ diff --git a/src/csn1.c b/src/csn1.c index 2be0392..e165e92 100644 --- a/src/csn1.c +++ b/src/csn1.c @@ -1,4 +1,4 @@ -/* csn1.cpp +/* csn1_enc.c * Routines for CSN1 dissection in wireshark. * * Copyright (C) 2011 Ivan Klyuchnikov @@ -38,20 +38,10 @@ #include #include -#define pvDATA(_pv, _offset) ((void*) ((unsigned char*)_pv + _offset)) -#define pui8DATA(_pv, _offset) ((guint8*) pvDATA(_pv, _offset)) -#define pui16DATA(_pv, _offset) ((guint16*) pvDATA(_pv, _offset)) -#define pui32DATA(_pv, _offset) ((guint32*) pvDATA(_pv, _offset)) -#define pui64DATA(_pv, _offset) ((guint64*) pvDATA(_pv, _offset)) -/* used to tag existence of next element in variable length lists */ -#define STANDARD_TAG 1 -#define REVERSED_TAG 0 - -static const unsigned char ixBitsTab[] = {0, 1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5}; - +const unsigned char ixBitsTab[] = {0, 1, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5}; /* Returns no_of_bits (up to 8) masked with 0x2B */ -static guint8 +guint8 get_masked_bits8(struct bitvec *vector, unsigned *readIndex, gint bit_offset, const gint no_of_bits) { static const guint8 maskBits[] = {0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, 0xFF}; @@ -105,7 +95,7 @@ }; -static gint16 ProcessError_impl(const char *file, int line, unsigned *readIndex, +gint16 ProcessError_impl(const char *file, int line, unsigned *readIndex, const char* sz, gint16 err, const CSN_DESCR* pDescr) { /* Don't add trailing newline, top caller is responsible for appending it */ @@ -115,2615 +105,3 @@ pDescr ? pDescr->sz : "-", *readIndex); return err; } - -#define ProcessError(readIndex, sz, err, pDescr) \ - ProcessError_impl(__FILE__, __LINE__, readIndex, sz, err, pDescr) - - -/** - * ================================================================================================ - * Return TRUE if tag in bit stream indicates existence of next list element, - * otherwise return FALSE. - * Will work for tag values equal to both 0 and 1. - * ================================================================================================ - */ - -static gboolean -existNextElement(struct bitvec *vector, unsigned *readIndex, guint8 Tag) -{ - int res = bitvec_get_bit_pos(vector, (*readIndex)++); - if (Tag == STANDARD_TAG) - { - return (res > 0); - } - return (res == 0); -} - - -gint16 -csnStreamDecoder(csnStream_t* ar, const CSN_DESCR* pDescr, struct bitvec *vector, unsigned *readIndex, void* data) -{ - gint remaining_bits_len = ar->remaining_bits_len; - gint bit_offset = ar->bit_offset; - guint8* pui8 = NULL; - guint16* pui16; - guint32* pui32; - guint64* pui64; - guint8 Tag = STANDARD_TAG; - unsigned ib; - - if (remaining_bits_len < 0) - { - return ProcessError(readIndex, __func__, CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - do - { - switch (pDescr->type) - { - case CSN_BIT: - { - if (remaining_bits_len > 0) - { - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = bitvec_read_field(vector, readIndex, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - /* end add the bit value to protocol tree */ - } - else if (pDescr->may_be_null) - { - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = 0; - LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - pDescr++; - remaining_bits_len--; - bit_offset++; - break; - } - - case CSN_NULL: - { /* Empty member! */ - bit_offset += pDescr->i; - pDescr++; - break; - } - - case CSN_UINT: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = ui8; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else if (no_of_bits <= 16) - { - guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); - pui16 = pui16DATA(data, pDescr->offset); - *pui16 = ui16; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); - } - else if (no_of_bits <= 32) - { - guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); - pui32 = pui32DATA(data, pDescr->offset); - *pui32 = ui32; - LOGPC(DCSN1, LOGL_DEBUG, "%s = 0x%08x | ", pDescr->sz , *pui32); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } - else if (pDescr->may_be_null) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = 0; - } - else if (no_of_bits <= 16) - { - pui16 = pui16DATA(data, pDescr->offset); - *pui16 = 0; - } - else if (no_of_bits <= 32) - { - pui32 = pui32DATA(data, pDescr->offset); - *pui32 = 0; - } - LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - pDescr++; - break; - } - - case CSN_UINT_OFFSET: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = ui8 + (guint8)pDescr->descr.value; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else if (no_of_bits <= 16) - { - guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); - pui16 = pui16DATA(data, pDescr->offset); - *pui16 = ui16 + (guint16)pDescr->descr.value; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); - } - else if (no_of_bits <= 32) - { - guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); - pui32 = pui32DATA(data, pDescr->offset); - *pui32 = ui32 + (guint16)pDescr->descr.value; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_LH: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - guint8 ui8 = get_masked_bits8(vector, readIndex, bit_offset, no_of_bits); - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = ui8; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else - {/* Maybe we should support more than 8 bits ? */ - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_ARRAY: - { - guint8 no_of_bits = (guint8) pDescr->i; - guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - - if (pDescr->value != 0) - { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ - nCount = *pui16DATA(data, nCount); - } - - if (remaining_bits_len >= (no_of_bits * nCount)) - { - remaining_bits_len -= (no_of_bits*nCount); - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - do - { - *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - bit_offset += no_of_bits; - } while (--nCount > 0); - } - else if (no_of_bits <= 16) - { - return ProcessError(readIndex,"csnStreamDecoder NOTIMPLEMENTED", 999, pDescr); - } - else if (no_of_bits <= 32) - { - return ProcessError(readIndex,"csnStreamDecoder NOTIMPLEMENTED", 999, pDescr); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - pDescr++; - break; - } - - case CSN_VARIABLE_TARRAY_OFFSET: - case CSN_VARIABLE_TARRAY: - case CSN_TYPE_ARRAY: - { - gint16 Status; - csnStream_t arT = *ar; - gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->value; - - pui8 = pui8DATA(data, pDescr->offset); - if (pDescr->type == CSN_VARIABLE_TARRAY) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - } - else if (pDescr->type == CSN_VARIABLE_TARRAY_OFFSET) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - /* nCount--; the 1 offset is already taken into account in CSN_UINT_OFFSET */ - } - - while (nCount > 0) - { /* resulting array of length 0 is possible - * but no bits shall be read from bitstream - */ - - LOGPC(DCSN1, LOGL_DEBUG, "%s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); - if (Status >= 0) - { - pui8 += nSize; - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { - return Status; - } - nCount--; - } - - pDescr++; - break; - } - - case CSN_BITMAP: - { /* bitmap with given length. The result is left aligned! */ - guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ - - if (no_of_bits > 0) - { - if (no_of_bits > remaining_bits_len) - { - return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - if (no_of_bits <= 32) - { - for(ib = 0; ib < 4; ib++) - { - guint8 ui8 = bitvec_read_field(vector, readIndex, 8); - pui8 = pui8DATA(data, pDescr->offset+ib); - *pui8 = ui8; - LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); - } - } - else if (no_of_bits <= 64) - { - for(ib = 0; ib < 8; ib++) - { - guint8 ui8 = bitvec_read_field(vector, readIndex, 8); - pui8 = pui8DATA(data, pDescr->offset+ib); - *pui8 = ui8; - LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder NOT IMPLEMENTED", 999, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } - /* bitmap was successfully extracted or it was empty */ - - pDescr++; - break; - } - - case CSN_TYPE: - { - gint16 Status; - csnStream_t arT = *ar; - LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); - LOGPC(DCSN1, LOGL_DEBUG, ": End %s | ", pDescr->sz); - if (Status >= 0) - { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - pDescr++; - } - else - { - /* Has already been processed: ProcessError("csnStreamDecoder", Status, pDescr); */ - return Status; - } - - break; - } - - case CSN_CHOICE: - { - gint16 count = pDescr->i; - guint8 i = 0; - CSN_ChoiceElement_t* pChoice = (CSN_ChoiceElement_t*) pDescr->descr.ptr; - - /* Make sure that the list of choice items is not empty */ - if (!count) - return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_IN_SCRIPT, pDescr); - else if (count > 255) /* We can handle up to 256 (UCHAR_MAX) selectors */ - return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_IN_SCRIPT, pDescr); - - while (count > 0) - { - guint8 no_of_bits = pChoice->bits; - guint8 value = bitvec_read_field(vector, readIndex, no_of_bits); - if (value == pChoice->value) - { - CSN_DESCR descr[2]; - gint16 Status; - csnStream_t arT = *ar; - - descr[0] = pChoice->descr; - memset(&descr[1], 0x00, sizeof(CSN_DESCR)); - descr[1].type = CSN_END; - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = i; - LOGPC(DCSN1, LOGL_DEBUG, "Choice %s = %u | ", pDescr->sz , (unsigned)value); - if (!pChoice->keep_bits) { - bit_offset += no_of_bits; - remaining_bits_len -= no_of_bits; - } - - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, descr, vector, readIndex, data); - - if (Status >= 0) - { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { - return Status; - } - break; - } - - *readIndex -= no_of_bits; - count--; - pChoice++; - i++; - } - - /* Neither of the choice items matched => unknown value */ - if (!count) - return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_STREAM_NOT_SUPPORTED, pDescr); - - pDescr++; - break; - } - - case CSN_SERIALIZE: - { - StreamSerializeFcn_t serialize = (StreamSerializeFcn_t)pDescr->aux_fn; - csnStream_t arT = *ar; - guint8 length_len = pDescr->i; - gint16 Status = -1; - - guint8 length = bitvec_read_field(vector, readIndex, length_len); - - LOGPC(DCSN1, LOGL_DEBUG, "%s length = %u | ", pDescr->sz , length); - bit_offset += length_len; - remaining_bits_len -= length_len; - - csnStreamInit(&arT, bit_offset, length > 0 ? length : remaining_bits_len); - arT.direction = 1; - LOGPC(DCSN1, LOGL_DEBUG, "offset = %u | ", pDescr->offset); - Status = serialize(&arT, vector, readIndex, pvDATA(data, pDescr->offset)); - - if (Status >= 0) - { - if (length > 0) { - remaining_bits_len -= length; - bit_offset += length; - } else { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - - /* Skip bits not handled by serialize(), if any */ - if (Status > 0) { - LOGPC(DCSN1, LOGL_DEBUG, "skipped = %d | ", Status); - *readIndex += Status; - } - - pDescr++; - } - else - { - /* Has already been processed: */ - return Status; - } - - break; - } - - case CSN_UNION_LH: - case CSN_UNION: - { - gint16 Bits; - guint8 index; - gint16 count = pDescr->i; - const CSN_DESCR* pDescrNext = pDescr; - - pDescrNext += count + 1; /* now this is next after the union */ - if ((count <= 0) || (count > 16)) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_INVALID_UNION_INDEX, pDescr); - } - - /* Now get the bits to extract the index */ - Bits = ixBitsTab[count]; - index = 0; - - while (Bits > 0) - { - index <<= 1; - - if (CSN_UNION_LH == pDescr->type) - { - index |= get_masked_bits8(vector, readIndex, bit_offset, 1); - } - else - { - index |= bitvec_read_field(vector, readIndex, 1); - } - remaining_bits_len--; - bit_offset++; - Bits--; - } - - /* Assign UnionType */ - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = index; - - - /* script index to continue on, limited in case we do not have a power of 2 */ - pDescr += (MIN(index + 1, count)); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - - switch (pDescr->type) - { /* get the right element of the union based on computed index */ - - case CSN_BIT: - { - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = 0x00; - if (bitvec_read_field(vector, readIndex, 1) > 0) - { - *pui8 = 0x01; - } - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - remaining_bits_len -= 1; - bit_offset++; - pDescr++; - break; - } - - case CSN_NULL: - { /* Empty member! */ - bit_offset += pDescr->i; - pDescr++; - break; - } - - case CSN_UINT: - { - guint8 no_of_bits = (guint8) pDescr->i; - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = ui8; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else if (no_of_bits <= 16) - { - guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); - pui16 = pui16DATA(data, pDescr->offset); - *pui16 = ui16; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); - } - else if (no_of_bits <= 32) - { - guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); - pui32 = pui32DATA(data, pDescr->offset); - *pui32 = ui32; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_OFFSET: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = ui8 + (guint8)pDescr->descr.value; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else if (no_of_bits <= 16) - { - guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); - pui16 = pui16DATA(data, pDescr->offset); - *pui16 = ui16 + (guint16)pDescr->descr.value; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); - } - else if (no_of_bits <= 32) - { - guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); - pui32 = pui32DATA(data, pDescr->offset); - *pui32 = ui32 + (guint16)pDescr->descr.value; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_LH: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - guint8 ui8 = get_masked_bits8(vector, readIndex, bit_offset, no_of_bits); - pui8 = pui8DATA(data, pDescr->offset); - *pui8 = ui8; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else - { /* Maybe we should support more than 8 bits ? */ - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_ARRAY: - { - guint8 no_of_bits = (guint8) pDescr->i; - guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - - if (pDescr->value != 0) - { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ - nCount = *pui16DATA(data, nCount); - } - - if (remaining_bits_len >= (no_of_bits * nCount)) - { - remaining_bits_len -= (no_of_bits * nCount); - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - - while (nCount > 0) - { - *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - bit_offset += no_of_bits; - nCount--; - } - } - else if (no_of_bits <= 16) - { - pui16 = pui16DATA(data, pDescr->offset); - - while (nCount > 0) - { - *pui16 = bitvec_read_field(vector, readIndex, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); - pui16++; - bit_offset += no_of_bits; - nCount--; - } - } - else if (no_of_bits <= 32) - { /* not supported */ - return ProcessError(readIndex,"csnStreamDecoder NOT IMPLEMENTED", 999, pDescr); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - pDescr++; - break; - } - - case CSN_VARIABLE_TARRAY_OFFSET: - case CSN_VARIABLE_TARRAY: - case CSN_TYPE_ARRAY: - { - gint16 Status; - csnStream_t arT = *ar; - guint16 nCount = (guint16) pDescr->i; - guint16 nSize = (guint16)(guint32)pDescr->value; - - pui8 = pui8DATA(data, pDescr->offset); - - if (CSN_VARIABLE_TARRAY == pDescr->type) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - } - else if (CSN_VARIABLE_TARRAY_OFFSET == pDescr->type) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - nCount--; /* Offset 1 */ - } - - while (nCount--) /* Changed to handle length = 0. */ - { - LOGPC(DCSN1, LOGL_DEBUG, "%s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); - if (Status >= 0) - { - pui8 += nSize; - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { - return Status; - } - } - - pDescr++; - break; - } - - case CSN_BITMAP: - { /* bitmap with given length. The result is left aligned! */ - guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ - - if (no_of_bits > 0) - { - if (no_of_bits > remaining_bits_len) - { - return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - if (no_of_bits <= 32) - { - guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); - pui32 = pui32DATA(data, pDescr->offset); - *pui32 = ui32; - } - else if (no_of_bits <= 64) - { - guint64 ui64 = bitvec_read_field(vector, readIndex, no_of_bits); - pui64 = pui64DATA(data, pDescr->offset); - *pui64 = ui64; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %lu | ", pDescr->sz , *pui64); - } - else - { - return ProcessError(readIndex,"csnStreamDecoder NOT IMPLEMENTED", 999, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } - /* bitmap was successfully extracted or it was empty */ - - pDescr++; - break; - } - - case CSN_TYPE: - { - gint16 Status; - csnStream_t arT = *ar; - LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); - LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); - if (Status >= 0) - { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - pDescr++; - } - else - { /* return error code Has already been processed: */ - return Status; - } - - break; - } - - default: - { /* descriptions of union elements other than above are illegal */ - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_IN_SCRIPT, pDescr); - } - } - - pDescr = pDescrNext; - break; - } - - case CSN_EXIST: - case CSN_EXIST_LH: - { - guint8 fExist; - - pui8 = pui8DATA(data, pDescr->offset); - - if (CSN_EXIST_LH == pDescr->type) - { - fExist = get_masked_bits8(vector, readIndex, bit_offset, 1); - } - else - { - fExist = bitvec_read_field(vector, readIndex, 1); - } - - *pui8 = fExist; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pDescr++; - bit_offset++; - remaining_bits_len -= 1; - - if (!fExist) - { - ar->remaining_bits_len = remaining_bits_len; - ar->bit_offset = bit_offset; - return remaining_bits_len; - } - - break; - } - - case CSN_NEXT_EXIST: - { - guint8 fExist; - - pui8 = pui8DATA(data, pDescr->offset); - - /* this if-statement represents the M_NEXT_EXIST_OR_NULL description element */ - if ((pDescr->may_be_null) && (remaining_bits_len == 0)) - { /* no more bits to decode is fine here - end of message detected and allowed */ - - /* Skip i entries + this entry */ - pDescr += pDescr->i + 1; - - /* Set the data member to "not exist" */ - *pui8 = 0; - break; - } - - /* the "regular" M_NEXT_EXIST description element */ - - fExist = 0x00; - if (bitvec_read_field(vector, readIndex, 1)) - { - fExist = 0x01; - } - - *pui8 = fExist; - remaining_bits_len -= 1; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - ++bit_offset; - - if (fExist == 0) - { /* Skip 'i' entries */ - pDescr += pDescr->i; - } - - pDescr++; - break; - } - - case CSN_NEXT_EXIST_LH: - { - guint8 fExist; - pui8 = pui8DATA(data, pDescr->offset); - - /* this if-statement represents the M_NEXT_EXIST_OR_NULL_LH description element */ - if ((pDescr->descr.ptr != NULL) && (remaining_bits_len == 0)) - { /* no more bits to decode is fine here - end of message detected and allowed */ - - /* skip 'i' entries + this entry */ - pDescr += pDescr->i + 1; - - /* set the data member to "not exist" */ - *pui8 = 0; - break; - } - - /* the "regular" M_NEXT_EXIST_LH description element */ - fExist = get_masked_bits8(vector, readIndex, bit_offset, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)fExist); - *pui8++ = fExist; - remaining_bits_len -= 1; - - bit_offset++; - - if (fExist == 0) - { /* Skip 'i' entries */ - pDescr += pDescr->i; - } - pDescr++; - - break; - } - - case CSN_VARIABLE_BITMAP_1: - { /* Bitmap from here and to the end of message */ - - *pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ - - /*no break - - * with a length set we have a regular variable length bitmap so we continue */ - } - /* FALL THROUGH */ - case CSN_VARIABLE_BITMAP: - { /* {CSN_VARIABLE_BITMAP, 0, offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * - * Bit array with length (in bits) specified in parameter (pDescr->descr) - * The result is right aligned! - */ - gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value); - - no_of_bits += pDescr->i; /* adjusted by offset */ - - if (no_of_bits > 0) - { - remaining_bits_len -= no_of_bits; - - if (remaining_bits_len < 0) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - { /* extract bits */ - guint8* pui8 = pui8DATA(data, pDescr->offset); - gint16 nB1 = no_of_bits & 0x07;/* no_of_bits Mod 8 */ - - if (nB1 > 0) - { /* take care of the first byte - it will be right aligned */ - *pui8 = bitvec_read_field(vector, readIndex, nB1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - no_of_bits -= nB1; - bit_offset += nB1; /* (nB1 is no_of_bits Mod 8) */ - } - - /* remaining no_of_bits is a multiple of 8 or 0 */ - while (no_of_bits > 0) - { - *pui8 = bitvec_read_field(vector, readIndex, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - no_of_bits -= 8; - } - } - } - pDescr++; - break; - } - - case CSN_LEFT_ALIGNED_VAR_BMP_1: - { /* Bitmap from here and to the end of message */ - - *pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ - - /* no break - - * with a length set we have a regular left aligned variable length bitmap so we continue - */ - } - /* FALL THROUGH */ - case CSN_LEFT_ALIGNED_VAR_BMP: - { /* {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * - * bit array with length (in bits) specified in parameter (pDescr->descr) - */ - gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value);/* Size of bitmap */ - - no_of_bits += pDescr->i;/* size adjusted by offset */ - - if (no_of_bits > 0) - { - remaining_bits_len -= no_of_bits; - - if (remaining_bits_len < 0) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - { /* extract bits */ - guint8* pui8 = pui8DATA(data, pDescr->offset); - - while (no_of_bits >= 8) - { - *pui8 = bitvec_read_field(vector, readIndex, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - no_of_bits -= 8; - } - if (no_of_bits > 0) - { - *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - bit_offset += no_of_bits; - no_of_bits = 0; - } - } - } - - /* bitmap was successfully extracted or it was empty */ - pDescr++; - break; - } - - case CSN_PADDING_BITS: - { /* Padding from here and to the end of message */ - LOGPC(DCSN1, LOGL_DEBUG, "%s = ", pDescr->sz); - if (remaining_bits_len > 0) - { - while (remaining_bits_len > 0) - { - guint bits_to_handle = remaining_bits_len%8; - if (bits_to_handle > 0) - { - LOGPC(DCSN1, LOGL_DEBUG, "%d|", bitvec_get_uint(vector, bits_to_handle)); - remaining_bits_len -= bits_to_handle; - bit_offset += bits_to_handle; - } - else if (bits_to_handle == 0) - { - LOGPC(DCSN1, LOGL_DEBUG, "%d|", bitvec_get_uint(vector, 8)); - remaining_bits_len -= 8; - bit_offset += 8; - } - } - } - if (remaining_bits_len < 0) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - /* Padding was successfully extracted or it was empty */ - pDescr++; - break; - } - - case CSN_VARIABLE_ARRAY: - { /* {int type; int i; void* descr; int offset; const char* sz; } CSN_DESCR; - * {CSN_VARIABLE_ARRAY, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * Array with length specified in parameter: - * - * - */ - gint16 count = *pui8DATA(data, (gint16)pDescr->descr.value); - - count += pDescr->i; /* Adjusted by offset */ - - if (count > 0) - { - remaining_bits_len -= count * 8; - - if (remaining_bits_len < 0) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - pui8 = pui8DATA(data, pDescr->offset); - - while (count > 0) - { - *pui8 = bitvec_read_field(vector, readIndex, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s = 0x%x | ", pDescr->sz , (unsigned)*pui8); - pui8++; - bit_offset += 8; - count--; - } - } - - pDescr++; - break; - } - - case CSN_RECURSIVE_ARRAY: - { /* Recursive way to specify an array: ::= {1 | 0} - * or more generally: ::= { | } - * where ::= bit(value) - * ::= 0 | 1 - * ::= reversed tag i.e. tag == 1 -> EndTag == 0 and vice versa - * {CSN_RECURSIVE_ARRAY, _BITS, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * REMARK: recursive way to specify an array but an iterative implementation! - */ - gint16 no_of_bits = pDescr->i; - guint8 ElementCount = 0; - - pui8 = pui8DATA(data, pDescr->offset); - - while (existNextElement(vector, readIndex, Tag)) - { /* tag control shows existence of next list elements */ - LOGPC(DCSN1, LOGL_DEBUG, "%s = Exist | ", pDescr->sz); - bit_offset++; - remaining_bits_len--; - - /* extract and store no_of_bits long element from bitstream */ - *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - remaining_bits_len -= no_of_bits; - ElementCount++; - - if (remaining_bits_len < 0) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - bit_offset += no_of_bits; - } - - LOGPC(DCSN1, LOGL_DEBUG, "%s = %d | ", pDescr->sz , bitvec_get_uint(vector, 1)); - /* existNextElement() returned FALSE, 1 bit consumed */ - bit_offset++; - remaining_bits_len--; - - /* Store the counted number of elements of the array */ - *pui8DATA(data, (gint16)pDescr->descr.value) = ElementCount; - - pDescr++; - break; - } - - case CSN_RECURSIVE_TARRAY: - { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; - * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) - * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE), (void_fn_t)ElementsOf(((_STRUCT*)0)->_MEMBER)} - */ - gint16 nSizeElement = (gint16)(gint32)pDescr->value; - guint32 nSizeArray = (guint32)((uintptr_t)pDescr->aux_fn); - guint8 ElementCount = 0; - pui8 = pui8DATA(data, pDescr->offset); - - while (existNextElement(vector, readIndex, Tag)) - { /* tag control shows existence of next list elements */ - LOGPC(DCSN1, LOGL_DEBUG, "%s = Exist | ", pDescr->sz); - /* existNextElement() returned TRUE, 1 bit consumed */ - bit_offset++; - remaining_bits_len--; - ElementCount++; - - if (ElementCount > nSizeArray) - { - LOGPC(DCSN1, LOGL_ERROR, "error: %s: too many elements (>%u) in recursive array. Increase its size! } |", pDescr->sz, nSizeArray); - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_STREAM_NOT_SUPPORTED, pDescr); - } - - { /* unpack the following data structure */ - csnStream_t arT = *ar; - gint16 Status; - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); - - if (Status >= 0) - { /* successful completion */ - pui8 += nSizeElement; /* -> to next data element */ - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { /* something went awry */ - return Status; - } - } - - if (remaining_bits_len < 0) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - } - - LOGPC(DCSN1, LOGL_DEBUG, "%s = %d | ", pDescr->sz , bitvec_get_uint(vector, 1)); - - /* existNextElement() returned FALSE, 1 bit consumed */ - remaining_bits_len--; - bit_offset++; - - /* Store the counted number of elements of the array */ - *pui8DATA(data, (gint16)(gint32)pDescr->i) = ElementCount; - - pDescr++; - break; - } - - case CSN_RECURSIVE_TARRAY_2: - { /* Recursive way to specify an array of type: ::= { 0 } ** 1 ; */ - - Tag = REVERSED_TAG; - - /* NO break - - * handling is exactly the same as for CSN_RECURSIVE_TARRAY_1 so we continue - */ - } - /* FALL THROUGH */ - case CSN_RECURSIVE_TARRAY_1: - { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; - * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) - * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE), (void_fn_t)ElementsOf(((_STRUCT*)0)->_MEMBER)} - */ - gint16 nSizeElement = (gint16)(gint32)pDescr->value; - guint32 nSizeArray = (guint32)((uintptr_t)pDescr->aux_fn); - guint8 ElementCount = 0; - csnStream_t arT = *ar; - gboolean EndOfList = FALSE; - gint16 Status; - pui8 = pui8DATA(data, pDescr->offset); - - do - { /* get data element */ - ElementCount++; - - if (ElementCount > nSizeArray) - { - LOGPC(DCSN1, LOGL_ERROR, "error: %s: too many elements (>%u) in recursive array. Increase its size! } |", pDescr->sz, nSizeArray); - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_STREAM_NOT_SUPPORTED, pDescr); - } - - LOGPC(DCSN1, LOGL_DEBUG, "%s { | ", pDescr->sz); - - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); - - if (Status >= 0) - { /* successful completion */ - pui8 += nSizeElement; /* -> to next */ - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { /* something went awry */ - return Status; - } - - if (remaining_bits_len < 0) - { - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - /* control of next element's tag */ - LOGPC(DCSN1, LOGL_DEBUG, "%s } | ", pDescr->sz); - EndOfList = !(existNextElement(vector, readIndex, Tag)); - - bit_offset++; - remaining_bits_len--; /* 1 bit consumed (tag) */ - } while (!EndOfList); - - - /* Store the count of the array */ - *pui8DATA(data, pDescr->i) = ElementCount; - Tag = STANDARD_TAG; /* in case it was set to "reversed" */ - pDescr++; - break; - } - - case CSN_FIXED: - { /* Verify the fixed bits */ - guint8 no_of_bits = (guint8) pDescr->i; - guint32 ui32; - - if (no_of_bits <= 32) - { - ui32 = bitvec_read_field(vector, readIndex, no_of_bits); - } - else - { - return ProcessError(readIndex,"no_of_bits > 32", -1, pDescr); - } - if (ui32 != (unsigned)(gint32)pDescr->offset) - { - return ProcessError(readIndex,"csnStreamDecoder FIXED value does not match", -1, pDescr); - } - - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned int)ui32); - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_CALLBACK: - { - guint16 no_of_bits; - DissectorCallbackFcn_t callback = (DissectorCallbackFcn_t)pDescr->aux_fn; - LOGPC(DCSN1, LOGL_DEBUG, "CSN_CALLBACK(%s) | ", pDescr->sz); - no_of_bits = callback(vector, readIndex, pvDATA(data, pDescr->i), pvDATA(data, pDescr->offset)); - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_TRAP_ERROR: - { - return ProcessError(readIndex,"csnStreamDecoder", pDescr->i, pDescr); - } - - case CSN_END: - { - ar->remaining_bits_len = remaining_bits_len; - ar->bit_offset = bit_offset; - return remaining_bits_len; - } - - default: - { - assert(0); - } - - - } - - } while (remaining_bits_len >= 0); - - return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); -} - - - - -gint16 csnStreamEncoder(csnStream_t* ar, const CSN_DESCR* pDescr, struct bitvec *vector, unsigned *writeIndex, void* data) -{ - gint remaining_bits_len = ar->remaining_bits_len; - gint bit_offset = ar->bit_offset; - guint8* pui8; - guint16* pui16; - guint32* pui32; - guint64* pui64; - unsigned ib; - - guint8 Tag = STANDARD_TAG; - - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex, __func__, CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - do - { - switch (pDescr->type) - { - case CSN_BIT: - { - if (remaining_bits_len > 0) - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - /* end add the bit value to protocol tree */ - } - else if (pDescr->may_be_null) - { - LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - pDescr++; - remaining_bits_len--; - bit_offset++; - break; - } - - case CSN_NULL: - { /* Empty member! */ - pDescr++; - break; - } - - case CSN_UINT: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else if (no_of_bits <= 16) - { - pui16 = pui16DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui16, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); - } - else if (no_of_bits <= 32) - { - pui32 = pui32DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui32, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } - else if (pDescr->may_be_null) - { - LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - pDescr++; - break; - } - - case CSN_UINT_OFFSET: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8 - (guint8)pDescr->descr.value, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(*pui8 - (guint8)pDescr->descr.value)); - } - else if (no_of_bits <= 16) - { - pui16 = pui16DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui16 - (guint16)pDescr->descr.value, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned short)(*pui16 - (guint16)pDescr->descr.value)); - } - else if (no_of_bits <= 32) - { - pui32 = pui32DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui32 - (guint16)pDescr->descr.value, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned int)(*pui32 - (guint16)pDescr->descr.value)); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_LH: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); - // TODO : Change get_masked_bits8() - *writeIndex -= no_of_bits; - guint8 ui8 = get_masked_bits8(vector, writeIndex, bit_offset, no_of_bits); - *writeIndex -= no_of_bits; - bitvec_write_field(vector, writeIndex, ui8, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - - } - else - {/* Maybe we should support more than 8 bits ? */ - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_ARRAY: - { - guint8 no_of_bits = (guint8) pDescr->i; - guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - - if (pDescr->value != 0) - { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ - nCount = *pui16DATA(data, nCount); - } - - if (remaining_bits_len >= (no_of_bits * nCount)) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - do - { - bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } while (--nCount > 0); - } - else if (no_of_bits <= 16) - { - return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); - } - else if (no_of_bits <= 32) - { - return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - pDescr++; - break; - } - - case CSN_VARIABLE_TARRAY_OFFSET: - case CSN_VARIABLE_TARRAY: - case CSN_TYPE_ARRAY: - { - gint16 Status; - csnStream_t arT = *ar; - gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->value; - - pui8 = pui8DATA(data, pDescr->offset); - if (pDescr->type == CSN_VARIABLE_TARRAY) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - } - else if (pDescr->type == CSN_VARIABLE_TARRAY_OFFSET) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - /* nCount--; the 1 offset is already taken into account in CSN_UINT_OFFSET */ - } - - while (nCount > 0) - { /* resulting array of length 0 is possible - * but no bits shall be read from bitstream - */ - - LOGPC(DCSN1, LOGL_DEBUG, "%s : | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); - if (Status >= 0) - { - pui8 += nSize; - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - - } - else - { - return Status; - } - nCount--; - } - - pDescr++; - break; - } - - case CSN_BITMAP: - { /* bitmap with given length. The result is left aligned! */ - guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ - - if (no_of_bits > 0) - { - if (no_of_bits > remaining_bits_len) - { - return ProcessError(writeIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - if (no_of_bits <= 32) - { - for(ib = 0; ib < 4; ib++) - { - pui8 = pui8DATA(data, pDescr->offset+ib); - bitvec_write_field(vector, writeIndex, *pui8, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); - } - } - else if (no_of_bits <= 64) - { - for(ib = 0; ib < 8; ib++) - { - pui8 = pui8DATA(data, pDescr->offset+ib); - bitvec_write_field(vector, writeIndex, *pui8, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder NOT IMPLEMENTED", 999, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } - /* bitmap was successfully extracted or it was empty */ - - pDescr++; - break; - } - - case CSN_TYPE: - { - gint16 Status; - csnStream_t arT = *ar; - LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pvDATA(data, pDescr->offset)); - LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); - if (Status >= 0) - { - - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - pDescr++; - } - else - { - /* Has already been processed: ProcessError("csnStreamEncoder", Status, pDescr); */ - return Status; - } - - break; - } - - case CSN_CHOICE: - { - gint16 count = pDescr->i; - const CSN_ChoiceElement_t* pChoice = (const CSN_ChoiceElement_t*) pDescr->descr.ptr; - - /* Make sure that the list of choice items is not empty */ - if (!count) - return ProcessError(writeIndex, "csnStreamEncoder", CSN_ERROR_IN_SCRIPT, pDescr); - else if (count > 255) /* We can handle up to 256 (UCHAR_MAX) selectors */ - return ProcessError(writeIndex, "csnStreamEncoder", CSN_ERROR_IN_SCRIPT, pDescr); - - /* Make sure that choice index is not out of range */ - pui8 = pui8DATA(data, pDescr->offset); - if (*pui8 >= count) - return ProcessError(writeIndex, "csnStreamEncoder", CSN_ERROR_INVALID_UNION_INDEX, pDescr); - - pChoice += *pui8; - guint8 no_of_bits = pChoice->bits; - guint8 value = pChoice->value; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pChoice->descr.sz , (unsigned)value); - bitvec_write_field(vector, writeIndex, value, no_of_bits); - - CSN_DESCR descr[2]; - gint16 Status; - csnStream_t arT = *ar; - - descr[0] = pChoice->descr; - memset(&descr[1], 0x00, sizeof(CSN_DESCR)); - descr[1].type = CSN_END; - bit_offset += no_of_bits; - remaining_bits_len -= no_of_bits; - - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamEncoder(&arT, descr, vector, writeIndex, data); - - if (Status >= 0) - { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { - return Status; - } - - pDescr++; - break; - } - - case CSN_SERIALIZE: - { - StreamSerializeFcn_t serialize = (StreamSerializeFcn_t)pDescr->aux_fn; - csnStream_t arT = *ar; - guint8 length_len = pDescr->i; - gint16 Status = -1; - unsigned lengthIndex; - - // store writeIndex for length value (7 bit) - lengthIndex = *writeIndex; - *writeIndex += length_len; - bit_offset += length_len; - remaining_bits_len -= length_len; - arT.direction = 0; - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = serialize(&arT, vector, writeIndex, pvDATA(data, pDescr->offset)); - - bitvec_write_field(vector, &lengthIndex, *writeIndex - lengthIndex - length_len, length_len); - LOGPC(DCSN1, LOGL_DEBUG, "%s length = %u | ", pDescr->sz , (unsigned)(*writeIndex - lengthIndex)); - - if (Status >= 0) - { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - pDescr++; - } - else - { - // Has already been processed: - return Status; - } - - break; - } - - case CSN_UNION_LH: - case CSN_UNION: - { - gint16 Bits; - guint8 index; - gint16 count = pDescr->i; - const CSN_DESCR* pDescrNext = pDescr; - - pDescrNext += count + 1; /* now this is next after the union */ - if ((count <= 0) || (count > 16)) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_INVALID_UNION_INDEX, pDescr); - } - - /* Now get the bits to extract the index */ - Bits = ixBitsTab[count]; - index = 0; - - /* Assign UnionType */ - pui8 = pui8DATA(data, pDescr->offset); - //read index from data and write to vector - bitvec_write_field(vector, writeIndex, *pui8, Bits); - - //decode index - *writeIndex -= Bits; - - while (Bits > 0) - { - index <<= 1; - - if (CSN_UNION_LH == pDescr->type) - { - index |= get_masked_bits8(vector, writeIndex, bit_offset, 1); - } - else - { - index |= bitvec_read_field(vector, writeIndex, 1); - } - - remaining_bits_len--; - bit_offset++; - Bits--; - } - - *writeIndex -= Bits; - bitvec_write_field(vector, writeIndex, index, Bits); - - - /* script index to continue on, limited in case we do not have a power of 2 */ - pDescr += (MIN(index + 1, count)); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)index); - - switch (pDescr->type) - { /* get the right element of the union based on computed index */ - - case CSN_BIT: - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - remaining_bits_len--; - bit_offset++; - pDescr++; - break; - } - - case CSN_NULL: - { /* Empty member! */ - pDescr++; - break; - } - - case CSN_UINT: - { - guint8 no_of_bits = (guint8) pDescr->i; - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - } - else if (no_of_bits <= 16) - { - pui16 = pui16DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui16, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); - } - else if (no_of_bits <= 32) - { - pui32 = pui32DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui32, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_OFFSET: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8 - (guint8)pDescr->descr.value, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(*pui8 - (guint8)pDescr->descr.value)); - } - else if (no_of_bits <= 16) - { - pui16 = pui16DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui16 - (guint16)pDescr->descr.value, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned short)(*pui16 - (guint16)pDescr->descr.value)); - } - else if (no_of_bits <= 32) - { - pui32 = pui32DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui32 - (guint16)pDescr->descr.value, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned int)(*pui32 - (guint16)pDescr->descr.value)); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_LH: - { - guint8 no_of_bits = (guint8) pDescr->i; - - if (remaining_bits_len >= no_of_bits) - { - remaining_bits_len -= no_of_bits; - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); - // TODO : Change get_masked_bits8() - *writeIndex -= no_of_bits; - guint8 ui8 = get_masked_bits8(vector, writeIndex, bit_offset, no_of_bits); - *writeIndex -= no_of_bits; - bitvec_write_field(vector, writeIndex, ui8, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - - } - else - {/* Maybe we should support more than 8 bits ? */ - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_UINT_ARRAY: - { - guint8 no_of_bits = (guint8) pDescr->i; - guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ - - if (pDescr->value != 0) - { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ - nCount = *pui16DATA(data, nCount); - } - - if (remaining_bits_len >= (no_of_bits * nCount)) - { - if (no_of_bits <= 8) - { - pui8 = pui8DATA(data, pDescr->offset); - do - { - bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } while (--nCount > 0); - } - else if (no_of_bits <= 16) - { - return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); - } - else if (no_of_bits <= 32) - { - return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); - } - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - pDescr++; - break; - } - - case CSN_VARIABLE_TARRAY_OFFSET: - case CSN_VARIABLE_TARRAY: - case CSN_TYPE_ARRAY: - { - gint16 Status; - csnStream_t arT = *ar; - gint16 nCount = pDescr->i; - guint16 nSize = (guint16)(gint32)pDescr->value; - - pui8 = pui8DATA(data, pDescr->offset); - if (pDescr->type == CSN_VARIABLE_TARRAY) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - } - else if (pDescr->type == CSN_VARIABLE_TARRAY_OFFSET) - { /* Count specified in field */ - nCount = *pui8DATA(data, pDescr->i); - /* nCount--; the 1 offset is already taken into account in CSN_UINT_OFFSET */ - } - - while (nCount > 0) - { /* resulting array of length 0 is possible - * but no bits shall be read from bitstream - */ - - LOGPC(DCSN1, LOGL_DEBUG, "%s : | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); - if (Status >= 0) - { - pui8 += nSize; - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { - return Status; - } - nCount--; - } - - pDescr++; - break; - } - - case CSN_BITMAP: - { /* bitmap with given length. The result is left aligned! */ - guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ - - if (no_of_bits > 0) - { - if (no_of_bits > remaining_bits_len) - { - return ProcessError(writeIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - if (no_of_bits <= 32) - { - pui32 = pui32DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui32, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); - } - else if (no_of_bits <= 64) - { - pui64 = pui64DATA(data, pDescr->offset); - bitvec_write_field(vector, writeIndex, *pui64, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %lu | ", pDescr->sz , *pui64); - } - else - { - return ProcessError(writeIndex,"csnStreamEncoder NOT IMPLEMENTED", 999, pDescr); - } - - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - } - /* bitmap was successfully extracted or it was empty */ - - pDescr++; - break; - } - - case CSN_TYPE: - { - gint16 Status; - csnStream_t arT = *ar; - LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pvDATA(data, pDescr->offset)); - LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); - if (Status >= 0) - { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - pDescr++; - } - else - { - /* Has already been processed: ProcessError("csnStreamEncoder", Status, pDescr); */ - return Status; - } - - break; - } - - default: - { /* descriptions of union elements other than above are illegal */ - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_IN_SCRIPT, pDescr); - } - } - - pDescr = pDescrNext; - break; - } - - case CSN_EXIST: - case CSN_EXIST_LH: - { - guint8 fExist; - unsigned exist = 0; - pui8 = pui8DATA(data, pDescr->offset); - exist = *pui8; - bitvec_write_field(vector, writeIndex, *pui8, 1); - writeIndex--; - if (CSN_EXIST_LH == pDescr->type) - { - fExist = get_masked_bits8(vector, writeIndex, bit_offset, 1); - } - else - { - fExist = bitvec_read_field(vector, writeIndex, 1); - } - writeIndex--; - bitvec_write_field(vector, writeIndex, fExist, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz, (unsigned)fExist); - remaining_bits_len--; - bit_offset++; - pDescr++; - - if (!exist) - { - ar->remaining_bits_len = remaining_bits_len; - ar->bit_offset = bit_offset; - return remaining_bits_len; - } - break; - } - - case CSN_NEXT_EXIST: - { - guint8 fExist; - - pui8 = pui8DATA(data, pDescr->offset); - - /* this if-statement represents the M_NEXT_EXIST_OR_NULL description element */ - if ((pDescr->may_be_null) && (remaining_bits_len == 0)) - { /* no more bits to decode is fine here - end of message detected and allowed */ - - /* Skip i entries + this entry */ - pDescr += pDescr->i + 1; - - break; - } - - bitvec_write_field(vector, writeIndex, *pui8, 1); - fExist = *pui8; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - - remaining_bits_len--; - bit_offset++; - - if (fExist == 0) - { /* Skip 'i' entries */ - pDescr += pDescr->i; - } - - pDescr++; - break; - } - - case CSN_NEXT_EXIST_LH: - { - guint8 fExist; - pui8 = pui8DATA(data, pDescr->offset); - - /* this if-statement represents the M_NEXT_EXIST_OR_NULL_LH description element */ - if ((pDescr->descr.ptr != NULL) && (remaining_bits_len == 0)) - { /* no more bits to decode is fine here - end of message detected and allowed */ - - /* skip 'i' entries + this entry */ - pDescr += pDescr->i + 1; - - /* set the data member to "not exist" */ - //*pui8 = 0; - break; - } - - /* the "regular" M_NEXT_EXIST_LH description element */ - bitvec_write_field(vector, writeIndex, *pui8, 1); - writeIndex--; - fExist = get_masked_bits8(vector, writeIndex, bit_offset, 1); - writeIndex--; - bitvec_write_field(vector, writeIndex, fExist, 1); - pui8++; - - remaining_bits_len--; - bit_offset++; - - if (fExist == 0) - { /* Skip 'i' entries */ - pDescr += pDescr->i; - } - pDescr++; - - break; - } - - case CSN_VARIABLE_BITMAP_1: - { /* Bitmap from here and to the end of message */ - - //*pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ - - /*no break - - * with a length set we have a regular variable length bitmap so we continue */ - } - /* FALL THROUGH */ - case CSN_VARIABLE_BITMAP: - { /* {CSN_VARIABLE_BITMAP, 0, offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * - * Bit array with length (in bits) specified in parameter (pDescr->descr) - * The result is right aligned! - */ - gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value); - - no_of_bits += pDescr->i; /* adjusted by offset */ - - if (no_of_bits > 0) - { - - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - { /* extract bits */ - guint8* pui8 = pui8DATA(data, pDescr->offset); - gint16 nB1 = no_of_bits & 0x07;/* no_of_bits Mod 8 */ - - if (nB1 > 0) - { /* take care of the first byte - it will be right aligned */ - bitvec_write_field(vector, writeIndex, *pui8, nB1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - no_of_bits -= nB1; - bit_offset += nB1; /* (nB1 is no_of_bits Mod 8) */ - remaining_bits_len -= nB1; - } - - /* remaining no_of_bits is a multiple of 8 or 0 */ - while (no_of_bits > 0) - { - bitvec_write_field(vector, writeIndex, *pui8, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - no_of_bits -= 8; - remaining_bits_len -= 8; - } - } - } - pDescr++; - break; - } - - case CSN_LEFT_ALIGNED_VAR_BMP_1: - { /* Bitmap from here and to the end of message */ - - //*pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ - - /* no break - - * with a length set we have a regular left aligned variable length bitmap so we continue - */ - } - /* FALL THROUGH */ - case CSN_LEFT_ALIGNED_VAR_BMP: - { /* {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * - * bit array with length (in bits) specified in parameter (pDescr->descr) - */ - - gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value);/* Size of bitmap */ - - no_of_bits += pDescr->i;/* size adjusted by offset */ - - if (no_of_bits > 0) - { - remaining_bits_len -= no_of_bits; - - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - { /* extract bits */ - guint8* pui8 = pui8DATA(data, pDescr->offset); - gint16 nB1 = no_of_bits & 0x07;/* no_of_bits Mod 8 */ - - while (no_of_bits > 0) - { - bitvec_write_field(vector, writeIndex, *pui8, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - no_of_bits -= 8; - } - if (nB1 > 0) - { - bitvec_write_field(vector, writeIndex, *pui8, nB1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - no_of_bits -= nB1; - bit_offset += nB1; /* (nB1 is no_of_bits Mod 8) */ - } - } - - } - - /* bitmap was successfully extracted or it was empty */ - pDescr++; - break; - } - - case CSN_PADDING_BITS: - { /* Padding from here and to the end of message */ - LOGPC(DCSN1, LOGL_DEBUG, "%s = ", pDescr->sz); - guint8 filler = 0x2b; - if (remaining_bits_len > 0) - { - while (remaining_bits_len > 0) - { - guint8 bits_to_handle = remaining_bits_len%8; - if (bits_to_handle > 0) - { - /* section 11 of 44.060 - * The padding bits may be the 'null' string. Otherwise, the - * padding bits starts with bit '0', followed by 'spare padding' - * < padding bits > ::= { null | 0 < spare padding > ! < Ignore : 1 bit** = < no string > > } ; - */ - guint8 fl = filler&(0xff>>(8-bits_to_handle + 1)); - bitvec_write_field(vector, writeIndex, fl, bits_to_handle); - LOGPC(DCSN1, LOGL_DEBUG, "%u|", fl); - remaining_bits_len -= bits_to_handle; - bit_offset += bits_to_handle; - } - else if (bits_to_handle == 0) - { - bitvec_write_field(vector, writeIndex, filler, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%u|", filler); - remaining_bits_len -= 8; - bit_offset += 8; - } - } - } - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - /* Padding was successfully extracted or it was empty */ - pDescr++; - break; - } - - case CSN_VARIABLE_ARRAY: - { /* {int type; int i; void* descr; int offset; const char* sz; } CSN_DESCR; - * {CSN_VARIABLE_ARRAY, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * Array with length specified in parameter: - * - * - */ - gint16 count = *pui8DATA(data, (gint16)pDescr->descr.value); - - count += pDescr->i; /* Adjusted by offset */ - - if (count > 0) - { - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - pui8 = pui8DATA(data, pDescr->offset); - - while (count > 0) - { - bitvec_write_field(vector, writeIndex, *pui8, 8); - LOGPC(DCSN1, LOGL_DEBUG, "%s = 0x%x | ", pDescr->sz , (unsigned)*pui8); - pui8++; - bit_offset += 8; - remaining_bits_len -= 8; - count--; - } - } - - pDescr++; - break; - } - - case CSN_RECURSIVE_ARRAY: - { /* Recursive way to specify an array: ::= {1 | 0} - * or more generally: ::= { | } - * where ::= bit(value) - * ::= 0 | 1 - * ::= reversed tag i.e. tag == 1 -> EndTag == 0 and vice versa - * {CSN_RECURSIVE_ARRAY, _BITS, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} - * REMARK: recursive way to specify an array but an iterative implementation! - */ - gint16 no_of_bits = pDescr->i; - guint8 ElementCount = 0; - pui8 = pui8DATA(data, pDescr->offset); - ElementCount = *pui8DATA(data, (gint16)pDescr->descr.value); - while (ElementCount > 0) - { /* tag control shows existence of next list elements */ - bitvec_write_field(vector, writeIndex, Tag, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)Tag); - bit_offset++; - remaining_bits_len--; - - /* extract and store no_of_bits long element from bitstream */ - bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); - pui8++; - ElementCount--; - - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - bit_offset += no_of_bits; - remaining_bits_len -= no_of_bits; - } - - bitvec_write_field(vector, writeIndex, !Tag, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(!Tag)); - bit_offset++; - remaining_bits_len--; - - pDescr++; - break; - } - - case CSN_RECURSIVE_TARRAY: - { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; - * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) - * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} - */ - gint16 nSizeElement = (gint16)(gint32)pDescr->value; - guint8 ElementCount = 0; - pui8 = pui8DATA(data, pDescr->offset); - /* Store the counted number of elements of the array */ - ElementCount = *pui8DATA(data, (gint16)(gint32)pDescr->i); - - while (ElementCount > 0) - { /* tag control shows existence of next list elements */ - bitvec_write_field(vector, writeIndex, Tag, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)Tag); - bit_offset++; - - remaining_bits_len--; - ElementCount--; - - { /* unpack the following data structure */ - csnStream_t arT = *ar; - gint16 Status; - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); - - if (Status >= 0) - { /* successful completion */ - pui8 += nSizeElement; /* -> to next data element */ - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { /* something went awry */ - return Status; - } - } - - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - } - - bitvec_write_field(vector, writeIndex, !Tag, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(!Tag)); - bit_offset++; - - pDescr++; - break; - } - - case CSN_RECURSIVE_TARRAY_2: - { /* Recursive way to specify an array of type: ::= { 0 } ** 1 ; */ - - Tag = REVERSED_TAG; - - /* NO break - - * handling is exactly the same as for CSN_RECURSIVE_TARRAY_1 so we continue - */ - } - /* FALL THROUGH */ - case CSN_RECURSIVE_TARRAY_1: - { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; - * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) - * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} - */ - gint16 nSizeElement = (gint16)(gint32)pDescr->value; - guint8 ElementCount = 0; - guint8 ElementNum = 0; - csnStream_t arT = *ar; - gint16 Status; - - pui8 = pui8DATA(data, pDescr->offset); - /* Store the count of the array */ - ElementCount = *pui8DATA(data, pDescr->i); - ElementNum = ElementCount; - - while (ElementCount > 0) - { /* get data element */ - if (ElementCount != ElementNum) - { - bitvec_write_field(vector, writeIndex, Tag, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)Tag); - bit_offset++; - remaining_bits_len--; - } - ElementCount--; - LOGPC(DCSN1, LOGL_DEBUG, "%s { | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); - LOGPC(DCSN1, LOGL_DEBUG, "%s } | ", pDescr->sz); - if (Status >= 0) - { /* successful completion */ - pui8 += nSizeElement; /* -> to next */ - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - } - else - { /* something went awry */ - return Status; - } - - if (remaining_bits_len < 0) - { - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); - } - - } - bitvec_write_field(vector, writeIndex, !Tag, 1); - bit_offset++; - remaining_bits_len--; - Tag = STANDARD_TAG; /* in case it was set to "reversed" */ - pDescr++; - break; - } - - case CSN_FIXED: - { /* Verify the fixed bits */ - guint8 no_of_bits = (guint8) pDescr->i; - bitvec_write_field(vector, writeIndex, pDescr->offset, no_of_bits); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)pDescr->offset); - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_CALLBACK: - { - guint16 no_of_bits; - DissectorCallbackFcn_t callback = (DissectorCallbackFcn_t)pDescr->aux_fn; - LOGPC(DCSN1, LOGL_DEBUG, "CSN_CALLBACK(%s) | ", pDescr->sz); - no_of_bits = callback(vector, writeIndex, pvDATA(data, pDescr->i), pvDATA(data, pDescr->offset)); - remaining_bits_len -= no_of_bits; - bit_offset += no_of_bits; - pDescr++; - break; - } - - case CSN_TRAP_ERROR: - { - return ProcessError(writeIndex,"csnStreamEncoder", pDescr->i, pDescr); - } - - case CSN_END: - { - ar->remaining_bits_len = remaining_bits_len; - ar->bit_offset = bit_offset; - return remaining_bits_len; - } - - default: - { - assert(0); - } - - } - - } while (remaining_bits_len >= 0); - - return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); -} diff --git a/src/csn1.h b/src/csn1.h index 761293d..d470228 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -592,4 +592,18 @@ #define CSNDESCR(_FuncType) CSNDESCR_##_FuncType +#define pvDATA(_pv, _offset) ((void*) ((unsigned char*)_pv + _offset)) +#define pui8DATA(_pv, _offset) ((guint8*) pvDATA(_pv, _offset)) +#define pui16DATA(_pv, _offset) ((guint16*) pvDATA(_pv, _offset)) +#define pui32DATA(_pv, _offset) ((guint32*) pvDATA(_pv, _offset)) +#define pui64DATA(_pv, _offset) ((guint64*) pvDATA(_pv, _offset)) +/* used to tag existence of next element in variable length lists */ +#define STANDARD_TAG 1 +#define REVERSED_TAG 0 + +gint16 ProcessError_impl(const char *file, int line, unsigned *readIndex, + const char* sz, gint16 err, const CSN_DESCR* pDescr); +#define ProcessError(readIndex, sz, err, pDescr) \ + ProcessError_impl(__FILE__, __LINE__, readIndex, sz, err, pDescr) + #endif /*_PACKET_CSN1_H_*/ diff --git a/src/csn1_dec.c b/src/csn1_dec.c new file mode 100644 index 0000000..2d3f242 --- /dev/null +++ b/src/csn1_dec.c @@ -0,0 +1,1390 @@ +/* csn1_dec.c + * Routines for CSN1 dissection in wireshark. + * + * Copyright (C) 2011 Ivan Klyuchnikov + * + * By Vincent Helfre, based on original code by Jari Sassi + * with the gracious authorization of STE + * Copyright (c) 2011 ST-Ericsson + * + * $Id: packet-csn1.c 39140 2011-09-25 22:01:50Z wmeier $ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include +#include +#define __STDC_FORMAT_MACROS +#include +#include "csn1.h" +#include + +#include +#include + +extern const unsigned char ixBitsTab[]; +guint8 get_masked_bits8(struct bitvec *vector, unsigned *readIndex, gint bit_offset, const gint no_of_bits); + +/** + * ================================================================================================ + * Return TRUE if tag in bit stream indicates existence of next list element, + * otherwise return FALSE. + * Will work for tag values equal to both 0 and 1. + * ================================================================================================ + */ + +static gboolean +existNextElement(struct bitvec *vector, unsigned *readIndex, guint8 Tag) +{ + int res = bitvec_get_bit_pos(vector, (*readIndex)++); + if (Tag == STANDARD_TAG) + { + return (res > 0); + } + return (res == 0); +} + + +gint16 +csnStreamDecoder(csnStream_t* ar, const CSN_DESCR* pDescr, struct bitvec *vector, unsigned *readIndex, void* data) +{ + gint remaining_bits_len = ar->remaining_bits_len; + gint bit_offset = ar->bit_offset; + guint8* pui8 = NULL; + guint16* pui16; + guint32* pui32; + guint64* pui64; + guint8 Tag = STANDARD_TAG; + unsigned ib; + + if (remaining_bits_len < 0) + { + return ProcessError(readIndex, __func__, CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + do + { + switch (pDescr->type) + { + case CSN_BIT: + { + if (remaining_bits_len > 0) + { + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = bitvec_read_field(vector, readIndex, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + /* end add the bit value to protocol tree */ + } + else if (pDescr->may_be_null) + { + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = 0; + LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + pDescr++; + remaining_bits_len--; + bit_offset++; + break; + } + + case CSN_NULL: + { /* Empty member! */ + bit_offset += pDescr->i; + pDescr++; + break; + } + + case CSN_UINT: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = ui8; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else if (no_of_bits <= 16) + { + guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); + pui16 = pui16DATA(data, pDescr->offset); + *pui16 = ui16; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); + } + else if (no_of_bits <= 32) + { + guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); + pui32 = pui32DATA(data, pDescr->offset); + *pui32 = ui32; + LOGPC(DCSN1, LOGL_DEBUG, "%s = 0x%08x | ", pDescr->sz , *pui32); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } + else if (pDescr->may_be_null) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = 0; + } + else if (no_of_bits <= 16) + { + pui16 = pui16DATA(data, pDescr->offset); + *pui16 = 0; + } + else if (no_of_bits <= 32) + { + pui32 = pui32DATA(data, pDescr->offset); + *pui32 = 0; + } + LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + pDescr++; + break; + } + + case CSN_UINT_OFFSET: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = ui8 + (guint8)pDescr->descr.value; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else if (no_of_bits <= 16) + { + guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); + pui16 = pui16DATA(data, pDescr->offset); + *pui16 = ui16 + (guint16)pDescr->descr.value; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); + } + else if (no_of_bits <= 32) + { + guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); + pui32 = pui32DATA(data, pDescr->offset); + *pui32 = ui32 + (guint16)pDescr->descr.value; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_LH: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + guint8 ui8 = get_masked_bits8(vector, readIndex, bit_offset, no_of_bits); + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = ui8; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else + {/* Maybe we should support more than 8 bits ? */ + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_ARRAY: + { + guint8 no_of_bits = (guint8) pDescr->i; + guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ + + if (pDescr->value != 0) + { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ + nCount = *pui16DATA(data, nCount); + } + + if (remaining_bits_len >= (no_of_bits * nCount)) + { + remaining_bits_len -= (no_of_bits*nCount); + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + do + { + *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + bit_offset += no_of_bits; + } while (--nCount > 0); + } + else if (no_of_bits <= 16) + { + return ProcessError(readIndex,"csnStreamDecoder NOTIMPLEMENTED", 999, pDescr); + } + else if (no_of_bits <= 32) + { + return ProcessError(readIndex,"csnStreamDecoder NOTIMPLEMENTED", 999, pDescr); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + pDescr++; + break; + } + + case CSN_VARIABLE_TARRAY_OFFSET: + case CSN_VARIABLE_TARRAY: + case CSN_TYPE_ARRAY: + { + gint16 Status; + csnStream_t arT = *ar; + gint16 nCount = pDescr->i; + guint16 nSize = (guint16)(gint32)pDescr->value; + + pui8 = pui8DATA(data, pDescr->offset); + if (pDescr->type == CSN_VARIABLE_TARRAY) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + } + else if (pDescr->type == CSN_VARIABLE_TARRAY_OFFSET) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + /* nCount--; the 1 offset is already taken into account in CSN_UINT_OFFSET */ + } + + while (nCount > 0) + { /* resulting array of length 0 is possible + * but no bits shall be read from bitstream + */ + + LOGPC(DCSN1, LOGL_DEBUG, "%s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); + if (Status >= 0) + { + pui8 += nSize; + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { + return Status; + } + nCount--; + } + + pDescr++; + break; + } + + case CSN_BITMAP: + { /* bitmap with given length. The result is left aligned! */ + guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ + + if (no_of_bits > 0) + { + if (no_of_bits > remaining_bits_len) + { + return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + if (no_of_bits <= 32) + { + for(ib = 0; ib < 4; ib++) + { + guint8 ui8 = bitvec_read_field(vector, readIndex, 8); + pui8 = pui8DATA(data, pDescr->offset+ib); + *pui8 = ui8; + LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); + } + } + else if (no_of_bits <= 64) + { + for(ib = 0; ib < 8; ib++) + { + guint8 ui8 = bitvec_read_field(vector, readIndex, 8); + pui8 = pui8DATA(data, pDescr->offset+ib); + *pui8 = ui8; + LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder NOT IMPLEMENTED", 999, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } + /* bitmap was successfully extracted or it was empty */ + + pDescr++; + break; + } + + case CSN_TYPE: + { + gint16 Status; + csnStream_t arT = *ar; + LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); + LOGPC(DCSN1, LOGL_DEBUG, ": End %s | ", pDescr->sz); + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + pDescr++; + } + else + { + /* Has already been processed: ProcessError("csnStreamDecoder", Status, pDescr); */ + return Status; + } + + break; + } + + case CSN_CHOICE: + { + gint16 count = pDescr->i; + guint8 i = 0; + CSN_ChoiceElement_t* pChoice = (CSN_ChoiceElement_t*) pDescr->descr.ptr; + + /* Make sure that the list of choice items is not empty */ + if (!count) + return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_IN_SCRIPT, pDescr); + else if (count > 255) /* We can handle up to 256 (UCHAR_MAX) selectors */ + return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_IN_SCRIPT, pDescr); + + while (count > 0) + { + guint8 no_of_bits = pChoice->bits; + guint8 value = bitvec_read_field(vector, readIndex, no_of_bits); + if (value == pChoice->value) + { + CSN_DESCR descr[2]; + gint16 Status; + csnStream_t arT = *ar; + + descr[0] = pChoice->descr; + memset(&descr[1], 0x00, sizeof(CSN_DESCR)); + descr[1].type = CSN_END; + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = i; + LOGPC(DCSN1, LOGL_DEBUG, "Choice %s = %u | ", pDescr->sz , (unsigned)value); + if (!pChoice->keep_bits) { + bit_offset += no_of_bits; + remaining_bits_len -= no_of_bits; + } + + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, descr, vector, readIndex, data); + + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { + return Status; + } + break; + } + + *readIndex -= no_of_bits; + count--; + pChoice++; + i++; + } + + /* Neither of the choice items matched => unknown value */ + if (!count) + return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_STREAM_NOT_SUPPORTED, pDescr); + + pDescr++; + break; + } + + case CSN_SERIALIZE: + { + StreamSerializeFcn_t serialize = (StreamSerializeFcn_t)pDescr->aux_fn; + csnStream_t arT = *ar; + guint8 length_len = pDescr->i; + gint16 Status = -1; + + guint8 length = bitvec_read_field(vector, readIndex, length_len); + + LOGPC(DCSN1, LOGL_DEBUG, "%s length = %u | ", pDescr->sz , length); + bit_offset += length_len; + remaining_bits_len -= length_len; + + csnStreamInit(&arT, bit_offset, length > 0 ? length : remaining_bits_len); + arT.direction = 1; + LOGPC(DCSN1, LOGL_DEBUG, "offset = %u | ", pDescr->offset); + Status = serialize(&arT, vector, readIndex, pvDATA(data, pDescr->offset)); + + if (Status >= 0) + { + if (length > 0) { + remaining_bits_len -= length; + bit_offset += length; + } else { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + + /* Skip bits not handled by serialize(), if any */ + if (Status > 0) { + LOGPC(DCSN1, LOGL_DEBUG, "skipped = %d | ", Status); + *readIndex += Status; + } + + pDescr++; + } + else + { + /* Has already been processed: */ + return Status; + } + + break; + } + + case CSN_UNION_LH: + case CSN_UNION: + { + gint16 Bits; + guint8 index; + gint16 count = pDescr->i; + const CSN_DESCR* pDescrNext = pDescr; + + pDescrNext += count + 1; /* now this is next after the union */ + if ((count <= 0) || (count > 16)) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_INVALID_UNION_INDEX, pDescr); + } + + /* Now get the bits to extract the index */ + Bits = ixBitsTab[count]; + index = 0; + + while (Bits > 0) + { + index <<= 1; + + if (CSN_UNION_LH == pDescr->type) + { + index |= get_masked_bits8(vector, readIndex, bit_offset, 1); + } + else + { + index |= bitvec_read_field(vector, readIndex, 1); + } + remaining_bits_len--; + bit_offset++; + Bits--; + } + + /* Assign UnionType */ + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = index; + + + /* script index to continue on, limited in case we do not have a power of 2 */ + pDescr += (MIN(index + 1, count)); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + + switch (pDescr->type) + { /* get the right element of the union based on computed index */ + + case CSN_BIT: + { + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = 0x00; + if (bitvec_read_field(vector, readIndex, 1) > 0) + { + *pui8 = 0x01; + } + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + remaining_bits_len -= 1; + bit_offset++; + pDescr++; + break; + } + + case CSN_NULL: + { /* Empty member! */ + bit_offset += pDescr->i; + pDescr++; + break; + } + + case CSN_UINT: + { + guint8 no_of_bits = (guint8) pDescr->i; + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = ui8; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else if (no_of_bits <= 16) + { + guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); + pui16 = pui16DATA(data, pDescr->offset); + *pui16 = ui16; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); + } + else if (no_of_bits <= 32) + { + guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); + pui32 = pui32DATA(data, pDescr->offset); + *pui32 = ui32; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_OFFSET: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + guint8 ui8 = bitvec_read_field(vector, readIndex, no_of_bits); + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = ui8 + (guint8)pDescr->descr.value; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else if (no_of_bits <= 16) + { + guint16 ui16 = bitvec_read_field(vector, readIndex, no_of_bits); + pui16 = pui16DATA(data, pDescr->offset); + *pui16 = ui16 + (guint16)pDescr->descr.value; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); + } + else if (no_of_bits <= 32) + { + guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); + pui32 = pui32DATA(data, pDescr->offset); + *pui32 = ui32 + (guint16)pDescr->descr.value; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_LH: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + guint8 ui8 = get_masked_bits8(vector, readIndex, bit_offset, no_of_bits); + pui8 = pui8DATA(data, pDescr->offset); + *pui8 = ui8; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else + { /* Maybe we should support more than 8 bits ? */ + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_ARRAY: + { + guint8 no_of_bits = (guint8) pDescr->i; + guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ + + if (pDescr->value != 0) + { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ + nCount = *pui16DATA(data, nCount); + } + + if (remaining_bits_len >= (no_of_bits * nCount)) + { + remaining_bits_len -= (no_of_bits * nCount); + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + + while (nCount > 0) + { + *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + bit_offset += no_of_bits; + nCount--; + } + } + else if (no_of_bits <= 16) + { + pui16 = pui16DATA(data, pDescr->offset); + + while (nCount > 0) + { + *pui16 = bitvec_read_field(vector, readIndex, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); + pui16++; + bit_offset += no_of_bits; + nCount--; + } + } + else if (no_of_bits <= 32) + { /* not supported */ + return ProcessError(readIndex,"csnStreamDecoder NOT IMPLEMENTED", 999, pDescr); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + pDescr++; + break; + } + + case CSN_VARIABLE_TARRAY_OFFSET: + case CSN_VARIABLE_TARRAY: + case CSN_TYPE_ARRAY: + { + gint16 Status; + csnStream_t arT = *ar; + guint16 nCount = (guint16) pDescr->i; + guint16 nSize = (guint16)(guint32)pDescr->value; + + pui8 = pui8DATA(data, pDescr->offset); + + if (CSN_VARIABLE_TARRAY == pDescr->type) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + } + else if (CSN_VARIABLE_TARRAY_OFFSET == pDescr->type) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + nCount--; /* Offset 1 */ + } + + while (nCount--) /* Changed to handle length = 0. */ + { + LOGPC(DCSN1, LOGL_DEBUG, "%s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); + if (Status >= 0) + { + pui8 += nSize; + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { + return Status; + } + } + + pDescr++; + break; + } + + case CSN_BITMAP: + { /* bitmap with given length. The result is left aligned! */ + guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ + + if (no_of_bits > 0) + { + if (no_of_bits > remaining_bits_len) + { + return ProcessError(readIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + if (no_of_bits <= 32) + { + guint32 ui32 = bitvec_read_field(vector, readIndex, no_of_bits); + pui32 = pui32DATA(data, pDescr->offset); + *pui32 = ui32; + } + else if (no_of_bits <= 64) + { + guint64 ui64 = bitvec_read_field(vector, readIndex, no_of_bits); + pui64 = pui64DATA(data, pDescr->offset); + *pui64 = ui64; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %lu | ", pDescr->sz , *pui64); + } + else + { + return ProcessError(readIndex,"csnStreamDecoder NOT IMPLEMENTED", 999, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } + /* bitmap was successfully extracted or it was empty */ + + pDescr++; + break; + } + + case CSN_TYPE: + { + gint16 Status; + csnStream_t arT = *ar; + LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); + LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + pDescr++; + } + else + { /* return error code Has already been processed: */ + return Status; + } + + break; + } + + default: + { /* descriptions of union elements other than above are illegal */ + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_IN_SCRIPT, pDescr); + } + } + + pDescr = pDescrNext; + break; + } + + case CSN_EXIST: + case CSN_EXIST_LH: + { + guint8 fExist; + + pui8 = pui8DATA(data, pDescr->offset); + + if (CSN_EXIST_LH == pDescr->type) + { + fExist = get_masked_bits8(vector, readIndex, bit_offset, 1); + } + else + { + fExist = bitvec_read_field(vector, readIndex, 1); + } + + *pui8 = fExist; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pDescr++; + bit_offset++; + remaining_bits_len -= 1; + + if (!fExist) + { + ar->remaining_bits_len = remaining_bits_len; + ar->bit_offset = bit_offset; + return remaining_bits_len; + } + + break; + } + + case CSN_NEXT_EXIST: + { + guint8 fExist; + + pui8 = pui8DATA(data, pDescr->offset); + + /* this if-statement represents the M_NEXT_EXIST_OR_NULL description element */ + if ((pDescr->may_be_null) && (remaining_bits_len == 0)) + { /* no more bits to decode is fine here - end of message detected and allowed */ + + /* Skip i entries + this entry */ + pDescr += pDescr->i + 1; + + /* Set the data member to "not exist" */ + *pui8 = 0; + break; + } + + /* the "regular" M_NEXT_EXIST description element */ + + fExist = 0x00; + if (bitvec_read_field(vector, readIndex, 1)) + { + fExist = 0x01; + } + + *pui8 = fExist; + remaining_bits_len -= 1; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + ++bit_offset; + + if (fExist == 0) + { /* Skip 'i' entries */ + pDescr += pDescr->i; + } + + pDescr++; + break; + } + + case CSN_NEXT_EXIST_LH: + { + guint8 fExist; + pui8 = pui8DATA(data, pDescr->offset); + + /* this if-statement represents the M_NEXT_EXIST_OR_NULL_LH description element */ + if ((pDescr->descr.ptr != NULL) && (remaining_bits_len == 0)) + { /* no more bits to decode is fine here - end of message detected and allowed */ + + /* skip 'i' entries + this entry */ + pDescr += pDescr->i + 1; + + /* set the data member to "not exist" */ + *pui8 = 0; + break; + } + + /* the "regular" M_NEXT_EXIST_LH description element */ + fExist = get_masked_bits8(vector, readIndex, bit_offset, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)fExist); + *pui8++ = fExist; + remaining_bits_len -= 1; + + bit_offset++; + + if (fExist == 0) + { /* Skip 'i' entries */ + pDescr += pDescr->i; + } + pDescr++; + + break; + } + + case CSN_VARIABLE_BITMAP_1: + { /* Bitmap from here and to the end of message */ + + *pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ + + /*no break - + * with a length set we have a regular variable length bitmap so we continue */ + } + /* FALL THROUGH */ + case CSN_VARIABLE_BITMAP: + { /* {CSN_VARIABLE_BITMAP, 0, offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * + * Bit array with length (in bits) specified in parameter (pDescr->descr) + * The result is right aligned! + */ + gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value); + + no_of_bits += pDescr->i; /* adjusted by offset */ + + if (no_of_bits > 0) + { + remaining_bits_len -= no_of_bits; + + if (remaining_bits_len < 0) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + { /* extract bits */ + guint8* pui8 = pui8DATA(data, pDescr->offset); + gint16 nB1 = no_of_bits & 0x07;/* no_of_bits Mod 8 */ + + if (nB1 > 0) + { /* take care of the first byte - it will be right aligned */ + *pui8 = bitvec_read_field(vector, readIndex, nB1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + no_of_bits -= nB1; + bit_offset += nB1; /* (nB1 is no_of_bits Mod 8) */ + } + + /* remaining no_of_bits is a multiple of 8 or 0 */ + while (no_of_bits > 0) + { + *pui8 = bitvec_read_field(vector, readIndex, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + no_of_bits -= 8; + } + } + } + pDescr++; + break; + } + + case CSN_LEFT_ALIGNED_VAR_BMP_1: + { /* Bitmap from here and to the end of message */ + + *pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ + + /* no break - + * with a length set we have a regular left aligned variable length bitmap so we continue + */ + } + /* FALL THROUGH */ + case CSN_LEFT_ALIGNED_VAR_BMP: + { /* {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * + * bit array with length (in bits) specified in parameter (pDescr->descr) + */ + gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value);/* Size of bitmap */ + + no_of_bits += pDescr->i;/* size adjusted by offset */ + + if (no_of_bits > 0) + { + remaining_bits_len -= no_of_bits; + + if (remaining_bits_len < 0) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + { /* extract bits */ + guint8* pui8 = pui8DATA(data, pDescr->offset); + + while (no_of_bits >= 8) + { + *pui8 = bitvec_read_field(vector, readIndex, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + no_of_bits -= 8; + } + if (no_of_bits > 0) + { + *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + bit_offset += no_of_bits; + no_of_bits = 0; + } + } + } + + /* bitmap was successfully extracted or it was empty */ + pDescr++; + break; + } + + case CSN_PADDING_BITS: + { /* Padding from here and to the end of message */ + LOGPC(DCSN1, LOGL_DEBUG, "%s = ", pDescr->sz); + if (remaining_bits_len > 0) + { + while (remaining_bits_len > 0) + { + guint bits_to_handle = remaining_bits_len%8; + if (bits_to_handle > 0) + { + LOGPC(DCSN1, LOGL_DEBUG, "%d|", bitvec_get_uint(vector, bits_to_handle)); + remaining_bits_len -= bits_to_handle; + bit_offset += bits_to_handle; + } + else if (bits_to_handle == 0) + { + LOGPC(DCSN1, LOGL_DEBUG, "%d|", bitvec_get_uint(vector, 8)); + remaining_bits_len -= 8; + bit_offset += 8; + } + } + } + if (remaining_bits_len < 0) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + /* Padding was successfully extracted or it was empty */ + pDescr++; + break; + } + + case CSN_VARIABLE_ARRAY: + { /* {int type; int i; void* descr; int offset; const char* sz; } CSN_DESCR; + * {CSN_VARIABLE_ARRAY, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * Array with length specified in parameter: + * + * + */ + gint16 count = *pui8DATA(data, (gint16)pDescr->descr.value); + + count += pDescr->i; /* Adjusted by offset */ + + if (count > 0) + { + remaining_bits_len -= count * 8; + + if (remaining_bits_len < 0) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + pui8 = pui8DATA(data, pDescr->offset); + + while (count > 0) + { + *pui8 = bitvec_read_field(vector, readIndex, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s = 0x%x | ", pDescr->sz , (unsigned)*pui8); + pui8++; + bit_offset += 8; + count--; + } + } + + pDescr++; + break; + } + + case CSN_RECURSIVE_ARRAY: + { /* Recursive way to specify an array: ::= {1 | 0} + * or more generally: ::= { | } + * where ::= bit(value) + * ::= 0 | 1 + * ::= reversed tag i.e. tag == 1 -> EndTag == 0 and vice versa + * {CSN_RECURSIVE_ARRAY, _BITS, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * REMARK: recursive way to specify an array but an iterative implementation! + */ + gint16 no_of_bits = pDescr->i; + guint8 ElementCount = 0; + + pui8 = pui8DATA(data, pDescr->offset); + + while (existNextElement(vector, readIndex, Tag)) + { /* tag control shows existence of next list elements */ + LOGPC(DCSN1, LOGL_DEBUG, "%s = Exist | ", pDescr->sz); + bit_offset++; + remaining_bits_len--; + + /* extract and store no_of_bits long element from bitstream */ + *pui8 = bitvec_read_field(vector, readIndex, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + remaining_bits_len -= no_of_bits; + ElementCount++; + + if (remaining_bits_len < 0) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + bit_offset += no_of_bits; + } + + LOGPC(DCSN1, LOGL_DEBUG, "%s = %d | ", pDescr->sz , bitvec_get_uint(vector, 1)); + /* existNextElement() returned FALSE, 1 bit consumed */ + bit_offset++; + remaining_bits_len--; + + /* Store the counted number of elements of the array */ + *pui8DATA(data, (gint16)pDescr->descr.value) = ElementCount; + + pDescr++; + break; + } + + case CSN_RECURSIVE_TARRAY: + { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; + * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) + * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE), (void_fn_t)ElementsOf(((_STRUCT*)0)->_MEMBER)} + */ + gint16 nSizeElement = (gint16)(gint32)pDescr->value; + guint32 nSizeArray = (guint32)((uintptr_t)pDescr->aux_fn); + guint8 ElementCount = 0; + pui8 = pui8DATA(data, pDescr->offset); + + while (existNextElement(vector, readIndex, Tag)) + { /* tag control shows existence of next list elements */ + LOGPC(DCSN1, LOGL_DEBUG, "%s = Exist | ", pDescr->sz); + /* existNextElement() returned TRUE, 1 bit consumed */ + bit_offset++; + remaining_bits_len--; + ElementCount++; + + if (ElementCount > nSizeArray) + { + LOGPC(DCSN1, LOGL_ERROR, "error: %s: too many elements (>%u) in recursive array. Increase its size! } |", pDescr->sz, nSizeArray); + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_STREAM_NOT_SUPPORTED, pDescr); + } + + { /* unpack the following data structure */ + csnStream_t arT = *ar; + gint16 Status; + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); + + if (Status >= 0) + { /* successful completion */ + pui8 += nSizeElement; /* -> to next data element */ + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { /* something went awry */ + return Status; + } + } + + if (remaining_bits_len < 0) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + } + + LOGPC(DCSN1, LOGL_DEBUG, "%s = %d | ", pDescr->sz , bitvec_get_uint(vector, 1)); + + /* existNextElement() returned FALSE, 1 bit consumed */ + remaining_bits_len--; + bit_offset++; + + /* Store the counted number of elements of the array */ + *pui8DATA(data, (gint16)(gint32)pDescr->i) = ElementCount; + + pDescr++; + break; + } + + case CSN_RECURSIVE_TARRAY_2: + { /* Recursive way to specify an array of type: ::= { 0 } ** 1 ; */ + + Tag = REVERSED_TAG; + + /* NO break - + * handling is exactly the same as for CSN_RECURSIVE_TARRAY_1 so we continue + */ + } + /* FALL THROUGH */ + case CSN_RECURSIVE_TARRAY_1: + { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; + * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) + * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE), (void_fn_t)ElementsOf(((_STRUCT*)0)->_MEMBER)} + */ + gint16 nSizeElement = (gint16)(gint32)pDescr->value; + guint32 nSizeArray = (guint32)((uintptr_t)pDescr->aux_fn); + guint8 ElementCount = 0; + csnStream_t arT = *ar; + gboolean EndOfList = FALSE; + gint16 Status; + pui8 = pui8DATA(data, pDescr->offset); + + do + { /* get data element */ + ElementCount++; + + if (ElementCount > nSizeArray) + { + LOGPC(DCSN1, LOGL_ERROR, "error: %s: too many elements (>%u) in recursive array. Increase its size! } |", pDescr->sz, nSizeArray); + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_STREAM_NOT_SUPPORTED, pDescr); + } + + LOGPC(DCSN1, LOGL_DEBUG, "%s { | ", pDescr->sz); + + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pui8); + + if (Status >= 0) + { /* successful completion */ + pui8 += nSizeElement; /* -> to next */ + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { /* something went awry */ + return Status; + } + + if (remaining_bits_len < 0) + { + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + /* control of next element's tag */ + LOGPC(DCSN1, LOGL_DEBUG, "%s } | ", pDescr->sz); + EndOfList = !(existNextElement(vector, readIndex, Tag)); + + bit_offset++; + remaining_bits_len--; /* 1 bit consumed (tag) */ + } while (!EndOfList); + + + /* Store the count of the array */ + *pui8DATA(data, pDescr->i) = ElementCount; + Tag = STANDARD_TAG; /* in case it was set to "reversed" */ + pDescr++; + break; + } + + case CSN_FIXED: + { /* Verify the fixed bits */ + guint8 no_of_bits = (guint8) pDescr->i; + guint32 ui32; + + if (no_of_bits <= 32) + { + ui32 = bitvec_read_field(vector, readIndex, no_of_bits); + } + else + { + return ProcessError(readIndex,"no_of_bits > 32", -1, pDescr); + } + if (ui32 != (unsigned)(gint32)pDescr->offset) + { + return ProcessError(readIndex,"csnStreamDecoder FIXED value does not match", -1, pDescr); + } + + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned int)ui32); + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_CALLBACK: + { + guint16 no_of_bits; + DissectorCallbackFcn_t callback = (DissectorCallbackFcn_t)pDescr->aux_fn; + LOGPC(DCSN1, LOGL_DEBUG, "CSN_CALLBACK(%s) | ", pDescr->sz); + no_of_bits = callback(vector, readIndex, pvDATA(data, pDescr->i), pvDATA(data, pDescr->offset)); + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_TRAP_ERROR: + { + return ProcessError(readIndex,"csnStreamDecoder", pDescr->i, pDescr); + } + + case CSN_END: + { + ar->remaining_bits_len = remaining_bits_len; + ar->bit_offset = bit_offset; + return remaining_bits_len; + } + + default: + { + assert(0); + } + + + } + + } while (remaining_bits_len >= 0); + + return ProcessError(readIndex,"csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); +} diff --git a/src/csn1_enc.c b/src/csn1_enc.c new file mode 100644 index 0000000..5518d06 --- /dev/null +++ b/src/csn1_enc.c @@ -0,0 +1,1305 @@ +/* csn1_enc.c + * Routines for CSN1 dissection in wireshark. + * + * Copyright (C) 2011 Ivan Klyuchnikov + * + * By Vincent Helfre, based on original code by Jari Sassi + * with the gracious authorization of STE + * Copyright (c) 2011 ST-Ericsson + * + * $Id: packet-csn1.c 39140 2011-09-25 22:01:50Z wmeier $ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include +#include +#define __STDC_FORMAT_MACROS +#include +#include "csn1.h" +#include + +#include +#include + +extern const unsigned char ixBitsTab[]; +guint8 get_masked_bits8(struct bitvec *vector, unsigned *readIndex, gint bit_offset, const gint no_of_bits); + +/** + * ================================================================================================ + * set initial/start values in help data structure used for packing/unpacking operation + * ================================================================================================ + */ + +gint16 csnStreamEncoder(csnStream_t* ar, const CSN_DESCR* pDescr, struct bitvec *vector, unsigned *writeIndex, void* data) +{ + gint remaining_bits_len = ar->remaining_bits_len; + gint bit_offset = ar->bit_offset; + guint8* pui8; + guint16* pui16; + guint32* pui32; + guint64* pui64; + unsigned ib; + + guint8 Tag = STANDARD_TAG; + + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex, __func__, CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + do + { + switch (pDescr->type) + { + case CSN_BIT: + { + if (remaining_bits_len > 0) + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + /* end add the bit value to protocol tree */ + } + else if (pDescr->may_be_null) + { + LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + pDescr++; + remaining_bits_len--; + bit_offset++; + break; + } + + case CSN_NULL: + { /* Empty member! */ + pDescr++; + break; + } + + case CSN_UINT: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else if (no_of_bits <= 16) + { + pui16 = pui16DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui16, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); + } + else if (no_of_bits <= 32) + { + pui32 = pui32DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui32, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } + else if (pDescr->may_be_null) + { + LOGPC(DCSN1, LOGL_DEBUG, "%s = NULL | ", pDescr->sz); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + pDescr++; + break; + } + + case CSN_UINT_OFFSET: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8 - (guint8)pDescr->descr.value, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(*pui8 - (guint8)pDescr->descr.value)); + } + else if (no_of_bits <= 16) + { + pui16 = pui16DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui16 - (guint16)pDescr->descr.value, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned short)(*pui16 - (guint16)pDescr->descr.value)); + } + else if (no_of_bits <= 32) + { + pui32 = pui32DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui32 - (guint16)pDescr->descr.value, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned int)(*pui32 - (guint16)pDescr->descr.value)); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_LH: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); + // TODO : Change get_masked_bits8() + *writeIndex -= no_of_bits; + guint8 ui8 = get_masked_bits8(vector, writeIndex, bit_offset, no_of_bits); + *writeIndex -= no_of_bits; + bitvec_write_field(vector, writeIndex, ui8, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + + } + else + {/* Maybe we should support more than 8 bits ? */ + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_ARRAY: + { + guint8 no_of_bits = (guint8) pDescr->i; + guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ + + if (pDescr->value != 0) + { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ + nCount = *pui16DATA(data, nCount); + } + + if (remaining_bits_len >= (no_of_bits * nCount)) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + do + { + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } while (--nCount > 0); + } + else if (no_of_bits <= 16) + { + return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); + } + else if (no_of_bits <= 32) + { + return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + pDescr++; + break; + } + + case CSN_VARIABLE_TARRAY_OFFSET: + case CSN_VARIABLE_TARRAY: + case CSN_TYPE_ARRAY: + { + gint16 Status; + csnStream_t arT = *ar; + gint16 nCount = pDescr->i; + guint16 nSize = (guint16)(gint32)pDescr->value; + + pui8 = pui8DATA(data, pDescr->offset); + if (pDescr->type == CSN_VARIABLE_TARRAY) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + } + else if (pDescr->type == CSN_VARIABLE_TARRAY_OFFSET) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + /* nCount--; the 1 offset is already taken into account in CSN_UINT_OFFSET */ + } + + while (nCount > 0) + { /* resulting array of length 0 is possible + * but no bits shall be read from bitstream + */ + + LOGPC(DCSN1, LOGL_DEBUG, "%s : | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); + if (Status >= 0) + { + pui8 += nSize; + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + + } + else + { + return Status; + } + nCount--; + } + + pDescr++; + break; + } + + case CSN_BITMAP: + { /* bitmap with given length. The result is left aligned! */ + guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ + + if (no_of_bits > 0) + { + if (no_of_bits > remaining_bits_len) + { + return ProcessError(writeIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + if (no_of_bits <= 32) + { + for(ib = 0; ib < 4; ib++) + { + pui8 = pui8DATA(data, pDescr->offset+ib); + bitvec_write_field(vector, writeIndex, *pui8, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); + } + } + else if (no_of_bits <= 64) + { + for(ib = 0; ib < 8; ib++) + { + pui8 = pui8DATA(data, pDescr->offset+ib); + bitvec_write_field(vector, writeIndex, *pui8, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s[%u] = %u | ", pDescr->sz , ib, (unsigned)*pui8); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder NOT IMPLEMENTED", 999, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } + /* bitmap was successfully extracted or it was empty */ + + pDescr++; + break; + } + + case CSN_TYPE: + { + gint16 Status; + csnStream_t arT = *ar; + LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pvDATA(data, pDescr->offset)); + LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); + if (Status >= 0) + { + + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + pDescr++; + } + else + { + /* Has already been processed: ProcessError("csnStreamEncoder", Status, pDescr); */ + return Status; + } + + break; + } + + case CSN_CHOICE: + { + gint16 count = pDescr->i; + const CSN_ChoiceElement_t* pChoice = (const CSN_ChoiceElement_t*) pDescr->descr.ptr; + + /* Make sure that the list of choice items is not empty */ + if (!count) + return ProcessError(writeIndex, "csnStreamEncoder", CSN_ERROR_IN_SCRIPT, pDescr); + else if (count > 255) /* We can handle up to 256 (UCHAR_MAX) selectors */ + return ProcessError(writeIndex, "csnStreamEncoder", CSN_ERROR_IN_SCRIPT, pDescr); + + /* Make sure that choice index is not out of range */ + pui8 = pui8DATA(data, pDescr->offset); + if (*pui8 >= count) + return ProcessError(writeIndex, "csnStreamEncoder", CSN_ERROR_INVALID_UNION_INDEX, pDescr); + + pChoice += *pui8; + guint8 no_of_bits = pChoice->bits; + guint8 value = pChoice->value; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pChoice->descr.sz , (unsigned)value); + bitvec_write_field(vector, writeIndex, value, no_of_bits); + + CSN_DESCR descr[2]; + gint16 Status; + csnStream_t arT = *ar; + + descr[0] = pChoice->descr; + memset(&descr[1], 0x00, sizeof(CSN_DESCR)); + descr[1].type = CSN_END; + bit_offset += no_of_bits; + remaining_bits_len -= no_of_bits; + + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamEncoder(&arT, descr, vector, writeIndex, data); + + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { + return Status; + } + + pDescr++; + break; + } + + case CSN_SERIALIZE: + { + StreamSerializeFcn_t serialize = (StreamSerializeFcn_t)pDescr->aux_fn; + csnStream_t arT = *ar; + guint8 length_len = pDescr->i; + gint16 Status = -1; + unsigned lengthIndex; + + // store writeIndex for length value (7 bit) + lengthIndex = *writeIndex; + *writeIndex += length_len; + bit_offset += length_len; + remaining_bits_len -= length_len; + arT.direction = 0; + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = serialize(&arT, vector, writeIndex, pvDATA(data, pDescr->offset)); + + bitvec_write_field(vector, &lengthIndex, *writeIndex - lengthIndex - length_len, length_len); + LOGPC(DCSN1, LOGL_DEBUG, "%s length = %u | ", pDescr->sz , (unsigned)(*writeIndex - lengthIndex)); + + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + pDescr++; + } + else + { + // Has already been processed: + return Status; + } + + break; + } + + case CSN_UNION_LH: + case CSN_UNION: + { + gint16 Bits; + guint8 index; + gint16 count = pDescr->i; + const CSN_DESCR* pDescrNext = pDescr; + + pDescrNext += count + 1; /* now this is next after the union */ + if ((count <= 0) || (count > 16)) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_INVALID_UNION_INDEX, pDescr); + } + + /* Now get the bits to extract the index */ + Bits = ixBitsTab[count]; + index = 0; + + /* Assign UnionType */ + pui8 = pui8DATA(data, pDescr->offset); + //read index from data and write to vector + bitvec_write_field(vector, writeIndex, *pui8, Bits); + + //decode index + *writeIndex -= Bits; + + while (Bits > 0) + { + index <<= 1; + + if (CSN_UNION_LH == pDescr->type) + { + index |= get_masked_bits8(vector, writeIndex, bit_offset, 1); + } + else + { + index |= bitvec_read_field(vector, writeIndex, 1); + } + + remaining_bits_len--; + bit_offset++; + Bits--; + } + + *writeIndex -= Bits; + bitvec_write_field(vector, writeIndex, index, Bits); + + + /* script index to continue on, limited in case we do not have a power of 2 */ + pDescr += (MIN(index + 1, count)); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)index); + + switch (pDescr->type) + { /* get the right element of the union based on computed index */ + + case CSN_BIT: + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + remaining_bits_len--; + bit_offset++; + pDescr++; + break; + } + + case CSN_NULL: + { /* Empty member! */ + pDescr++; + break; + } + + case CSN_UINT: + { + guint8 no_of_bits = (guint8) pDescr->i; + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + } + else if (no_of_bits <= 16) + { + pui16 = pui16DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui16, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui16); + } + else if (no_of_bits <= 32) + { + pui32 = pui32DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui32, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_OFFSET: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8 - (guint8)pDescr->descr.value, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(*pui8 - (guint8)pDescr->descr.value)); + } + else if (no_of_bits <= 16) + { + pui16 = pui16DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui16 - (guint16)pDescr->descr.value, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned short)(*pui16 - (guint16)pDescr->descr.value)); + } + else if (no_of_bits <= 32) + { + pui32 = pui32DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui32 - (guint16)pDescr->descr.value, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned int)(*pui32 - (guint16)pDescr->descr.value)); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_LH: + { + guint8 no_of_bits = (guint8) pDescr->i; + + if (remaining_bits_len >= no_of_bits) + { + remaining_bits_len -= no_of_bits; + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); + // TODO : Change get_masked_bits8() + *writeIndex -= no_of_bits; + guint8 ui8 = get_masked_bits8(vector, writeIndex, bit_offset, no_of_bits); + *writeIndex -= no_of_bits; + bitvec_write_field(vector, writeIndex, ui8, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + + } + else + {/* Maybe we should support more than 8 bits ? */ + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_UINT_ARRAY: + { + guint8 no_of_bits = (guint8) pDescr->i; + guint16 nCount = (guint16)pDescr->descr.value; /* nCount supplied by value i.e. M_UINT_ARRAY(...) */ + + if (pDescr->value != 0) + { /* nCount specified by a reference to field holding value i.e. M_VAR_UINT_ARRAY(...) */ + nCount = *pui16DATA(data, nCount); + } + + if (remaining_bits_len >= (no_of_bits * nCount)) + { + if (no_of_bits <= 8) + { + pui8 = pui8DATA(data, pDescr->offset); + do + { + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } while (--nCount > 0); + } + else if (no_of_bits <= 16) + { + return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); + } + else if (no_of_bits <= 32) + { + return ProcessError(writeIndex,"csnStreamEncoder NOTIMPLEMENTED", 999, pDescr); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_GENERAL, pDescr); + } + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + pDescr++; + break; + } + + case CSN_VARIABLE_TARRAY_OFFSET: + case CSN_VARIABLE_TARRAY: + case CSN_TYPE_ARRAY: + { + gint16 Status; + csnStream_t arT = *ar; + gint16 nCount = pDescr->i; + guint16 nSize = (guint16)(gint32)pDescr->value; + + pui8 = pui8DATA(data, pDescr->offset); + if (pDescr->type == CSN_VARIABLE_TARRAY) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + } + else if (pDescr->type == CSN_VARIABLE_TARRAY_OFFSET) + { /* Count specified in field */ + nCount = *pui8DATA(data, pDescr->i); + /* nCount--; the 1 offset is already taken into account in CSN_UINT_OFFSET */ + } + + while (nCount > 0) + { /* resulting array of length 0 is possible + * but no bits shall be read from bitstream + */ + + LOGPC(DCSN1, LOGL_DEBUG, "%s : | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); + if (Status >= 0) + { + pui8 += nSize; + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { + return Status; + } + nCount--; + } + + pDescr++; + break; + } + + case CSN_BITMAP: + { /* bitmap with given length. The result is left aligned! */ + guint8 no_of_bits = (guint8) pDescr->i; /* length of bitmap */ + + if (no_of_bits > 0) + { + if (no_of_bits > remaining_bits_len) + { + return ProcessError(writeIndex, "csnStreamDecoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + if (no_of_bits <= 32) + { + pui32 = pui32DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui32, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , *pui32); + } + else if (no_of_bits <= 64) + { + pui64 = pui64DATA(data, pDescr->offset); + bitvec_write_field(vector, writeIndex, *pui64, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %lu | ", pDescr->sz , *pui64); + } + else + { + return ProcessError(writeIndex,"csnStreamEncoder NOT IMPLEMENTED", 999, pDescr); + } + + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + } + /* bitmap was successfully extracted or it was empty */ + + pDescr++; + break; + } + + case CSN_TYPE: + { + gint16 Status; + csnStream_t arT = *ar; + LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pvDATA(data, pDescr->offset)); + LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + pDescr++; + } + else + { + /* Has already been processed: ProcessError("csnStreamEncoder", Status, pDescr); */ + return Status; + } + + break; + } + + default: + { /* descriptions of union elements other than above are illegal */ + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_IN_SCRIPT, pDescr); + } + } + + pDescr = pDescrNext; + break; + } + + case CSN_EXIST: + case CSN_EXIST_LH: + { + guint8 fExist; + unsigned exist = 0; + pui8 = pui8DATA(data, pDescr->offset); + exist = *pui8; + bitvec_write_field(vector, writeIndex, *pui8, 1); + writeIndex--; + if (CSN_EXIST_LH == pDescr->type) + { + fExist = get_masked_bits8(vector, writeIndex, bit_offset, 1); + } + else + { + fExist = bitvec_read_field(vector, writeIndex, 1); + } + writeIndex--; + bitvec_write_field(vector, writeIndex, fExist, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz, (unsigned)fExist); + remaining_bits_len--; + bit_offset++; + pDescr++; + + if (!exist) + { + ar->remaining_bits_len = remaining_bits_len; + ar->bit_offset = bit_offset; + return remaining_bits_len; + } + break; + } + + case CSN_NEXT_EXIST: + { + guint8 fExist; + + pui8 = pui8DATA(data, pDescr->offset); + + /* this if-statement represents the M_NEXT_EXIST_OR_NULL description element */ + if ((pDescr->may_be_null) && (remaining_bits_len == 0)) + { /* no more bits to decode is fine here - end of message detected and allowed */ + + /* Skip i entries + this entry */ + pDescr += pDescr->i + 1; + + break; + } + + bitvec_write_field(vector, writeIndex, *pui8, 1); + fExist = *pui8; + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + + remaining_bits_len--; + bit_offset++; + + if (fExist == 0) + { /* Skip 'i' entries */ + pDescr += pDescr->i; + } + + pDescr++; + break; + } + + case CSN_NEXT_EXIST_LH: + { + guint8 fExist; + pui8 = pui8DATA(data, pDescr->offset); + + /* this if-statement represents the M_NEXT_EXIST_OR_NULL_LH description element */ + if ((pDescr->descr.ptr != NULL) && (remaining_bits_len == 0)) + { /* no more bits to decode is fine here - end of message detected and allowed */ + + /* skip 'i' entries + this entry */ + pDescr += pDescr->i + 1; + + /* set the data member to "not exist" */ + //*pui8 = 0; + break; + } + + /* the "regular" M_NEXT_EXIST_LH description element */ + bitvec_write_field(vector, writeIndex, *pui8, 1); + writeIndex--; + fExist = get_masked_bits8(vector, writeIndex, bit_offset, 1); + writeIndex--; + bitvec_write_field(vector, writeIndex, fExist, 1); + pui8++; + + remaining_bits_len--; + bit_offset++; + + if (fExist == 0) + { /* Skip 'i' entries */ + pDescr += pDescr->i; + } + pDescr++; + + break; + } + + case CSN_VARIABLE_BITMAP_1: + { /* Bitmap from here and to the end of message */ + + //*pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ + + /*no break - + * with a length set we have a regular variable length bitmap so we continue */ + } + /* FALL THROUGH */ + case CSN_VARIABLE_BITMAP: + { /* {CSN_VARIABLE_BITMAP, 0, offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * + * Bit array with length (in bits) specified in parameter (pDescr->descr) + * The result is right aligned! + */ + gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value); + + no_of_bits += pDescr->i; /* adjusted by offset */ + + if (no_of_bits > 0) + { + + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + { /* extract bits */ + guint8* pui8 = pui8DATA(data, pDescr->offset); + gint16 nB1 = no_of_bits & 0x07;/* no_of_bits Mod 8 */ + + if (nB1 > 0) + { /* take care of the first byte - it will be right aligned */ + bitvec_write_field(vector, writeIndex, *pui8, nB1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + no_of_bits -= nB1; + bit_offset += nB1; /* (nB1 is no_of_bits Mod 8) */ + remaining_bits_len -= nB1; + } + + /* remaining no_of_bits is a multiple of 8 or 0 */ + while (no_of_bits > 0) + { + bitvec_write_field(vector, writeIndex, *pui8, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + no_of_bits -= 8; + remaining_bits_len -= 8; + } + } + } + pDescr++; + break; + } + + case CSN_LEFT_ALIGNED_VAR_BMP_1: + { /* Bitmap from here and to the end of message */ + + //*pui8DATA(data, (gint16)pDescr->descr.value) = (guint8) remaining_bits_len; /* length of bitmap == remaining bits */ + + /* no break - + * with a length set we have a regular left aligned variable length bitmap so we continue + */ + } + /* FALL THROUGH */ + case CSN_LEFT_ALIGNED_VAR_BMP: + { /* {CSN_LEFT_ALIGNED_VAR_BMP, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * + * bit array with length (in bits) specified in parameter (pDescr->descr) + */ + + gint16 no_of_bits = *pui8DATA(data, (gint16)pDescr->descr.value);/* Size of bitmap */ + + no_of_bits += pDescr->i;/* size adjusted by offset */ + + if (no_of_bits > 0) + { + remaining_bits_len -= no_of_bits; + + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + { /* extract bits */ + guint8* pui8 = pui8DATA(data, pDescr->offset); + gint16 nB1 = no_of_bits & 0x07;/* no_of_bits Mod 8 */ + + while (no_of_bits > 0) + { + bitvec_write_field(vector, writeIndex, *pui8, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + no_of_bits -= 8; + } + if (nB1 > 0) + { + bitvec_write_field(vector, writeIndex, *pui8, nB1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + no_of_bits -= nB1; + bit_offset += nB1; /* (nB1 is no_of_bits Mod 8) */ + } + } + + } + + /* bitmap was successfully extracted or it was empty */ + pDescr++; + break; + } + + case CSN_PADDING_BITS: + { /* Padding from here and to the end of message */ + LOGPC(DCSN1, LOGL_DEBUG, "%s = ", pDescr->sz); + guint8 filler = 0x2b; + if (remaining_bits_len > 0) + { + while (remaining_bits_len > 0) + { + guint8 bits_to_handle = remaining_bits_len%8; + if (bits_to_handle > 0) + { + /* section 11 of 44.060 + * The padding bits may be the 'null' string. Otherwise, the + * padding bits starts with bit '0', followed by 'spare padding' + * < padding bits > ::= { null | 0 < spare padding > ! < Ignore : 1 bit** = < no string > > } ; + */ + guint8 fl = filler&(0xff>>(8-bits_to_handle + 1)); + bitvec_write_field(vector, writeIndex, fl, bits_to_handle); + LOGPC(DCSN1, LOGL_DEBUG, "%u|", fl); + remaining_bits_len -= bits_to_handle; + bit_offset += bits_to_handle; + } + else if (bits_to_handle == 0) + { + bitvec_write_field(vector, writeIndex, filler, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%u|", filler); + remaining_bits_len -= 8; + bit_offset += 8; + } + } + } + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + /* Padding was successfully extracted or it was empty */ + pDescr++; + break; + } + + case CSN_VARIABLE_ARRAY: + { /* {int type; int i; void* descr; int offset; const char* sz; } CSN_DESCR; + * {CSN_VARIABLE_ARRAY, _OFFSET, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * Array with length specified in parameter: + * + * + */ + gint16 count = *pui8DATA(data, (gint16)pDescr->descr.value); + + count += pDescr->i; /* Adjusted by offset */ + + if (count > 0) + { + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + pui8 = pui8DATA(data, pDescr->offset); + + while (count > 0) + { + bitvec_write_field(vector, writeIndex, *pui8, 8); + LOGPC(DCSN1, LOGL_DEBUG, "%s = 0x%x | ", pDescr->sz , (unsigned)*pui8); + pui8++; + bit_offset += 8; + remaining_bits_len -= 8; + count--; + } + } + + pDescr++; + break; + } + + case CSN_RECURSIVE_ARRAY: + { /* Recursive way to specify an array: ::= {1 | 0} + * or more generally: ::= { | } + * where ::= bit(value) + * ::= 0 | 1 + * ::= reversed tag i.e. tag == 1 -> EndTag == 0 and vice versa + * {CSN_RECURSIVE_ARRAY, _BITS, (void*)offsetof(_STRUCT, _ElementCountField), offsetof(_STRUCT, _MEMBER), #_MEMBER} + * REMARK: recursive way to specify an array but an iterative implementation! + */ + gint16 no_of_bits = pDescr->i; + guint8 ElementCount = 0; + pui8 = pui8DATA(data, pDescr->offset); + ElementCount = *pui8DATA(data, (gint16)pDescr->descr.value); + while (ElementCount > 0) + { /* tag control shows existence of next list elements */ + bitvec_write_field(vector, writeIndex, Tag, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)Tag); + bit_offset++; + remaining_bits_len--; + + /* extract and store no_of_bits long element from bitstream */ + bitvec_write_field(vector, writeIndex, *pui8, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + pui8++; + ElementCount--; + + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + bit_offset += no_of_bits; + remaining_bits_len -= no_of_bits; + } + + bitvec_write_field(vector, writeIndex, !Tag, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(!Tag)); + bit_offset++; + remaining_bits_len--; + + pDescr++; + break; + } + + case CSN_RECURSIVE_TARRAY: + { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; + * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) + * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} + */ + gint16 nSizeElement = (gint16)(gint32)pDescr->value; + guint8 ElementCount = 0; + pui8 = pui8DATA(data, pDescr->offset); + /* Store the counted number of elements of the array */ + ElementCount = *pui8DATA(data, (gint16)(gint32)pDescr->i); + + while (ElementCount > 0) + { /* tag control shows existence of next list elements */ + bitvec_write_field(vector, writeIndex, Tag, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)Tag); + bit_offset++; + + remaining_bits_len--; + ElementCount--; + + { /* unpack the following data structure */ + csnStream_t arT = *ar; + gint16 Status; + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); + + if (Status >= 0) + { /* successful completion */ + pui8 += nSizeElement; /* -> to next data element */ + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { /* something went awry */ + return Status; + } + } + + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + } + + bitvec_write_field(vector, writeIndex, !Tag, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)(!Tag)); + bit_offset++; + + pDescr++; + break; + } + + case CSN_RECURSIVE_TARRAY_2: + { /* Recursive way to specify an array of type: ::= { 0 } ** 1 ; */ + + Tag = REVERSED_TAG; + + /* NO break - + * handling is exactly the same as for CSN_RECURSIVE_TARRAY_1 so we continue + */ + } + /* FALL THROUGH */ + case CSN_RECURSIVE_TARRAY_1: + { /* Recursive way to specify an array of type: ::= { 1 } ** 0 ; + * M_REC_TARRAY(_STRUCT, _MEMBER, _MEMBER_TYPE, _ElementCountField) + * {t, offsetof(_STRUCT, _ElementCountField), (void*)CSNDESCR_##_MEMBER_TYPE, offsetof(_STRUCT, _MEMBER), #_MEMBER, (StreamSerializeFcn_t)sizeof(_MEMBER_TYPE)} + */ + gint16 nSizeElement = (gint16)(gint32)pDescr->value; + guint8 ElementCount = 0; + guint8 ElementNum = 0; + csnStream_t arT = *ar; + gint16 Status; + + pui8 = pui8DATA(data, pDescr->offset); + /* Store the count of the array */ + ElementCount = *pui8DATA(data, pDescr->i); + ElementNum = ElementCount; + + while (ElementCount > 0) + { /* get data element */ + if (ElementCount != ElementNum) + { + bitvec_write_field(vector, writeIndex, Tag, 1); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)Tag); + bit_offset++; + remaining_bits_len--; + } + ElementCount--; + LOGPC(DCSN1, LOGL_DEBUG, "%s { | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamEncoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, writeIndex, pui8); + LOGPC(DCSN1, LOGL_DEBUG, "%s } | ", pDescr->sz); + if (Status >= 0) + { /* successful completion */ + pui8 += nSizeElement; /* -> to next */ + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { /* something went awry */ + return Status; + } + + if (remaining_bits_len < 0) + { + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); + } + + } + bitvec_write_field(vector, writeIndex, !Tag, 1); + bit_offset++; + remaining_bits_len--; + Tag = STANDARD_TAG; /* in case it was set to "reversed" */ + pDescr++; + break; + } + + case CSN_FIXED: + { /* Verify the fixed bits */ + guint8 no_of_bits = (guint8) pDescr->i; + bitvec_write_field(vector, writeIndex, pDescr->offset, no_of_bits); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)pDescr->offset); + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_CALLBACK: + { + guint16 no_of_bits; + DissectorCallbackFcn_t callback = (DissectorCallbackFcn_t)pDescr->aux_fn; + LOGPC(DCSN1, LOGL_DEBUG, "CSN_CALLBACK(%s) | ", pDescr->sz); + no_of_bits = callback(vector, writeIndex, pvDATA(data, pDescr->i), pvDATA(data, pDescr->offset)); + remaining_bits_len -= no_of_bits; + bit_offset += no_of_bits; + pDescr++; + break; + } + + case CSN_TRAP_ERROR: + { + return ProcessError(writeIndex,"csnStreamEncoder", pDescr->i, pDescr); + } + + case CSN_END: + { + ar->remaining_bits_len = remaining_bits_len; + ar->bit_offset = bit_offset; + return remaining_bits_len; + } + + default: + { + assert(0); + } + + } + + } while (remaining_bits_len >= 0); + + return ProcessError(writeIndex,"csnStreamEncoder", CSN_ERROR_NEED_MORE_BITS_TO_UNPACK, pDescr); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25827 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 Gerrit-Change-Number: 25827 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 14:06:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 14:06:44 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is m... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25830 ) Change subject: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is missing ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9a2541bd3544802a646890f32725201836abb0da Gerrit-Change-Number: 25830 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 14:06:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 14:06:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 14:06:46 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is m... In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25830 ) Change subject: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is missing ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9a2541bd3544802a646890f32725201836abb0da Gerrit-Change-Number: 25830 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 14:06:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 14:06:49 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid storing existence bit as true if content was actually NULL In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25831 ) Change subject: csn1: Avoid storing existence bit as true if content was actually NULL ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38602e4b680ed87297c7e440691a494c07cad446 Gerrit-Change-Number: 25831 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 14:06:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 14:06:54 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid storing existence bit as true if content was actually NULL In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25831 ) Change subject: csn1: Avoid storing existence bit as true if content was actually NULL ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38602e4b680ed87297c7e440691a494c07cad446 Gerrit-Change-Number: 25831 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 14:06:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 14:06:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 14:06:56 +0000 Subject: Change in osmo-pcu[master]: csn1: Add unit test showing RadioAccess Capability decoding failure In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25716 ) Change subject: csn1: Add unit test showing RadioAccess Capability decoding failure ...................................................................... csn1: Add unit test showing RadioAccess Capability decoding failure This RA Cap creaes a decoding error on our CSN1 decoder, but seems to be handled properly by wireshark's own decoder as well as pycrate. The ending bit of last byte in "MS RA capability 1" has a "1" which according to spec should flag the existance of DownlinkDualCarrierCapability_r7, but nothing else comes after it. This matches the expectancies as per Length field of the first RA Cap. Related: SYS#5552 Related: OS#4955 Related: OS#5020 Change-Id: I51235e8575f4b992b44078713ec67bbccfd13293 --- M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.err M tests/rlcmac/RLCMACTest.ok 3 files changed, 150 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index f763b95..4875bce 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -676,6 +676,148 @@ bitvec_free(bv_dec); } +/* RAcap larger than 23 bytes */ +void testRAcap4(void *test_ctx) +{ + printf("*** %s ***\n", __func__); + MS_Radio_Access_capability_t data; + memset(&data, 0, sizeof(data)); + bitvec *bv_dec = bitvec_alloc(22, test_ctx); + int rc; + +/* +MS Radio Access Capability + Element ID: 0x13 + 1... .... = ext: 1 + Length: 22 + ------------------------------------------- Hex bitstream starts here: + MS RA capability 1 + 0001 .... = Access Technology Type: GSM E --note that GSM E covers GSM P (1) + .... 0111 101. .... = Length in bits: 0x3d (61) + ...1 00.. RF Power Capability, GMSK Power Class: 2 W (33 dBm) (4) + A5 Bits: A5 bits follow (1) + A5/1: encryption algorithm available (1) + A5/2: encryption algorithm not available (0) + A5/3: encryption algorithm available (1) + A5/4: encryption algorithm not available (0) + A5/5: encryption algorithm not available (0) + A5/6: encryption algorithm not available (0) + A5/7: encryption algorithm not available (0) + .... ..1. = Controlled early Classmark Sending: Implemented + .... ...1 = Pseudo Synchronisation: Present + 0... .... = Voice Group Call Service: no VGCS capability or no notifications wanted + .0.. .... = Voice Broadcast Service: no VBS capability or no notifications wanted + ..1. .... = Multislot capability struct: Present + HSCSD multislot class: Bits are not available (0) + SMS_VALUE (Switch-Measure-Switch): Bits are not available (0) + ECSD multislot class: Bits are not available (0) + DTM GPRS Multi Slot Class: Bits are not available (0) + .... .011 00.. .... = GPRS multislot class: Max Rx-Slot/TDMA:4 Max Tx-Slot/TDMA:4 Max-Sum-Slot/TDMA:5 Tta:2 Ttb:1 Tra:2 Trb:1 Type:1 (12) + ..1. .... = GPRS Extended Dynamic Allocation Capability: Implemented + .... ..01 100. .... = EGPRS multislot class: Max Rx-Slot/TDMA:4 Max Tx-Slot/TDMA:4 Max-Sum-Slot/TDMA:5 Tta:2 Ttb:1 Tra:2 Trb:1 Type:1 (12) + ...1 .... = EGPRS Extended Dynamic Allocation Capability: Implemented + .... .1.. = 8PSK Power Capability Bits: Present + 8PSK Power Capability: Power class E2 (2) + 0... .... = COMPACT Interference Measurement Capability: Not Implemented + .1.. .... = Revision Level Indicator: The ME is Release '99 onwards + ..1. .... = UMTS FDD Radio Access Technology Capability: Supported + ...0 .... = UMTS 3.84 Mcps TDD Radio Access Technology Capability: Not supported + .... 0... = CDMA 2000 Radio Access Technology Capability: Not supported + .... .0.. = UMTS 1.28 Mcps TDD Radio Access Technology Capability: Not supported + .... ..1. = GERAN Feature Package 1: Supported + Extended DTM EGPRS Multi Slot Class: Bits are not available (0) + 0... .... = Modulation based multislot class support: Not supported + High Multislot Capability: Bits are not available (0) + ..0. .... = GERAN Iu mode: Not supported + GMSK Multislot Power Profile: GMSK_MULTISLOT_POWER_PROFILE 0 (0) + 8-PSK Multislot Power Profile: 8-PSK_MULTISLOT_POWER_PROFILE 0 (0) + .... ...0 = Multiple TBF Capability: Not supported + 00.. .... = Downlink Advanced Receiver Performance: Downlink Advanced Receiver Performance not supported (0) + ..0. .... = Extended RLC/MAC Control Message Segmentation Capability: Not supported + ...0 .... = DTM Enhancements Capability: The mobile station does not support enhanced DTM CS establishment and enhanced DTM CS release procedures + .... .0.. = PS Handover Capability: Not supported + .... ..0. = DTM Handover Capability: Not supported + MS RA capability 2 + .001 1... = Access Technology Type: GSM 1800 (3) + .... .010 0100 .... = Length in bits: 0x24 (36) + .... 001. RF Power Capability, GMSK Power Class: 1 W (30 dBm) (1) + A5 Bits: Same values apply for parameters as in the immediately preceding Access capabilities field within this IE (0) + 1... .... = Controlled early Classmark Sending: Implemented + .1.. .... = Pseudo Synchronisation: Present + ..0. .... = Voice Group Call Service: no VGCS capability or no notifications wanted + ...0 .... = Voice Broadcast Service: no VBS capability or no notifications wanted + .... 0... = Multislot capability struct: Not Present + .... .1.. = 8PSK Power Capability Bits: Present + 8PSK Power Capability: Power class E2 (2) + 0... .... = COMPACT Interference Measurement Capability: Not Implemented + .1.. .... = Revision Level Indicator: The ME is Release '99 onwards + ..1. .... = UMTS FDD Radio Access Technology Capability: Supported + ...0 .... = UMTS 3.84 Mcps TDD Radio Access Technology Capability: Not supported + .... 0... = CDMA 2000 Radio Access Technology Capability: Not supported + .... .0.. = UMTS 1.28 Mcps TDD Radio Access Technology Capability: Not supported + .... ..1. = GERAN Feature Package 1: Supported + Extended DTM EGPRS Multi Slot Class: Bits are not available (0) + 0... .... = Modulation based multislot class support: Not supported + High Multislot Capability: Bits are not available (0) + ..0. .... = GERAN Iu mode: Not supported + GMSK Multislot Power Profile: GMSK_MULTISLOT_POWER_PROFILE 0 (0) + 8-PSK Multislot Power Profile: 8-PSK_MULTISLOT_POWER_PROFILE 0 (0) + .... ...0 = Multiple TBF Capability: Not supported + 00.. .... = Downlink Advanced Receiver Performance: Downlink Advanced Receiver Performance not supported (0) + ..0. .... = Extended RLC/MAC Control Message Segmentation Capability: Not supported + ...0 .... = DTM Enhancements Capability: The mobile station does not support enhanced DTM CS establishment and enhanced DTM CS release procedures + .... .0.. = PS Handover Capability: Not supported + .... ..0. = DTM Handover Capability: Not supported + MS RA capability 3 + .011 1... = Access Technology Type: GSM 850 (7) + .... .010 0100 .... = Length in bits: 0x24 (36) + .... 100. RF Power Capability, GMSK Power Class: 2 W (33 dBm) (4) + A5 Bits: Same values apply for parameters as in the immediately preceding Access capabilities field within this IE (0) + 1... .... = Controlled early Classmark Sending: Implemented + .1.. .... = Pseudo Synchronisation: Present + ..0. .... = Voice Group Call Service: no VGCS capability or no notifications wanted + ...0 .... = Voice Broadcast Service: no VBS capability or no notifications wanted + .... 0... = Multislot capability struct: Not Present + .... .1.. = 8PSK Power Capability Bits: Present + 8PSK Power Capability: Power class E2 (2) + 0... .... = COMPACT Interference Measurement Capability: Not Implemented + .1.. .... = Revision Level Indicator: The ME is Release '99 onwards + ..1. .... = UMTS FDD Radio Access Technology Capability: Supported + ...0 .... = UMTS 3.84 Mcps TDD Radio Access Technology Capability: Not supported + .... 0... = CDMA 2000 Radio Access Technology Capability: Not supported + .... .0.. = UMTS 1.28 Mcps TDD Radio Access Technology Capability: Not supported + .... ..1. = GERAN Feature Package 1: Supported + Extended DTM EGPRS Multi Slot Class: Bits are not available (0) + 0... .... = Modulation based multislot class support: Not supported + High Multislot Capability: Bits are not available (0) + ..0. .... = GERAN Iu mode: Not supported + GMSK Multislot Power Profile: GMSK_MULTISLOT_POWER_PROFILE 0 (0) + 8-PSK Multislot Power Profile: 8-PSK_MULTISLOT_POWER_PROFILE 0 (0) + .... ...0 = Multiple TBF Capability: Not supported + 00.. .... = Downlink Advanced Receiver Performance: Downlink Advanced Receiver Performance not supported (0) + ..0. .... = Extended RLC/MAC Control Message Segmentation Capability: Not supported + ...0 .... = DTM Enhancements Capability: The mobile station does not support enhanced DTM CS establishment and enhanced DTM CS release procedures + .... .0.. = PS Handover Capability: Not supported + .... ..0. = DTM Handover Capability: Not supported +*/ + + bitvec_unhex(bv_dec, "17b3432b25966200019a42c6620001ba48c662000100"); + + printf("=== Test decoding of MS RA Capability 4===\n"); + rc = decode_gsm_ra_cap(bv_dec, &data); + printf("decode_gsm_ra_cap() returns %d\n", rc); + OSMO_ASSERT(rc == -5); /* FIXME: should be 0 */ + + /* Make sure there's 3 values */ + OSMO_ASSERT(data.Count_MS_RA_capability_value == 0); /* FIXME: should be 3 */ + + /* Make sure GPRS / EGPRS multislot class is parsed correctly */ + printf("GPRS multislot class = %u\n", get_ms_class_by_capability(&data)); /* FIXME: should be 12 */ + printf("EGPRS multislot class = %u\n", get_egprs_ms_class_by_capability(&data)); /* FIXME: should be 12 */ + + bitvec_free(bv_dec); +} + void testEGPRSPktChReq(void *test_ctx) { EGPRS_PacketChannelRequest_t req; @@ -752,5 +894,7 @@ testEGPRSPktChReq(ctx); + testRAcap4(ctx); + talloc_free(ctx); } diff --git a/tests/rlcmac/RLCMACTest.err b/tests/rlcmac/RLCMACTest.err index d36f248..045ba78 100644 --- a/tests/rlcmac/RLCMACTest.err +++ b/tests/rlcmac/RLCMACTest.err @@ -58,3 +58,4 @@ DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): Choice EGPRS_PacketChannelRequest_Choice = 51 | : Content | RandomBits = 17 | : End Content | DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): Choice EGPRS_PacketChannelRequest_Choice = 55 | : Content | RandomBits = 25 | : End Content | DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): DCSN1 ERROR csnStreamDecoder: error STREAM_NOT_SUPPORTED (-8) at EGPRS_PacketChannelRequest_Choice (idx 0) +DCSN1 INFO csnStreamDecoder (RAcap): MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 1 | u.Content length = 61 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 1 | A5_bits = 80 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 1 | : Multislot_capability | Exist_HSCSD_multislot_class = 0 | Exist_GPRS_multislot_class = 1 | GPRS_multislot_class = 12 | GPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_SM = 0 | Exist_ECSD_multislot_class = 0 | Exist_EGPRS_multislot_class = 1 | EGPRS_multislot_class = 12 | EGPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_DTM_GPRS_multislot_class = 0 | : End Multislot_capability | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 | : DownlinkDualCarrierCapability_r7 | DCSN1 ERROR csnStreamDecoder: error NEED_MORE BITS TO UNPACK (-5) at MultislotCapabilityReductionForDL_DualCarrier (idx 72): End DownlinkDualCarrierCapability_r7 | diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 5bf38a2..27800b0 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -212,3 +212,8 @@ decode_egprs_pkt_ch_req(0x6f9) returns 0 ==> Emergency call decode_egprs_pkt_ch_req(0x7ea) returns -8 +*** testRAcap4 *** +=== Test decoding of MS RA Capability 4=== +decode_gsm_ra_cap() returns -5 +GPRS multislot class = 0 +EGPRS multislot class = 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I51235e8575f4b992b44078713ec67bbccfd13293 Gerrit-Change-Number: 25716 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 14:06:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 14:06:56 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is m... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25830 ) Change subject: csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is missing ...................................................................... csn1: Avoid failing if optional DownlinkDualCarrierCapability_r7 is missing All additional release fields are considered optional, and the CSN_DESCR for Content_t already marks almost all as such, except DownlinkDualCarrierCapability_r7. It has been found that some MS transmits a MS RA Capability with a Length=61 bits where the last bit in the buffer is setting the Exist bit for DownlinkDualCarrierCapability_r7 as 1. Hence, the CSN1 decoder failed to decode the whole message because it expected to keep reading there despite there's no more bytes to read. While this is could actually be considered an MS bug, let's relax our expectancies and simply consider the case { 1 } as it was { 0 }, and mark skip decoding DownlinkDualCarrierCapability_r7. That waht wireshark (packet-gsm_a_gsm.c) or pycrate do for instance. This patch itself doesn't fix the problem where actually the Exist bit is stored as 1 in the output decoded structure, but simply allows keep ongoing with decoding until the end. This issue will be fixed in a follow-up patch. Related: SYS#5552 Related: OS#4955 Related: OS#5020 Change-Id: I9a2541bd3544802a646890f32725201836abb0da --- M src/csn1.h M src/csn1_dec.c M src/gsm_rlcmac.c M tests/rlcmac/RLCMACTest.cpp M tests/rlcmac/RLCMACTest.err M tests/rlcmac/RLCMACTest.ok 6 files changed, 54 insertions(+), 36 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Verified diff --git a/src/csn1.h b/src/csn1.h index d470228..285ae99 100644 --- a/src/csn1.h +++ b/src/csn1.h @@ -462,6 +462,16 @@ {CSN_TYPE, 0, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), FALSE, #_MEMBER, 0, NULL} /****************************************************************************** + * M_TYPE_OR_NULL(Par1, Par2, Par3) + * Similar to the M_TYPE except that not only the request set of bits but also the + * end of the message may be encountered when looking for the next element in + * the message. + * Covers the case {null | 0 | 1 < IE >} + *****************************************************************************/ +#define M_TYPE_OR_NULL(_STRUCT, _MEMBER, _MEMBER_TYPE)\ + {CSN_TYPE, 0, {(const void*)CSNDESCR_##_MEMBER_TYPE}, offsetof(_STRUCT, _MEMBER), TRUE, #_MEMBER, 0, NULL} + +/****************************************************************************** * M_UNION(Par1, Par2) * Informs the CSN.1 library that a union follows and how many possible choices * there are in the union. The actual value of the choice, which points out the diff --git a/src/csn1_dec.c b/src/csn1_dec.c index 2d3f242..4bc74f3 100644 --- a/src/csn1_dec.c +++ b/src/csn1_dec.c @@ -388,22 +388,26 @@ { gint16 Status; csnStream_t arT = *ar; - LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); - LOGPC(DCSN1, LOGL_DEBUG, ": End %s | ", pDescr->sz); - if (Status >= 0) + if (pDescr->may_be_null && remaining_bits_len == 0) { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - pDescr++; + LOGPC(DCSN1, LOGL_DEBUG, " : %s = NULL | ", pDescr->sz); + } else { + LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); + LOGPC(DCSN1, LOGL_DEBUG, ": End %s | ", pDescr->sz); + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { + /* Has already been processed: ProcessError("csnStreamDecoder", Status, pDescr); */ + return Status; + } } - else - { - /* Has already been processed: ProcessError("csnStreamDecoder", Status, pDescr); */ - return Status; - } - + pDescr++; break; } @@ -838,21 +842,25 @@ { gint16 Status; csnStream_t arT = *ar; - LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); - csnStreamInit(&arT, bit_offset, remaining_bits_len); - Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); - LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); - if (Status >= 0) + if (pDescr->may_be_null && remaining_bits_len == 0) { - remaining_bits_len = arT.remaining_bits_len; - bit_offset = arT.bit_offset; - pDescr++; + LOGPC(DCSN1, LOGL_DEBUG, " : %s = NULL | ", pDescr->sz); + } else { + LOGPC(DCSN1, LOGL_DEBUG, " : %s | ", pDescr->sz); + csnStreamInit(&arT, bit_offset, remaining_bits_len); + Status = csnStreamDecoder(&arT, (const CSN_DESCR*)pDescr->descr.ptr, vector, readIndex, pvDATA(data, pDescr->offset)); + LOGPC(DCSN1, LOGL_DEBUG, " : End %s | ", pDescr->sz); + if (Status >= 0) + { + remaining_bits_len = arT.remaining_bits_len; + bit_offset = arT.bit_offset; + } + else + { /* return error code Has already been processed: */ + return Status; + } } - else - { /* return error code Has already been processed: */ - return Status; - } - + pDescr++; break; } diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c index f676645..6793602 100644 --- a/src/gsm_rlcmac.c +++ b/src/gsm_rlcmac.c @@ -928,7 +928,7 @@ /* additions in release 7 */ M_UINT_OR_NULL (Content_t, DTM_Handover_Capability, 1), M_NEXT_EXIST_OR_NULL(Content_t, Exist_DownlinkDualCarrierCapability_r7, 1), - M_TYPE (Content_t, DownlinkDualCarrierCapability_r7, DownlinkDualCarrierCapability_r7_t), + M_TYPE_OR_NULL (Content_t, DownlinkDualCarrierCapability_r7, DownlinkDualCarrierCapability_r7_t), M_UINT_OR_NULL (Content_t, FlexibleTimeslotAssignment, 1), M_UINT_OR_NULL (Content_t, GAN_PS_HandoverCapability, 1), diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index 4875bce..88847de 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -806,14 +806,14 @@ printf("=== Test decoding of MS RA Capability 4===\n"); rc = decode_gsm_ra_cap(bv_dec, &data); printf("decode_gsm_ra_cap() returns %d\n", rc); - OSMO_ASSERT(rc == -5); /* FIXME: should be 0 */ + OSMO_ASSERT(rc == 0); /* Make sure there's 3 values */ - OSMO_ASSERT(data.Count_MS_RA_capability_value == 0); /* FIXME: should be 3 */ + OSMO_ASSERT(data.Count_MS_RA_capability_value == 3); /* Make sure GPRS / EGPRS multislot class is parsed correctly */ - printf("GPRS multislot class = %u\n", get_ms_class_by_capability(&data)); /* FIXME: should be 12 */ - printf("EGPRS multislot class = %u\n", get_egprs_ms_class_by_capability(&data)); /* FIXME: should be 12 */ + printf("GPRS multislot class = %u\n", get_ms_class_by_capability(&data)); + printf("EGPRS multislot class = %u\n", get_egprs_ms_class_by_capability(&data)); bitvec_free(bv_dec); } diff --git a/tests/rlcmac/RLCMACTest.err b/tests/rlcmac/RLCMACTest.err index 045ba78..33a47c3 100644 --- a/tests/rlcmac/RLCMACTest.err +++ b/tests/rlcmac/RLCMACTest.err @@ -58,4 +58,4 @@ DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): Choice EGPRS_PacketChannelRequest_Choice = 51 | : Content | RandomBits = 17 | : End Content | DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): Choice EGPRS_PacketChannelRequest_Choice = 55 | : Content | RandomBits = 25 | : End Content | DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): DCSN1 ERROR csnStreamDecoder: error STREAM_NOT_SUPPORTED (-8) at EGPRS_PacketChannelRequest_Choice (idx 0) -DCSN1 INFO csnStreamDecoder (RAcap): MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 1 | u.Content length = 61 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 1 | A5_bits = 80 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 1 | : Multislot_capability | Exist_HSCSD_multislot_class = 0 | Exist_GPRS_multislot_class = 1 | GPRS_multislot_class = 12 | GPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_SM = 0 | Exist_ECSD_multislot_class = 0 | Exist_EGPRS_multislot_class = 1 | EGPRS_multislot_class = 12 | EGPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_DTM_GPRS_multislot_class = 0 | : End Multislot_capability | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 | : DownlinkDualCarrierCapability_r7 | DCSN1 ERROR csnStreamDecoder: error NEED_MORE BITS TO UNPACK (-5) at MultislotCapabilityReductionForDL_DualCarrier (idx 72): End DownlinkDualCarrierCapability_r7 | +DCSN1 INFO csnStreamDecoder (RAcap): MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 1 | u.Content length = 61 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 1 | A5_bits = 80 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 1 | : Multislot_capability | Exist_HSCSD_multislot_class = 0 | Exist_GPRS_multislot_class = 1 | GPRS_multislot_class = 12 | GPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_SM = 0 | Exist_ECSD_multislot_class = 0 | Exist_EGPRS_multislot_class = 1 | EGPRS_multislot_class = 12 | EGPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_DTM_GPRS_multislot_class = 0 | : End Multislot_capability | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 | : DownlinkDualCarrierCapability_r7 = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 3 | u.Content length = 36 | offset = 1 | RF_Power_Capability = 1 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 | : DownlinkDualCarrierCapability_r7 = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 7 | u.Content length = 36 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 | : DownlinkDualCarrierCapability_r7 = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | Padding = 0| diff --git a/tests/rlcmac/RLCMACTest.ok b/tests/rlcmac/RLCMACTest.ok index 27800b0..86364c4 100644 --- a/tests/rlcmac/RLCMACTest.ok +++ b/tests/rlcmac/RLCMACTest.ok @@ -214,6 +214,6 @@ decode_egprs_pkt_ch_req(0x7ea) returns -8 *** testRAcap4 *** === Test decoding of MS RA Capability 4=== -decode_gsm_ra_cap() returns -5 -GPRS multislot class = 0 -EGPRS multislot class = 0 +decode_gsm_ra_cap() returns 0 +GPRS multislot class = 12 +EGPRS multislot class = 12 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25830 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I9a2541bd3544802a646890f32725201836abb0da Gerrit-Change-Number: 25830 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 14:06:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 14:06:57 +0000 Subject: Change in osmo-pcu[master]: csn1: Avoid storing existence bit as true if content was actually NULL In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25831 ) Change subject: csn1: Avoid storing existence bit as true if content was actually NULL ...................................................................... csn1: Avoid storing existence bit as true if content was actually NULL If we decode Exist bit as "1" but we are at the end of the message, and all the Next items we'd read are expected to be possibly NULL, then swap the Exist bit in the decoded structure as "0" in order to tell the decoder user that the related information structure is actually unset, as if "0" was received. Related: SYS#5552 Related: OS#4955 Related: OS#5020 Change-Id: I38602e4b680ed87297c7e440691a494c07cad446 --- M src/csn1_dec.c M tests/rlcmac/RLCMACTest.err 2 files changed, 37 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/src/csn1_dec.c b/src/csn1_dec.c index 4bc74f3..fa1f0c3 100644 --- a/src/csn1_dec.c +++ b/src/csn1_dec.c @@ -909,6 +909,7 @@ case CSN_NEXT_EXIST: { guint8 fExist; + guint8 isnull; pui8 = pui8DATA(data, pDescr->offset); @@ -927,17 +928,30 @@ /* the "regular" M_NEXT_EXIST description element */ fExist = 0x00; + isnull = 1; if (bitvec_read_field(vector, readIndex, 1)) { fExist = 0x01; + if (remaining_bits_len == 1) { + /* If { 1 < end > } and all next items may be null, store it as { 0 } */ + const CSN_DESCR* pDescrNext = pDescr + 1; + guint8 i; + for (i = 0; i < pDescr->i; i++, pDescrNext++) + { + if (!pDescrNext->may_be_null) + isnull = 0; + } + } else { + isnull = 0; + } } - *pui8 = fExist; + *pui8 = !isnull; remaining_bits_len -= 1; - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)*pui8); + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u%s | ", pDescr->sz, (unsigned)fExist, fExist && isnull ? " (NULL)" : ""); ++bit_offset; - if (fExist == 0) + if (isnull) { /* Skip 'i' entries */ pDescr += pDescr->i; } @@ -949,6 +963,7 @@ case CSN_NEXT_EXIST_LH: { guint8 fExist; + guint8 isnull; pui8 = pui8DATA(data, pDescr->offset); /* this if-statement represents the M_NEXT_EXIST_OR_NULL_LH description element */ @@ -964,14 +979,29 @@ } /* the "regular" M_NEXT_EXIST_LH description element */ - fExist = get_masked_bits8(vector, readIndex, bit_offset, 1); - LOGPC(DCSN1, LOGL_DEBUG, "%s = %u | ", pDescr->sz , (unsigned)fExist); + isnull = 1; + if ((fExist = get_masked_bits8(vector, readIndex, bit_offset, 1))) + { + if (remaining_bits_len == 1) { + /* If { 1 < end > } and all next items may be null, store it as { 0 } */ + const CSN_DESCR* pDescrNext = pDescr + 1; + guint8 i; + for (i = 0; i < pDescr->i; i++, pDescrNext++) + { + if (!pDescrNext->may_be_null) + isnull = 0; + } + } else { + isnull = 0; + } + } + LOGPC(DCSN1, LOGL_DEBUG, "%s = %u%s | ", pDescr->sz , (unsigned)fExist, fExist && isnull ? " (NULL)" : ""); *pui8++ = fExist; remaining_bits_len -= 1; bit_offset++; - if (fExist == 0) + if (isnull) { /* Skip 'i' entries */ pDescr += pDescr->i; } diff --git a/tests/rlcmac/RLCMACTest.err b/tests/rlcmac/RLCMACTest.err index 33a47c3..1dc8d04 100644 --- a/tests/rlcmac/RLCMACTest.err +++ b/tests/rlcmac/RLCMACTest.err @@ -58,4 +58,4 @@ DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): Choice EGPRS_PacketChannelRequest_Choice = 51 | : Content | RandomBits = 17 | : End Content | DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): Choice EGPRS_PacketChannelRequest_Choice = 55 | : Content | RandomBits = 25 | : End Content | DCSN1 DEBUG csnStreamDecoder (EGPRS Packet Channel Request): DCSN1 ERROR csnStreamDecoder: error STREAM_NOT_SUPPORTED (-8) at EGPRS_PacketChannelRequest_Choice (idx 0) -DCSN1 INFO csnStreamDecoder (RAcap): MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 1 | u.Content length = 61 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 1 | A5_bits = 80 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 1 | : Multislot_capability | Exist_HSCSD_multislot_class = 0 | Exist_GPRS_multislot_class = 1 | GPRS_multislot_class = 12 | GPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_SM = 0 | Exist_ECSD_multislot_class = 0 | Exist_EGPRS_multislot_class = 1 | EGPRS_multislot_class = 12 | EGPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_DTM_GPRS_multislot_class = 0 | : End Multislot_capability | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 | : DownlinkDualCarrierCapability_r7 = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 3 | u.Content length = 36 | offset = 1 | RF_Power_Capability = 1 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 | : DownlinkDualCarrierCapability_r7 = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 7 | u.Content length = 36 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 | : DownlinkDualCarrierCapability_r7 = NULL | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | Padding = 0| +DCSN1 INFO csnStreamDecoder (RAcap): MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 1 | u.Content length = 61 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 1 | A5_bits = 80 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 1 | : Multislot_capability | Exist_HSCSD_multislot_class = 0 | Exist_GPRS_multislot_class = 1 | GPRS_multislot_class = 12 | GPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_SM = 0 | Exist_ECSD_multislot_class = 0 | Exist_EGPRS_multislot_class = 1 | EGPRS_multislot_class = 12 | EGPRS_Extended_Dynamic_Allocation_Capability = 1 | Exist_DTM_GPRS_multislot_class = 0 | : End Multislot_capability | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 (NULL) | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 3 | u.Content length = 36 | offset = 1 | RF_Power_Capability = 1 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 (NULL) | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | MS_RA_capability_value { | Choice MS_RA_capability_value_Choice = 7 | u.Content length = 36 | offset = 1 | RF_Power_Capability = 4 | Exist_A5_bits = 0 | ES_IND = 1 | PS = 1 | VGCS = 0 | VBS = 0 | Exist_Multislot_capability = 0 | Exist_Eight_PSK_Power_Capability = 1 | Eight_PSK_Power_Capability = 2 | COMPACT_Interference_Measurement_Capability = 0 | Revision_Level_Indicator = 1 | UMTS_FDD_Radio_Access_Technology_Capability = 1 | UMTS_384_TDD_Radio_Access_Technology_Capability = 0 | CDMA2000_Radio_Access_Technology_Capability = 0 | UMTS_128_TDD_Radio_Access_Technology_Capability = 0 | GERAN_Feature_Package_1 = 1 | Exist_Extended_DTM_multislot_class = 0 | Modulation_based_multislot_class_support = 0 | Exist_HighMultislotCapability = 0 | Exist_GERAN_lu_ModeCapability = 0 | GMSK_MultislotPowerProfile = 0 | EightPSK_MultislotProfile = 0 | MultipleTBF_Capability = 0 | DownlinkAdvancedReceiverPerformance = 0 | ExtendedRLC_MAC_ControlMessageSegmentionsCapability = 0 | DTM_EnhancementsCapability = 0 | Exist_DTM_GPRS_HighMultislotClass = 0 | PS_HandoverCapability = 0 | DTM_Handover_Capability = 0 | Exist_DownlinkDualCarrierCapability_r7 = 1 (NULL) | FlexibleTimeslotAssignment = NULL | GAN_PS_HandoverCapability = NULL | RLC_Non_persistentMode = NULL | ReducedLatencyCapability = NULL | UplinkEGPRS2 = NULL | DownlinkEGPRS2 = NULL | EUTRA_FDD_Support = NULL | EUTRA_TDD_Support = NULL | GERAN_To_EUTRAN_supportInGERAN_PTM = NULL | PriorityBasedReselectionSupport = NULL | MS_RA_capability_value } | Padding = 0| -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I38602e4b680ed87297c7e440691a494c07cad446 Gerrit-Change-Number: 25831 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 14:16:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 14:16:23 +0000 Subject: Change in osmo-bts[master]: Reset CBCH state after BTS shutdown References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25841 ) Change subject: Reset CBCH state after BTS shutdown ...................................................................... Reset CBCH state after BTS shutdown Related: OS#5273 Change-Id: Ib01d38c59ba9fa083fcc0682009c13d2db3664fe --- M include/osmo-bts/cbch.h M src/common/cbch.c M src/common/nm_bts_fsm.c 3 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/25841/1 diff --git a/include/osmo-bts/cbch.h b/include/osmo-bts/cbch.h index 6bba5fa..d5521f0 100644 --- a/include/osmo-bts/cbch.h +++ b/include/osmo-bts/cbch.h @@ -21,3 +21,5 @@ /* call-back from bts model specific code when it wants to obtain a CBCH * block for a given gsm_time. outbuf must have 23 bytes of space. */ int bts_cbch_get(struct gsm_bts *bts, uint8_t *outbuf, struct gsm_time *g_time); + +void bts_cbch_reset(struct gsm_bts *bts); diff --git a/src/common/cbch.c b/src/common/cbch.c index ebea60b..addd68c 100644 --- a/src/common/cbch.c +++ b/src/common/cbch.c @@ -322,3 +322,22 @@ return rc; } + +static void bts_smscb_state_reset(struct bts_smscb_state *bts_ss) +{ + struct smscb_msg *scm, *tmp; + llist_for_each_entry_safe(scm, tmp, &bts_ss->queue, list) { + llist_del(&scm->list); + talloc_free(scm); + } + bts_ss->queue_len = 0; + rate_ctr_group_reset(bts_ss->ctrs); + TALLOC_FREE(bts_ss->cur_msg); + TALLOC_FREE(bts_ss->default_msg); +} + +void bts_cbch_reset(struct gsm_bts *bts) +{ + bts_smscb_state_reset(&bts->smscb_basic); + bts_smscb_state_reset(&bts->smscb_extended); +} diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index c9dcd4c..063ffe8 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -35,6 +35,7 @@ #include #include #include +#include #define X(s) (1 << (s)) @@ -60,6 +61,7 @@ /* Reset state: */ bts->si_valid = 0; TALLOC_FREE(bts->mo.nm_attr); + bts_cbch_reset(bts); bts->mo.setattr_success = false; bts->mo.opstart_success = false; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib01d38c59ba9fa083fcc0682009c13d2db3664fe Gerrit-Change-Number: 25841 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 14:55:26 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 14:55:26 +0000 Subject: Change in osmo-bts[master]: Reset CBCH state after BTS shutdown In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25841 ) Change subject: Reset CBCH state after BTS shutdown ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25841/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/25841/1//COMMIT_MSG at 9 PS1, Line 9: Related Fixes? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib01d38c59ba9fa083fcc0682009c13d2db3664fe Gerrit-Change-Number: 25841 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 20 Oct 2021 14:55:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 15:00:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 15:00:17 +0000 Subject: Change in osmo-bts[master]: Reset CBCH state after BTS shutdown In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25841 ) Change subject: Reset CBCH state after BTS shutdown ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25841/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/25841/1//COMMIT_MSG at 9 PS1, Line 9: Related > Fixes? I tend to use "Related:" for tickets and "Fixes:" for commit hashes. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib01d38c59ba9fa083fcc0682009c13d2db3664fe Gerrit-Change-Number: 25841 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 20 Oct 2021 15:00:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 15:21:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 15:21:50 +0000 Subject: Change in osmo-pcu[master]: csn1_dec.c: Fix stored bit in CSN_NEXT_EXIST_LH References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25842 ) Change subject: csn1_dec.c: Fix stored bit in CSN_NEXT_EXIST_LH ...................................................................... csn1_dec.c: Fix stored bit in CSN_NEXT_EXIST_LH Fixup for previous patch, which forgot to update the pui using the new variable, as done already in the same patch for M_NEXT_EXIST. Change-Id: I92a04c708bcc6c15348324321e8890361bbc5c31 Fixes: 72cdb30ee2b1c0d71ff6d9583d51f46b2e5fdcea --- M src/csn1_dec.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/42/25842/1 diff --git a/src/csn1_dec.c b/src/csn1_dec.c index fa1f0c3..6892dde 100644 --- a/src/csn1_dec.c +++ b/src/csn1_dec.c @@ -996,7 +996,7 @@ } } LOGPC(DCSN1, LOGL_DEBUG, "%s = %u%s | ", pDescr->sz , (unsigned)fExist, fExist && isnull ? " (NULL)" : ""); - *pui8++ = fExist; + *pui8++ = !isnull; remaining_bits_len -= 1; bit_offset++; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I92a04c708bcc6c15348324321e8890361bbc5c31 Gerrit-Change-Number: 25842 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 15:36:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 15:36:52 +0000 Subject: Change in osmo-pcu[master]: csn1_dec.c: Fix stored bit in CSN_NEXT_EXIST_LH In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25842 ) Change subject: csn1_dec.c: Fix stored bit in CSN_NEXT_EXIST_LH ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I92a04c708bcc6c15348324321e8890361bbc5c31 Gerrit-Change-Number: 25842 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 15:36:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 15:36:59 +0000 Subject: Change in osmo-pcu[master]: csn1_dec.c: Fix stored bit in CSN_NEXT_EXIST_LH In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25842 ) Change subject: csn1_dec.c: Fix stored bit in CSN_NEXT_EXIST_LH ...................................................................... Patch Set 1: Verified+1 linter doesn't apply here. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I92a04c708bcc6c15348324321e8890361bbc5c31 Gerrit-Change-Number: 25842 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 15:36:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 15:38:52 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 15:38:52 +0000 Subject: Change in osmo-pcu[master]: csn1_dec.c: Fix stored bit in CSN_NEXT_EXIST_LH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25842 ) Change subject: csn1_dec.c: Fix stored bit in CSN_NEXT_EXIST_LH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I92a04c708bcc6c15348324321e8890361bbc5c31 Gerrit-Change-Number: 25842 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 15:38:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 15:39:24 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 15:39:24 +0000 Subject: Change in osmo-pcu[master]: csn1_dec.c: Fix stored bit in CSN_NEXT_EXIST_LH In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/25842 ) Change subject: csn1_dec.c: Fix stored bit in CSN_NEXT_EXIST_LH ...................................................................... csn1_dec.c: Fix stored bit in CSN_NEXT_EXIST_LH Fixup for previous patch, which forgot to update the pui using the new variable, as done already in the same patch for M_NEXT_EXIST. Change-Id: I92a04c708bcc6c15348324321e8890361bbc5c31 Fixes: 72cdb30ee2b1c0d71ff6d9583d51f46b2e5fdcea --- M src/csn1_dec.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Verified fixeria: Looks good to me, approved diff --git a/src/csn1_dec.c b/src/csn1_dec.c index fa1f0c3..6892dde 100644 --- a/src/csn1_dec.c +++ b/src/csn1_dec.c @@ -996,7 +996,7 @@ } } LOGPC(DCSN1, LOGL_DEBUG, "%s = %u%s | ", pDescr->sz , (unsigned)fExist, fExist && isnull ? " (NULL)" : ""); - *pui8++ = fExist; + *pui8++ = !isnull; remaining_bits_len -= 1; bit_offset++; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/25842 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I92a04c708bcc6c15348324321e8890361bbc5c31 Gerrit-Change-Number: 25842 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 16:35:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 16:35:22 +0000 Subject: Change in osmo-bsc[pespin/1.7.1]: lchan_fsm: fix potential NULL-pointer dereference References: Message-ID: Hello fixeria, I'd like you to do a code review. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25843 to review the following change. Change subject: lchan_fsm: fix potential NULL-pointer dereference ...................................................................... lchan_fsm: fix potential NULL-pointer dereference Test case TC_lost_sdcch_during_assignment from ttcn3-bsc-test causes osmo-bsc to crash due to for_conn being NULL. This patch is a backport from osmo-bsc.git master dfd7bef6644d0c0837f7e5498bc5c86362b668dc. Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Related: SYS#5526, OS#5255 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/43/25843/1 diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 9c7ecaf..fb40e00 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -114,6 +114,18 @@ case FOR_ASSIGNMENT: LOG_LCHAN(lchan, LOGL_NOTICE, "Signalling Assignment FSM of error (%s)\n", lchan->last_error ? : "unknown error"); + if (!for_conn) { + LOG_LCHAN(lchan, LOGL_ERROR, + "lchan activation for Assignment failed, but activation request has" + " no conn\n"); + break; + } + if (!for_conn->assignment.fi) { + LOG_LCHAN(lchan, LOGL_ERROR, + "lchan activation for Assignment failed, but conn has no ongoing" + " assignment procedure\n"); + break; + } _osmo_fsm_inst_dispatch(for_conn->assignment.fi, ASSIGNMENT_EV_LCHAN_ERROR, lchan, file, line); return; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: pespin/1.7.1 Gerrit-Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Gerrit-Change-Number: 25843 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 16:35:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 16:35:23 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Bpespin/1=2E7=2E1=5D=3A_Bump_version=3A_1=2E7=2E1=2E1-06983_=E2=86=92_1=2E7=2E2?= References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25844 ) Change subject: Bump version: 1.7.1.1-06983 ? 1.7.2 ...................................................................... Bump version: 1.7.1.1-06983 ? 1.7.2 Change-Id: I531a9ba39b3b0c6096f7a37173639de15ec76058 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/44/25844/1 diff --git a/debian/changelog b/debian/changelog index 9713aab..b084b9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-bsc (1.7.2) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * lchan_fsm: fix potential NULL-pointer dereference + + -- Pau Espin Pedrol Wed, 20 Oct 2021 18:34:47 +0200 + osmo-bsc (1.7.1) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: pespin/1.7.1 Gerrit-Change-Id: I531a9ba39b3b0c6096f7a37173639de15ec76058 Gerrit-Change-Number: 25844 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 16:38:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 16:38:04 +0000 Subject: Change in osmo-bsc[rel-1.7.2]: lchan_fsm: fix potential NULL-pointer dereference In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25836 ) Change subject: lchan_fsm: fix potential NULL-pointer dereference ...................................................................... Abandoned In favor of 25843. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25836 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: rel-1.7.2 Gerrit-Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Gerrit-Change-Number: 25836 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 16:38:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 16:38:28 +0000 Subject: Change in osmo-bsc[pespin/1.7.1]: lchan_fsm: fix potential NULL-pointer dereference In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25843 ) Change subject: lchan_fsm: fix potential NULL-pointer dereference ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: pespin/1.7.1 Gerrit-Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Gerrit-Change-Number: 25843 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 20 Oct 2021 16:38:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 16:38:40 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 16:38:40 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Bpespin/1=2E7=2E1=5D=3A_Bump_version=3A_1=2E7=2E1=2E1-06983_=E2=86=92_1=2E7=2E2?= In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25844 ) Change subject: Bump version: 1.7.1.1-06983 ? 1.7.2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: pespin/1.7.1 Gerrit-Change-Id: I531a9ba39b3b0c6096f7a37173639de15ec76058 Gerrit-Change-Number: 25844 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 20 Oct 2021 16:38:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 16:45:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 16:45:00 +0000 Subject: Change in osmo-bsc[pespin/1.7.1]: lchan_fsm: fix potential NULL-pointer dereference In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25843 ) Change subject: lchan_fsm: fix potential NULL-pointer dereference ...................................................................... lchan_fsm: fix potential NULL-pointer dereference Test case TC_lost_sdcch_during_assignment from ttcn3-bsc-test causes osmo-bsc to crash due to for_conn being NULL. This patch is a backport from osmo-bsc.git master dfd7bef6644d0c0837f7e5498bc5c86362b668dc. Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Related: SYS#5526, OS#5255 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 9c7ecaf..fb40e00 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -114,6 +114,18 @@ case FOR_ASSIGNMENT: LOG_LCHAN(lchan, LOGL_NOTICE, "Signalling Assignment FSM of error (%s)\n", lchan->last_error ? : "unknown error"); + if (!for_conn) { + LOG_LCHAN(lchan, LOGL_ERROR, + "lchan activation for Assignment failed, but activation request has" + " no conn\n"); + break; + } + if (!for_conn->assignment.fi) { + LOG_LCHAN(lchan, LOGL_ERROR, + "lchan activation for Assignment failed, but conn has no ongoing" + " assignment procedure\n"); + break; + } _osmo_fsm_inst_dispatch(for_conn->assignment.fi, ASSIGNMENT_EV_LCHAN_ERROR, lchan, file, line); return; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: pespin/1.7.1 Gerrit-Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Gerrit-Change-Number: 25843 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 16:45:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 16:45:00 +0000 Subject: =?UTF-8?Q?Change_in_osmo-bsc=5Bpespin/1=2E7=2E1=5D=3A_Bump_version=3A_1=2E7=2E1=2E1-06983_=E2=86=92_1=2E7=2E2?= In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25844 ) Change subject: Bump version: 1.7.1.1-06983 ? 1.7.2 ...................................................................... Bump version: 1.7.1.1-06983 ? 1.7.2 Change-Id: I531a9ba39b3b0c6096f7a37173639de15ec76058 --- M debian/changelog 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/debian/changelog b/debian/changelog index 9713aab..b084b9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +osmo-bsc (1.7.2) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * lchan_fsm: fix potential NULL-pointer dereference + + -- Pau Espin Pedrol Wed, 20 Oct 2021 18:34:47 +0200 + osmo-bsc (1.7.1) unstable; urgency=medium [ Philipp Maier ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25844 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: pespin/1.7.1 Gerrit-Change-Id: I531a9ba39b3b0c6096f7a37173639de15ec76058 Gerrit-Change-Number: 25844 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 17:24:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 17:24:03 +0000 Subject: Change in osmo-bsc[master]: gitignore: Fix typo References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25845 ) Change subject: gitignore: Fix typo ...................................................................... gitignore: Fix typo Change-Id: I4c9737b7749f0b8eb8fac3c882bcd7e6f66c58a8 --- M .gitignore 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/45/25845/1 diff --git a/.gitignore b/.gitignore index c4d8984..e504f4c 100644 --- a/.gitignore +++ b/.gitignore @@ -84,7 +84,7 @@ doc/manuals/*__*.png doc/manuals/*.check doc/manuals/generated/ -doc/manuals/osmomsc-usermanual.xml +doc/manuals/osmobsc-usermanual.xml doc/manuals/common doc/manuals/build -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4c9737b7749f0b8eb8fac3c882bcd7e6f66c58a8 Gerrit-Change-Number: 25845 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 17:47:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 17:47:50 +0000 Subject: Change in osmo-bsc[master]: jenkins.sh: Fix typo References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25846 ) Change subject: jenkins.sh: Fix typo ...................................................................... jenkins.sh: Fix typo Change-Id: I80add059bd41cf385de1981bddd5c35b1d19bf57 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/46/25846/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0b978dc..189eb2c 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org +# jenkins build helper script for osmo-bsc. This is how we build on jenkins.osmocom.org # # environment variables: # * WITH_MANUALS: build manual PDFs if set to "1" -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I80add059bd41cf385de1981bddd5c35b1d19bf57 Gerrit-Change-Number: 25846 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 18:04:11 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 20 Oct 2021 18:04:11 +0000 Subject: Change in simtrace2[master]: add the ngff cardem to default build targets References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/25847 ) Change subject: add the ngff cardem to default build targets ...................................................................... add the ngff cardem to default build targets Change-Id: Icec4966fe419eee9f7ace67e46e3d88738812b38 --- M Makefile 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/47/25847/1 diff --git a/Makefile b/Makefile index e9917c3..b15f38d 100644 --- a/Makefile +++ b/Makefile @@ -12,9 +12,12 @@ $(eval $(call RULES,simtrace,cardem)) $(eval $(call RULES,qmod,dfu)) $(eval $(call RULES,qmod,cardem)) +$(eval $(call RULES,ngff_cardem,dfu)) +$(eval $(call RULES,ngff_cardem,trace)) +$(eval $(call RULES,ngff_cardem,cardem)) fw-clean: fw-simtrace-dfu-clean fw-simtrace-trace-clean fw-simtrace-cardem-clean fw-qmod-dfu-clean fw-qmod-cardem-clean -fw: fw-simtrace-dfu fw-simtrace-trace fw-simtrace-cardem fw-qmod-dfu fw-qmod-cardem +fw: fw-simtrace-dfu fw-simtrace-trace fw-simtrace-cardem fw-qmod-dfu fw-qmod-cardem fw-ngff_cardem-dfu fw-ngff_cardem-trace fw-ngff_cardem-cardem utils: (cd host && \ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Icec4966fe419eee9f7ace67e46e3d88738812b38 Gerrit-Change-Number: 25847 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 18:04:11 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 20 Oct 2021 18:04:11 +0000 Subject: Change in simtrace2[master]: drop unused exidx sections when linking References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/25848 ) Change subject: drop unused exidx sections when linking ...................................................................... drop unused exidx sections when linking clang might emit those even though they are neither needed or wanted, so just get rid of them. Change-Id: I159b4405cebe72af4d98b27f876c48835ffd6e2d --- M firmware/libboard/common/resources/sam3s4/dfu.ld M firmware/libboard/common/resources/sam3s4/flash.ld 2 files changed, 6 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/48/25848/1 diff --git a/firmware/libboard/common/resources/sam3s4/dfu.ld b/firmware/libboard/common/resources/sam3s4/dfu.ld index a485770..db747fa 100644 --- a/firmware/libboard/common/resources/sam3s4/dfu.ld +++ b/firmware/libboard/common/resources/sam3s4/dfu.ld @@ -96,13 +96,10 @@ _efixed = .; /* End of text section */ } > rom - /* .ARM.exidx is sorted, so has to go in its own output section. */ - PROVIDE_HIDDEN (__exidx_start = .); - .ARM.exidx : + /DISCARD/ : { - *(.ARM.exidx* .gnu.linkonce.armexidx.*) - } > rom - PROVIDE_HIDDEN (__exidx_end = .); + *(.ARM.exidx) + } . = ALIGN(4); _etext = .; diff --git a/firmware/libboard/common/resources/sam3s4/flash.ld b/firmware/libboard/common/resources/sam3s4/flash.ld index f5cdbfd..50631c6 100644 --- a/firmware/libboard/common/resources/sam3s4/flash.ld +++ b/firmware/libboard/common/resources/sam3s4/flash.ld @@ -94,13 +94,10 @@ _efixed = .; /* End of text section */ } > rom - /* .ARM.exidx is sorted, so has to go in its own output section. */ - PROVIDE_HIDDEN (__exidx_start = .); - .ARM.exidx : + /DISCARD/ : { - *(.ARM.exidx* .gnu.linkonce.armexidx.*) - } > rom - PROVIDE_HIDDEN (__exidx_end = .); + *(.ARM.exidx) + } . = ALIGN(4); _etext = .; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I159b4405cebe72af4d98b27f876c48835ffd6e2d Gerrit-Change-Number: 25848 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 18:04:12 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 20 Oct 2021 18:04:12 +0000 Subject: Change in simtrace2[master]: clang build support References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/25849 ) Change subject: clang build support ...................................................................... clang build support Supposed to be used with https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm + distro provided binutils-arm-none-eabi package, might provide better and more reliable binary sizes, especially for the bootloader. Just run USE_CLANG=1 make Change-Id: I1a19f40d44797efad5c46121e73115ed738a095b --- M firmware/Makefile M firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c 2 files changed, 30 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/49/25849/1 diff --git a/firmware/Makefile b/firmware/Makefile index 0364166..bfe2c9d 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -73,12 +73,20 @@ # Tool suffix when cross-compiling CROSS_COMPILE = arm-none-eabi- -LIBS = -Wl,--start-group -lgcc -Wl,--end-group -nostdlib - -# Compilation tools +USE_CLANG ?= 0 +ifneq ("$(USE_CLANG)","0") +# --target=thumbv7m-none-eabi +CC = clang +LD = ld.lld +SIZE = llvm-size +LIBS = -nostdlib +else CC = $(CROSS_COMPILE)gcc LD = $(CROSS_COMPILE)ld SIZE = $(CROSS_COMPILE)size +LIBS = -Wl,--start-group -lgcc -Wl,--end-group -nostdlib +endif + STRIP = $(CROSS_COMPILE)strip OBJCOPY = $(CROSS_COMPILE)objcopy GDB = $(CROSS_COMPILE)gdb @@ -139,7 +147,11 @@ #CFLAGS+=-DUSB_NO_DEBUG=1 # Optimization level, put in comment for debugging +ifneq ("$(USE_CLANG)","0") +OPTIMIZATION ?= -Oz +else OPTIMIZATION ?= -Os +endif # Flags INCLUDES_USB = -I$(AT91LIB)/usb/include -I$(AT91LIB) @@ -153,6 +165,11 @@ INCLUDES += -Isrc_simtrace -Iinclude INCLUDES += -Iapps/$(APP) +ifneq ("$(USE_CLANG)","0") +CFLAGS += -Wno-unknown-warning-option -Wno-empty-body -fno-exceptions -fno-unwind-tables --config armv7em_soft_nofp_nosys +else +CFLAGS += -Wno-suggest-attribute=noreturn --param max-inline-insns-single=500 +endif CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int -Wformat=2 CFLAGS += -Werror-implicit-function-declaration -Wmain -Wparentheses CFLAGS += -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs #-Wunused @@ -165,16 +182,16 @@ CFLAGS += -Wunreachable-code #CFLAGS += -Wcast-align #CFLAGS += -std=c11 -CFLAGS += -Wmissing-noreturn +#CFLAGS += -Wmissing-noreturn #CFLAGS += -Wconversion CFLAGS += -Wno-unused-but-set-variable -Wno-unused-variable -CFLAGS += -Wno-suggest-attribute=noreturn + # -mlong-calls -Wall #CFLAGS += -save-temps -fverbose-asm #CFLAGS += -Wa,-a,-ad CFLAGS += -D__ARM -fno-builtin -CFLAGS += --param max-inline-insns-single=500 -mcpu=cortex-m3 -mthumb # -mfix-cortex-m3-ldrd +CFLAGS += -mcpu=cortex-m3 -mthumb # -mfix-cortex-m3-ldrd CFLAGS += -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DALLOW_PEER_ERASE=$(ALLOW_PEER_ERASE) CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" CFLAGS += -DBOARD=\"$(BOARD)\" -DBOARD_$(BOARD) @@ -188,7 +205,10 @@ endif ASFLAGS = -mcpu=cortex-m3 -mthumb -Wall -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -D__ASSEMBLY__ -LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--print-memory-usage -Wl,--no-undefined $(LIB) +LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--no-undefined $(LIB) +ifeq ("$(USE_CLANG)","0") +LDFLAGS += -Wl,--warn-section-align -Wl,--print-memory-usage +endif #LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats # Append BIN directories to output filename @@ -227,14 +247,14 @@ ASM_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(ASM_OBJECTS)) $(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1)) - $(SILENT)$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS) + $(SILENT)$(CC) $(CFLAGS) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS) $(SILENT)$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt $(SILENT)$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin $(SILENT)$(SIZE) $$^ $(OUTPUT)-$$@.elf $$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN) @echo [COMPILING $$<] - $(SILENT)$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -Wa,-ahlms=$(BIN)/$$*.lst -c -o $$@ $$< + $(SILENT)$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$< $$(ASM_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.S Makefile $(OBJ) $(BIN) @echo [ASSEMBLING $$@] diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c index 4799eae..7496f3a 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c @@ -151,8 +151,7 @@ " mrseq r0, msp \n" " mrsne r0, psp \n" //" ldr r1, [r0, #24] \n" - " b hard_fault_handler_c\n" - ".syntax divided \n"); + " b hard_fault_handler_c\n"); } /** -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I1a19f40d44797efad5c46121e73115ed738a095b Gerrit-Change-Number: 25849 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 18:04:12 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Wed, 20 Oct 2021 18:04:12 +0000 Subject: Change in simtrace2[master]: fix bootloader led config crash References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/25850 ) Change subject: fix bootloader led config crash ...................................................................... fix bootloader led config crash This led to occasional crashes for targets with leds since it was introduced 3 years ago The interesting thing is that most of the time it didn't crash... Change-Id: Ia6a1b1fc0e44a301b4fb1d9c9fdbc27d61dcab97 --- M firmware/apps/dfu/main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/50/25850/1 diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index f8c0c53..d5a6fa6 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -271,7 +271,7 @@ #ifdef PINS_LEDS /* Configure LED */ - PIO_Configure(pinsLeds, sizeof(pinsLeds)); + PIO_Configure(pinsLeds, PIO_LISTSIZE(pinsLeds)); PIO_Set(&pinsLeds[LED_NUM_RED]); PIO_Clear(&pinsLeds[LED_NUM_GREEN]); #endif -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ia6a1b1fc0e44a301b4fb1d9c9fdbc27d61dcab97 Gerrit-Change-Number: 25850 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 18:22:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 18:22:04 +0000 Subject: Change in simtrace2[master]: fix bootloader led config crash In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25850 ) Change subject: fix bootloader led config crash ...................................................................... Patch Set 1: Code-Review+1 Nice catch! -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ia6a1b1fc0e44a301b4fb1d9c9fdbc27d61dcab97 Gerrit-Change-Number: 25850 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 20 Oct 2021 18:22:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 18:25:42 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 18:25:42 +0000 Subject: Change in osmo-ci[master]: lint/checkpatch: ignore csn1_(enc|dec).c files in osmo-pcu.git References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25851 ) Change subject: lint/checkpatch: ignore csn1_(enc|dec).c files in osmo-pcu.git ...................................................................... lint/checkpatch: ignore csn1_(enc|dec).c files in osmo-pcu.git Change-Id: I5f8c83e3a8b9f5280779d6a6cf0736b9d3f4e958 Related: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/51/25851/1 diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh index 568f9b2..91e9abe 100755 --- a/lint/checkpatch/checkpatch_osmo.sh +++ b/lint/checkpatch/checkpatch_osmo.sh @@ -23,6 +23,7 @@ osmo-pcu) # Imported code echo '--exclude ^src/csn1.(c|h)$' + echo '--exclude ^src/csn1_(enc|dec).c$' echo '--exclude ^src/gsm_rlcmac.(c|h)$' ;; esac -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5f8c83e3a8b9f5280779d6a6cf0736b9d3f4e958 Gerrit-Change-Number: 25851 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 18:26:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 18:26:23 +0000 Subject: Change in osmo-ci[master]: lint/checkpatch: ignore csn1_(enc|dec).c files in osmo-pcu.git In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25851 ) Change subject: lint/checkpatch: ignore csn1_(enc|dec).c files in osmo-pcu.git ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5f8c83e3a8b9f5280779d6a6cf0736b9d3f4e958 Gerrit-Change-Number: 25851 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 18:26:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 18:26:59 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 18:26:59 +0000 Subject: Change in osmo-ci[master]: lint/checkpatch: ignore csn1_(enc|dec).c files in osmo-pcu.git In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25851 ) Change subject: lint/checkpatch: ignore csn1_(enc|dec).c files in osmo-pcu.git ...................................................................... lint/checkpatch: ignore csn1_(enc|dec).c files in osmo-pcu.git Change-Id: I5f8c83e3a8b9f5280779d6a6cf0736b9d3f4e958 Related: I7d1b1f7e6d7f89b052b3fd73a960419bb2673020 --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh index 568f9b2..91e9abe 100755 --- a/lint/checkpatch/checkpatch_osmo.sh +++ b/lint/checkpatch/checkpatch_osmo.sh @@ -23,6 +23,7 @@ osmo-pcu) # Imported code echo '--exclude ^src/csn1.(c|h)$' + echo '--exclude ^src/csn1_(enc|dec).c$' echo '--exclude ^src/gsm_rlcmac.(c|h)$' ;; esac -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5f8c83e3a8b9f5280779d6a6cf0736b9d3f4e958 Gerrit-Change-Number: 25851 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 18:41:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 18:41:06 +0000 Subject: Change in libosmocore[master]: {ctrl, vty}/ports.h: Allocate ports for osmo-hnodeb References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/25852 ) Change subject: {ctrl,vty}/ports.h: Allocate ports for osmo-hnodeb ...................................................................... {ctrl,vty}/ports.h: Allocate ports for osmo-hnodeb Change-Id: I6514d040d88d145a321075911368645868e6280e --- M include/osmocom/ctrl/ports.h M include/osmocom/vty/ports.h 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/52/25852/1 diff --git a/include/osmocom/ctrl/ports.h b/include/osmocom/ctrl/ports.h index 91206dc..38abd6d 100644 --- a/include/osmocom/ctrl/ports.h +++ b/include/osmocom/ctrl/ports.h @@ -28,4 +28,6 @@ /* 4266 used by D-GSM mDNS */ #define OSMO_CTRL_PORT_MGW 4267 #define OSMO_CTRL_PORT_SMLC 4272 +/* 4273 used by VTY interface */ +#define OSMO_CTRL_PORT_SMLC 4274 /* When adding/changing port numbers, keep docs and wiki in sync. See above. */ diff --git a/include/osmocom/vty/ports.h b/include/osmocom/vty/ports.h index 580e642..cfefaa8 100644 --- a/include/osmocom/vty/ports.h +++ b/include/osmocom/vty/ports.h @@ -39,4 +39,7 @@ #define OSMO_VTY_PORT_UECUPS 4268 #define OSMO_VTY_PORT_E1D 4269 #define OSMO_VTY_PORT_SMLC 4271 +/* 4272 used by control interface */ +#define OSMO_VTY_PORT_HNODEB 4273 +/* 4274 used by control interface */ /* When adding/changing port numbers, keep docs and wiki in sync. See above. */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6514d040d88d145a321075911368645868e6280e Gerrit-Change-Number: 25852 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 18:51:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 18:51:51 +0000 Subject: Change in osmo-ci[master]: coverity: enable parallel build for libsmpp34 References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25853 ) Change subject: coverity: enable parallel build for libsmpp34 ...................................................................... coverity: enable parallel build for libsmpp34 We have parallel build enabled in libsmpp34.git since 2018. Change-Id: Ibe57a8c823d9b35e2f51c9bd7a13d6baf61bf0ca Related: Id41fbcb5a96093eb6c3dc00bcacbd379111ada70 --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/53/25853/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index c064a95..bb0f894 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -52,15 +52,6 @@ popd } -build_libsmpp34() { - pushd libsmpp34 - PM=$PARALLEL_MAKE - PARALLEL_MAKE="" - do_build - PARALLEL_MAKE=$PM - popd -} - build_osmocombb() { pushd osmocom-bb/src/ make nofirmware @@ -78,7 +69,7 @@ build_default libosmo-abis build_default libosmo-netif build_default libosmo-sccp -build_libsmpp34 +build_default libsmpp34 build_default osmo-ggsn build_default osmo-iuh build_osmopcu -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibe57a8c823d9b35e2f51c9bd7a13d6baf61bf0ca Gerrit-Change-Number: 25853 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 19:47:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 19:47:39 +0000 Subject: Change in simtrace2[master]: fix bootloader led config crash In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25850 ) Change subject: fix bootloader led config crash ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ia6a1b1fc0e44a301b4fb1d9c9fdbc27d61dcab97 Gerrit-Change-Number: 25850 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 20 Oct 2021 19:47:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 19:47:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 19:47:55 +0000 Subject: Change in simtrace2[master]: add the ngff cardem to default build targets In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25847 ) Change subject: add the ngff cardem to default build targets ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Icec4966fe419eee9f7ace67e46e3d88738812b38 Gerrit-Change-Number: 25847 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 20 Oct 2021 19:47:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 19:48:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 19:48:13 +0000 Subject: Change in simtrace2[master]: drop unused exidx sections when linking In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25848 ) Change subject: drop unused exidx sections when linking ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I159b4405cebe72af4d98b27f876c48835ffd6e2d Gerrit-Change-Number: 25848 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 20 Oct 2021 19:48:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 19:49:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 19:49:27 +0000 Subject: Change in simtrace2[master]: clang build support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25849 ) Change subject: clang build support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I1a19f40d44797efad5c46121e73115ed738a095b Gerrit-Change-Number: 25849 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 20 Oct 2021 19:49:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 19:49:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 19:49:36 +0000 Subject: Change in simtrace2[master]: add the ngff cardem to default build targets In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25847 ) Change subject: add the ngff cardem to default build targets ...................................................................... add the ngff cardem to default build targets Change-Id: Icec4966fe419eee9f7ace67e46e3d88738812b38 --- M Makefile 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/Makefile b/Makefile index e9917c3..b15f38d 100644 --- a/Makefile +++ b/Makefile @@ -12,9 +12,12 @@ $(eval $(call RULES,simtrace,cardem)) $(eval $(call RULES,qmod,dfu)) $(eval $(call RULES,qmod,cardem)) +$(eval $(call RULES,ngff_cardem,dfu)) +$(eval $(call RULES,ngff_cardem,trace)) +$(eval $(call RULES,ngff_cardem,cardem)) fw-clean: fw-simtrace-dfu-clean fw-simtrace-trace-clean fw-simtrace-cardem-clean fw-qmod-dfu-clean fw-qmod-cardem-clean -fw: fw-simtrace-dfu fw-simtrace-trace fw-simtrace-cardem fw-qmod-dfu fw-qmod-cardem +fw: fw-simtrace-dfu fw-simtrace-trace fw-simtrace-cardem fw-qmod-dfu fw-qmod-cardem fw-ngff_cardem-dfu fw-ngff_cardem-trace fw-ngff_cardem-cardem utils: (cd host && \ -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25847 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Icec4966fe419eee9f7ace67e46e3d88738812b38 Gerrit-Change-Number: 25847 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 19:49:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 19:49:37 +0000 Subject: Change in simtrace2[master]: drop unused exidx sections when linking In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25848 ) Change subject: drop unused exidx sections when linking ...................................................................... drop unused exidx sections when linking clang might emit those even though they are neither needed or wanted, so just get rid of them. Change-Id: I159b4405cebe72af4d98b27f876c48835ffd6e2d --- M firmware/libboard/common/resources/sam3s4/dfu.ld M firmware/libboard/common/resources/sam3s4/flash.ld 2 files changed, 6 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/libboard/common/resources/sam3s4/dfu.ld b/firmware/libboard/common/resources/sam3s4/dfu.ld index a485770..db747fa 100644 --- a/firmware/libboard/common/resources/sam3s4/dfu.ld +++ b/firmware/libboard/common/resources/sam3s4/dfu.ld @@ -96,13 +96,10 @@ _efixed = .; /* End of text section */ } > rom - /* .ARM.exidx is sorted, so has to go in its own output section. */ - PROVIDE_HIDDEN (__exidx_start = .); - .ARM.exidx : + /DISCARD/ : { - *(.ARM.exidx* .gnu.linkonce.armexidx.*) - } > rom - PROVIDE_HIDDEN (__exidx_end = .); + *(.ARM.exidx) + } . = ALIGN(4); _etext = .; diff --git a/firmware/libboard/common/resources/sam3s4/flash.ld b/firmware/libboard/common/resources/sam3s4/flash.ld index f5cdbfd..50631c6 100644 --- a/firmware/libboard/common/resources/sam3s4/flash.ld +++ b/firmware/libboard/common/resources/sam3s4/flash.ld @@ -94,13 +94,10 @@ _efixed = .; /* End of text section */ } > rom - /* .ARM.exidx is sorted, so has to go in its own output section. */ - PROVIDE_HIDDEN (__exidx_start = .); - .ARM.exidx : + /DISCARD/ : { - *(.ARM.exidx* .gnu.linkonce.armexidx.*) - } > rom - PROVIDE_HIDDEN (__exidx_end = .); + *(.ARM.exidx) + } . = ALIGN(4); _etext = .; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I159b4405cebe72af4d98b27f876c48835ffd6e2d Gerrit-Change-Number: 25848 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 19:49:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 19:49:37 +0000 Subject: Change in simtrace2[master]: clang build support In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25849 ) Change subject: clang build support ...................................................................... clang build support Supposed to be used with https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm + distro provided binutils-arm-none-eabi package, might provide better and more reliable binary sizes, especially for the bootloader. Just run USE_CLANG=1 make Change-Id: I1a19f40d44797efad5c46121e73115ed738a095b --- M firmware/Makefile M firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c 2 files changed, 30 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/firmware/Makefile b/firmware/Makefile index 0364166..bfe2c9d 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -73,12 +73,20 @@ # Tool suffix when cross-compiling CROSS_COMPILE = arm-none-eabi- -LIBS = -Wl,--start-group -lgcc -Wl,--end-group -nostdlib - -# Compilation tools +USE_CLANG ?= 0 +ifneq ("$(USE_CLANG)","0") +# --target=thumbv7m-none-eabi +CC = clang +LD = ld.lld +SIZE = llvm-size +LIBS = -nostdlib +else CC = $(CROSS_COMPILE)gcc LD = $(CROSS_COMPILE)ld SIZE = $(CROSS_COMPILE)size +LIBS = -Wl,--start-group -lgcc -Wl,--end-group -nostdlib +endif + STRIP = $(CROSS_COMPILE)strip OBJCOPY = $(CROSS_COMPILE)objcopy GDB = $(CROSS_COMPILE)gdb @@ -139,7 +147,11 @@ #CFLAGS+=-DUSB_NO_DEBUG=1 # Optimization level, put in comment for debugging +ifneq ("$(USE_CLANG)","0") +OPTIMIZATION ?= -Oz +else OPTIMIZATION ?= -Os +endif # Flags INCLUDES_USB = -I$(AT91LIB)/usb/include -I$(AT91LIB) @@ -153,6 +165,11 @@ INCLUDES += -Isrc_simtrace -Iinclude INCLUDES += -Iapps/$(APP) +ifneq ("$(USE_CLANG)","0") +CFLAGS += -Wno-unknown-warning-option -Wno-empty-body -fno-exceptions -fno-unwind-tables --config armv7em_soft_nofp_nosys +else +CFLAGS += -Wno-suggest-attribute=noreturn --param max-inline-insns-single=500 +endif CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int -Wformat=2 CFLAGS += -Werror-implicit-function-declaration -Wmain -Wparentheses CFLAGS += -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs #-Wunused @@ -165,16 +182,16 @@ CFLAGS += -Wunreachable-code #CFLAGS += -Wcast-align #CFLAGS += -std=c11 -CFLAGS += -Wmissing-noreturn +#CFLAGS += -Wmissing-noreturn #CFLAGS += -Wconversion CFLAGS += -Wno-unused-but-set-variable -Wno-unused-variable -CFLAGS += -Wno-suggest-attribute=noreturn + # -mlong-calls -Wall #CFLAGS += -save-temps -fverbose-asm #CFLAGS += -Wa,-a,-ad CFLAGS += -D__ARM -fno-builtin -CFLAGS += --param max-inline-insns-single=500 -mcpu=cortex-m3 -mthumb # -mfix-cortex-m3-ldrd +CFLAGS += -mcpu=cortex-m3 -mthumb # -mfix-cortex-m3-ldrd CFLAGS += -ffunction-sections -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DALLOW_PEER_ERASE=$(ALLOW_PEER_ERASE) CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" CFLAGS += -DBOARD=\"$(BOARD)\" -DBOARD_$(BOARD) @@ -188,7 +205,10 @@ endif ASFLAGS = -mcpu=cortex-m3 -mthumb -Wall -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -D__ASSEMBLY__ -LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--print-memory-usage -Wl,--no-undefined $(LIB) +LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--no-undefined $(LIB) +ifeq ("$(USE_CLANG)","0") +LDFLAGS += -Wl,--warn-section-align -Wl,--print-memory-usage +endif #LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats # Append BIN directories to output filename @@ -227,14 +247,14 @@ ASM_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(ASM_OBJECTS)) $(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1)) - $(SILENT)$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS) + $(SILENT)$(CC) $(CFLAGS) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS) $(SILENT)$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt $(SILENT)$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin $(SILENT)$(SIZE) $$^ $(OUTPUT)-$$@.elf $$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN) @echo [COMPILING $$<] - $(SILENT)$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -Wa,-ahlms=$(BIN)/$$*.lst -c -o $$@ $$< + $(SILENT)$(CC) $(CFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$< $$(ASM_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.S Makefile $(OBJ) $(BIN) @echo [ASSEMBLING $$@] diff --git a/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c b/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c index 4799eae..7496f3a 100644 --- a/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c +++ b/firmware/atmel_softpack_libraries/libchip_sam3s/source/exceptions.c @@ -151,8 +151,7 @@ " mrseq r0, msp \n" " mrsne r0, psp \n" //" ldr r1, [r0, #24] \n" - " b hard_fault_handler_c\n" - ".syntax divided \n"); + " b hard_fault_handler_c\n"); } /** -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25849 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I1a19f40d44797efad5c46121e73115ed738a095b Gerrit-Change-Number: 25849 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 19:49:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 19:49:38 +0000 Subject: Change in simtrace2[master]: fix bootloader led config crash In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25850 ) Change subject: fix bootloader led config crash ...................................................................... fix bootloader led config crash This led to occasional crashes for targets with leds since it was introduced 3 years ago The interesting thing is that most of the time it didn't crash... Change-Id: Ia6a1b1fc0e44a301b4fb1d9c9fdbc27d61dcab97 --- M firmware/apps/dfu/main.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index f8c0c53..d5a6fa6 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -271,7 +271,7 @@ #ifdef PINS_LEDS /* Configure LED */ - PIO_Configure(pinsLeds, sizeof(pinsLeds)); + PIO_Configure(pinsLeds, PIO_LISTSIZE(pinsLeds)); PIO_Set(&pinsLeds[LED_NUM_RED]); PIO_Clear(&pinsLeds[LED_NUM_GREEN]); #endif -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25850 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ia6a1b1fc0e44a301b4fb1d9c9fdbc27d61dcab97 Gerrit-Change-Number: 25850 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 19:51:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 19:51:25 +0000 Subject: Change in osmo-ci[master]: coverity: enable parallel build for libsmpp34 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25853 ) Change subject: coverity: enable parallel build for libsmpp34 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibe57a8c823d9b35e2f51c9bd7a13d6baf61bf0ca Gerrit-Change-Number: 25853 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 20 Oct 2021 19:51:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 19:51:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 20 Oct 2021 19:51:28 +0000 Subject: Change in osmo-ci[master]: coverity: enable parallel build for libsmpp34 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25853 ) Change subject: coverity: enable parallel build for libsmpp34 ...................................................................... coverity: enable parallel build for libsmpp34 We have parallel build enabled in libsmpp34.git since 2018. Change-Id: Ibe57a8c823d9b35e2f51c9bd7a13d6baf61bf0ca Related: Id41fbcb5a96093eb6c3dc00bcacbd379111ada70 --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index c064a95..bb0f894 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -52,15 +52,6 @@ popd } -build_libsmpp34() { - pushd libsmpp34 - PM=$PARALLEL_MAKE - PARALLEL_MAKE="" - do_build - PARALLEL_MAKE=$PM - popd -} - build_osmocombb() { pushd osmocom-bb/src/ make nofirmware @@ -78,7 +69,7 @@ build_default libosmo-abis build_default libosmo-netif build_default libosmo-sccp -build_libsmpp34 +build_default libsmpp34 build_default osmo-ggsn build_default osmo-iuh build_osmopcu -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25853 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibe57a8c823d9b35e2f51c9bd7a13d6baf61bf0ca Gerrit-Change-Number: 25853 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:15:16 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:15:16 +0000 Subject: Change in osmo-ci[master]: coverity: drop --enable-sysmocom-bts for osmo-pcu References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25854 ) Change subject: coverity: drop --enable-sysmocom-bts for osmo-pcu ...................................................................... coverity: drop --enable-sysmocom-bts for osmo-pcu There is no such parameter in osmo-pcu's configure script. Change-Id: I7f06f3d804acd97526a9eb0f93a23375ec555ee8 --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/54/25854/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index bb0f894..fcad50e 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -48,7 +48,7 @@ build_osmopcu() { pushd osmo-pcu - do_build --enable-sysmocom-bts=yes --enable-sysmocom-dsp=yes + do_build --enable-sysmocom-dsp=yes popd } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7f06f3d804acd97526a9eb0f93a23375ec555ee8 Gerrit-Change-Number: 25854 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:15:16 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:15:16 +0000 Subject: Change in osmo-ci[master]: coverity: also specify --with-sysmobts for osmo-pcu References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25855 ) Change subject: coverity: also specify --with-sysmobts for osmo-pcu ...................................................................... coverity: also specify --with-sysmobts for osmo-pcu It's present in build_osmobts(), so let's add it for consistency. Change-Id: Ie17e2f9f81258e4d60c8cecf0a7af38e8372f9dd --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/55/25855/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index fcad50e..a778add 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -48,7 +48,7 @@ build_osmopcu() { pushd osmo-pcu - do_build --enable-sysmocom-dsp=yes + do_build --enable-sysmocom-dsp=yes --with-sysmobts="$prefix/include/" popd } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie17e2f9f81258e4d60c8cecf0a7af38e8372f9dd Gerrit-Change-Number: 25855 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:15:17 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:15:17 +0000 Subject: Change in osmo-ci[master]: coverity: allow passing configure args to build_default() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25856 ) Change subject: coverity: allow passing configure args to build_default() ...................................................................... coverity: allow passing configure args to build_default() Change-Id: I79aa2c65cd0d3b06c0bd9ec4f44288b21e40c3b7 --- M coverity/build_Osmocom.sh 1 file changed, 9 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/56/25856/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index a778add..2e00273 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -20,7 +20,8 @@ build_default() { pushd $1 - do_build + shift + do_build $* popd } @@ -38,20 +39,6 @@ popd } -build_osmobts() { - pushd osmo-bts - - do_build --enable-sysmocom-bts --with-sysmobts="$prefix/include/" --enable-trx - popd -} - -build_osmopcu() { - pushd osmo-pcu - - do_build --enable-sysmocom-dsp=yes --with-sysmobts="$prefix/include/" - popd -} - build_osmocombb() { pushd osmocom-bb/src/ make nofirmware @@ -72,8 +59,13 @@ build_default libsmpp34 build_default osmo-ggsn build_default osmo-iuh -build_osmopcu -build_osmobts +build_default osmo-pcu \ + --with-sysmobts="$prefix/include/" \ + --enable-sysmocom-dsp=yes +build_default osmo-bts \ + --with-sysmobts="$prefix/include/" \ + --enable-sysmocom-bts \ + --enable-trx build_default osmo-sysmon build_default osmo-mgw build_default osmo-bsc -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I79aa2c65cd0d3b06c0bd9ec4f44288b21e40c3b7 Gerrit-Change-Number: 25856 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:15:18 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:15:18 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-{msc, sgsn} with --enable-iu References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25857 ) Change subject: coverity: build osmo-{msc,sgsn} with --enable-iu ...................................................................... coverity: build osmo-{msc,sgsn} with --enable-iu This allows Coverity to analyze the Iu (UMTS) specific code. Change-Id: I3ef08fcf42950b33e18b3bfcddff890547308364 --- M coverity/build_Osmocom.sh 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/57/25857/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 2e00273..e0cb237 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -70,8 +70,10 @@ build_default osmo-mgw build_default osmo-bsc build_default osmo-hlr -build_default osmo-msc -build_default osmo-sgsn +build_default osmo-msc \ + --enable-iu +build_default osmo-sgsn \ + --enable-iu build_default osmo-smlc # GMR -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3ef08fcf42950b33e18b3bfcddff890547308364 Gerrit-Change-Number: 25857 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:15:18 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:15:18 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-msc with --enable-smpp References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25858 ) Change subject: coverity: build osmo-msc with --enable-smpp ...................................................................... coverity: build osmo-msc with --enable-smpp This allows Coverity to analyze the SMPP specific code. Change-Id: Ie1e4f1610d86fe57d940527ac64d3d1beb7165e0 --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/58/25858/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index e0cb237..2d561cd 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -71,6 +71,7 @@ build_default osmo-bsc build_default osmo-hlr build_default osmo-msc \ + --enable-smpp \ --enable-iu build_default osmo-sgsn \ --enable-iu -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie1e4f1610d86fe57d940527ac64d3d1beb7165e0 Gerrit-Change-Number: 25858 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:15:18 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:15:18 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-trx with UHD+LMS+IPC support References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25859 ) Change subject: coverity: build osmo-trx with UHD+LMS+IPC support ...................................................................... coverity: build osmo-trx with UHD+LMS+IPC support This allows Coverity to analyze the UHD/LMS/IPC specific code. Change-Id: Ib58bee277414596cb46e523c798d42514c0eb78d --- M coverity/build_Osmocom.sh 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/59/25859/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 2d561cd..78767ee 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -84,7 +84,10 @@ # MNCC to SIP build_default osmo-sip-connector -build_default osmo-trx +build_default osmo-trx \ + --with-uhd \ + --with-lms \ + --with-ipc # OsmocomBB (without firmware) build_osmocombb -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib58bee277414596cb46e523c798d42514c0eb78d Gerrit-Change-Number: 25859 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:39:19 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:39:19 +0000 Subject: Change in libosmocore[master]: {ctrl, vty}/ports.h: Allocate ports for osmo-hnodeb In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25852 ) Change subject: {ctrl,vty}/ports.h: Allocate ports for osmo-hnodeb ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6514d040d88d145a321075911368645868e6280e Gerrit-Change-Number: 25852 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 20 Oct 2021 20:39:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:40:30 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:40:30 +0000 Subject: Change in osmo-bsc[master]: gitignore: Fix typo In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25845 ) Change subject: gitignore: Fix typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4c9737b7749f0b8eb8fac3c882bcd7e6f66c58a8 Gerrit-Change-Number: 25845 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 20 Oct 2021 20:40:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:40:45 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:40:45 +0000 Subject: Change in osmo-bsc[master]: jenkins.sh: Fix typo In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25846 ) Change subject: jenkins.sh: Fix typo ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I80add059bd41cf385de1981bddd5c35b1d19bf57 Gerrit-Change-Number: 25846 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 20 Oct 2021 20:40:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:40:54 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:40:54 +0000 Subject: Change in osmo-bsc[master]: gitignore: Fix typo In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25845 ) Change subject: gitignore: Fix typo ...................................................................... gitignore: Fix typo Change-Id: I4c9737b7749f0b8eb8fac3c882bcd7e6f66c58a8 --- M .gitignore 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/.gitignore b/.gitignore index c4d8984..e504f4c 100644 --- a/.gitignore +++ b/.gitignore @@ -84,7 +84,7 @@ doc/manuals/*__*.png doc/manuals/*.check doc/manuals/generated/ -doc/manuals/osmomsc-usermanual.xml +doc/manuals/osmobsc-usermanual.xml doc/manuals/common doc/manuals/build -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25845 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4c9737b7749f0b8eb8fac3c882bcd7e6f66c58a8 Gerrit-Change-Number: 25845 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:40:54 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:40:54 +0000 Subject: Change in osmo-bsc[master]: jenkins.sh: Fix typo In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25846 ) Change subject: jenkins.sh: Fix typo ...................................................................... jenkins.sh: Fix typo Change-Id: I80add059bd41cf385de1981bddd5c35b1d19bf57 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 0b978dc..189eb2c 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# jenkins build helper script for openbsc. This is how we build on jenkins.osmocom.org +# jenkins build helper script for osmo-bsc. This is how we build on jenkins.osmocom.org # # environment variables: # * WITH_MANUALS: build manual PDFs if set to "1" -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25846 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I80add059bd41cf385de1981bddd5c35b1d19bf57 Gerrit-Change-Number: 25846 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:46:29 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:46:29 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-trx with USRP1 support References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25860 ) Change subject: coverity: build osmo-trx with USRP1 support ...................................................................... coverity: build osmo-trx with USRP1 support This allows Coverity to analyze the libusrp specific code. Change-Id: I36df72149a32cb0df43c74af910d1fbb92b88f4a --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmcocom.sh 2 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/60/25860/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 78767ee..cf71a6f 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -39,6 +39,15 @@ popd } +build_libusrp() { + pushd libusrp + PM=$PARALLEL_MAKE + PARALLEL_MAKE="" + do_build + PARALLEL_MAKE=$PM + popd +} + build_osmocombb() { pushd osmocom-bb/src/ make nofirmware @@ -53,6 +62,7 @@ build_default asn1c build_default libosmocore build_libasn1c +build_libusrp build_default libosmo-abis build_default libosmo-netif build_default libosmo-sccp @@ -85,6 +95,7 @@ build_default osmo-sip-connector build_default osmo-trx \ + --with-usrp1 \ --with-uhd \ --with-lms \ --with-ipc diff --git a/coverity/prepare_source_Osmcocom.sh b/coverity/prepare_source_Osmcocom.sh index ab1525e..cad9b16 100755 --- a/coverity/prepare_source_Osmcocom.sh +++ b/coverity/prepare_source_Osmcocom.sh @@ -13,6 +13,7 @@ libosmo-netif \ libosmo-sccp \ libsmpp34 \ + libusrp \ osmo-bsc \ osmo-msc \ osmo-mgw \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I36df72149a32cb0df43c74af910d1fbb92b88f4a Gerrit-Change-Number: 25860 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:46:29 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:46:29 +0000 Subject: Change in osmo-ci[master]: coverity: also build and check SIMTrace host tools References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25861 ) Change subject: coverity: also build and check SIMTrace host tools ...................................................................... coverity: also build and check SIMTrace host tools Change-Id: I74da8b523c9d51887d5eceb01ca0f505bb846812 --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmcocom.sh 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/61/25861/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index cf71a6f..65277fd 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -54,6 +54,12 @@ popd } +build_simtrace2() { + pushd simtrace + make -C host + popd +} + cd "$src_dir" rm -rf "$prefix" @@ -102,3 +108,5 @@ # OsmocomBB (without firmware) build_osmocombb +# SIMTrace host tools +build_simtrace2 diff --git a/coverity/prepare_source_Osmcocom.sh b/coverity/prepare_source_Osmcocom.sh index cad9b16..8dbcbce 100755 --- a/coverity/prepare_source_Osmcocom.sh +++ b/coverity/prepare_source_Osmcocom.sh @@ -29,6 +29,7 @@ osmo-hlr \ osmocom-bb \ osmo-smlc \ + simtrace2 \ ; do if [ -d $proj ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I74da8b523c9d51887d5eceb01ca0f505bb846812 Gerrit-Change-Number: 25861 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:46:29 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:46:29 +0000 Subject: Change in osmo-ci[master]: coverity: also build and check osmo-{cbc, gbproxy} References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25862 ) Change subject: coverity: also build and check osmo-{cbc,gbproxy} ...................................................................... coverity: also build and check osmo-{cbc,gbproxy} Change-Id: Ibbff2bdf3163ba33dac11ccaa2e405894a7a0f10 --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmcocom.sh 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/62/25862/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 65277fd..5c2c71e 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -74,6 +74,7 @@ build_default libosmo-sccp build_default libsmpp34 build_default osmo-ggsn +build_default osmo-gbproxy build_default osmo-iuh build_default osmo-pcu \ --with-sysmobts="$prefix/include/" \ @@ -92,6 +93,7 @@ build_default osmo-sgsn \ --enable-iu build_default osmo-smlc +build_default osmo-cbc # GMR build_default libosmo-dsp diff --git a/coverity/prepare_source_Osmcocom.sh b/coverity/prepare_source_Osmcocom.sh index 8dbcbce..7a86b7d 100755 --- a/coverity/prepare_source_Osmcocom.sh +++ b/coverity/prepare_source_Osmcocom.sh @@ -18,6 +18,7 @@ osmo-msc \ osmo-mgw \ osmo-ggsn \ + osmo-gbproxy \ osmo-sgsn \ osmo-bts \ osmo-gmr \ @@ -29,6 +30,7 @@ osmo-hlr \ osmocom-bb \ osmo-smlc \ + osmo-cbc \ simtrace2 \ ; do -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibbff2bdf3163ba33dac11ccaa2e405894a7a0f10 Gerrit-Change-Number: 25862 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:53:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:53:35 +0000 Subject: Change in osmo-bts[master]: measurement: fix wrong operator used in handle_ms_meas_report() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25863 ) Change subject: measurement: fix wrong operator used in handle_ms_meas_report() ...................................................................... measurement: fix wrong operator used in handle_ms_meas_report() Change-Id: Iad781dde0406d341bf385734ceddf51999558dd3 Fixes: CID#240263 --- M src/common/measurement.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/63/25863/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index 87e853e..1e4097e 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -824,7 +824,7 @@ ms_pwr = lchan->ms_power_ctrl.current; } else { /* if len!=0, it means we were able to parse L1Header in UL SACCH: */ - OSMO_ASSERT(lchan->meas.flags | LC_UL_M_F_L1_VALID); + OSMO_ASSERT(lchan->meas.flags & LC_UL_M_F_L1_VALID); ms_ta = lchan->meas.l1_info.ta; ms_pwr = lchan->meas.l1_info.ms_pwr; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iad781dde0406d341bf385734ceddf51999558dd3 Gerrit-Change-Number: 25863 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 20:59:45 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 20:59:45 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: fix potential NULL pointer dereference References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25864 ) Change subject: osmo-bts-trx: fix potential NULL pointer dereference ...................................................................... osmo-bts-trx: fix potential NULL pointer dereference Change-Id: Ic9c1f3a3fb9c151bba4f6c3e605746fc8d43f44f Fixes: CID#240207 --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/64/25864/1 diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 273b491..5deecd7 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -369,11 +369,13 @@ trx_provision_reset(l1h); - /* Apply initial RFMUTE state */ - if (pinst->trx != NULL) - trx_if_cmd_rfmute(l1h, pinst->trx->mo.nm_state.administrative != NM_STATE_UNLOCKED); - else + if (pinst->trx == NULL) { trx_if_cmd_rfmute(l1h, true); + return; + } + + /* Apply initial RFMUTE state */ + trx_if_cmd_rfmute(l1h, pinst->trx->mo.nm_state.administrative != NM_STATE_UNLOCKED); osmo_fsm_inst_dispatch(pinst->trx->mo.fi, NM_EV_SW_ACT, NULL); osmo_fsm_inst_dispatch(pinst->trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic9c1f3a3fb9c151bba4f6c3e605746fc8d43f44f Gerrit-Change-Number: 25864 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 21:07:18 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 21:07:18 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: use OSMO_STRLCPY_ARRAY in mgcp_codec_add() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/25865 ) Change subject: libosmo-mgcp: use OSMO_STRLCPY_ARRAY in mgcp_codec_add() ...................................................................... libosmo-mgcp: use OSMO_STRLCPY_ARRAY in mgcp_codec_add() Change-Id: Icc2486308577b587a6ebd1b44b2fa92693aa7fc7 Fixes: CID#240100 --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/65/25865/1 diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 06dcedc..7ab2a17 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -176,7 +176,7 @@ goto error; } } else { - strncpy(codec->audio_name, audio_name, sizeof(codec->audio_name)); + OSMO_STRLCPY_ARRAY(codec->audio_name, audio_name); } /* Now we extract the codec subtype name, rate and channels. The latter -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icc2486308577b587a6ebd1b44b2fa92693aa7fc7 Gerrit-Change-Number: 25865 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 21:12:57 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 20 Oct 2021 21:12:57 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/24236 ) Change subject: Add support for LCLS to the MSC ...................................................................... Patch Set 10: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 10 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 21:12:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 21:14:15 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 20 Oct 2021 21:14:15 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/24236 ) Change subject: Add support for LCLS to the MSC ...................................................................... Patch Set 10: neels + fixeria bioth + 1 = 2 I think this and https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 are both ready to submit at the same time. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 10 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: neels Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 21:14:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 21:51:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 21:51:54 +0000 Subject: Change in osmo-ci[master]: coverity: drop --enable-sysmocom-bts for osmo-pcu In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25854 ) Change subject: coverity: drop --enable-sysmocom-bts for osmo-pcu ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7f06f3d804acd97526a9eb0f93a23375ec555ee8 Gerrit-Change-Number: 25854 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 21:51:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 21:52:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 21:52:07 +0000 Subject: Change in osmo-ci[master]: coverity: also specify --with-sysmobts for osmo-pcu In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25855 ) Change subject: coverity: also specify --with-sysmobts for osmo-pcu ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie17e2f9f81258e4d60c8cecf0a7af38e8372f9dd Gerrit-Change-Number: 25855 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 21:52:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 21:53:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 21:53:15 +0000 Subject: Change in osmo-ci[master]: coverity: allow passing configure args to build_default() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25856 ) Change subject: coverity: allow passing configure args to build_default() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I79aa2c65cd0d3b06c0bd9ec4f44288b21e40c3b7 Gerrit-Change-Number: 25856 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 21:53:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 21:54:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 21:54:15 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-{msc, sgsn} with --enable-iu In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25857 ) Change subject: coverity: build osmo-{msc,sgsn} with --enable-iu ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3ef08fcf42950b33e18b3bfcddff890547308364 Gerrit-Change-Number: 25857 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 21:54:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 21:54:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 21:54:27 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-msc with --enable-smpp In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25858 ) Change subject: coverity: build osmo-msc with --enable-smpp ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie1e4f1610d86fe57d940527ac64d3d1beb7165e0 Gerrit-Change-Number: 25858 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 21:54:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 21:55:14 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 21:55:14 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-trx with UHD+LMS+IPC support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25859 ) Change subject: coverity: build osmo-trx with UHD+LMS+IPC support ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib58bee277414596cb46e523c798d42514c0eb78d Gerrit-Change-Number: 25859 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 21:55:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 21:55:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 21:55:41 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-trx with USRP1 support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25860 ) Change subject: coverity: build osmo-trx with USRP1 support ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I36df72149a32cb0df43c74af910d1fbb92b88f4a Gerrit-Change-Number: 25860 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 21:55:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 21:55:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 21:55:52 +0000 Subject: Change in osmo-ci[master]: coverity: also build and check SIMTrace host tools In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25861 ) Change subject: coverity: also build and check SIMTrace host tools ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I74da8b523c9d51887d5eceb01ca0f505bb846812 Gerrit-Change-Number: 25861 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 21:55:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 21:56:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 21:56:07 +0000 Subject: Change in osmo-ci[master]: coverity: also build and check osmo-{cbc, gbproxy} In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25862 ) Change subject: coverity: also build and check osmo-{cbc,gbproxy} ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibbff2bdf3163ba33dac11ccaa2e405894a7a0f10 Gerrit-Change-Number: 25862 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 21:56:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 21:56:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 21:56:59 +0000 Subject: Change in osmo-bts[master]: measurement: fix wrong operator used in handle_ms_meas_report() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25863 ) Change subject: measurement: fix wrong operator used in handle_ms_meas_report() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iad781dde0406d341bf385734ceddf51999558dd3 Gerrit-Change-Number: 25863 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 21:56:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 21:58:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 21:58:28 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: fix potential NULL pointer dereference In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25864 ) Change subject: osmo-bts-trx: fix potential NULL pointer dereference ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic9c1f3a3fb9c151bba4f6c3e605746fc8d43f44f Gerrit-Change-Number: 25864 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 21:58:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 21:58:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 20 Oct 2021 21:58:48 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: use OSMO_STRLCPY_ARRAY in mgcp_codec_add() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/25865 ) Change subject: libosmo-mgcp: use OSMO_STRLCPY_ARRAY in mgcp_codec_add() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icc2486308577b587a6ebd1b44b2fa92693aa7fc7 Gerrit-Change-Number: 25865 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 20 Oct 2021 21:58:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 22:07:44 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 22:07:44 +0000 Subject: Change in libosmocore[master]: gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/25866 ) Change subject: gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap ...................................................................... gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap This change adds new [bit-]fields in order to allow: * selectively enabling SACCH and/or FACCH, * setting the RxQual (BER) threshold. Change-Id: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M include/osmocom/gsm/protocol/gsm_08_58.h 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/25866/1 diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index fd22d91..c661bdc 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -141,7 +141,17 @@ /* Osmocom specific IE to negotiate temporary overpower of ACCH channels */ struct abis_rsl_osmo_temp_ovp_acch_cap { - uint8_t overpower_db; +#if OSMO_IS_BIG_ENDIAN + uint8_t sacch:1, + facch:1, + rxqual:3, + overpower_db:3; +#elif OSMO_IS_LITTLE_ENDIAN + uint8_t overpower_db:3, + rxqual:3, + facch:1, + sacch:1; +#endif } __attribute__ ((packed)); /* Chapter 9.1 */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia28293a12de0af71f55e701fb65c46e905dae217 Gerrit-Change-Number: 25866 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 22:07:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 22:07:51 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: cosmetic: fix lower case in command description References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25867 ) Change subject: [overpower] VTY: cosmetic: fix lower case in command description ...................................................................... [overpower] VTY: cosmetic: fix lower case in command description Change-Id: Iadce870b599b4af4269b9026bd8fbe746f1f4979 Related: SYS#5319 --- M src/osmo-bsc/bts_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/25867/1 diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index a05d965..3696ca8 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -754,7 +754,7 @@ "overpower dl-acch <1-4>", TOP_ACCH_STR "Enable ACCH overpower for this BTS\n" - "overpower value in dB\n") + "Overpower value in dB\n") { struct gsm_bts *bts = vty->index; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iadce870b599b4af4269b9026bd8fbe746f1f4979 Gerrit-Change-Number: 25867 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 22:07:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 22:07:51 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: fix copy-pasted warning message References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25868 ) Change subject: [overpower] VTY: fix copy-pasted warning message ...................................................................... [overpower] VTY: fix copy-pasted warning message Change-Id: Ie0bc0b503c7c7e893b5c94597c84c47fa881874d Related: SYS#5319 --- M src/osmo-bsc/bts_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/68/25868/1 diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 3696ca8..8eae2a4 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -759,7 +759,7 @@ struct gsm_bts *bts = vty->index; if (bts->model->type != GSM_BTS_TYPE_OSMOBTS) { - vty_out(vty, "%% repeated ACCH not supported by BTS %u%s", + vty_out(vty, "%% ACCH overpower is not supported by BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie0bc0b503c7c7e893b5c94597c84c47fa881874d Gerrit-Change-Number: 25868 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 22:07:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 22:07:51 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: add more ACCH overpower related parameters References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25869 ) Change subject: [overpower] VTY: add more ACCH overpower related parameters ...................................................................... [overpower] VTY: add more ACCH overpower related parameters The new fields in 'struct abis_rsl_osmo_temp_ovp_acch_cap' allow: * selectively enabling SACCH and/or FACCH, * setting the RxQual (BER) threshold. Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Depends: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M src/osmo-bsc/bts.c M src/osmo-bsc/bts_vty.c 2 files changed, 67 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/25869/1 diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index fe18b59..21ee01a 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -352,7 +352,9 @@ acc_mgr_init(&bts->acc_mgr, bts); acc_ramp_init(&bts->acc_ramp, bts); + /* Default RxQual threshold for ACCH repetition/overpower */ bts->repeated_acch_policy.rxqual = 4; + bts->temporary_overpower.rxqual = 4; /* MS Power Control parameters (defaults) */ power_ctrl_params_def_reset(&bts->ms_power_ctrl, GSM_PWR_CTRL_DIR_UL); diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 8eae2a4..fe2616a 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -716,21 +716,25 @@ return CMD_SUCCESS; } +/* See 3GPP TS 45.008, section 8.2.4 */ +#define RXQUAL_THRESH_CMD \ + "rxqual (0|1|2|3|4|5|6|7)" +#define RXQUAL_THRESH_CMD_DESC \ + "Set Uplink RxQual (BER) threshold (default 4)\n" \ + "BER >= 0% (always on)\n" \ + "BER >= 0.2%\n" \ + "BER >= 0.4%\n" \ + "BER >= 0.8%\n" \ + "BER >= 1.6%\n" \ + "BER >= 3.2%\n" \ + "BER >= 6.4%\n" \ + "BER >= 12.8%\n" + DEFUN_USRATTR(cfg_bts_rep_rxqual, cfg_bts_rep_rxqual_cmd, X(BSC_VTY_ATTR_NEW_LCHAN), - "repeat rxqual (0|1|2|3|4|5|6|7)", - REP_ACCH_STR - "Set UL-SACCH/DL-FACCH rxqual threshold-ber\n" - "0 disabled (always on)\n" - "1 BER >= 0.2%\n" - "2 BER >= 0.4%\n" - "3 BER >= 0.8%\n" - "4 BER >= 1.6% (default)\n" - "5 BER >= 3.2%\n" - "6 BER >= 6.4%\n" - "7 BER >= 12.8%\n") - /* See also: GSM 05.08, section 8.2.4 */ + "repeat " RXQUAL_THRESH_CMD, + REP_ACCH_STR RXQUAL_THRESH_CMD_DESC) { struct gsm_bts *bts = vty->index; @@ -751,9 +755,11 @@ DEFUN_USRATTR(cfg_bts_top_dl_acch, cfg_bts_top_dl_acch_cmd, X(BSC_VTY_ATTR_NEW_LCHAN), - "overpower dl-acch <1-4>", + "overpower (dl-acch|dl-sacch|dl-facch) <1-4>", TOP_ACCH_STR - "Enable ACCH overpower for this BTS\n" + "Enable overpower for both SACCH and FACCH\n" + "Enable overpower for SACCH only\n" + "Enable overpower for FACCH only\n" "Overpower value in dB\n") { struct gsm_bts *bts = vty->index; @@ -764,7 +770,12 @@ return CMD_WARNING; } - bts->temporary_overpower.overpower_db = atoi(argv[0]); + if (!strncmp(argv[0], "dl-acch") || !strncmp(argv[0], "dl-sacch")) + bts->temporary_overpower.sacch = 1; + if (!strncmp(argv[0], "dl-acch") || !strncmp(argv[0], "dl-facch")) + bts->temporary_overpower.facch = 1; + bts->temporary_overpower.overpower_db = atoi(argv[1]); + return CMD_SUCCESS; } @@ -778,6 +789,27 @@ struct gsm_bts *bts = vty->index; bts->temporary_overpower.overpower_db = 0; + bts->temporary_overpower.sacch = 0; + bts->temporary_overpower.facch = 0; + + return CMD_SUCCESS; +} + +DEFUN_USRATTR(cfg_bts_top_dl_acch_rxqual, + cfg_bts_top_dl_acch_rxqual_cmd, + X(BSC_VTY_ATTR_NEW_LCHAN), + "overpower " RXQUAL_THRESH_CMD, + TOP_ACCH_STR RXQUAL_THRESH_CMD_DESC) +{ + struct gsm_bts *bts = vty->index; + + if (bts->model->type != GSM_BTS_TYPE_OSMOBTS) { + vty_out(vty, "%% ACCH overpower is not supported by BTS %u%s", + bts->nr, VTY_NEWLINE); + return CMD_WARNING; + } + + bts->temporary_overpower.rxqual = atoi(argv[0]); return CMD_SUCCESS; } @@ -4257,8 +4289,23 @@ ho_vty_write_bts(vty, bts); - if (bts->temporary_overpower.overpower_db > 0) - vty_out(vty, " overpower dl-acch %u%s", bts->temporary_overpower.overpower_db, VTY_NEWLINE); + if (bts->temporary_overpower.overpower_db > 0) { + const struct abis_rsl_osmo_temp_ovp_acch_cap *top = \ + &bts->temporary_overpower; + const char *mode = NULL; + + if (top->sacch && top->facch) + mode = "dl-acch"; + else if (top->sacch) + mode = "dl-sacch"; + else if (top->facch) + mode = "dl-facch"; + + vty_out(vty, " overpower %s %u%s", + mode, top->overpower_db, VTY_NEWLINE); + vty_out(vty, " overpower rxqual %u%s", + mode, top->rxqual, VTY_NEWLINE); + } if (bts->repeated_acch_policy.dl_facch_all) vty_out(vty, " repeat dl-facch all%s", VTY_NEWLINE); @@ -4477,6 +4524,7 @@ install_element(BTS_NODE, &cfg_bts_rep_rxqual_cmd); install_element(BTS_NODE, &cfg_bts_top_dl_acch_cmd); install_element(BTS_NODE, &cfg_bts_top_no_dl_acch_cmd); + install_element(BTS_NODE, &cfg_bts_top_dl_acch_rxqual_cmd); install_element(BTS_NODE, &cfg_bts_interf_meas_avg_period_cmd); install_element(BTS_NODE, &cfg_bts_interf_meas_level_bounds_cmd); install_element(BTS_NODE, &cfg_bts_srvcc_fast_return_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Gerrit-Change-Number: 25869 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 22:15:37 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 22:15:37 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: add more ACCH overpower related parameters In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 to look at the new patch set (#2). Change subject: [overpower] VTY: add more ACCH overpower related parameters ...................................................................... [overpower] VTY: add more ACCH overpower related parameters The new fields in 'struct abis_rsl_osmo_temp_ovp_acch_cap' allow: * selectively enabling SACCH and/or FACCH, * setting the RxQual (BER) threshold. Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Depends: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M src/osmo-bsc/bts.c M src/osmo-bsc/bts_vty.c 2 files changed, 67 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/25869/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Gerrit-Change-Number: 25869 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 22:38:16 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 22:38:16 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: add more ACCH overpower related parameters In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 to look at the new patch set (#3). Change subject: [overpower] VTY: add more ACCH overpower related parameters ...................................................................... [overpower] VTY: add more ACCH overpower related parameters The new fields in 'struct abis_rsl_osmo_temp_ovp_acch_cap' allow: * selectively enabling SACCH and/or FACCH, * setting the RxQual (BER) threshold. Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Depends: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M src/osmo-bsc/bts.c M src/osmo-bsc/bts_vty.c 2 files changed, 71 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/25869/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Gerrit-Change-Number: 25869 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 20 22:38:16 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 20 Oct 2021 22:38:16 +0000 Subject: Change in osmo-bsc[master]: [overpower] Add VTY transcript tests for all commands References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25870 ) Change subject: [overpower] Add VTY transcript tests for all commands ...................................................................... [overpower] Add VTY transcript tests for all commands Change-Id: Iefbdbeb36a4692102dbb76d86113a183e4f381a7 Related: SYS#5319 --- M tests/Makefile.am A tests/acch_overpower.vty 2 files changed, 71 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/70/25870/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 0831dee..762561e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,6 +42,7 @@ timer.vty \ power_ctrl.vty \ interf_meas.vty \ + acch_overpower.vty \ ctrl/osmo-bsc-neigh-test.cfg \ ctrl/osmo-bsc-apply-config-file.cfg \ ctrl/osmo-bsc-apply-config-file-invalid.cfg \ diff --git a/tests/acch_overpower.vty b/tests/acch_overpower.vty new file mode 100644 index 0000000..d26c011 --- /dev/null +++ b/tests/acch_overpower.vty @@ -0,0 +1,70 @@ +OsmoBSC> enable + +OsmoBSC# ### Default configuration (overpower disabled) +OsmoBSC# show running-config +... !overpower + +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 0 +OsmoBSC(config-net-bts)# list with-flags +... + . ..l overpower (dl-acch|dl-sacch|dl-facch) <1-4> + . ..l no overpower dl-acch + . ..l overpower rxqual (0|1|2|3|4|5|6|7) +... + +OsmoBSC(config-net-bts)# overpower? + overpower Temporary ACCH overpower +OsmoBSC(config-net-bts)# overpower ? + dl-acch Enable overpower for both SACCH and FACCH + dl-sacch Enable overpower for SACCH only + dl-facch Enable overpower for FACCH only + rxqual Set Uplink RxQual (BER) threshold (default 4) + +OsmoBSC(config-net-bts)# overpower dl-acch ? + <1-4> Overpower value in dB +OsmoBSC(config-net-bts)# overpower dl-acch 2 +OsmoBSC# show running-config +... + overpower dl-acch 2 + overpower rxqual 4 +... +OsmoBSC(config-net-bts)# overpower dl-sacch 3 +OsmoBSC# show running-config +... + overpower dl-sacch 3 + overpower rxqual 4 +... +OsmoBSC(config-net-bts)# overpower dl-facch 4 +OsmoBSC# show running-config +... + overpower dl-facch 4 + overpower rxqual 4 +... + +OsmoBSC(config-net-bts)# overpower rxqual ? + 0 BER >= 0% (always on) + 1 BER >= 0.2% + 2 BER >= 0.4% + 3 BER >= 0.8% + 4 BER >= 1.6% (default) + 5 BER >= 3.2% + 6 BER >= 6.4% + 7 BER >= 12.8% +OsmoBSC(config-net-bts)# overpower rxqual 0 +OsmoBSC# show running-config +... + overpower dl-facch 4 + overpower rxqual 0 +... +OsmoBSC(config-net-bts)# overpower rxqual 7 +OsmoBSC# show running-config +... + overpower dl-facch 4 + overpower rxqual 7 +... + +OsmoBSC(config-net-bts)# no overpower dl-acch +OsmoBSC# show running-config +... !overpower -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefbdbeb36a4692102dbb76d86113a183e4f381a7 Gerrit-Change-Number: 25870 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 00:14:30 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 21 Oct 2021 00:14:30 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25829 ) Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... Patch Set 1: Code-Review-1 I think this is implemented already by 'send-new-system-informations' bsc_ctrl_commands.c:290 In fact, I use it that way, so I'm pretty sure it works. :-) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Comment-Date: Thu, 21 Oct 2021 00:14:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 00:18:40 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Thu, 21 Oct 2021 00:18:40 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25829 ) Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... Patch Set 1: NOTE: It's implemented as a set command, This patch wants to implement it as a get command. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Comment-Date: Thu, 21 Oct 2021 00:18:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 07:00:59 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 07:00:59 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information In-Reply-To: References: Message-ID: fixeria has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25829 ) Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... Removed Code-Review+1 by fixeria -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 08:07:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 08:07:18 +0000 Subject: Change in pysim[master]: pySim-shell: Use iteration when unregistering command sets References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25871 ) Change subject: pySim-shell: Use iteration when unregistering command sets ...................................................................... pySim-shell: Use iteration when unregistering command sets This makes it more easy to extend in the future Change-Id: I53ecf03d330fe1eb80ee920e6f9c8185f9be48fd --- M pySim-shell.py 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/71/25871/1 diff --git a/pySim-shell.py b/pySim-shell.py index 316ac6f..0de237b 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -138,12 +138,10 @@ # Unequip everything from pySim-shell that would not work in unequipped state if self.rs: self.rs.unregister_cmds(self) - cmd_set = self.find_commandsets(Iso7816Commands) - if cmd_set: - self.unregister_command_set(cmd_set[0]) - cmd_set = self.find_commandsets(PySimCommands) - if cmd_set: - self.unregister_command_set(cmd_set[0]) + for cmds in [Iso7816Commands, PySimCommands]: + cmd_set = self.find_commandsets(cmds) + if cmd_set: + self.unregister_command_set(cmd_set[0]) self.card = card self.rs = rs -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I53ecf03d330fe1eb80ee920e6f9c8185f9be48fd Gerrit-Change-Number: 25871 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 08:07:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 08:07:18 +0000 Subject: Change in pysim[master]: tlv: Don't require encoder/decoder methods for TLV without value References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25872 ) Change subject: tlv: Don't require encoder/decoder methods for TLV without value ...................................................................... tlv: Don't require encoder/decoder methods for TLV without value There are instances where a TLV IE is used as just a flag, i.e. length zero and no value part. In those situations, it would require a lot of boilerplate code to require the TLV_IE class definitions to have _to_bytes/_from_bytes methods that do nothing. So instead, add a shortcut: If we want to encode 'None', then return b'', and if we want to decode b'' return None. Change-Id: Ie8eb2830e8eefa81e94b8b8b157062c085aeb777 --- M pySim/tlv.py 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/72/25872/1 diff --git a/pySim/tlv.py b/pySim/tlv.py index 05f824e..0dc746b 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -80,7 +80,9 @@ def to_bytes(self) -> bytes: """Convert from internal representation to binary bytes. Store the binary result in the internal state and return it.""" - if self._construct: + if not self.decoded: + do = b'' + elif self._construct: do = self._construct.build(self.decoded, total_len=None) elif self.__class__._construct: do = self.__class__._construct.build(self.decoded, total_len=None) @@ -97,7 +99,9 @@ """Convert from binary bytes to internal representation. Store the decoded result in the internal state and return it.""" self.encoded = do - if self._construct: + if self.encoded == b'': + self.decoded = None + elif self._construct: self.decoded = parse_construct(self._construct, do) elif self.__class__._construct: self.decoded = parse_construct(self.__class__._construct, do) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie8eb2830e8eefa81e94b8b8b157062c085aeb777 Gerrit-Change-Number: 25872 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 08:07:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 08:07:19 +0000 Subject: Change in pysim[master]: cards: Make select_adf_by_aid() use prefix AID selection References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25873 ) Change subject: cards: Make select_adf_by_aid() use prefix AID selection ...................................................................... cards: Make select_adf_by_aid() use prefix AID selection There is no need for us to expand a partial AID to the full AID before selecting that ADF. The UICC specifications permit AID selection by prefix only. So we can pass the prefix to the card, and the card will do the prefix matching. >From the API user point of view, this allows us to select applications not listed in EF.DIR Change-Id: I0747b4e46ca7e30bd96d76053765080367ac1317 --- M pySim/cards.py 1 file changed, 4 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/73/25873/1 diff --git a/pySim/cards.py b/pySim/cards.py index 95352ff..305ca0c 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -282,22 +282,18 @@ self._aids = [] return self._aids - # Select ADF.U/ISIM in the Card using its full AID + # Select ADF.U/ISIM in the Card using its AID def select_adf_by_aid(self, adf="usim"): - # Find full AID by partial AID: if is_hex(adf): - for aid in self._aids: - if len(aid) >= len(adf) and adf == aid[0:len(adf)]: - return self._scc.select_adf(aid) + return self._scc.select_adf(adf) # Find full AID by application name: elif adf in ["usim", "isim"]: # First (known) halves of the U/ISIM AID aid_map = {} aid_map["usim"] = "a0000000871002" aid_map["isim"] = "a0000000871004" - for aid in self._aids: - if aid_map[adf] in aid: - return self._scc.select_adf(aid) + if aid_map[adf] in aid: + return self._scc.select_adf(aid_map[adf]) return (None, None) # Erase the contents of a file -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0747b4e46ca7e30bd96d76053765080367ac1317 Gerrit-Change-Number: 25873 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 09:14:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 09:14:42 +0000 Subject: Change in libosmocore[master]: gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25866 ) Change subject: gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/25866/1/include/osmocom/gsm/protocol/gsm_08_58.h File include/osmocom/gsm/protocol/gsm_08_58.h: https://gerrit.osmocom.org/c/libosmocore/+/25866/1/include/osmocom/gsm/protocol/gsm_08_58.h at 145 PS1, Line 145: uint8_t sacch:1, I'd rename those to sacch_enabled and alike, otherwise it's confusing imho. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia28293a12de0af71f55e701fb65c46e905dae217 Gerrit-Change-Number: 25866 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Oct 2021 09:14:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 09:14:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 09:14:58 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: cosmetic: fix lower case in command description In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25867 ) Change subject: [overpower] VTY: cosmetic: fix lower case in command description ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iadce870b599b4af4269b9026bd8fbe746f1f4979 Gerrit-Change-Number: 25867 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Oct 2021 09:14:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 09:15:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 09:15:15 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: fix copy-pasted warning message In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25868 ) Change subject: [overpower] VTY: fix copy-pasted warning message ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie0bc0b503c7c7e893b5c94597c84c47fa881874d Gerrit-Change-Number: 25868 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Oct 2021 09:15:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 09:20:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 09:20:20 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: add more ACCH overpower related parameters In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25869 ) Change subject: [overpower] VTY: add more ACCH overpower related parameters ...................................................................... Patch Set 3: (3 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25869/3/src/osmo-bsc/bts_vty.c File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25869/3/src/osmo-bsc/bts_vty.c at 721 PS3, Line 721: "rxqual (0|1|2|3|4|5|6|7)" I wonder why isn't this specified as <0-7> (I know it's not related to this patch, but anyway). https://gerrit.osmocom.org/c/osmo-bsc/+/25869/3/src/osmo-bsc/bts_vty.c at 724 PS3, Line 724: "BER >= 0% (always on)\n" \ if changed above, this can be rewritten to simply point to the 3GPP TS where this table is specified. https://gerrit.osmocom.org/c/osmo-bsc/+/25869/3/src/osmo-bsc/bts_vty.c at 4309 PS3, Line 4309: mode, top->overpower_db, VTY_NEWLINE); what if mode is NULL here? top->sacch and top->facch being false. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Gerrit-Change-Number: 25869 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 21 Oct 2021 09:20:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 09:21:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 09:21:03 +0000 Subject: Change in osmo-bsc[master]: [overpower] Add VTY transcript tests for all commands In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25870 ) Change subject: [overpower] Add VTY transcript tests for all commands ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefbdbeb36a4692102dbb76d86113a183e4f381a7 Gerrit-Change-Number: 25870 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Oct 2021 09:21:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 09:24:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 09:24:27 +0000 Subject: Change in osmo-hnodeb[master]: Initial commit References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 ) Change subject: Initial commit ...................................................................... Initial commit This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am A README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 43 files changed, 2,122 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/74/25874/1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0518b6f --- /dev/null +++ b/.gitignore @@ -0,0 +1,71 @@ +debian/*.log +*.o +*.lo +*.a +.deps +Makefile +Makefile.in +config.h +config.h.in +*.pc +*~ + +*.*~ +*.sw? +.libs +*.pyc +*.gcda +*.gcno + +**/TAGS + +#configure +aclocal.m4 +autom4te.cache/ +config.log +config.status +config.guess +config.sub +configure +compile +depcomp +install-sh +missing +stamp-h1 +libtool +ltmain.sh +m4/*.m4 + +# git-version-gen magic +.tarball-version +.version +osmo-hnodeb-*.tar.bz2 +osmo-hnodeb-*.tar.gz + +tags +/deps + +#tests +tests/testsuite.dir +tests/*/*_test + +tests/atconfig +tests/atlocal +tests/package.m4 +tests/testsuite +tests/testsuite.log + +writtenconfig/ + +# manuals +doc/manuals/*.html +doc/manuals/*.svg +doc/manuals/*.pdf +doc/manuals/*__*.png +doc/manuals/*.check +doc/manuals/generated/ +doc/manuals/osmohnodeb-usermanual.xml +doc/manuals/common +doc/manuals/build + +contrib/osmo-hnodeb.spec diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..b08b10a --- /dev/null +++ b/.gitreview @@ -0,0 +1,3 @@ +[gerrit] +host=gerrit.osmocom.org +project=osmo-hnodeb diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..f621811 --- /dev/null +++ b/AUTHORS @@ -0,0 +1 @@ +Pau Espin Pedrol diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..dba13ed --- /dev/null +++ b/COPYING @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..3fdc737 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,36 @@ +AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 + +## FIXME: automake >= 1.13 or autoconf >= 2.70 provide better suited AC_CONFIG_MACRO_DIRS for configure.ac +## remove line below when OE toolchain is updated to version which include those +ACLOCAL_AMFLAGS = -I m4 +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + $(NULL) + +SUBDIRS = \ + include \ + src \ + tests \ + doc \ + contrib \ + $(NULL) + +BUILT_SOURCES = $(top_srcdir)/.version +EXTRA_DIST = \ + .version \ + contrib/osmo-hnodeb.spec.in \ + debian \ + git-version-gen \ + osmoappdesc.py \ + $(NULL) + +AM_DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + + at RELMAKE@ + +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version diff --git a/README.md b/README.md new file mode 100644 index 0000000..c428b7f --- /dev/null +++ b/README.md @@ -0,0 +1,60 @@ +osmo-hnodeb - Osmocom hNodeB Implementation +=========================================== + +This repository contains a C-language implementation of a 3G Home NodeB (hNodeB). +It is part of the [Osmocom](https://osmocom.org/) Open Source Mobile Communications +project. + +You can use it to interface Iuh-speaking Home NodeB Gateway (HNB-GW), such as osmo-hnbgw. + +Homepage +-------- + +The official homepage of the project is +https://osmocom.org/projects/osmohnodeb/wiki + +GIT Repository +-------------- + +You can clone from the official osmo-hnodeb.git repository using + + git clone git://git.osmocom.org/osmo-hnodeb.git + +There is a cgit interface at https://git.osmocom.org/osmo-hnodeb/ + +Documentation +------------- + +User Manuals and VTY reference manuals are [optionally] built in PDF form +as part of the build process. + +Pre-rendered PDF version of the current "master" can be found at +[User Manual](https://ftp.osmocom.org/docs/latest/osmohnodeb-usermanual.pdf) +as well as the [VTY Reference Manual](https://ftp.osmocom.org/docs/latest/osmohnodeb-vty-reference.pdf) + + +Mailing List +------------ + +Discussions related to osmo-bts are happening on the +openbsc at lists.osmocom.org mailing list, please see +https://lists.osmocom.org/mailman/listinfo/openbsc for subscription +options and the list archive. + +Please observe the [Osmocom Mailing List +Rules](https://osmocom.org/projects/cellular-infrastructure/wiki/Mailing_List_Rules) +when posting. + +Contributing +------------ + +Our coding standards are described at +https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards + +We us a gerrit based patch submission/review process for managing +contributions. Please see +https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit for +more details + +The current patch queue for osmo-bts can be seen at +https://gerrit.osmocom.org/#/q/project:osmo-hnodeb+status:open diff --git a/TODO-RELEASE b/TODO-RELEASE new file mode 100644 index 0000000..d0852fc --- /dev/null +++ b/TODO-RELEASE @@ -0,0 +1,9 @@ +# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install +# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info +# In short: +# LIBVERSION=c:r:a +# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0. +# If any interfaces have been added since the last public release: c:r:a + 1. +# If any interfaces have been removed or changed since the last public release: c:r:0. +#library what description / commit summary line diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..3886876 --- /dev/null +++ b/configure.ac @@ -0,0 +1,229 @@ +dnl Process this file with autoconf to produce a configure script +AC_INIT([osmo-hnodeb], + m4_esyscmd([./git-version-gen .tarball-version]), + [openbsc at lists.osmocom.org]) + +dnl *This* is the root dir, even if an install-sh exists in ../ or ../../ +AC_CONFIG_AUX_DIR([.]) + +AM_INIT_AUTOMAKE([dist-bzip2]) +AC_CONFIG_TESTDIR(tests) + +CFLAGS="$CFLAGS -std=gnu11" + +dnl kernel style compile messages +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + +dnl checks for programs +AC_PROG_MAKE_SET +AC_PROG_CC +AC_PROG_INSTALL +LT_INIT + +dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang +AS_CASE(["$LD"],[*clang*], + [AS_CASE(["${host_os}"], + [*linux*],[archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'])]) + +dnl check for pkg-config (explained in detail in libosmocore/configure.ac) +AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no) +if test "x$PKG_CONFIG_INSTALLED" = "xno"; then + AC_MSG_WARN([You need to install pkg-config]) +fi +PKG_PROG_PKG_CONFIG([0.20]) + +dnl check for AX_CHECK_COMPILE_FLAG +m4_ifdef([AX_CHECK_COMPILE_FLAG], [], [ + AC_MSG_ERROR([Please install autoconf-archive; re-run 'autoreconf -fi' for it to take effect.]) + ]) + +dnl checks for libraries +AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DL="$LIBS";LIBS=""]) +AC_SUBST(LIBRARY_DL) + +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.8.0) + +dnl checks for header files +AC_HEADER_STDC + +dnl Checks for typedefs, structures and compiler characteristics + +AC_ARG_ENABLE(sanitize, + [AS_HELP_STRING( + [--enable-sanitize], + [Compile with address sanitizer enabled], + )], + [sanitize=$enableval], [sanitize="no"]) +if test x"$sanitize" = x"yes" +then + CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined" + CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined" +fi + +AC_ARG_ENABLE(werror, + [AS_HELP_STRING( + [--enable-werror], + [Turn all compiler warnings into errors, with exceptions: + a) deprecation (allow upstream to mark deprecation without breaking builds); + b) "#warning" pragmas (allow to remind ourselves of errors without breaking builds) + ] + )], + [werror=$enableval], [werror="no"]) +if test x"$werror" = x"yes" +then + WERROR_FLAGS="-Werror" + WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" + WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" + CFLAGS="$CFLAGS $WERROR_FLAGS" + CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" +fi + +# The following test is taken from WebKit's webkit.m4 +saved_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -fvisibility=hidden " +AC_MSG_CHECKING([if ${CC} supports -fvisibility=hidden]) +AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])], + [ AC_MSG_RESULT([yes]) + SYMBOL_VISIBILITY="-fvisibility=hidden"], + AC_MSG_RESULT([no])) +CFLAGS="$saved_CFLAGS" +AC_SUBST(SYMBOL_VISIBILITY) + +AX_CHECK_COMPILE_FLAG([-Werror=implicit], [CFLAGS="$CFLAGS -Werror=implicit"]) +AX_CHECK_COMPILE_FLAG([-Werror=maybe-uninitialized], [CFLAGS="$CFLAGS -Werror=maybe-uninitialized"]) +AX_CHECK_COMPILE_FLAG([-Werror=memset-transposed-args], [CFLAGS="$CFLAGS -Werror=memset-transposed-args"]) +AX_CHECK_COMPILE_FLAG([-Wnull-dereference], [CFLAGS="$CFLAGS -Wnull-dereference"]) +AX_CHECK_COMPILE_FLAG([-Werror=sizeof-array-argument], [CFLAGS="$CFLAGS -Werror=sizeof-array-argument"]) +AX_CHECK_COMPILE_FLAG([-Werror=sizeof-pointer-memaccess], [CFLAGS="$CFLAGS -Werror=sizeof-pointer-memaccess"]) + +# Coverage build taken from WebKit's configure.in +AC_MSG_CHECKING([whether to enable code coverage support]) +AC_ARG_ENABLE(coverage, + AC_HELP_STRING([--enable-coverage], + [enable code coverage support [default=no]]), + [],[enable_coverage="no"]) +AC_MSG_RESULT([$enable_coverage]) +if test "$enable_coverage" = "yes"; then + COVERAGE_CFLAGS="-ftest-coverage -fprofile-arcs" + COVERAGE_LDFLAGS="-ftest-coverage -fprofile-arcs" + AC_SUBST([COVERAGE_CFLAGS]) + AC_SUBST([COVERAGE_LDFLAGS]) +fi + +AC_ARG_ENABLE(profile, + [AS_HELP_STRING([--enable-profile], [Compile with profiling support enabled], )], + [profile=$enableval], [profile="no"]) +if test x"$profile" = x"yes" +then + CFLAGS="$CFLAGS -pg" + CPPFLAGS="$CPPFLAGS -pg" +fi + +AC_ARG_ENABLE([external_tests], + AC_HELP_STRING([--enable-external-tests], + [Include the VTY/CTRL tests in make check [default=no]]), + [enable_ext_tests="$enableval"],[enable_ext_tests="no"]) +if test "x$enable_ext_tests" = "xyes" ; then + AC_CHECK_PROG(PYTHON3_AVAIL,python3,yes) + if test "x$PYTHON3_AVAIL" != "xyes" ; then + AC_MSG_ERROR([Please install python3 to run the VTY/CTRL tests.]) + fi + AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes) + if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then + AC_MSG_ERROR([Please install git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.]) + fi +fi +AC_MSG_CHECKING([whether to enable VTY/CTRL tests]) +AC_MSG_RESULT([$enable_ext_tests]) +AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") + +# Generate manuals +AC_ARG_ENABLE(manuals, + [AS_HELP_STRING( + [--enable-manuals], + [Generate manual PDFs [default=no]], + )], + [osmo_ac_build_manuals=$enableval], [osmo_ac_build_manuals="no"]) +AM_CONDITIONAL([BUILD_MANUALS], [test x"$osmo_ac_build_manuals" = x"yes"]) +AC_ARG_VAR(OSMO_GSM_MANUALS_DIR, [path to common osmo-gsm-manuals files, overriding pkg-config and "../osmo-gsm-manuals" + fallback]) +if test x"$osmo_ac_build_manuals" = x"yes" +then + # Find OSMO_GSM_MANUALS_DIR (env, pkg-conf, fallback) + if test -n "$OSMO_GSM_MANUALS_DIR"; then + echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (from env)" + else + OSMO_GSM_MANUALS_DIR="$($PKG_CONFIG osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null)" + if test -n "$OSMO_GSM_MANUALS_DIR"; then + echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (from pkg-conf)" + else + OSMO_GSM_MANUALS_DIR="../osmo-gsm-manuals" + echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (fallback)" + fi + fi + if ! test -d "$OSMO_GSM_MANUALS_DIR"; then + AC_MSG_ERROR("OSMO_GSM_MANUALS_DIR does not exist! Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR.") + fi + + # Find and run check-depends + CHECK_DEPENDS="$OSMO_GSM_MANUALS_DIR/check-depends.sh" + if ! test -x "$CHECK_DEPENDS"; then + CHECK_DEPENDS="osmo-gsm-manuals-check-depends" + fi + if ! $CHECK_DEPENDS; then + AC_MSG_ERROR("missing dependencies for --enable-manuals") + fi + + # Put in Makefile with absolute path + OSMO_GSM_MANUALS_DIR="$(realpath "$OSMO_GSM_MANUALS_DIR")" + AC_SUBST([OSMO_GSM_MANUALS_DIR]) +fi + +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + +AC_MSG_RESULT([CFLAGS="$CFLAGS"]) +AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) + +dnl Generate the output +AM_CONFIG_HEADER(config.h) + +AC_OUTPUT( + include/Makefile + include/osmocom/Makefile + include/osmocom/hnodeb/Makefile + src/Makefile + src/osmo-hnodeb/Makefile + tests/Makefile + tests/atlocal + doc/Makefile + doc/examples/Makefile + doc/manuals/Makefile + contrib/Makefile + contrib/systemd/Makefile + contrib/osmo-hnodeb.spec + Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..85042d8 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,68 @@ +#!/usr/bin/env bash +# jenkins build helper script for osmo-hnodeb. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# + +if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then + echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" + exit 2 +fi + + +set -ex + +base="$PWD" +deps="$base/deps" +inst="$deps/install" +export deps inst + +osmo-clean-workspace.sh + +mkdir "$deps" || true + +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") + +export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" +export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" + +osmo-build-dep.sh libosmocore "" --disable-doxygen +osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-netif +osmo-build-dep.sh libosmo-sccp +osmo-build-dep.sh libasn1c + +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "1" ]; then + CONFIG="--enable-manuals" +fi + +set +x +echo +echo +echo +echo " =============================== osmo-hnodeb ===============================" +echo +set -x + +cd "$base" +autoreconf --install --force +./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG +$MAKE $PARALLEL_MAKE +LD_LIBRARY_PATH="$inst/lib" $MAKE check \ + || cat-testlogs.sh +LD_LIBRARY_PATH="$inst/lib" \ + DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests --enable-werror $CONFIG" \ + $MAKE $PARALLEL_MAKE distcheck \ + || cat-testlogs.sh + +if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish +fi + +$MAKE $PARALLEL_MAKE maintainer-clean +osmo-clean-workspace.sh diff --git a/contrib/osmo-hnodeb.spec.in b/contrib/osmo-hnodeb.spec.in new file mode 100644 index 0000000..0fc448e --- /dev/null +++ b/contrib/osmo-hnodeb.spec.in @@ -0,0 +1,91 @@ +# +# spec file for package osmo-hnodeb +# +# Copyright (c) 2017, Martin Hauke +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +## Disable LTO for now since it breaks compilation of the tests +## https://osmocom.org/issues/4113 +%define _lto_cflags %{nil} + +Name: osmo-hnodeb +Version: @VERSION@ +Release: 0 +Summary: Osmohnodeb: Osmocom's Base Station Controller for 2G CS mobile networks +License: AGPL-3.0-or-later AND GPL-2.0-or-later +Group: Hardware/Mobile +URL: https://osmocom.org/projects/osmohnodeb +Source: %{name}-%{version}.tar.xz +BuildRequires: automake >= 1.9 +BuildRequires: libtool >= 2 +BuildRequires: pkgconfig >= 0.20 +%if 0%{?suse_version} +BuildRequires: systemd-rpm-macros +%endif +BuildRequires: pkgconfig(libcrypto) >= 0.9.5 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmo-sigtran) >= 1.4.0 +BuildRequires: pkgconfig(libosmoabis) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogb) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 +BuildRequires: pkgconfig(talloc) +%{?systemd_requires} + +%description +OsmohNodeB: Osmocom's Home NodeB for 3G mobile networks. + +%prep +%setup -q + +%build +echo "%{version}" >.tarball-version +autoreconf -fi +%configure \ + --docdir=%{_docdir}/%{name} \ + --with-systemdsystemunitdir=%{_unitdir} +make %{?_smp_mflags} + +%install +%make_install + +%if 0%{?suse_version} +%preun +%service_del_preun %{name}.service + +%postun +%service_del_postun %{name}.service + +%pre +%service_add_pre %{name}.service + +%post +%service_add_post %{name}.service +%endif + +%check +make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) + +%files +%license COPYING +%doc AUTHORS README +%{_bindir}/osmo-hnodeb +%dir %{_docdir}/%{name}/examples +%dir %{_docdir}/%{name}/examples/osmo-hnodeb +%{_docdir}/%{name}/examples/osmo-hnodeb/osmo-hnodeb.cfg +%{_docdir}/%{name}/examples/osmo-hnodeb/*/osmo-hnodeb*.cfg +%dir %{_sysconfdir}/osmocom +%config(noreplace) %{_sysconfdir}/osmocom/osmo-hnodeb.cfg +%{_unitdir}/%{name}.service + +%changelog diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..b20cf20 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,6 @@ +EXTRA_DIST = osmo-hnodeb.service + +if HAVE_SYSTEMD +systemdsystemunit_DATA = \ + osmo-hnodeb.service +endif diff --git a/contrib/systemd/osmo-hnodeb.service b/contrib/systemd/osmo-hnodeb.service new file mode 100644 index 0000000..037e0e8 --- /dev/null +++ b/contrib/systemd/osmo-hnodeb.service @@ -0,0 +1,11 @@ +[Unit] +Description=Osmocom Home NodeB (hNodeB) + +[Service] +Type=simple +Restart=always +ExecStart=/usr/bin/osmo-hnodeb -c /etc/osmocom/osmo-hnodeb.cfg +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/debian/changelog diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..9b85ae3 --- /dev/null +++ b/debian/control @@ -0,0 +1,47 @@ +Source: osmo-hnodeb +Section: net +Priority: extra +Maintainer: Osmocom team +Build-Depends: debhelper (>=9), + dh-autoreconf, + autotools-dev, + autoconf, + automake, + libtool, + pkg-config, + python3-minimal, + libtalloc-dev, + libasn1c-dev, + libosmocore-dev (>= 1.5.0), + libosmo-sigtran-dev (>= 1.4.0), + libosmo-abis-dev (>= 1.1.0), + libosmo-netif-dev (>= 1.1.0), + libosmo-mgcp-client-dev (>= 1.8.0), + osmo-gsm-manuals-dev (>= 1.1.0) +Standards-Version: 3.9.8 +Vcs-Git: git://git.osmocom.org/osmo-hnodeb.git +Vcs-Browser: https://git.osmocom.org/osmo-hnodeb/ +Homepage: https://projects.osmocom.org/projects/osmo-hnodeb + +Package: osmo-hnodeb +Architecture: any +Multi-Arch: foreign +Depends: ${misc:Depends}, ${shlibs:Depends} +Recommends: osmo-mgw +Description: OsmohNodeB: Osmocom's Home NodeB for 3G mobile networks + +Package: osmo-hnodeb-dbg +Section: debug +Architecture: any +Multi-Arch: same +Depends: osmo-hnodeb (= ${binary:Version}), ${misc:Depends} +Description:OsmohNodeB: Osmocom's Home NodeB for 3G mobile networks + +Package: osmo-hnodeb-doc +Architecture: all +Section: doc +Priority: optional +Depends: ${misc:Depends} +Description: ${misc:Package} PDF documentation + Various manuals: user manual, VTY reference manual and/or + protocol/interface manuals. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..8321a0e --- /dev/null +++ b/debian/copyright @@ -0,0 +1,19 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: osmo-hnodeb +Source: git://git.osmocom.org/osmo-hnodeb + +Files: * +Copyright: 2021 sysmocom - s.f.m.c. GmbH +License: AGPL-3.0+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + . + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . diff --git a/debian/osmo-hnodeb.install b/debian/osmo-hnodeb.install new file mode 100644 index 0000000..e875d68 --- /dev/null +++ b/debian/osmo-hnodeb.install @@ -0,0 +1,4 @@ +etc/osmocom/osmo-hnodeb.cfg +lib/systemd/system/osmo-hnodeb.service +usr/bin/osmo-hnodeb +usr/share/doc/osmo-hnodeb/examples/osmo-hnodeb/osmo-hnodeb.cfg usr/share/doc/osmo-hnodeb/examples diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..a6bcd45 --- /dev/null +++ b/debian/rules @@ -0,0 +1,66 @@ +#!/usr/bin/make -f +# You must remove unused comment lines for the released package. +# See debhelper(7) (uncomment to enable) +# This is an autogenerated template for debian/rules. +# +# Output every command that modifies files on the build system. +#export DH_VERBOSE = 1 +# +# Copy some variable definitions from pkg-info.mk and vendor.mk +# under /usr/share/dpkg/ to here if they are useful. +# +# See FEATURE AREAS/ENVIRONMENT in dpkg-buildflags(1) +# Apply all hardening options +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +# Package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# Package maintainers to append LDFLAGS +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +# +# With debhelper version 9 or newer, the dh command exports +# all buildflags. So there is no need to include the +# /usr/share/dpkg/buildflags.mk file here if compat is 9 or newer. +# +# These are rarely used code. (START) +# +# The following include for *.mk magically sets miscellaneous +# variables while honoring existing values of pertinent +# environment variables: +# +# Architecture-related variables such as DEB_TARGET_MULTIARCH: +#include /usr/share/dpkg/architecture.mk +# Vendor-related variables such as DEB_VENDOR: +#include /usr/share/dpkg/vendor.mk +# Package-related variables such as DEB_DISTRIBUTION +#include /usr/share/dpkg/pkg-info.mk +# +# You may alternatively set them susing a simple script such as: +# DEB_VENDOR ?= $(shell dpkg-vendor --query Vendor) +# +# These are rarely used code. (END) +# + +# main packaging script based on dh7 syntax +%: + dh $@ --with autoreconf + +# debmake generated override targets +CONFIGURE_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals +override_dh_auto_configure: + dh_auto_configure -- $(CONFIGURE_FLAGS) +# +# Do not install libtool archive, python .pyc .pyo +#override_dh_install: +# dh_install --list-missing -X.la -X.pyc -X.pyo + +# See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg +override_dh_strip: + dh_strip -posmo-hnodeb --dbg-package=osmo-hnodeb-dbg + +# Print test results in case of a failure +override_dh_auto_test: + dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) + +# Don't create .pdf.gz files (barely saves space and they can't be opened directly by most pdf readers) +override_dh_compress: + dh_compress -X.pdf diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..15f36b7 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = \ + examples \ + manuals \ + $(NULL) diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am new file mode 100644 index 0000000..c533e4e --- /dev/null +++ b/doc/examples/Makefile.am @@ -0,0 +1,30 @@ +OSMOCONF_FILES = \ + osmo-hnodeb/osmo-hnodeb.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) + +EXTRA_DIST = $(OSMOCONF_FILES) + +CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' + +dist-hook: + for f in $$($(CFG_FILES)); do \ + j="$(distdir)/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +install-data-hook: + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +uninstall-hook: + @$(PRE_UNINSTALL) + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + $(RM) $$j; \ + done diff --git a/doc/examples/osmo-hnodeb/osmo-hnodeb.cfg b/doc/examples/osmo-hnodeb/osmo-hnodeb.cfg new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/doc/examples/osmo-hnodeb/osmo-hnodeb.cfg diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am new file mode 100644 index 0000000..989246e --- /dev/null +++ b/doc/manuals/Makefile.am @@ -0,0 +1,26 @@ +EXTRA_DIST = \ + osmohnodeb-usermanual.adoc \ + osmohnodeb-usermanual-docinfo.xml \ + osmohnodeb-vty-reference.xml \ + chapters \ + message-sequences \ + regen_doc.sh \ + vty + +if BUILD_MANUALS + ASCIIDOC = osmohnodeb-usermanual.adoc + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + osmohnodeb-usermanual.pdf: $(srcdir)/chapters/*.adoc $(srcdir)/chapters/*.dot + + VTY_REFERENCE = osmohnodeb-vty-reference.xml + + BUILT_REFERENCE_XML = $(builddir)/vty/hnodeb_vty_reference.xml + $(builddir)/vty/hnodeb_vty_reference.xml: $(top_builddir)/src/osmo-hnodeb/osmo-hnodeb + mkdir -p $(builddir)/vty + $(top_builddir)/src/osmo-hnodeb/osmo-hnodeb --vty-ref-xml > $@ + + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc + + OSMO_REPOSITORY = osmo-hnodeb + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc +endif diff --git a/doc/manuals/chapters/overview.adoc b/doc/manuals/chapters/overview.adoc new file mode 100644 index 0000000..67aaaee --- /dev/null +++ b/doc/manuals/chapters/overview.adoc @@ -0,0 +1,14 @@ +OsmohNodeB[[overview]] +== Overview + +This manual should help you getting started with OsmohNodeB. It will cover +aspects of configuring and running the OsmohNodeB. + +[[intro_overview]] +=== About OsmohNodeB + +OsmohNodeB is the Osmocom implementation of a 3G Home NodeB. It +implements: + +- An L2 Uu radio interface towards 3G UEs +- an Iuh interface towards Home Node BG Gateway HNBGW diff --git a/doc/manuals/osmohnodeb-usermanual-docinfo.xml b/doc/manuals/osmohnodeb-usermanual-docinfo.xml new file mode 100644 index 0000000..d3ddc8c --- /dev/null +++ b/doc/manuals/osmohnodeb-usermanual-docinfo.xml @@ -0,0 +1,47 @@ + + + 1 + October 2016 + PEP + + Initial OsmoHnodeB manual + + + + + + + Pau + Espin Pedrol + pespin at sysmocom.de + PE + + sysmocom + sysmocom - s.f.m.c. GmbH + Software Developer + + + + + + 2021 + sysmocom - s.f.m.c. GmbH + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with the Invariant Sections being just 'Foreword', + 'Acknowledgements' and 'Preface', with no Front-Cover Texts, + and no Back-Cover Texts. A copy of the license is included in + the section entitled "GNU Free Documentation License". + + + The Asciidoc source code of this manual can be found at + + http://git.osmocom.org/osmo-gsm-manuals/ + + + diff --git a/doc/manuals/osmohnodeb-usermanual.adoc b/doc/manuals/osmohnodeb-usermanual.adoc new file mode 100644 index 0000000..542bae6 --- /dev/null +++ b/doc/manuals/osmohnodeb-usermanual.adoc @@ -0,0 +1,31 @@ +:gfdl-enabled: +:program-name: OsmohNodeB + +OsmohNodeB User Manual +=================== +Pau Espin Pedrol + + +include::./common/chapters/preface.adoc[] + +include::{srcdir}/chapters/overview.adoc[] + +include::./common/chapters/vty.adoc[] + +include::./common/chapters/logging.adoc[] + +include::./common/chapters/cs7-config.adoc[] + +include::./common/chapters/counters-overview.adoc[] + +include::./common/chapters/control_if.adoc[] + +include::./common/chapters/vty_cpu_sched.adoc[] + +include::./common/chapters/port_numbers.adoc[] + +include::./common/chapters/bibliography.adoc[] + +include::./common/chapters/glossary.adoc[] + +include::./common/chapters/gfdl.adoc[] diff --git a/doc/manuals/osmohnodeb-vty-reference.xml b/doc/manuals/osmohnodeb-vty-reference.xml new file mode 100644 index 0000000..218c790 --- /dev/null +++ b/doc/manuals/osmohnodeb-vty-reference.xml @@ -0,0 +1,37 @@ + + + + +]> + + + + + + v1 + 20th October 2021 + PEP + Initial + + + + OsmohNodeB VTY Reference + + + 2021 + + + + This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + diff --git a/doc/manuals/regen_doc.sh b/doc/manuals/regen_doc.sh new file mode 100755 index 0000000..81636ea --- /dev/null +++ b/doc/manuals/regen_doc.sh @@ -0,0 +1,17 @@ +#!/bin/sh -x + +if [ -z "$DOCKER_PLAYGROUND" ]; then + echo "You need to set DOCKER_PLAYGROUND" + exit 1 +fi + +SCRIPT=$(realpath "$0") +MANUAL_DIR=$(dirname "$SCRIPT") + +COMMIT=${COMMIT:-$(git log -1 --format=format:%H)} + +cd "$DOCKER_PLAYGROUND/scripts" || exit 1 + +OSMO_HNODEB_BRANCH=$COMMIT ./regen_doc.sh osmo-hnodeb 4273 \ + "$MANUAL_DIR/chapters/counters_generated.adoc" \ + "$MANUAL_DIR/vty/hnodeb_vty_reference.xml" diff --git a/doc/manuals/vty/hnodeb_vty_additions.xml b/doc/manuals/vty/hnodeb_vty_additions.xml new file mode 100644 index 0000000..a4c675e --- /dev/null +++ b/doc/manuals/vty/hnodeb_vty_additions.xml @@ -0,0 +1,2 @@ + + diff --git a/git-version-gen b/git-version-gen new file mode 100755 index 0000000..42cf3d2 --- /dev/null +++ b/git-version-gen @@ -0,0 +1,151 @@ +#!/bin/sh +# Print a version string. +scriptversion=2010-01-28.01 + +# Copyright (C) 2007-2010 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# It is probably wise to add these two files to .gitignore, so that you +# don't accidentally commit either generated file. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project at example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .tarball-version will +# exist in distribution tarballs. +# +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + +case $# in + 1) ;; + *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;; +esac + +tarball_version_file=$1 +nl=' +' + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || exit 1 + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test -z "$v" \ + && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 +fi + +if test -n "$v" +then + : # use $v +elif + v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && case $v in + [0-9]*) ;; + v[0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + numcommits=`git rev-list "$vtag"..HEAD | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + ;; + esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. + v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; +else + v=UNKNOWN +fi + +v=`echo "$v" |sed 's/^v//'` + +# Don't declare a version "dirty" merely because a time stamp has changed. +git status > /dev/null 2>&1 + +dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; +esac + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d '\012' + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 0000000..9d963a0 --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + osmocom \ + $(NULL) diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am new file mode 100644 index 0000000..19b6348 --- /dev/null +++ b/include/osmocom/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + hnodeb \ + $(NULL) diff --git a/include/osmocom/hnodeb/Makefile.am b/include/osmocom/hnodeb/Makefile.am new file mode 100644 index 0000000..189ef37 --- /dev/null +++ b/include/osmocom/hnodeb/Makefile.am @@ -0,0 +1,3 @@ +noinst_HEADERS = \ + hnodeb.h \ + $(NULL) diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h new file mode 100644 index 0000000..6f70f09 --- /dev/null +++ b/include/osmocom/hnodeb/hnodeb.h @@ -0,0 +1 @@ +#pragma once diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..ba68ce8 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + osmo-hnodeb \ + $(NULL) diff --git a/src/osmo-hnodeb/Makefile.am b/src/osmo-hnodeb/Makefile.am new file mode 100644 index 0000000..2ec8b24 --- /dev/null +++ b/src/osmo-hnodeb/Makefile.am @@ -0,0 +1,40 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + -I$(top_builddir) \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOCTRL_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + $(NULL) + +bin_PROGRAMS = \ + osmo-hnodeb \ + $(NULL) + +osmo_hnodeb_SOURCES = \ + main.c \ + $(NULL) + +osmo_hnodeb_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMONETIF_LIBS) \ + $(COVERAGE_LDFLAGS) \ + $(LIBOSMOABIS_LIBS) \ + $(LIBOSMOSIGTRAN_LIBS) \ + $(NULL) diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c new file mode 100644 index 0000000..96d9136 --- /dev/null +++ b/src/osmo-hnodeb/main.c @@ -0,0 +1,25 @@ +/* (C) 2021 by sysmocom - s.f.m.c. GmbH + * Author: Pau Espin Pedrol + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include "config.h" + +int main(int argc, char **argv) +{ + return 0; +} diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..278b8a7 --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,75 @@ +SUBDIRS = \ + $(NULL) + +# The `:;' works around a Bash 3.2 bug when the output is not writeable. +$(srcdir)/package.m4: $(top_srcdir)/configure.ac + :;{ \ + echo '# Signature of the current package.' && \ + echo 'm4_define([AT_PACKAGE_NAME],' && \ + echo ' [$(PACKAGE_NAME)])' && \ + echo 'm4_define([AT_PACKAGE_TARNAME],' && \ + echo ' [$(PACKAGE_TARNAME)])' && \ + echo 'm4_define([AT_PACKAGE_VERSION],' && \ + echo ' [$(PACKAGE_VERSION)])' && \ + echo 'm4_define([AT_PACKAGE_STRING],' && \ + echo ' [$(PACKAGE_STRING)])' && \ + echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \ + echo ' [$(PACKAGE_BUGREPORT)])'; \ + echo 'm4_define([AT_PACKAGE_URL],' && \ + echo ' [$(PACKAGE_URL)])'; \ + } >'$(srcdir)/package.m4' + +EXTRA_DIST = \ + testsuite.at \ + $(srcdir)/package.m4 \ + $(TESTSUITE) \ + ctrl_test_runner.py \ + osmo-hnodeb.vty \ + $(NULL) + +TESTSUITE = $(srcdir)/testsuite + +DISTCLEANFILES = \ + atconfig \ + $(NULL) + +if ENABLE_EXT_TESTS +python-tests: $(BUILT_SOURCES) + $(MAKE) vty-test + osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v + $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v +else +python-tests: $(BUILT_SOURCES) + echo "Not running python-based tests (determined at configure-time)" +endif + +# Run a specific test with: 'make vty-test VTY_TEST=osmo-hnodeb.vty' +VTY_TEST ?= *.vty + +# To update the VTY script from current application behavior, +# pass -u to vty_script_runner.py by doing: +# make vty-test U=-u +vty-test: + osmo_verify_transcript_vty.py -v \ + -n OsmohNodeB -p 4242 \ + -r "$(top_builddir)/src/osmo-hnodeb/osmo-hnodeb -c $(top_srcdir)/doc/examples/osmo-hnodeb/osmo-hnodeb.cfg" \ + $(U) $(srcdir)/$(VTY_TEST) + +check-local: atconfig $(TESTSUITE) + $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) + $(MAKE) $(AM_MAKEFLAGS) python-tests + +installcheck-local: atconfig $(TESTSUITE) + $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \ + $(TESTSUITEFLAGS) + +clean-local: + test ! -f '$(TESTSUITE)' || \ + $(SHELL) '$(TESTSUITE)' --clean + +AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te +AUTOTEST = $(AUTOM4TE) --language=autotest +$(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 + $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at + mv $@.tmp $@ diff --git a/tests/atlocal.in b/tests/atlocal.in new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/atlocal.in diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py new file mode 100755 index 0000000..8bc29bf --- /dev/null +++ b/tests/ctrl_test_runner.py @@ -0,0 +1,215 @@ +#!/usr/bin/env python3 + +# (C) 2013 by Jacob Erlbeck +# (C) 2014 by Holger Hans Peter Freyther +# based on vty_test_runner.py: +# (C) 2013 by Katerina Barone-Adesi +# (C) 2013 by Holger Hans Peter Freyther +# based on bsc_control.py. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import os +import time +import unittest +import socket +import sys +import struct + +import osmopy.obscvty as obscvty +import osmopy.osmoutil as osmoutil +from osmopy.osmo_ipa import Ctrl, IPA + +# to be able to find $top_srcdir/doc/... +confpath = os.path.join(sys.path[0], '..') +verbose = False + +class TestCtrlBase(unittest.TestCase): + + def ctrl_command(self): + raise Exception("Needs to be implemented by a subclass") + + def ctrl_app(self): + raise Exception("Needs to be implemented by a subclass") + + def setUp(self): + osmo_ctrl_cmd = self.ctrl_command()[:] + config_index = osmo_ctrl_cmd.index('-c') + if config_index: + cfi = config_index + 1 + osmo_ctrl_cmd[cfi] = os.path.join(confpath, osmo_ctrl_cmd[cfi]) + + try: + self.proc = osmoutil.popen_devnull(osmo_ctrl_cmd) + except OSError: + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) + + appstring = self.ctrl_app()[2] + appport = self.ctrl_app()[0] + self.connect("127.0.0.1", appport) + self.next_id = 1000 + + def tearDown(self): + self.disconnect() + osmoutil.end_proc(self.proc) + + def disconnect(self): + if not (self.sock is None): + self.sock.close() + + def connect(self, host, port): + if verbose: + print("Connecting to host %s:%i" % (host, port)) + + retries = 30 + while True: + try: + sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sck.setblocking(1) + sck.connect((host, port)) + except IOError: + retries -= 1 + if retries <= 0: + raise + time.sleep(.1) + continue + break + self.sock = sck + return sck + + def send(self, data): + if verbose: + print("Sending \"%s\"" %(data)) + data = Ctrl().add_header(data) + return self.sock.send(data) == len(data) + + def send_set(self, var, value, id): + setmsg = "SET %s %s %s" %(id, var, value) + return self.send(setmsg) + + def send_get(self, var, id): + getmsg = "GET %s %s" %(id, var) + return self.send(getmsg) + + def do_set(self, var, value): + id = self.next_id + self.next_id += 1 + self.send_set(var, value, id) + return self.recv_msgs()[id] + + def do_get(self, var): + id = self.next_id + self.next_id += 1 + self.send_get(var, id) + return self.recv_msgs()[id] + + def recv_msgs(self): + responses = {} + data = self.sock.recv(4096) + while (len(data)>0): + (head, data) = IPA().split_combined(data) + answer = Ctrl().rem_header(head).decode() + if verbose: + print("Got message:", answer) + (mtype, id, msg) = answer.split(None, 2) + id = int(id) + rsp = {'mtype': mtype, 'id': id} + if mtype == "ERROR": + rsp['error'] = msg + else: + split = msg.split(None, 1) + rsp['var'] = split[0] + if len(split) > 1: + rsp['value'] = split[1] + else: + rsp['value'] = None + responses[id] = rsp + + if verbose: + print("Decoded replies: ", responses) + + return responses + + +class TestCtrlHNB(TestCtrlBase): + + def tearDown(self): + TestCtrlBase.tearDown(self) + os.unlink("tmp_dummy_sock") + + def ctrl_command(self): + return ["./src/osmo-hnodeb/osmo-hnodeb", "-r", "tmp_dummy_sock", "-c", + "doc/examples/osmo-hnodeb/osmo-hnodeb.cfg"] + + def ctrl_app(self): + return (4249, "./src/osmo-hnodeb/osmo-hnodeb", "OsmohNodeB", "hnb") + + def testCtrlErrs(self): + r = self.do_get('invalid') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Command not found') + + r = self.do_set('rf_locked', '999') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Value failed verification.') + + r = self.do_get('bts') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Error while parsing the index.') + + r = self.do_get('bts.999') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Error while resolving object') + +def add_hnodeb_test(suite, workdir, klass): + if not os.path.isfile(os.path.join(workdir, "src/osmo-hnodeb/osmo-hnodeb")): + print("Skipping the hNodeB test") + return + test = unittest.TestLoader().loadTestsFromTestCase(klass) + suite.addTest(test) + +if __name__ == '__main__': + import argparse + import sys + + workdir = '.' + + parser = argparse.ArgumentParser() + parser.add_argument("-v", "--verbose", dest="verbose", + action="store_true", help="verbose mode") + parser.add_argument("-p", "--pythonconfpath", dest="p", + help="searchpath for config") + parser.add_argument("-w", "--workdir", dest="w", + help="Working directory") + args = parser.parse_args() + + verbose_level = 1 + if args.verbose: + verbose_level = 2 + verbose = True + + if args.w: + workdir = args.w + + if args.p: + confpath = args.p + + print("confpath %s, workdir %s" % (confpath, workdir)) + os.chdir(workdir) + print("Running tests for specific control commands") + suite = unittest.TestSuite() + add_hnodeb_test(suite, workdir, TestCtrlHNB) + res = unittest.TextTestRunner(verbosity=verbose_level).run(suite) + sys.exit(len(res.errors) + len(res.failures)) diff --git a/tests/osmo-hnodeb.vty b/tests/osmo-hnodeb.vty new file mode 100644 index 0000000..eba6043 --- /dev/null +++ b/tests/osmo-hnodeb.vty @@ -0,0 +1,2 @@ +OsmohNodeB> enable + diff --git a/tests/testsuite.at b/tests/testsuite.at new file mode 100644 index 0000000..65d1ca0 --- /dev/null +++ b/tests/testsuite.at @@ -0,0 +1,8 @@ +AT_INIT +AT_BANNER([Regression tests.]) + +#AT_SETUP([foobar]) +#AT_KEYWORDS([foobar]) +#cat $abs_srcdir/foobar/foobar_test.ok > expout +#AT_CHECK([$abs_top_builddir/tests/foobar/foobar_test], [], [expout], [ignore]) +#AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 09:37:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 09:37:27 +0000 Subject: Change in osmo-ci[master]: Add osmo-hnodeb to ansible/jenkins/coverity setup References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25875 ) Change subject: Add osmo-hnodeb to ansible/jenkins/coverity setup ...................................................................... Add osmo-hnodeb to ansible/jenkins/coverity setup Change-Id: Ie4b03aefeda13d216706bd648145689cf2ef93bb --- M ansible/roles/osmocom-workstation/tasks/git-repos.yml M coverity/build_Osmocom.sh M coverity/prepare_source_Osmcocom.sh M jobs/gerrit-lint.yml M jobs/gerrit-verifications.yml M jobs/master-builds.yml 6 files changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/75/25875/1 diff --git a/ansible/roles/osmocom-workstation/tasks/git-repos.yml b/ansible/roles/osmocom-workstation/tasks/git-repos.yml index d829892..edef6dd 100644 --- a/ansible/roles/osmocom-workstation/tasks/git-repos.yml +++ b/ansible/roles/osmocom-workstation/tasks/git-repos.yml @@ -36,6 +36,7 @@ - osmo-gsm-manuals - osmo-gtp-kernel - osmo-hlr + - osmo-hnodeb - osmo-iuh - osmo-mgw - osmo-msc diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index bb0f894..c33d6fd 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -46,7 +46,7 @@ } build_osmopcu() { - pushd osmo-pcu + pushd osmo-pcu do_build --enable-sysmocom-bts=yes --enable-sysmocom-dsp=yes popd @@ -81,6 +81,7 @@ build_default osmo-msc build_default osmo-sgsn build_default osmo-smlc +build_default osmo-hnodeb # GMR build_default libosmo-dsp diff --git a/coverity/prepare_source_Osmcocom.sh b/coverity/prepare_source_Osmcocom.sh index ab1525e..4e8d3b9 100755 --- a/coverity/prepare_source_Osmcocom.sh +++ b/coverity/prepare_source_Osmcocom.sh @@ -28,6 +28,7 @@ osmo-hlr \ osmocom-bb \ osmo-smlc \ + osmo-hnodeb \ ; do if [ -d $proj ]; then diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index 130b616..db00509 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -27,6 +27,7 @@ - openggsn - osmo-bsc - osmo-bts + - osmo-hnodeb - osmo-ci: # Run the lint script from the checked out branch diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 59e332c..77865b7 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -250,6 +250,7 @@ - osmo-el2tpd - osmo-smlc - osmo-gbproxy + - osmo-hnodeb - pysim: slave_axis: !!python/tuple [simtester] diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 56e2065..65b641b 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -107,7 +107,8 @@ master-osmo-bsc, master-osmo-iuh, master-osmo-msc, - master-osmo-sgsn + master-osmo-sgsn, + master-osmo-hnodeb - libosmocore: a1_name: arch @@ -350,6 +351,7 @@ - osmo-el2tpd - osmo-smlc - osmo-gbproxy + - osmo-hnodeb - rtl-sdr: email: laforge at gnumonks.org steve at steve-m.de -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie4b03aefeda13d216706bd648145689cf2ef93bb Gerrit-Change-Number: 25875 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 09:37:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 09:37:27 +0000 Subject: Change in osmo-ci[master]: Build and test osmo-hnodeb nightly packages References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25876 ) Change subject: Build and test osmo-hnodeb nightly packages ...................................................................... Build and test osmo-hnodeb nightly packages Change-Id: I53c2b357b0669f5101ceec7896c4ba30e69605c2 --- M scripts/common.sh M scripts/osmocom-nightly-packages.sh M scripts/repo-install-test/run-inside-docker.sh 3 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/76/25876/1 diff --git a/scripts/common.sh b/scripts/common.sh index 8dd00a1..85725f6 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -28,6 +28,7 @@ osmo-trx osmocom-bb " +#TODO: Add above once we have releases: osmo-hnodeb, osmo-gbproxy OSMO_BRANCH_DOCKER_PLAYGROUND="${OSMO_BRANCH_DOCKER_PLAYGROUND:-master}" diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index d9fd996..2bdc4f0 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -265,6 +265,7 @@ build osmo-smlc build osmo-cbc build osmo-gbproxy + build osmo-hnodeb post } diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index e47b4ec..1ba94d9 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -31,6 +31,7 @@ # * osmo-pcap-server 0.2.0: VTY port in default config conflicts with osmo-bts (OS#5203) SERVICES_NIGHTLY=" osmo-pcap-server + osmo-hnodeb " distro_obsdir() { -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I53c2b357b0669f5101ceec7896c4ba30e69605c2 Gerrit-Change-Number: 25876 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 09:41:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 09:41:26 +0000 Subject: Change in osmo-hnodeb[master]: Initial commit In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 ) Change subject: Initial commit ...................................................................... Initial commit This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Related: SYS#5516 Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am A README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 43 files changed, 2,122 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/74/25874/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 09:55:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 09:55:11 +0000 Subject: Change in osmo-hnodeb[master]: Initial commit References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25877 ) Change subject: Initial commit ...................................................................... Initial commit Change-Id: I132a83c8c5d265ff90654f2afa004648a1418e40 --- A README.md 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/77/25877/1 diff --git a/README.md b/README.md new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I132a83c8c5d265ff90654f2afa004648a1418e40 Gerrit-Change-Number: 25877 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 09:55:25 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 09:55:25 +0000 Subject: Change in osmo-hnodeb[master]: Initial commit In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25877 ) Change subject: Initial commit ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I132a83c8c5d265ff90654f2afa004648a1418e40 Gerrit-Change-Number: 25877 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Oct 2021 09:55:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 09:56:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 09:56:03 +0000 Subject: Change in osmo-hnodeb[master]: Initial commit In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25877 ) Change subject: Initial commit ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I132a83c8c5d265ff90654f2afa004648a1418e40 Gerrit-Change-Number: 25877 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 09:56:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 09:56:06 +0000 Subject: Change in osmo-hnodeb[master]: Initial commit In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25877 ) Change subject: Initial commit ...................................................................... Initial commit Change-Id: I132a83c8c5d265ff90654f2afa004648a1418e40 --- A README.md 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved; Verified diff --git a/README.md b/README.md new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ + -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25877 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I132a83c8c5d265ff90654f2afa004648a1418e40 Gerrit-Change-Number: 25877 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 09:58:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 09:58:22 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#3). ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 ) Change subject: Add project skeleton ...................................................................... Add project skeleton This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Related: SYS#5516 Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am M README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 43 files changed, 2,121 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/74/25874/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:01:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 10:01:05 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 to look at the new patch set (#4). Change subject: Add project skeleton ...................................................................... Add project skeleton This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Related: SYS#5516 Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am M README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 43 files changed, 2,120 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/74/25874/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:04:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 10:04:43 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 to look at the new patch set (#5). Change subject: Add project skeleton ...................................................................... Add project skeleton This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Related: SYS#5516 Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am M README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 43 files changed, 2,120 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/74/25874/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:19:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 10:19:09 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 to look at the new patch set (#6). Change subject: Add project skeleton ...................................................................... Add project skeleton This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Related: SYS#5516 Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am M README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A doc/manuals/vty/hnodeb_vty_reference.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 44 files changed, 2,122 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/74/25874/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 6 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:24:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 10:24:52 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 to look at the new patch set (#7). Change subject: Add project skeleton ...................................................................... Add project skeleton This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Related: SYS#5516 Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am M README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 43 files changed, 2,121 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/74/25874/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 7 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:27:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 10:27:50 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 to look at the new patch set (#8). Change subject: Add project skeleton ...................................................................... Add project skeleton This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Related: SYS#5516 Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am M README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 43 files changed, 2,121 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/74/25874/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 8 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:32:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 10:32:04 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 to look at the new patch set (#9). Change subject: Add project skeleton ...................................................................... Add project skeleton This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Related: SYS#5516 Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am M README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 43 files changed, 2,122 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/74/25874/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 9 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:35:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 10:35:03 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 to look at the new patch set (#10). Change subject: Add project skeleton ...................................................................... Add project skeleton This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Related: SYS#5516 Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am M README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 43 files changed, 2,123 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/74/25874/10 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 10 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:37:25 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 10:37:25 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 to look at the new patch set (#11). Change subject: Add project skeleton ...................................................................... Add project skeleton This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Related: SYS#5516 Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am M README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 43 files changed, 2,123 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/74/25874/11 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 11 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:39:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 10:39:04 +0000 Subject: Change in osmo-ci[master]: Add osmo-hnodeb to ansible/jenkins/coverity setup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25875 ) Change subject: Add osmo-hnodeb to ansible/jenkins/coverity setup ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-ci/+/25875/1/coverity/build_Osmocom.sh File coverity/build_Osmocom.sh: https://gerrit.osmocom.org/c/osmo-ci/+/25875/1/coverity/build_Osmocom.sh at a49 PS1, Line 49: pushd osmo-pcu unrelated whitespace change, but we can overlook that. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie4b03aefeda13d216706bd648145689cf2ef93bb Gerrit-Change-Number: 25875 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Oct 2021 10:39:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:39:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 10:39:30 +0000 Subject: Change in osmo-ci[master]: Build and test osmo-hnodeb nightly packages In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25876 ) Change subject: Build and test osmo-hnodeb nightly packages ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I53c2b357b0669f5101ceec7896c4ba30e69605c2 Gerrit-Change-Number: 25876 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Oct 2021 10:39:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:40:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 10:40:12 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 to look at the new patch set (#12). Change subject: Add project skeleton ...................................................................... Add project skeleton This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Related: SYS#5516 Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am M README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 43 files changed, 2,122 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/74/25874/12 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 12 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:40:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 10:40:18 +0000 Subject: Change in libosmocore[master]: {ctrl, vty}/ports.h: Allocate ports for osmo-hnodeb In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25852 ) Change subject: {ctrl,vty}/ports.h: Allocate ports for osmo-hnodeb ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/25852/1/include/osmocom/ctrl/ports.h File include/osmocom/ctrl/ports.h: https://gerrit.osmocom.org/c/libosmocore/+/25852/1/include/osmocom/ctrl/ports.h at 32 PS1, Line 32: #de copy+paste, you probably wanted HNODEB and not SMLC here -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6514d040d88d145a321075911368645868e6280e Gerrit-Change-Number: 25852 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Oct 2021 10:40:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:43:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 10:43:29 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 to look at the new patch set (#13). Change subject: Add project skeleton ...................................................................... Add project skeleton This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Related: SYS#5516 Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am M README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 43 files changed, 2,121 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/74/25874/13 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 13 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:43:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 10:43:47 +0000 Subject: Change in pysim[master]: cards: Make select_adf_by_aid() use prefix AID selection In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25873 to look at the new patch set (#2). Change subject: cards: Make select_adf_by_aid() use prefix AID selection ...................................................................... cards: Make select_adf_by_aid() use prefix AID selection There is no need for us to expand a partial AID to the full AID before selecting that ADF. The UICC specifications permit AID selection by prefix only. So we can pass the prefix to the card, and the card will do the prefix matching. >From the API user point of view, this allows us to select applications not listed in EF.DIR Change-Id: I0747b4e46ca7e30bd96d76053765080367ac1317 --- M pySim/cards.py 1 file changed, 3 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/73/25873/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0747b4e46ca7e30bd96d76053765080367ac1317 Gerrit-Change-Number: 25873 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:43:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 10:43:48 +0000 Subject: Change in pysim[master]: tlv: Fix recursive initialization from_dict() References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25878 ) Change subject: tlv: Fix recursive initialization from_dict() ...................................................................... tlv: Fix recursive initialization from_dict() When calling from_dict() on a hierarchy of nested BER_TLV_IE, only the first/outer layer of TLV_IE_Collection would get its 'decoded' initialized correctly from the dict. Subsequent layers were not, as the 'decoded=' was passed as parameter during instance initialization. If we first instantiate the class and then call the from_dict() method, the recursive initialization down the full hierarchy works as expected. Change-Id: I795a33ed8dfa8454dc9079c189ab7b2ba64a3b72 --- M pySim/tlv.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/78/25878/1 diff --git a/pySim/tlv.py b/pySim/tlv.py index 0dc746b..e1e2852 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -373,7 +373,8 @@ for k in i.keys(): if k in self.members_by_name: cls = self.members_by_name[k] - inst = cls(decoded=i[k]) + inst = cls() + inst.from_dict(i[k]) res.append(inst) else: raise ValueError('%s: Unknown TLV Class %s in %s; expected %s' % -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I795a33ed8dfa8454dc9079c189ab7b2ba64a3b72 Gerrit-Change-Number: 25878 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:50:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 10:50:58 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 to look at the new patch set (#14). Change subject: Add project skeleton ...................................................................... Add project skeleton This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Related: SYS#5516 Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am M README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A osmoappdesc.py A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 44 files changed, 2,149 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/74/25874/14 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 14 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:52:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 10:52:53 +0000 Subject: Change in osmo-ci[master]: Build and test osmo-hnodeb nightly packages In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/25876 to look at the new patch set (#2). Change subject: Build and test osmo-hnodeb nightly packages ...................................................................... Build and test osmo-hnodeb nightly packages Change-Id: I53c2b357b0669f5101ceec7896c4ba30e69605c2 --- M scripts/common.sh M scripts/osmocom-nightly-packages.sh M scripts/repo-install-test/run-inside-docker.sh 3 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/76/25876/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I53c2b357b0669f5101ceec7896c4ba30e69605c2 Gerrit-Change-Number: 25876 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:52:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 10:52:54 +0000 Subject: Change in osmo-ci[master]: coverity/build_Osmocom.sh: Fix trailing whitespace References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25879 ) Change subject: coverity/build_Osmocom.sh: Fix trailing whitespace ...................................................................... coverity/build_Osmocom.sh: Fix trailing whitespace Change-Id: I999c112c27d243366a010f216749a067d7b0509d --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/79/25879/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index bb0f894..3b47b70 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -46,7 +46,7 @@ } build_osmopcu() { - pushd osmo-pcu + pushd osmo-pcu do_build --enable-sysmocom-bts=yes --enable-sysmocom-dsp=yes popd -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25879 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I999c112c27d243366a010f216749a067d7b0509d Gerrit-Change-Number: 25879 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 10:53:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 10:53:36 +0000 Subject: Change in libosmocore[master]: {ctrl, vty}/ports.h: Allocate ports for osmo-hnodeb In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/25852 to look at the new patch set (#2). Change subject: {ctrl,vty}/ports.h: Allocate ports for osmo-hnodeb ...................................................................... {ctrl,vty}/ports.h: Allocate ports for osmo-hnodeb Change-Id: I6514d040d88d145a321075911368645868e6280e --- M include/osmocom/ctrl/ports.h M include/osmocom/vty/ports.h 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/52/25852/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6514d040d88d145a321075911368645868e6280e Gerrit-Change-Number: 25852 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 11:29:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 11:29:56 +0000 Subject: Change in libosmocore[master]: {ctrl, vty}/ports.h: Allocate ports for osmo-hnodeb In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25852 ) Change subject: {ctrl,vty}/ports.h: Allocate ports for osmo-hnodeb ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6514d040d88d145a321075911368645868e6280e Gerrit-Change-Number: 25852 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Oct 2021 11:29:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 11:29:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 11:29:58 +0000 Subject: Change in libosmocore[master]: {ctrl, vty}/ports.h: Allocate ports for osmo-hnodeb In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25852 ) Change subject: {ctrl,vty}/ports.h: Allocate ports for osmo-hnodeb ...................................................................... {ctrl,vty}/ports.h: Allocate ports for osmo-hnodeb Change-Id: I6514d040d88d145a321075911368645868e6280e --- M include/osmocom/ctrl/ports.h M include/osmocom/vty/ports.h 2 files changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/ctrl/ports.h b/include/osmocom/ctrl/ports.h index 91206dc..56d663a 100644 --- a/include/osmocom/ctrl/ports.h +++ b/include/osmocom/ctrl/ports.h @@ -28,4 +28,6 @@ /* 4266 used by D-GSM mDNS */ #define OSMO_CTRL_PORT_MGW 4267 #define OSMO_CTRL_PORT_SMLC 4272 +/* 4273 used by VTY interface */ +#define OSMO_CTRL_PORT_HNODEB 4274 /* When adding/changing port numbers, keep docs and wiki in sync. See above. */ diff --git a/include/osmocom/vty/ports.h b/include/osmocom/vty/ports.h index 580e642..cfefaa8 100644 --- a/include/osmocom/vty/ports.h +++ b/include/osmocom/vty/ports.h @@ -39,4 +39,7 @@ #define OSMO_VTY_PORT_UECUPS 4268 #define OSMO_VTY_PORT_E1D 4269 #define OSMO_VTY_PORT_SMLC 4271 +/* 4272 used by control interface */ +#define OSMO_VTY_PORT_HNODEB 4273 +/* 4274 used by control interface */ /* When adding/changing port numbers, keep docs and wiki in sync. See above. */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25852 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I6514d040d88d145a321075911368645868e6280e Gerrit-Change-Number: 25852 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 11:30:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 11:30:18 +0000 Subject: Change in osmo-ci[master]: coverity/build_Osmocom.sh: Fix trailing whitespace In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25879 ) Change subject: coverity/build_Osmocom.sh: Fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25879 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I999c112c27d243366a010f216749a067d7b0509d Gerrit-Change-Number: 25879 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Oct 2021 11:30:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 11:30:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 11:30:23 +0000 Subject: Change in osmo-ci[master]: Add osmo-hnodeb to ansible/jenkins/coverity setup In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25875 ) Change subject: Add osmo-hnodeb to ansible/jenkins/coverity setup ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie4b03aefeda13d216706bd648145689cf2ef93bb Gerrit-Change-Number: 25875 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Oct 2021 11:30:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 11:31:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 11:31:30 +0000 Subject: Change in osmo-ci[master]: coverity/build_Osmocom.sh: Fix trailing whitespace In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25879 ) Change subject: coverity/build_Osmocom.sh: Fix trailing whitespace ...................................................................... coverity/build_Osmocom.sh: Fix trailing whitespace Change-Id: I999c112c27d243366a010f216749a067d7b0509d --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index bb0f894..3b47b70 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -46,7 +46,7 @@ } build_osmopcu() { - pushd osmo-pcu + pushd osmo-pcu do_build --enable-sysmocom-bts=yes --enable-sysmocom-dsp=yes popd -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25879 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I999c112c27d243366a010f216749a067d7b0509d Gerrit-Change-Number: 25879 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 11:34:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 11:34:15 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 ) Change subject: Add project skeleton ...................................................................... Patch Set 14: (1 comment) the readme should probably state that this is a very early start and that it will only cover the Iuh interface for the time being (or longer) and not the lower layers. Check e.g. the wording I used in the redmine project / wiki. https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874/14/debian/control File debian/control: https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874/14/debian/control at 19 PS14, Line 19: not needed -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 14 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Oct 2021 11:34:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 11:35:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 11:35:34 +0000 Subject: Change in osmo-bts[master]: Reset CBCH state after BTS shutdown In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25841 ) Change subject: Reset CBCH state after BTS shutdown ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25841/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/25841/1//COMMIT_MSG at 9 PS1, Line 9: Related > I tend to use "Related:" for tickets and "Fixes:" for commit hashes. the question is whether you want to auto-close the redmine issue. If yes, it should be Fixes/Closes. If not, then Related is the way to go. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib01d38c59ba9fa083fcc0682009c13d2db3664fe Gerrit-Change-Number: 25841 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 21 Oct 2021 11:35:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 11:35:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 11:35:57 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: use OSMO_STRLCPY_ARRAY in mgcp_codec_add() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/25865 ) Change subject: libosmo-mgcp: use OSMO_STRLCPY_ARRAY in mgcp_codec_add() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icc2486308577b587a6ebd1b44b2fa92693aa7fc7 Gerrit-Change-Number: 25865 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Oct 2021 11:35:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 11:35:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 11:35:59 +0000 Subject: Change in osmo-mgw[master]: libosmo-mgcp: use OSMO_STRLCPY_ARRAY in mgcp_codec_add() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/25865 ) Change subject: libosmo-mgcp: use OSMO_STRLCPY_ARRAY in mgcp_codec_add() ...................................................................... libosmo-mgcp: use OSMO_STRLCPY_ARRAY in mgcp_codec_add() Change-Id: Icc2486308577b587a6ebd1b44b2fa92693aa7fc7 Fixes: CID#240100 --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 06dcedc..7ab2a17 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -176,7 +176,7 @@ goto error; } } else { - strncpy(codec->audio_name, audio_name, sizeof(codec->audio_name)); + OSMO_STRLCPY_ARRAY(codec->audio_name, audio_name); } /* Now we extract the codec subtype name, rate and channels. The latter -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/25865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icc2486308577b587a6ebd1b44b2fa92693aa7fc7 Gerrit-Change-Number: 25865 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 11:36:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 11:36:30 +0000 Subject: Change in osmo-bts[master]: Reset CBCH state after BTS shutdown In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25841 ) Change subject: Reset CBCH state after BTS shutdown ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25841/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/25841/1//COMMIT_MSG at 9 PS1, Line 9: Related > the question is whether you want to auto-close the redmine issue. [?] I tend to close them myself, so I'm fine with Related. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib01d38c59ba9fa083fcc0682009c13d2db3664fe Gerrit-Change-Number: 25841 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Oct 2021 11:36:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 11:36:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 11:36:32 +0000 Subject: Change in osmo-bts[master]: Reset CBCH state after BTS shutdown In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25841 ) Change subject: Reset CBCH state after BTS shutdown ...................................................................... Reset CBCH state after BTS shutdown Related: OS#5273 Change-Id: Ib01d38c59ba9fa083fcc0682009c13d2db3664fe --- M include/osmo-bts/cbch.h M src/common/cbch.c M src/common/nm_bts_fsm.c 3 files changed, 23 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmo-bts/cbch.h b/include/osmo-bts/cbch.h index 6bba5fa..d5521f0 100644 --- a/include/osmo-bts/cbch.h +++ b/include/osmo-bts/cbch.h @@ -21,3 +21,5 @@ /* call-back from bts model specific code when it wants to obtain a CBCH * block for a given gsm_time. outbuf must have 23 bytes of space. */ int bts_cbch_get(struct gsm_bts *bts, uint8_t *outbuf, struct gsm_time *g_time); + +void bts_cbch_reset(struct gsm_bts *bts); diff --git a/src/common/cbch.c b/src/common/cbch.c index ebea60b..addd68c 100644 --- a/src/common/cbch.c +++ b/src/common/cbch.c @@ -322,3 +322,22 @@ return rc; } + +static void bts_smscb_state_reset(struct bts_smscb_state *bts_ss) +{ + struct smscb_msg *scm, *tmp; + llist_for_each_entry_safe(scm, tmp, &bts_ss->queue, list) { + llist_del(&scm->list); + talloc_free(scm); + } + bts_ss->queue_len = 0; + rate_ctr_group_reset(bts_ss->ctrs); + TALLOC_FREE(bts_ss->cur_msg); + TALLOC_FREE(bts_ss->default_msg); +} + +void bts_cbch_reset(struct gsm_bts *bts) +{ + bts_smscb_state_reset(&bts->smscb_basic); + bts_smscb_state_reset(&bts->smscb_extended); +} diff --git a/src/common/nm_bts_fsm.c b/src/common/nm_bts_fsm.c index c9dcd4c..063ffe8 100644 --- a/src/common/nm_bts_fsm.c +++ b/src/common/nm_bts_fsm.c @@ -35,6 +35,7 @@ #include #include #include +#include #define X(s) (1 << (s)) @@ -60,6 +61,7 @@ /* Reset state: */ bts->si_valid = 0; TALLOC_FREE(bts->mo.nm_attr); + bts_cbch_reset(bts); bts->mo.setattr_success = false; bts->mo.opstart_success = false; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib01d38c59ba9fa083fcc0682009c13d2db3664fe Gerrit-Change-Number: 25841 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 11:48:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 11:48:59 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 to look at the new patch set (#15). Change subject: Add project skeleton ...................................................................... Add project skeleton This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Related: SYS#5516 Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am M README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A osmoappdesc.py A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 44 files changed, 2,152 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/74/25874/15 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 15 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 12:23:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 12:23:00 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-hnbap as a public shared library References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25880 ) Change subject: Provide libosmo-hnbap as a public shared library ...................................................................... Provide libosmo-hnbap as a public shared library It is needed by the new osmo-hnodeb project. Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 --- M Makefile.am M configure.ac M contrib/osmo-iuh.spec.in M debian/control A debian/libosmo-hnbap-dev.install A debian/libosmo-hnbap0.install M debian/rules M include/osmocom/hnbap/Makefile.am A libosmo-hnbap.pc.in M src/Makefile.am M src/hnbap/Makefile.am M src/ranap/Makefile.am M src/tests/Makefile.am 13 files changed, 82 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/80/25880/1 diff --git a/Makefile.am b/Makefile.am index fd684e7..1dc00d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = src include doc contrib pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libosmo-ranap.pc libosmo-sabp.pc +pkgconfig_DATA = libosmo-hnbap.pc libosmo-ranap.pc libosmo-sabp.pc EXTRA_DIST = \ .version \ diff --git a/configure.ac b/configure.ac index e2d9f56..93c5bb1 100644 --- a/configure.ac +++ b/configure.ac @@ -150,6 +150,7 @@ AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) AC_OUTPUT( + libosmo-hnbap.pc libosmo-ranap.pc libosmo-sabp.pc src/Makefile diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in index c8bdea2..592b168 100644 --- a/contrib/osmo-iuh.spec.in +++ b/contrib/osmo-iuh.spec.in @@ -42,6 +42,21 @@ %description Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) +%package -n libosmo-hnbap0 +Summary: Shared Library part of libosmo-hnbap +Group: System/Libraries + +%description -n libosmo-hnbap0 +Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + +%package -n libosmo-hnbap-devel +Summary: Development files for Osmocom HNBAP library +Group: Development/Libraries/C and C++ +Requires: libosmo-hnbap0 = %{version} + +%description -n libosmo-hnbap-devel +Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + %package -n libosmo-ranap3 Summary: Shared Library part of libosmo-ranap Group: System/Libraries @@ -121,6 +136,14 @@ %config %{_sysconfdir}/osmocom/osmo-hnbgw.cfg %{_unitdir}/osmo-hnbgw.service +%files -n libosmo-hnbap0 +%{_libdir}/libosmo-hnbap.so.0* + +%files -n libosmo-hnbap-devel +%{_includedir}/* +%{_libdir}/libosmo-hnbap.so +%{_libdir}/pkgconfig/libosmo-hnbap.pc + %files -n libosmo-ranap3 %{_libdir}/libosmo-ranap.so.3* diff --git a/debian/control b/debian/control index 236e853..e13834f 100644 --- a/debian/control +++ b/debian/control @@ -45,6 +45,28 @@ Various manuals: user manual, VTY reference manual and/or protocol/interface manuals. +Package: libosmo-hnbap0 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + +Package: libosmo-hnbap-dbg +Section: debug +Architecture: any +Multi-Arch: same +Depends: libosmo-hnbap0 (= ${binary:Version}), ${misc:Depends} +Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + +Package: libosmo-hnbap-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libosmo-hnbap0 (= ${binary:Version}), ${misc:Depends} +Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + Package: libosmo-ranap3 Section: libs Architecture: any diff --git a/debian/libosmo-hnbap-dev.install b/debian/libosmo-hnbap-dev.install new file mode 100644 index 0000000..4191a57 --- /dev/null +++ b/debian/libosmo-hnbap-dev.install @@ -0,0 +1,3 @@ +usr/include/osmocom/hnbap +usr/lib/*/libosmo-hnbap.so +usr/lib/*/pkgconfig/libosmo-hnbap.pc diff --git a/debian/libosmo-hnbap0.install b/debian/libosmo-hnbap0.install new file mode 100644 index 0000000..766f1f1 --- /dev/null +++ b/debian/libosmo-hnbap0.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-hnbap*.so.* diff --git a/debian/rules b/debian/rules index e1f6124..714ef8b 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,7 @@ # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg override_dh_strip: + dh_strip -plibosmo-hnbap0 --dbg-package=libosmo-hnbap-dbg dh_strip -plibosmo-ranap3 --dbg-package=libosmo-ranap-dbg dh_strip -plibosmo-sabp0 --dbg-package=libosmo-sabp-dbg dh_strip -posmo-hnbgw --dbg-package=osmo-hnbgw-dbg diff --git a/include/osmocom/hnbap/Makefile.am b/include/osmocom/hnbap/Makefile.am index cd9b720..871549e 100644 --- a/include/osmocom/hnbap/Makefile.am +++ b/include/osmocom/hnbap/Makefile.am @@ -1,4 +1,4 @@ -noinst_HEADERS = \ +hnbap_HEADERS = \ hnbap_common.h hnbap_ies_defs.h \ AccessResult.h \ Access-stratum-release-indicator.h \ @@ -116,5 +116,7 @@ U-RNTIQueryResponse.h \ UTRANCellID.h +hnbapdir = $(includedir)/osmocom/hnbap + DISTCLEANFILES = \ hnbap_ies_defs.h diff --git a/libosmo-hnbap.pc.in b/libosmo-hnbap.pc.in new file mode 100644 index 0000000..db05756 --- /dev/null +++ b/libosmo-hnbap.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Osmocom HNBAP protocol library +Description: C Utility Library +Version: @VERSION@ +Libs: -L${libdir} -losmo-hnbap +Cflags: -I${includedir}/ diff --git a/src/Makefile.am b/src/Makefile.am index 524f7b2..83a1cdc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -61,9 +61,14 @@ # build the shared RANAP + SABP library # +HNBAP_LIBVERSION=0:0:0 RANAP_LIBVERSION=4:0:1 SABP_LIBVERSION=0:0:0 -lib_LTLIBRARIES = libosmo-ranap.la libosmo-sabp.la +lib_LTLIBRARIES = libosmo-hnbap.la libosmo-ranap.la libosmo-sabp.la +libosmo_hnbap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HNBAP_LIBVERSION) +libosmo_hnbap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ + $(ASN1C_LIBS) hnbap/libosmo-asn1-hnbap.la +libosmo_hnbap_la_SOURCES = hnbap_common.c hnbap_encoder.c hnbap_decoder.c libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION) libosmo_ranap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ $(ASN1C_LIBS) ranap/libosmo-asn1-ranap.la @@ -80,8 +85,7 @@ # bin_PROGRAMS = osmo-hnbgw -osmo_hnbgw_SOURCES = hnbap_encoder.c hnbap_decoder.c hnbap_common.c \ - rua_encoder.c rua_decoder.c rua_common.c \ +osmo_hnbgw_SOURCES = rua_encoder.c rua_decoder.c rua_common.c \ rua_msg_factory.c \ hnbgw.c hnbgw_hnbap.c hnbgw_rua.c hnbgw_ranap.c \ hnbgw_vty.c \ @@ -90,8 +94,8 @@ osmo_hnbgw_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOCTRL_LIBS) \ $(ASN1C_LIBS) $(OSMOSIGTRAN_LIBS) \ $(OSMONETIF_LIBS) \ - hnbap/libosmo-asn1-hnbap.a rua/libosmo-asn1-rua.a \ - libosmo-ranap.la + rua/libosmo-asn1-rua.a \ + libosmo-ranap.la libosmo-hnbap.la regen: regenerate-from-asn1-source diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am index 8a2c56a..c4a8c29 100644 --- a/src/hnbap/Makefile.am +++ b/src/hnbap/Makefile.am @@ -236,9 +236,9 @@ HNBAP_ASN1 = $(top_srcdir)/asn1/hnbap -noinst_LIBRARIES=libosmo-asn1-hnbap.a -libosmo_asn1_hnbap_a_SOURCES=$(ASN_MODULE_SOURCES) -libosmo_asn1_hnbap_a_LIBADD=$(ASN1C_LDADD) +noinst_LTLIBRARIES=libosmo-asn1-hnbap.la +libosmo_asn1_hnbap_la_SOURCES=$(ASN_MODULE_SOURCES) +libosmo_asn1_hnbap_la_LIBADD=$(ASN1C_LDADD) regen: regenerate-from-asn1-source diff --git a/src/ranap/Makefile.am b/src/ranap/Makefile.am index 0fb3cdf..0bb36a0 100644 --- a/src/ranap/Makefile.am +++ b/src/ranap/Makefile.am @@ -1188,4 +1188,3 @@ sed -i 's/Member/MemberN/' RANAP_RABDataVolumeReport.[ch] # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/ranap $(ASN_MODULE_INC) - diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 72a3300..9f68145 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -18,10 +18,10 @@ test_helpers_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la test_hnbap_SOURCES = $(top_srcdir)/src/hnbap_common.c $(top_builddir)/src/hnbap_decoder.c test-hnbap.c test_common.c -test_hnbap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/hnbap/libosmo-asn1-hnbap.a $(top_builddir)/src/libosmo-ranap.la +test_hnbap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-hnbap.la $(top_builddir)/src/libosmo-ranap.la hnb_test_SOURCES = $(HNBAP_FILES) $(RUA_FILES) hnb-test.c test_common.c hnb-test-ranap.c hnb-test-rua.c -hnb_test_LDADD = $(COMMON_LIBS) $(top_builddir)/src/hnbap/libosmo-asn1-hnbap.a $(top_builddir)/src/rua/libosmo-asn1-rua.a $(top_builddir)/src/libosmo-ranap.la +hnb_test_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-hnbap.la $(top_builddir)/src/rua/libosmo-asn1-rua.a $(top_builddir)/src/libosmo-ranap.la test_ranap_SOURCES = $(RANAP_FILES) test-ranap.c test_common.c test_ranap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la @@ -30,6 +30,9 @@ #dummy_cn_SOURCES = $(RANAP_FILES) test_common.c dummy_cn_sua.c #dummy_cn_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la +$(top_builddir)/src/libosmo-hnbap.la: + $(MAKE) -C $(top_builddir)/src libosmo-hnbap.la + $(top_builddir)/src/libosmo-ranap.la: $(MAKE) -C $(top_builddir)/src libosmo-ranap.la @@ -74,4 +77,3 @@ $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 $(AUTOTEST) -I '$(top_srcdir)/include' -I '$(srcdir)' -o $@.tmp $@.at mv $@.tmp $@ - -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 Gerrit-Change-Number: 25880 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 12:42:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 12:42:24 +0000 Subject: Change in pysim[master]: pySim-shell: Add suspend_uicc command In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/25840 to look at the new patch set (#4). Change subject: pySim-shell: Add suspend_uicc command ...................................................................... pySim-shell: Add suspend_uicc command This is an optional command, and it is not supported by e.g. sysmoISIM-SJA2 Change-Id: Icc726ffd672744e56cc8dd3762891af507942c1e --- M docs/shell.rst M pySim-shell.py M pySim/commands.py 3 files changed, 65 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/25840/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icc726ffd672744e56cc8dd3762891af507942c1e Gerrit-Change-Number: 25840 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 12:42:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 12:42:25 +0000 Subject: Change in pysim[master]: utils: Fix BER-TLV tag decode for multi-byte tags References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25881 ) Change subject: utils: Fix BER-TLV tag decode for multi-byte tags ...................................................................... utils: Fix BER-TLV tag decode for multi-byte tags We cannot simply skip anything that has 0xFF as first byte to detect the padding after the end of a TLV object: 0xFF may very well be a valid first octet of a multi-octet TAG: Tags of private class (11) with constructed (1) payload will have 0xFF as first octet. So let's expand the check to only detect padding in case of either only a single byte FF being left, or two FF following each other [with whatever suffix]. Change-Id: I5d64ce9ef1d973804daabae0b15c2e2349e6fab9 --- M pySim/utils.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/81/25881/1 diff --git a/pySim/utils.py b/pySim/utils.py index 777638c..def88f0 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -173,7 +173,8 @@ Returns: Tuple of (tag:int, remainder:bytes) """ - if binary[0] == 0xff: + # check for FF padding at the end, as customary in SIM card files + if binary[0] == 0xff and len(binary) == 1 or binary[0] == 0xff and binary[1] == 0xff: return None, binary tag = binary[0] & 0x1f if tag <= 30: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5d64ce9ef1d973804daabae0b15c2e2349e6fab9 Gerrit-Change-Number: 25881 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 12:42:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 12:42:25 +0000 Subject: Change in pysim[master]: pySim-shell: Improve documentation References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25882 ) Change subject: pySim-shell: Improve documentation ...................................................................... pySim-shell: Improve documentation A number of new commands were recently introduced without proper coverage in the documentation (user manual). This includes equip, bulk_script and others. Change-Id: Ide7ba68ad90f6e5c2a41a2e3de22534258ebb7fd --- M docs/shell.rst M pySim-shell.py 2 files changed, 37 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/82/25882/1 diff --git a/docs/shell.rst b/docs/shell.rst index 3d56c6d..e5d70a0 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -196,6 +196,15 @@ :module: pySim-shell :func: PySimCommands.export_parser +Please note that `export` works relative to the current working +directory, so if you are in `MF`, then the export will contain all known +files on the card. However, if you are in `ADF.ISIM`, only files below +that ADF will be part of the export. + +Furthermore, it is strongly advised to first enter the ADM1 pin +(`verify_adm`) to maximize the chance of having permission to read +all/most files. + tree ~~~~ @@ -216,9 +225,35 @@ reset ~~~~~ - Perform card reset and display the card ATR. +intro +~~~~~ +[Re-]Display the introductory banner + + +equip +~~~~~ +Equip pySim-shell with a card; particularly useful if the program was +started before a card was present, or after a card has been replaced by +the user while pySim-shell was kept running. + +bulk_script +~~~~~~~~~~~ +.. argparse:: + :module: pySim-shell + :func: PysimApp.bulk_script_parser + +Run a script for bulk-provisioning of multiple cards. + + +echo +~~~~ +.. argparse:: + :module: pySim-shell + :func: PysimApp.echo_parser + + Linear Fixed EF commands ------------------------ diff --git a/pySim-shell.py b/pySim-shell.py index 1fc09ef..3fc5859 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -380,6 +380,7 @@ @cmd2.with_argparser(echo_parser) @cmd2.with_category(CUSTOM_CATEGORY) def do_echo(self, opts): + """Echo (print) a string on the console""" self.poutput(opts.string) @with_default_category('pySim Commands') -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ide7ba68ad90f6e5c2a41a2e3de22534258ebb7fd Gerrit-Change-Number: 25882 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 12:54:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 12:54:51 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-hnbap as a public shared library In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/25880 to look at the new patch set (#2). Change subject: Provide libosmo-hnbap as a public shared library ...................................................................... Provide libosmo-hnbap as a public shared library It is needed by the new osmo-hnodeb project. Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 --- M Makefile.am M configure.ac M contrib/osmo-iuh.spec.in M debian/control A debian/libosmo-hnbap-dev.install A debian/libosmo-hnbap0.install M debian/rules M include/osmocom/hnbap/Makefile.am A libosmo-hnbap.pc.in M src/Makefile.am M src/hnbap/Makefile.am M src/ranap/Makefile.am M src/tests/Makefile.am 13 files changed, 83 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/80/25880/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 Gerrit-Change-Number: 25880 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 12:57:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 12:57:52 +0000 Subject: Change in osmo-iuh[master]: cosmetic: src/ranap/Makefile.am: Drop trailing whitespace References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25883 ) Change subject: cosmetic: src/ranap/Makefile.am: Drop trailing whitespace ...................................................................... cosmetic: src/ranap/Makefile.am: Drop trailing whitespace Change-Id: I934b7be7ca1fac05410df6640428ee8e9c70c3e7 --- M src/ranap/Makefile.am 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/83/25883/1 diff --git a/src/ranap/Makefile.am b/src/ranap/Makefile.am index 0fb3cdf..0bb36a0 100644 --- a/src/ranap/Makefile.am +++ b/src/ranap/Makefile.am @@ -1188,4 +1188,3 @@ sed -i 's/Member/MemberN/' RANAP_RABDataVolumeReport.[ch] # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/ranap $(ASN_MODULE_INC) - -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I934b7be7ca1fac05410df6640428ee8e9c70c3e7 Gerrit-Change-Number: 25883 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 13:06:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 13:06:07 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-hnbap as a public shared library In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/25880 to look at the new patch set (#4). Change subject: Provide libosmo-hnbap as a public shared library ...................................................................... Provide libosmo-hnbap as a public shared library It is needed by the new osmo-hnodeb project. Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 --- M Makefile.am M configure.ac M contrib/osmo-iuh.spec.in M debian/control A debian/libosmo-hnbap-dev.install A debian/libosmo-hnbap0.install M debian/rules M include/osmocom/hnbap/Makefile.am A libosmo-hnbap.pc.in M src/Makefile.am M src/hnbap/Makefile.am M src/tests/Makefile.am 12 files changed, 84 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/80/25880/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 Gerrit-Change-Number: 25880 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 13:06:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 13:06:08 +0000 Subject: Change in osmo-iuh[master]: src/tests/Makefile.am: Drop reference to non-existent RANAP_FILES var References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25884 ) Change subject: src/tests/Makefile.am: Drop reference to non-existent RANAP_FILES var ...................................................................... src/tests/Makefile.am: Drop reference to non-existent RANAP_FILES var It was no longer needed since .la was used. Change-Id: I3f196d5c2bb35826709bfc32d10e6b3683b552ee --- M src/tests/Makefile.am 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/84/25884/1 diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 72a3300..28eedb9 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -23,11 +23,11 @@ hnb_test_SOURCES = $(HNBAP_FILES) $(RUA_FILES) hnb-test.c test_common.c hnb-test-ranap.c hnb-test-rua.c hnb_test_LDADD = $(COMMON_LIBS) $(top_builddir)/src/hnbap/libosmo-asn1-hnbap.a $(top_builddir)/src/rua/libosmo-asn1-rua.a $(top_builddir)/src/libosmo-ranap.la -test_ranap_SOURCES = $(RANAP_FILES) test-ranap.c test_common.c +test_ranap_SOURCES = test-ranap.c test_common.c test_ranap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la # TODO: re-add using SCCP? -#dummy_cn_SOURCES = $(RANAP_FILES) test_common.c dummy_cn_sua.c +#dummy_cn_SOURCES = test_common.c dummy_cn_sua.c #dummy_cn_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la $(top_builddir)/src/libosmo-ranap.la: -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25884 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3f196d5c2bb35826709bfc32d10e6b3683b552ee Gerrit-Change-Number: 25884 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 13:29:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 13:29:28 +0000 Subject: Change in pysim[master]: ARA-M related command support References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/25885 ) Change subject: ARA-M related command support ...................................................................... ARA-M related command support This introduces support for talking to the ARA-M application on a card, as specified in the GlobalPlatform "Secure Element Access Control" specification v1.1. Change-Id: Ia9107a4629c3d68320f32bbd4dd26e1f430717da --- M docs/shell.rst M pySim-shell.py A pySim/ara_m.py 3 files changed, 454 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/85/25885/1 diff --git a/docs/shell.rst b/docs/shell.rst index e5d70a0..3ab1113 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -443,6 +443,94 @@ :func: ADF_USIM.AddlShellCommands.authenticate_parser +ARA-M commands +-------------- + +The ARA-M commands exist to manage the access rules stored in an ARA-M applet on the card. + +ARA-M in the context of SIM cards is primarily used to enable Android UICC Carrier Privileges, +please see https://source.android.com/devices/tech/config/uicc for more details on the background. + + +aram_get_all +~~~~~~~~~~~~ + +Obtain and decode all access rules from the ARA-M applet on the card. + +NOTE: if the total size of the access rules exceeds 255 bytes, this command will fail, as +it doesn't yet implement fragmentation/reassembly on rule retrieval. YMMV + +:: + + pySIM-shell (MF/ADF.ARA-M)> aram_get_all + [ + { + "ResponseAllRefArDO": [ + { + "RefArDO": [ + { + "RefDO": [ + { + "AidRefDO": "ffffffffffff" + }, + { + "DevAppIdRefDO": "e46872f28b350b7e1f140de535c2a8d5804f0be3" + } + ] + }, + { + "ArDO": [ + { + "ApduArDO": { + "generic_access_rule": "always" + } + }, + { + "PermArDO": { + "permissions": "0000000000000001" + } + } + ] + } + ] + } + ] + } + ] + +aram_get_config +~~~~~~~~~~~~~~~ +Perform Config handshake with ARA-M applet: Tell it our version and retrieve its version. + +NOTE: Not supported in all ARA-M implementations. + +.. argparse:: + :module: pySim.ara_m + :func: ADF_ARAM.AddlShellCommands.get_config_parser + + +aram_store_ref_ar_do +~~~~~~~~~~~~~~~~~~~~ +Store a [new] access rule on the ARA-M applet. + +.. argparse:: + :module: pySim.ara_m + :func: ADF_ARAM.AddlShellCommands.store_ref_ar_do_parse + +For example, to store an Android UICC carrier privilege rule for the SHA1 hash of the certificate used to sign the CoIMS android app of Supreeth Herle (https://github.com/herlesupreeth/CoIMS_Wiki) you can use the following command: + +:: + + pySIM-shell (MF/ADF.ARA-M)> aram_store_ref_ar_do --aid FFFFFFFFFFFF --device-app-id E46872F28B350B7E1F140DE535C2A8D5804F0BE3 --android-permissions 0000000000000001 --apdu-always + + +aram_delete_all +~~~~~~~~~~~~~~~ +This command will request deletion of all access rules stored within the +ARA-M applet. Use it with caution, there is no undo. Any rules later +intended must be manually inserted again using `aram_store_ref_ar_do` + + cmd2 settable parameters ------------------------ diff --git a/pySim-shell.py b/pySim-shell.py index 3fc5859..dc81360 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -49,6 +49,7 @@ from pySim.ts_102_221 import CardProfileUICC from pySim.ts_31_102 import CardApplicationUSIM from pySim.ts_31_103 import CardApplicationISIM +from pySim.ara_m import CardApplicationARAM from pySim.gsm_r import DF_EIRENE # we need to import this module so that the SysmocomSJA2 sub-class of @@ -86,6 +87,7 @@ profile = CardProfileUICC() profile.add_application(CardApplicationUSIM()) profile.add_application(CardApplicationISIM()) + profile.add_application(CardApplicationARAM()) rs = RuntimeState(card, profile) # FIXME: do this dynamically diff --git a/pySim/ara_m.py b/pySim/ara_m.py new file mode 100644 index 0000000..5dee3e0 --- /dev/null +++ b/pySim/ara_m.py @@ -0,0 +1,364 @@ +# -*- coding: utf-8 -*- + +# without this, pylint will fail when inner classes are used +# within the 'nested' kwarg of our TlvMeta metaclass on python 3.7 :( +# pylint: disable=undefined-variable + +""" +Support for the Secure Element Access Control, specifically the ARA-M inside an UICC. +""" + +# +# Copyright (C) 2021 Harald Welte +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + + +from construct import * +from construct import Optional as COptional +from pySim.construct import * +from pySim.filesystem import * +from pySim.tlv import * + +# various BER-TLV encoded Data Objects (DOs) + +class AidRefDO(BER_TLV_IE, tag=0x4f): + # SEID v1.1 Table 6-3 + _construct = HexAdapter(GreedyBytes) + +class AidRefEmptyDO(BER_TLV_IE, tag=0xc0): + # SEID v1.1 Table 6-3 + pass + +class DevAppIdRefDO(BER_TLV_IE, tag=0xc1): + # SEID v1.1 Table 6-4 + _construct = HexAdapter(GreedyBytes) + +class PkgRefDO(BER_TLV_IE, tag=0xca): + # Android UICC Carrier Privileges specific extension, see https://source.android.com/devices/tech/config/uicc + _construct = Struct('package_name_string'/GreedyString("ascii")) + +class RefDO(BER_TLV_IE, tag=0xe1, nested=[AidRefDO,AidRefEmptyDO,DevAppIdRefDO,PkgRefDO]): + # SEID v1.1 Table 6-5 + pass + +class ApduArDO(BER_TLV_IE, tag=0xd0): + # SEID v1.1 Table 6-8 + def _from_bytes(self, do:bytes): + if len(do) == 1: + if do[0] == 0x00: + self.decoded = {'generic_access_rule': 'never'} + return self.decoded + elif do[0] == 0x01: + self.decoded = {'generic_access_rule': 'always'} + return self.decoded + else: + return ValueError('Invalid 1-byte generic APDU access rule') + else: + if len(do) % 8: + return ValueError('Invalid non-modulo-8 length of APDU filter: %d' % len(do)) + self.decoded['apdu_filter'] = [] + offset = 0 + while offset < len(do): + self.decoded['apdu_filter'] += {'header': b2h(do[offset:offset+4]), + 'mask': b2h(do[offset+4:offset+8])} + self.decoded = res + return res + def _to_bytes(self): + if 'generic_access_rule' in self.decoded: + if self.decoded['generic_access_rule'] == 'never': + return b'\x00' + elif self.decoded['generic_access_rule'] == 'always': + return b'\x01' + else: + return ValueError('Invalid 1-byte generic APDU access rule') + else: + if not 'apdu_filter' in self.decoded: + return ValueError('Invalid APDU AR DO') + filters = self.decoded['apdu_filter'] + res = b'' + for f in filters: + if not 'header' in f or not 'mask' in f: + return ValueError('APDU filter must contain header and mask') + header_b = h2b(f['header']) + mask_b = h2b(f['mask']) + if len(header_b) != 4 or len(mask_b) != 4: + return ValueError('APDU filter header and mask must each be 4 bytes') + res += header_b + mask_b + return res + +class NfcArDO(BER_TLV_IE, tag=0xd1): + # SEID v1.1 Table 6-9 + _construct = Struct('nfc_event_access_rule'/Enum(Int8ub, never=0, always=1)) + +class PermArDO(BER_TLV_IE, tag=0xdb): + # Android UICC Carrier Privileges specific extension, see https://source.android.com/devices/tech/config/uicc + _construct = Struct('permissions'/HexAdapter(Bytes(8))) + +class ArDO(BER_TLV_IE, tag=0xe3, nested=[ApduArDO, NfcArDO, PermArDO]): + # SEID v1.1 Table 6-7 + pass + +class RefArDO(BER_TLV_IE, tag=0xe2, nested=[RefDO, ArDO]): + # SEID v1.1 Table 6-6 + pass + +class ResponseAllRefArDO(BER_TLV_IE, tag=0xff40, nested=[RefArDO]): + # SEID v1.1 Table 4-2 + pass + +class ResponseArDO(BER_TLV_IE, tag=0xff50, nested=[ArDO]): + # SEID v1.1 Table 4-3 + pass + +class ResponseRefreshTagDO(BER_TLV_IE, tag=0xdf20): + # SEID v1.1 Table 4-4 + _construct = Struct('refresh_tag'/HexAdapter(Bytes(8))) + +class DeviceInterfaceVersionDO(BER_TLV_IE, tag=0xe6): + # SEID v1.1 Table 6-12 + _construct = Struct('major'/Int8ub, 'minor'/Int8ub, 'patch'/Int8ub) + +class DeviceConfigDO(BER_TLV_IE, tag=0xe4, nested=[DeviceInterfaceVersionDO]): + # SEID v1.1 Table 6-10 + pass + +class ResponseDeviceConfigDO(BER_TLV_IE, tag=0xff7f, nested=[DeviceConfigDO]): + # SEID v1.1 Table 5-14 + pass + +class AramConfigDO(BER_TLV_IE, tag=0xe5, nested=[DeviceInterfaceVersionDO]): + # SEID v1.1 Table 6-11 + pass + +class ResponseAramConfigDO(BER_TLV_IE, tag=0xdf21, nested=[AramConfigDO]): + # SEID v1.1 Table 4-5 + pass + +class CommandStoreRefArDO(BER_TLV_IE, tag=0xf0, nested=[RefArDO]): + # SEID v1.1 Table 5-2 + pass + +class CommandDelete(BER_TLV_IE, tag=0xf1, nested=[AidRefDO, AidRefEmptyDO, RefDO, RefArDO]): + # SEID v1.1 Table 5-4 + pass + +class CommandUpdateRefreshTagDO(BER_TLV_IE, tag=0xf2): + # SEID V1.1 Table 5-6 + pass + +class CommandRegisterClientAidsDO(BER_TLV_IE, tag=0xf7, nested=[AidRefDO, AidRefEmptyDO]): + # SEID v1.1 Table 5-7 + pass + +class CommandGet(BER_TLV_IE, tag=0xf3, nested=[AidRefDO, AidRefEmptyDO]): + # SEID v1.1 Table 5-8 + pass + +class CommandGetAll(BER_TLV_IE, tag=0xf4): + # SEID v1.1 Table 5-9 + pass + +class CommandGetClientAidsDO(BER_TLV_IE, tag=0xf6): + # SEID v1.1 Table 5-10 + pass + +class CommandGetNext(BER_TLV_IE, tag=0xf5): + # SEID v1.1 Table 5-11 + pass + +class CommandGetDeviceConfigDO(BER_TLV_IE, tag=0xf8): + # SEID v1.1 Table 5-12 + pass + +class ResponseAracAidDO(BER_TLV_IE, tag=0xff70, nested=[AidRefDO, AidRefEmptyDO]): + # SEID v1.1 Table 5-13 + pass + +class BlockDO(BER_TLV_IE, tag=0xe7): + # SEID v1.1 Table 6-13 + _construct = Struct('offset'/Int16ub, 'length'/Int8ub) + + +# SEID v1.1 Table 4-1 +class GetCommandDoCollection(TLV_IE_Collection, nested=[RefDO, DeviceConfigDO]): + pass + +# SEID v1.1 Table 4-2 +class GetResponseDoCollection(TLV_IE_Collection, nested=[ResponseAllRefArDO, ResponseArDO, + ResponseRefreshTagDO, ResponseAramConfigDO]): + pass + +# SEID v1.1 Table 5-1 +class StoreCommandDoCollection(TLV_IE_Collection, + nested=[BlockDO, CommandStoreRefArDO, CommandDelete, + CommandUpdateRefreshTagDO, CommandRegisterClientAidsDO, + CommandGet, CommandGetAll, CommandGetClientAidsDO, + CommandGetNext, CommandGetDeviceConfigDO]): + pass + + +# SEID v1.1 Section 5.1.2 +class StoreResponseDoCollection(TLV_IE_Collection, + nested=[ResponseAllRefArDO, ResponseAracAidDO, ResponseDeviceConfigDO]): + pass + +class ADF_ARAM(CardADF): + def __init__(self, aid='a00000015141434c00', name='ADF.ARA-M', fid=None, sfid=None, + desc='ARA-M Application'): + super().__init__(aid=aid, fid=fid, sfid=sfid, name=name, desc=desc) + self.shell_commands += [self.AddlShellCommands()] + files = [] + self.add_files(files) + + @staticmethod + def xceive_apdu_tlv(tp, hdr:Hexstr, cmd_do, resp_cls, exp_sw='9000'): + """Transceive an APDU with the card, transparently encoding the command data from TLV + and decoding the response data tlv.""" + if cmd_do: + cmd_do_enc = cmd_do.to_ie() + cmd_do_len = len(cmd_do_enc) + if cmd_do_len > 255: + return ValueError('DO > 255 bytes not supported yet') + else: + cmd_do_enc = b'' + cmd_do_len = 0 + c_apdu = hdr + ('%02x' % cmd_do_len) + b2h(cmd_do_enc) + (data, sw) = tp.send_apdu_checksw(c_apdu, exp_sw) + if data: + if resp_cls: + resp_do = resp_cls() + resp_do.from_tlv(h2b(data)) + return resp_do + else: + return data + else: + return None + + @staticmethod + def store_data(tp, do) -> bytes: + """Build the Command APDU for STORE DATA.""" + return ADF_ARAM.xceive_apdu_tlv(tp, '80e29000', do, StoreResponseDoCollection) + + @staticmethod + def get_all(tp): + return ADF_ARAM.xceive_apdu_tlv(tp, '80caff40', None, GetResponseDoCollection) + + @staticmethod + def get_config(tp, v_major=0, v_minor=0, v_patch=1): + cmd_do = DeviceConfigDO() + cmd_do.from_dict([{'DeviceInterfaceVersionDO': {'major': v_major, 'minor': v_minor, 'patch': v_patch }}]) + return ADF_ARAM.xceive_apdu_tlv(tp, '80cadf21', cmd_do, ResponseAramConfigDO) + + @with_default_category('Application-Specific Commands') + class AddlShellCommands(CommandSet): + def __init(self): + super().__init__() + + def do_aram_get_all(self, opts): + """GET DATA [All] on the ARA-M Applet""" + res_do = ADF_ARAM.get_all(self._cmd.card._scc._tp) + if res_do: + self._cmd.poutput_json(res_do.to_dict()) + + def do_aram_get_config(self, opts): + """GET DATA [Config] on the ARA-M Applet""" + res_do = ADF_ARAM.get_config(self._cmd.card._scc._tp) + if res_do: + self._cmd.poutput_json(res_do.to_dict()) + + store_ref_ar_do_parse = argparse.ArgumentParser() + # REF-DO + store_ref_ar_do_parse.add_argument('--device-app-id', required=True, help='Identifies the specific device application that the rule appplies to. Hash of Certificate of Application Provider, or UUID. (20/32 hex bytes)') + aid_grp = store_ref_ar_do_parse.add_mutually_exclusive_group() + aid_grp.add_argument('--aid', help='Identifies the specific SE application for which rules are to be stored. Can be a partial AID, containing for example only the RID. (5-16 hex bytes)') + aid_grp.add_argument('--aid-empty', action='store_true', help='No specific SE application, applies to all applications') + store_ref_ar_do_parse.add_argument('--pkg-ref', help='Full Android Java package name (up to 127 chars ASCII)') + # AR-DO + apdu_grp = store_ref_ar_do_parse.add_mutually_exclusive_group() + apdu_grp.add_argument('--apdu-never', action='store_true', help='APDU access is not allowed') + apdu_grp.add_argument('--apdu-always', action='store_true', help='APDU access is allowed') + apdu_grp.add_argument('--apdu-filter', help='APDU filter: 4 byte CLA/INS/P1/P2 followed by 4 byte mask (8 hex bytes)') + nfc_grp = store_ref_ar_do_parse.add_mutually_exclusive_group() + nfc_grp.add_argument('--nfc-always', action='store_true', help='NFC event access is allowed') + nfc_grp.add_argument('--nfc-never', action='store_true', help='NFC event access is not allowed') + store_ref_ar_do_parse.add_argument('--android-permissions', help='Android UICC Carrier Privilege Permissions (8 hex bytes)') + + @cmd2.with_argparser(store_ref_ar_do_parse) + def do_aram_store_ref_ar_do(self, opts): + """Perform STORE DATA [Command-Store-REF-AR-DO] to store a new access rule.""" + # REF + ref_do_content = [] + if opts.aid: + ref_do_content += [{'AidRefDO': opts.aid}] + elif opts.aid_empty: + ref_do_content += [{'AidRefEmptyDO': None}] + ref_do_content += [{'DevAppIdRefDO': opts.device_app_id}] + if opts.pkg_ref: + ref_do_content += [{'PkgRefDO': opts.pkg_ref}] + # AR + ar_do_content = [] + if opts.apdu_never: + ar_do_content += [{'ApduArDO': {'generic_access_rule': 'never'}}] + elif opts.apdu_always: + ar_do_content += [{'ApduArDO': {'generic_access_rule': 'always'}}] + elif opts.apdu_filter: + # TODO: multiple filters + ar_do_content += [{'ApduArDO': {'apdu_filter': [opts.apdu_filter]}}] + if opts.nfc_always: + ar_do_content += [{'NfcArDO': {'nfc_event_access_rule': 'always'}}] + elif opts.nfc_never: + ar_do_content += [{'NfcArDO': {'nfc_event_access_rule': 'never'}}] + if opts.android_permissions: + ar_do_content += [{'PermArDO': {'permissions': opts.android_permissions}}] + d = [{'RefArDO': [{ 'RefDO': ref_do_content}, {'ArDO': ar_do_content }]}] + csrado = CommandStoreRefArDO() + csrado.from_dict(d) + res_do = ADF_ARAM.store_data(self._cmd.card._scc._tp, csrado) + if res_do: + self._cmd.poutput_json(res_do.to_dict()) + + def do_aram_delete_all(self, opts): + """Perform STORE DATA [Command-Delete[all]] to delete all access rules.""" + deldo = CommandDelete() + res_do = ADF_ARAM.store_data(self._cmd.card._scc._tp, deldo) + if res_do: + self._cmd.poutput_json(res_do.to_dict()) + + +# SEAC v1.1 Section 4.1.2.2 + 5.1.2.2 +sw_aram = { + 'ARA-M': { + '6381': 'Rule successfully stored but an access rule already exists', + '6382': 'Rule successfully stored bu contained at least one unknown (discarded) BER-TLV', + '6581': 'Memory Problem', + '6700': 'Wrong Length in Lc', + '6981': 'DO is not supported by the ARA-M/ARA-C', + '6982': 'Security status not satisfied', + '6984': 'Rules have been updated and must be read again / logical channels in use', + '6985': 'Conditions not satisfied', + '6a80': 'Incorrect values in the command data', + '6a84': 'Rules have been updated and must be read again', + '6a86': 'Incorrect P1 P2', + '6a88': 'Referenced data not found', + '6a89': 'Conflicting access rule already exists in the Secure Element', + '6d00': 'Invalid instruction', + '6e00': 'Invalid class', + } +} + +class CardApplicationARAM(CardApplication): + def __init__(self): + super().__init__('ARA-M', adf=ADF_ARAM(), sw=sw_aram) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia9107a4629c3d68320f32bbd4dd26e1f430717da Gerrit-Change-Number: 25885 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 13:33:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 21 Oct 2021 13:33:16 +0000 Subject: Change in pysim[master]: ARA-M related command support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25885 ) Change subject: ARA-M related command support ...................................................................... Patch Set 1: this currently doesn't work until the ARA-M application is listed in EF.DIR. However, it is not normally listed there. I think I'll disable RuntimeState._match_applications() for the time being. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia9107a4629c3d68320f32bbd4dd26e1f430717da Gerrit-Change-Number: 25885 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: dexter Gerrit-Reviewer: herlesupreeth Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 21 Oct 2021 13:33:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 13:37:35 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 21 Oct 2021 13:37:35 +0000 Subject: Change in pysim[master]: pySim-shell: Add suspend_uicc command In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25840 ) Change subject: pySim-shell: Add suspend_uicc command ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icc726ffd672744e56cc8dd3762891af507942c1e Gerrit-Change-Number: 25840 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 21 Oct 2021 13:37:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 14:46:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 14:46:55 +0000 Subject: Change in osmo-iuh[master]: RFC: WIP: Fix compilation warnings References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25886 ) Change subject: RFC: WIP: Fix compilation warnings ...................................................................... RFC: WIP: Fix compilation warnings This seems to solve the compilation warnings we get when including the related headers. This needs to be applied for each of the in-place struct definitions. If I'm correct it's around 20 of them. The question is: Are these generated somehow? can we apply the proposed fixed in the ASN1 compiler? Change-Id: I36b6dc391af58334ab87986e76a0b63c4c3dfffa --- M include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h M src/hnbap/CriticalityDiagnostics-IE-List.c 2 files changed, 22 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/86/25886/1 diff --git a/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h b/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h index 3e24ec9..73ac3fd 100644 --- a/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h +++ b/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h @@ -26,22 +26,24 @@ /* Forward declarations */ struct IE_Extensions; +typedef struct CriticalityDiagnostics_IE_List_Member { + Criticality_t iECriticality; + ProtocolIE_ID_t iE_ID; + TypeOfError_t typeOfError; + struct IE_Extensions *iE_Extensions /* OPTIONAL */; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} CriticalityDiagnostics_IE_List_Member_t; + /* CriticalityDiagnostics-IE-List */ typedef struct CriticalityDiagnostics_IE_List { - A_SEQUENCE_OF(struct Member { - Criticality_t iECriticality; - ProtocolIE_ID_t iE_ID; - TypeOfError_t typeOfError; - struct IE_Extensions *iE_Extensions /* OPTIONAL */; - /* - * This type is extensible, - * possible extensions are below. - */ - - /* Context for parsing across buffer boundaries */ - asn_struct_ctx_t _asn_ctx; - } ) list; - + A_SEQUENCE_OF(CriticalityDiagnostics_IE_List_Member_t) list; + /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } CriticalityDiagnostics_IE_List_t; diff --git a/src/hnbap/CriticalityDiagnostics-IE-List.c b/src/hnbap/CriticalityDiagnostics-IE-List.c index b3f48e8..30e9a7e 100644 --- a/src/hnbap/CriticalityDiagnostics-IE-List.c +++ b/src/hnbap/CriticalityDiagnostics-IE-List.c @@ -13,7 +13,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_Member_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct Member, iECriticality), + { ATF_NOFLAGS, 0, offsetof(CriticalityDiagnostics_IE_List_Member_t, iECriticality), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_Criticality, @@ -22,7 +22,7 @@ 0, "iECriticality" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, iE_ID), + { ATF_NOFLAGS, 0, offsetof(CriticalityDiagnostics_IE_List_Member_t, iE_ID), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_ProtocolIE_ID, @@ -31,7 +31,7 @@ 0, "iE-ID" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, typeOfError), + { ATF_NOFLAGS, 0, offsetof(CriticalityDiagnostics_IE_List_Member_t, typeOfError), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_TypeOfError, @@ -40,7 +40,7 @@ 0, "typeOfError" }, - { ATF_POINTER, 1, offsetof(struct Member, iE_Extensions), + { ATF_POINTER, 1, offsetof(CriticalityDiagnostics_IE_List_Member_t, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_IE_Extensions, @@ -61,8 +61,8 @@ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { - sizeof(struct Member), - offsetof(struct Member, _asn_ctx), + sizeof(CriticalityDiagnostics_IE_List_Member_t), + offsetof(CriticalityDiagnostics_IE_List_Member_t, _asn_ctx), asn_MAP_Member_tag2el_2, 4, /* Count of tags in the map */ asn_MAP_Member_oms_2, /* Optional members */ @@ -143,4 +143,3 @@ 1, /* Single element */ &asn_SPC_CriticalityDiagnostics_IE_List_specs_1 /* Additional specs */ }; - -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I36b6dc391af58334ab87986e76a0b63c4c3dfffa Gerrit-Change-Number: 25886 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 15:00:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 15:00:20 +0000 Subject: Change in osmo-iuh[master]: RFC: WIP: Fix compilation warnings In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25886 ) Change subject: RFC: WIP: Fix compilation warnings ...................................................................... Patch Set 1: Looks like related place is asn1c.git/libasn1compiler/asn1c_C.c function "asn1c_lang_C_type_SEx_OF" -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I36b6dc391af58334ab87986e76a0b63c4c3dfffa Gerrit-Change-Number: 25886 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 21 Oct 2021 15:00:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 15:49:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 15:49:35 +0000 Subject: Change in osmo-iuh[master]: RFC: WIP: Fix compilation warnings In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25886 ) Change subject: RFC: WIP: Fix compilation warnings ...................................................................... Patch Set 1: Using "#pragma GCC system_header" in the osmo-iuh offending header files seems to also be working. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I36b6dc391af58334ab87986e76a0b63c4c3dfffa Gerrit-Change-Number: 25886 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Thu, 21 Oct 2021 15:49:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 16:54:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 16:54:51 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-rua as a public shared library References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25887 ) Change subject: Provide libosmo-rua as a public shared library ...................................................................... Provide libosmo-rua as a public shared library It is needed by the new osmo-hnodeb project. Change-Id: I8b800baacbfe3a3c424c51b418b5ac2e2848b3ba --- M Makefile.am M configure.ac M contrib/osmo-iuh.spec.in M debian/control A debian/libosmo-rua-dev.install A debian/libosmo-rua0.install M debian/rules M include/osmocom/rua/Makefile.am A libosmo-rua.pc.in M src/Makefile.am M src/rua/Makefile.am M src/tests/Makefile.am 12 files changed, 81 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/87/25887/1 diff --git a/Makefile.am b/Makefile.am index 1dc00d6..f40cbd1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = src include doc contrib pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libosmo-hnbap.pc libosmo-ranap.pc libosmo-sabp.pc +pkgconfig_DATA = libosmo-hnbap.pc libosmo-ranap.pc libosmo-rua.pc libosmo-sabp.pc EXTRA_DIST = \ .version \ diff --git a/configure.ac b/configure.ac index 93c5bb1..5490348 100644 --- a/configure.ac +++ b/configure.ac @@ -152,6 +152,7 @@ AC_OUTPUT( libosmo-hnbap.pc libosmo-ranap.pc + libosmo-rua.pc libosmo-sabp.pc src/Makefile src/hnbap/Makefile diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in index 592b168..2ef38a3 100644 --- a/contrib/osmo-iuh.spec.in +++ b/contrib/osmo-iuh.spec.in @@ -75,6 +75,20 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmoranap. +%package -n libosmo-rua0 +Summary: Shared Library part of libosmo-rua +Group: System/Libraries + +%description -n libosmo-rua0 +Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + +%package -n libosmo-rua-devel +Summary: Development files for Osmocom RUA library +Group: Development/Libraries/C and C++ +Requires: libosmo-rua0 = %{version} + +%description -n libosmo-rua-devel +Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) %package -n libosmo-sabp0 Summary: Shared Library part of libosmo-sabp @@ -152,6 +166,14 @@ %{_libdir}/libosmo-ranap.so %{_libdir}/pkgconfig/libosmo-ranap.pc +%files -n libosmo-rua0 +%{_libdir}/libosmo-rua.so.0* + +%files -n libosmo-rua-devel +%{_includedir}/* +%{_libdir}/libosmo-rua.so +%{_libdir}/pkgconfig/libosmo-rua.pc + %files -n libosmo-sabp0 %{_libdir}/libosmo-sabp.so.0* diff --git a/debian/control b/debian/control index e13834f..f89869a 100644 --- a/debian/control +++ b/debian/control @@ -89,6 +89,28 @@ Depends: libosmo-ranap3 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) +Package: libosmo-rua0 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + +Package: libosmo-rua-dbg +Section: debug +Architecture: any +Multi-Arch: same +Depends: libosmo-rua0 (= ${binary:Version}), ${misc:Depends} +Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + +Package: libosmo-rua-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libosmo-rua0 (= ${binary:Version}), ${misc:Depends} +Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + Package: libosmo-sabp0 Section: libs Architecture: any diff --git a/debian/libosmo-rua-dev.install b/debian/libosmo-rua-dev.install new file mode 100644 index 0000000..b615076 --- /dev/null +++ b/debian/libosmo-rua-dev.install @@ -0,0 +1,3 @@ +usr/include/osmocom/rua +usr/lib/*/libosmo-rua.so +usr/lib/*/pkgconfig/libosmo-rua.pc diff --git a/debian/libosmo-rua0.install b/debian/libosmo-rua0.install new file mode 100644 index 0000000..ac07bed --- /dev/null +++ b/debian/libosmo-rua0.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-rua*.so.* diff --git a/debian/rules b/debian/rules index 714ef8b..b85b0d2 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,7 @@ override_dh_strip: dh_strip -plibosmo-hnbap0 --dbg-package=libosmo-hnbap-dbg dh_strip -plibosmo-ranap3 --dbg-package=libosmo-ranap-dbg + dh_strip -plibosmo-rua0 --dbg-package=libosmo-rua-dbg dh_strip -plibosmo-sabp0 --dbg-package=libosmo-sabp-dbg dh_strip -posmo-hnbgw --dbg-package=osmo-hnbgw-dbg diff --git a/include/osmocom/rua/Makefile.am b/include/osmocom/rua/Makefile.am index 307f123..37b9384 100644 --- a/include/osmocom/rua/Makefile.am +++ b/include/osmocom/rua/Makefile.am @@ -1,4 +1,4 @@ -noinst_HEADERS = \ +rua_HEADERS = \ rua_common.h rua_ies_defs.h rua_msg_factory.h \ RUA_Ansi-41-IDNNS.h \ RUA_Cause.h \ @@ -36,5 +36,7 @@ RUA_TypeOfError.h \ RUA_UnsuccessfulOutcome.h +ruadir = $(includedir)/osmocom/rua + DISTCLEANFILES = \ rua_ies_defs.h diff --git a/libosmo-rua.pc.in b/libosmo-rua.pc.in new file mode 100644 index 0000000..b9bd1d4 --- /dev/null +++ b/libosmo-rua.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Osmocom RUA protocol library +Description: C Utility Library +Version: @VERSION@ +Libs: -L${libdir} -losmo-rua +Cflags: -I${includedir}/ diff --git a/src/Makefile.am b/src/Makefile.am index 3414a01..c1508ad 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -63,8 +63,9 @@ # HNBAP_LIBVERSION=0:0:0 RANAP_LIBVERSION=4:0:1 +RUA_LIBVERSION=0:0:0 SABP_LIBVERSION=0:0:0 -lib_LTLIBRARIES = libosmo-hnbap.la libosmo-ranap.la libosmo-sabp.la +lib_LTLIBRARIES = libosmo-hnbap.la libosmo-ranap.la libosmo-rua.la libosmo-sabp.la libosmo_hnbap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HNBAP_LIBVERSION) libosmo_hnbap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ $(ASN1C_LIBS) hnbap/libosmo-asn1-hnbap.la @@ -76,6 +77,11 @@ libosmo_ranap_la_SOURCES = ranap_common.c ranap_encoder.c ranap_decoder.c ranap_msg_factory.c iu_helpers.c \ ranap_common_cn.c iu_client.c iu_client_vty.c +libosmo_rua_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HNBAP_LIBVERSION) +libosmo_rua_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ + $(ASN1C_LIBS) rua/libosmo-asn1-rua.la +libosmo_rua_la_SOURCES = rua_common.c rua_encoder.c rua_decoder.c rua_msg_factory.c + libosmo_sabp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(SABP_LIBVERSION) libosmo_sabp_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ $(ASN1C_LIBS) sabp/libosmo-asn1-sabp.la @@ -86,17 +92,14 @@ # bin_PROGRAMS = osmo-hnbgw -osmo_hnbgw_SOURCES = rua_encoder.c rua_decoder.c rua_common.c \ - rua_msg_factory.c \ - hnbgw.c hnbgw_hnbap.c hnbgw_rua.c hnbgw_ranap.c \ +osmo_hnbgw_SOURCES = hnbgw.c hnbgw_hnbap.c hnbgw_rua.c hnbgw_ranap.c \ hnbgw_vty.c \ context_map.c hnbgw_cn.c osmo_hnbgw_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOCTRL_LIBS) \ $(ASN1C_LIBS) $(OSMOSIGTRAN_LIBS) \ $(OSMONETIF_LIBS) \ - rua/libosmo-asn1-rua.a \ - libosmo-hnbap.la libosmo-ranap.la + libosmo-hnbap.la libosmo-rua.la libosmo-ranap.la regen: regenerate-from-asn1-source diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am index d8fb042..7e1d18e 100644 --- a/src/rua/Makefile.am +++ b/src/rua/Makefile.am @@ -74,9 +74,9 @@ AM_CFLAGS = -I$(top_srcdir)/include $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS) -noinst_LIBRARIES=libosmo-asn1-rua.a -libosmo_asn1_rua_a_SOURCES=$(ASN_MODULE_SOURCES) -libosmo_asn1_rua_a_LIBADD=$(ASN1C_LDADD) +noinst_LTLIBRARIES=libosmo-asn1-rua.la +libosmo_asn1_rua_la_SOURCES=$(ASN_MODULE_SOURCES) +libosmo_asn1_rua_la_LIBADD=$(ASN1C_LDADD) regen: regenerate-from-asn1-source @@ -86,4 +86,3 @@ @rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.* # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/rua $(ASN_MODULE_INC) - diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index dfc8fe6..2063524 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -11,16 +11,14 @@ noinst_HEADERS = test_common.h hnb-test.h hnb-test-layers.h -RUA_FILES = $(top_srcdir)/src/rua_common.c $(top_builddir)/src/rua_decoder.c $(top_builddir)/src/rua_encoder.c $(top_srcdir)/src/rua_msg_factory.c - test_helpers_SOURCES = test-helpers.c test_common.c test_helpers_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la test_hnbap_SOURCES = $(top_srcdir)/src/hnbap_common.c $(top_builddir)/src/hnbap_decoder.c test-hnbap.c test_common.c test_hnbap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-hnbap.la $(top_builddir)/src/libosmo-ranap.la -hnb_test_SOURCES = $(RUA_FILES) hnb-test.c test_common.c hnb-test-ranap.c hnb-test-rua.c -hnb_test_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-hnbap.la $(top_builddir)/src/rua/libosmo-asn1-rua.a $(top_builddir)/src/libosmo-ranap.la +hnb_test_SOURCES = hnb-test.c test_common.c hnb-test-ranap.c hnb-test-rua.c +hnb_test_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-hnbap.la $(top_builddir)/src/libosmo-rua.la $(top_builddir)/src/libosmo-ranap.la test_ranap_SOURCES = test-ranap.c test_common.c test_ranap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la @@ -32,6 +30,9 @@ $(top_builddir)/src/libosmo-hnbap.la: $(MAKE) -C $(top_builddir)/src libosmo-hnbap.la +$(top_builddir)/src/libosmo-rua.la: + $(MAKE) -C $(top_builddir)/src libosmo-rua.la + $(top_builddir)/src/libosmo-ranap.la: $(MAKE) -C $(top_builddir)/src libosmo-ranap.la -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I8b800baacbfe3a3c424c51b418b5ac2e2848b3ba Gerrit-Change-Number: 25887 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 16:54:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 16:54:52 +0000 Subject: Change in osmo-iuh[master]: RFC: Add lib prefix to structs with duplicated names References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25888 ) Change subject: RFC: Add lib prefix to structs with duplicated names ...................................................................... RFC: Add lib prefix to structs with duplicated names Otherwise it's impossible to include eg. rua/*.h and ranap/*.h since they will collision and gcc will error. Following commands are used to generate this patch: """ for t in hnbap ranap rua sabp; do ag -l "struct Member" include/osmocom/$t src/$t/ | xargs sed -i "s/struct Member/struct ${t}_Member/g"; done for t in hnbap ranap rua sabp; do ag -l "struct errorIndication_ies" include/osmocom/$t src/$t/ | xargs sed -i "s/struct errorIndication_ies/struct ${t}_errorIndication_ies/g"; done for t in hnbap ranap rua sabp; do ag -l "struct directTransfer_ies" include/osmocom/$t src/$t/ | xargs sed -i "s/struct directTransfer_ies/struct ${t}_directTransfer_ies/g"; done """ Change-Id: I552fc028c7d08c880fdb844ece75816602c5bb67 --- M include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h M include/osmocom/hnbap/ErrorIndication.h M include/osmocom/ranap/RANAP_AuthorisedPLMNs.h M include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h M include/osmocom/ranap/RANAP_DataVolumeList.h M include/osmocom/ranap/RANAP_DirectTransfer.h M include/osmocom/ranap/RANAP_EUTRANFrequencies.h M include/osmocom/ranap/RANAP_ErrorIndication.h M include/osmocom/ranap/RANAP_GA-Polygon.h M include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h M include/osmocom/ranap/RANAP_LA-LIST.h M include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h M include/osmocom/ranap/RANAP_MessageStructure.h M include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h M include/osmocom/ranap/RANAP_RABDataVolumeReport.h M include/osmocom/ranap/RANAP_RABParametersList.h M include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h M include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h M include/osmocom/rua/RUA_DirectTransfer.h M include/osmocom/rua/RUA_ErrorIndication.h M include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h M include/osmocom/sabp/SABP_MessageStructure.h M src/hnbap/CriticalityDiagnostics-IE-List.c M src/hnbap/ErrorIndication.c M src/ranap/RANAP_AuthorisedPLMNs.c M src/ranap/RANAP_CriticalityDiagnostics-IE-List.c M src/ranap/RANAP_DataVolumeList.c M src/ranap/RANAP_DirectTransfer.c M src/ranap/RANAP_EUTRANFrequencies.c M src/ranap/RANAP_ErrorIndication.c M src/ranap/RANAP_GA-Polygon.c M src/ranap/RANAP_JoinedMBMSBearerService-IEs.c M src/ranap/RANAP_LA-LIST.c M src/ranap/RANAP_LeftMBMSBearerService-IEs.c M src/ranap/RANAP_MessageStructure.c M src/ranap/RANAP_PLMNs-in-shared-network.c M src/ranap/RANAP_RABDataVolumeReport.c M src/ranap/RANAP_RABParametersList.c M src/ranap/RANAP_UnsuccessfulLinking-IEs.c M src/rua/RUA_CriticalityDiagnostics-IE-List.c M src/rua/RUA_DirectTransfer.c M src/rua/RUA_ErrorIndication.c M src/sabp/SABP_CriticalityDiagnostics-IE-List.c M src/sabp/SABP_MessageStructure.c 44 files changed, 121 insertions(+), 121 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/88/25888/1 diff --git a/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h b/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h index 3e24ec9..a073f52 100644 --- a/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h +++ b/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h @@ -28,7 +28,7 @@ /* CriticalityDiagnostics-IE-List */ typedef struct CriticalityDiagnostics_IE_List { - A_SEQUENCE_OF(struct Member { + A_SEQUENCE_OF(struct hnbap_Member { Criticality_t iECriticality; ProtocolIE_ID_t iE_ID; TypeOfError_t typeOfError; diff --git a/include/osmocom/hnbap/ErrorIndication.h b/include/osmocom/hnbap/ErrorIndication.h index 110934c..abce354 100644 --- a/include/osmocom/hnbap/ErrorIndication.h +++ b/include/osmocom/hnbap/ErrorIndication.h @@ -25,7 +25,7 @@ /* ErrorIndication */ typedef struct ErrorIndication { - struct errorIndication_ies { + struct hnbap_errorIndication_ies { A_SEQUENCE_OF(struct IE) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h b/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h index 77b65a7..485227d 100644 --- a/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h +++ b/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h @@ -24,7 +24,7 @@ /* RANAP_AuthorisedPLMNs */ typedef struct RANAP_AuthorisedPLMNs { - A_SEQUENCE_OF(struct MemberC { + A_SEQUENCE_OF(struct ranap_MemberC { RANAP_PLMNidentity_t pLMNidentity; RANAP_AuthorisedSNAs_t *authorisedSNAsList /* OPTIONAL */; RANAP_IE_Extensions_t *iE_Extensions /* OPTIONAL */; diff --git a/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h b/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h index 0eaeb3e..ea0b548 100644 --- a/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h +++ b/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h @@ -25,7 +25,7 @@ /* RANAP_CriticalityDiagnostics-IE-List */ typedef struct RANAP_CriticalityDiagnostics_IE_List { - A_SEQUENCE_OF(struct MemberG { + A_SEQUENCE_OF(struct ranap_MemberG { RANAP_Criticality_t iECriticality; RANAP_ProtocolIE_ID_t iE_ID; RANAP_RepetitionNumber0_t *repetitionNumber /* OPTIONAL */; diff --git a/include/osmocom/ranap/RANAP_DataVolumeList.h b/include/osmocom/ranap/RANAP_DataVolumeList.h index 459c2d5..9c40d7f 100644 --- a/include/osmocom/ranap/RANAP_DataVolumeList.h +++ b/include/osmocom/ranap/RANAP_DataVolumeList.h @@ -24,7 +24,7 @@ /* RANAP_DataVolumeList */ typedef struct RANAP_DataVolumeList { - A_SEQUENCE_OF(struct MemberH { + A_SEQUENCE_OF(struct ranap_MemberH { RANAP_UnsuccessfullyTransmittedDataVolume_t dl_UnsuccessfullyTransmittedDataVolume; RANAP_DataVolumeReference_t *dataVolumeReference /* OPTIONAL */; RANAP_ProtocolExtensionContainer_t *iE_Extensions /* OPTIONAL */; diff --git a/include/osmocom/ranap/RANAP_DirectTransfer.h b/include/osmocom/ranap/RANAP_DirectTransfer.h index 2a8a1ff..5a16a4c 100644 --- a/include/osmocom/ranap/RANAP_DirectTransfer.h +++ b/include/osmocom/ranap/RANAP_DirectTransfer.h @@ -22,7 +22,7 @@ /* RANAP_DirectTransfer */ typedef struct RANAP_DirectTransfer { - struct directTransfer_ies { + struct ranap_directTransfer_ies { A_SEQUENCE_OF(RANAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/ranap/RANAP_EUTRANFrequencies.h b/include/osmocom/ranap/RANAP_EUTRANFrequencies.h index f6c653c..8d87b29 100644 --- a/include/osmocom/ranap/RANAP_EUTRANFrequencies.h +++ b/include/osmocom/ranap/RANAP_EUTRANFrequencies.h @@ -24,7 +24,7 @@ /* RANAP_EUTRANFrequencies */ typedef struct RANAP_EUTRANFrequencies { - A_SEQUENCE_OF(struct MemberJ { + A_SEQUENCE_OF(struct ranap_MemberJ { long earfcn; RANAP_MeasBand_t *measBand /* OPTIONAL */; RANAP_IE_Extensions_t *iE_Extensions /* OPTIONAL */; diff --git a/include/osmocom/ranap/RANAP_ErrorIndication.h b/include/osmocom/ranap/RANAP_ErrorIndication.h index 5bad287..db5b80f 100644 --- a/include/osmocom/ranap/RANAP_ErrorIndication.h +++ b/include/osmocom/ranap/RANAP_ErrorIndication.h @@ -22,7 +22,7 @@ /* RANAP_ErrorIndication */ typedef struct RANAP_ErrorIndication { - struct errorIndication_ies { + struct ranap_errorIndication_ies { A_SEQUENCE_OF(RANAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/ranap/RANAP_GA-Polygon.h b/include/osmocom/ranap/RANAP_GA-Polygon.h index 200d0a4..feac8d0 100644 --- a/include/osmocom/ranap/RANAP_GA-Polygon.h +++ b/include/osmocom/ranap/RANAP_GA-Polygon.h @@ -23,7 +23,7 @@ /* RANAP_GA-Polygon */ typedef struct RANAP_GA_Polygon { - A_SEQUENCE_OF(struct Member { + A_SEQUENCE_OF(struct ranap_Member { RANAP_GeographicalCoordinates_t geographicalCoordinates; RANAP_IE_Extensions_t *iE_Extensions /* OPTIONAL */; /* diff --git a/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h b/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h index b27cde4..21db94f 100644 --- a/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h +++ b/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h @@ -24,7 +24,7 @@ /* RANAP_JoinedMBMSBearerService-IEs */ typedef struct RANAP_JoinedMBMSBearerService_IEs { - A_SEQUENCE_OF(struct MemberF { + A_SEQUENCE_OF(struct ranap_MemberF { RANAP_TMGI_t tMGI; RANAP_MBMS_PTP_RAB_ID_t mBMS_PTP_RAB_ID; RANAP_ProtocolExtensionContainer_t *iE_Extensions /* OPTIONAL */; diff --git a/include/osmocom/ranap/RANAP_LA-LIST.h b/include/osmocom/ranap/RANAP_LA-LIST.h index 08e76ed..7d81456 100644 --- a/include/osmocom/ranap/RANAP_LA-LIST.h +++ b/include/osmocom/ranap/RANAP_LA-LIST.h @@ -24,7 +24,7 @@ /* RANAP_LA-LIST */ typedef struct RANAP_LA_LIST { - A_SEQUENCE_OF(struct MemberA { + A_SEQUENCE_OF(struct ranap_MemberA { RANAP_LAC_t lAC; RANAP_ListOF_SNAs_t listOF_SNAs; RANAP_IE_Extensions_t *iE_Extensions /* OPTIONAL */; diff --git a/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h b/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h index f348739..7422a7e 100644 --- a/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h +++ b/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h @@ -23,7 +23,7 @@ /* RANAP_LeftMBMSBearerService-IEs */ typedef struct RANAP_LeftMBMSBearerService_IEs { - A_SEQUENCE_OF(struct MemberK { + A_SEQUENCE_OF(struct ranap_MemberK { RANAP_TMGI_t tMGI; RANAP_ProtocolExtensionContainer_t *iE_Extensions /* OPTIONAL */; /* diff --git a/include/osmocom/ranap/RANAP_MessageStructure.h b/include/osmocom/ranap/RANAP_MessageStructure.h index f44d0b4..54198c4 100644 --- a/include/osmocom/ranap/RANAP_MessageStructure.h +++ b/include/osmocom/ranap/RANAP_MessageStructure.h @@ -24,7 +24,7 @@ /* RANAP_MessageStructure */ typedef struct RANAP_MessageStructure { - A_SEQUENCE_OF(struct MemberL { + A_SEQUENCE_OF(struct ranap_MemberL { RANAP_ProtocolIE_ID_t iE_ID; RANAP_RepetitionNumber1_t *repetitionNumber /* OPTIONAL */; RANAP_IE_Extensions_t *iE_Extensions /* OPTIONAL */; diff --git a/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h b/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h index d335490..1b1a98d 100644 --- a/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h +++ b/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h @@ -24,7 +24,7 @@ /* RANAP_PLMNs-in-shared-network */ typedef struct RANAP_PLMNs_in_shared_network { - A_SEQUENCE_OF(struct MemberM { + A_SEQUENCE_OF(struct ranap_MemberM { RANAP_PLMNidentity_t pLMNidentity; RANAP_LA_LIST_t lA_LIST; RANAP_IE_Extensions_t *iE_Extensions /* OPTIONAL */; diff --git a/include/osmocom/ranap/RANAP_RABDataVolumeReport.h b/include/osmocom/ranap/RANAP_RABDataVolumeReport.h index ab671d5..8ae0043 100644 --- a/include/osmocom/ranap/RANAP_RABDataVolumeReport.h +++ b/include/osmocom/ranap/RANAP_RABDataVolumeReport.h @@ -24,7 +24,7 @@ /* RANAP_RABDataVolumeReport */ typedef struct RANAP_RABDataVolumeReport { - A_SEQUENCE_OF(struct MemberN { + A_SEQUENCE_OF(struct ranap_MemberN { RANAP_UnsuccessfullyTransmittedDataVolume_t dl_UnsuccessfullyTransmittedDataVolume; RANAP_DataVolumeReference_t *dataVolumeReference /* OPTIONAL */; RANAP_IE_Extensions_t *iE_Extensions /* OPTIONAL */; diff --git a/include/osmocom/ranap/RANAP_RABParametersList.h b/include/osmocom/ranap/RANAP_RABParametersList.h index f3bec06..c05c631 100644 --- a/include/osmocom/ranap/RANAP_RABParametersList.h +++ b/include/osmocom/ranap/RANAP_RABParametersList.h @@ -26,7 +26,7 @@ /* RANAP_RABParametersList */ typedef struct RANAP_RABParametersList { - A_SEQUENCE_OF(struct MemberB { + A_SEQUENCE_OF(struct ranap_MemberB { RANAP_RAB_ID_t rab_Id; RANAP_CN_DomainIndicator_t cn_domain; RANAP_RABDataVolumeReport_t *rabDataVolumeReport /* OPTIONAL */; diff --git a/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h b/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h index 149db08..ca5fd9f 100644 --- a/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h +++ b/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h @@ -24,7 +24,7 @@ /* RANAP_UnsuccessfulLinking-IEs */ typedef struct RANAP_UnsuccessfulLinking_IEs { - A_SEQUENCE_OF(struct MemberD { + A_SEQUENCE_OF(struct ranap_MemberD { RANAP_TMGI_t tMGI; RANAP_Cause_t cause; RANAP_ProtocolExtensionContainer_t *iE_Extensions /* OPTIONAL */; diff --git a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h index c10dc14..d16a021 100644 --- a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h +++ b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h @@ -25,7 +25,7 @@ /* RUA_CriticalityDiagnostics-IE-List */ typedef struct RUA_CriticalityDiagnostics_IE_List { - A_SEQUENCE_OF(struct Member { + A_SEQUENCE_OF(struct rua_Member { RUA_Criticality_t iECriticality; RUA_ProtocolIE_ID_t iE_ID; RUA_TypeOfError_t typeOfError; diff --git a/include/osmocom/rua/RUA_DirectTransfer.h b/include/osmocom/rua/RUA_DirectTransfer.h index 223bf83..23280e2 100644 --- a/include/osmocom/rua/RUA_DirectTransfer.h +++ b/include/osmocom/rua/RUA_DirectTransfer.h @@ -22,7 +22,7 @@ /* RUA_DirectTransfer */ typedef struct RUA_DirectTransfer { - struct directTransfer_ies { + struct rua_directTransfer_ies { A_SEQUENCE_OF(RUA_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_ErrorIndication.h b/include/osmocom/rua/RUA_ErrorIndication.h index bdc997d..1b3ce12 100644 --- a/include/osmocom/rua/RUA_ErrorIndication.h +++ b/include/osmocom/rua/RUA_ErrorIndication.h @@ -22,7 +22,7 @@ /* RUA_ErrorIndication */ typedef struct RUA_ErrorIndication { - struct errorIndication_ies { + struct rua_errorIndication_ies { A_SEQUENCE_OF(RUA_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h b/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h index 2d2fa40..7667735 100644 --- a/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h +++ b/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h @@ -25,7 +25,7 @@ /* SABP_CriticalityDiagnostics-IE-List */ typedef struct SABP_CriticalityDiagnostics_IE_List { - A_SEQUENCE_OF(struct Member { + A_SEQUENCE_OF(struct sabp_Member { SABP_Criticality_t iECriticality; SABP_ProtocolIE_ID_t iE_ID; SABP_RepetitionNumber0_t *repetitionNumber /* OPTIONAL */; diff --git a/include/osmocom/sabp/SABP_MessageStructure.h b/include/osmocom/sabp/SABP_MessageStructure.h index f63f28e..fce5f73 100644 --- a/include/osmocom/sabp/SABP_MessageStructure.h +++ b/include/osmocom/sabp/SABP_MessageStructure.h @@ -24,7 +24,7 @@ /* SABP_MessageStructure */ typedef struct SABP_MessageStructure { - A_SEQUENCE_OF(struct MemberA { + A_SEQUENCE_OF(struct sabp_MemberA { SABP_ProtocolIE_ID_t iE_ID; SABP_RepetitionNumber1_t *repetitionNumber /* OPTIONAL */; SABP_IE_Extensions_t *iE_Extensions /* OPTIONAL */; diff --git a/src/hnbap/CriticalityDiagnostics-IE-List.c b/src/hnbap/CriticalityDiagnostics-IE-List.c index b3f48e8..f30ad6f 100644 --- a/src/hnbap/CriticalityDiagnostics-IE-List.c +++ b/src/hnbap/CriticalityDiagnostics-IE-List.c @@ -13,7 +13,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_Member_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct Member, iECriticality), + { ATF_NOFLAGS, 0, offsetof(struct hnbap_Member, iECriticality), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_Criticality, @@ -22,7 +22,7 @@ 0, "iECriticality" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, iE_ID), + { ATF_NOFLAGS, 0, offsetof(struct hnbap_Member, iE_ID), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_ProtocolIE_ID, @@ -31,7 +31,7 @@ 0, "iE-ID" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, typeOfError), + { ATF_NOFLAGS, 0, offsetof(struct hnbap_Member, typeOfError), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_TypeOfError, @@ -40,7 +40,7 @@ 0, "typeOfError" }, - { ATF_POINTER, 1, offsetof(struct Member, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct hnbap_Member, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_IE_Extensions, @@ -61,8 +61,8 @@ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { - sizeof(struct Member), - offsetof(struct Member, _asn_ctx), + sizeof(struct hnbap_Member), + offsetof(struct hnbap_Member, _asn_ctx), asn_MAP_Member_tag2el_2, 4, /* Count of tags in the map */ asn_MAP_Member_oms_2, /* Optional members */ diff --git a/src/hnbap/ErrorIndication.c b/src/hnbap/ErrorIndication.c index 9765617..4c802fb 100644 --- a/src/hnbap/ErrorIndication.c +++ b/src/hnbap/ErrorIndication.c @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_errorIndication_ies_specs_2 = { - sizeof(struct errorIndication_ies), - offsetof(struct errorIndication_ies, _asn_ctx), + sizeof(struct hnbap_errorIndication_ies), + offsetof(struct hnbap_errorIndication_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/ranap/RANAP_AuthorisedPLMNs.c b/src/ranap/RANAP_AuthorisedPLMNs.c index b25c22e..fa9eb99 100644 --- a/src/ranap/RANAP_AuthorisedPLMNs.c +++ b/src/ranap/RANAP_AuthorisedPLMNs.c @@ -12,7 +12,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_MemberC_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct MemberC, pLMNidentity), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberC, pLMNidentity), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_PLMNidentity, @@ -21,7 +21,7 @@ 0, "pLMNidentity" }, - { ATF_POINTER, 2, offsetof(struct MemberC, authorisedSNAsList), + { ATF_POINTER, 2, offsetof(struct ranap_MemberC, authorisedSNAsList), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_AuthorisedSNAs, @@ -30,7 +30,7 @@ 0, "authorisedSNAsList" }, - { ATF_POINTER, 1, offsetof(struct MemberC, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct ranap_MemberC, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_IE_Extensions, @@ -50,8 +50,8 @@ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_MemberC_specs_2 = { - sizeof(struct MemberC), - offsetof(struct MemberC, _asn_ctx), + sizeof(struct ranap_MemberC), + offsetof(struct ranap_MemberC, _asn_ctx), asn_MAP_MemberC_tag2el_2, 3, /* Count of tags in the map */ asn_MAP_MemberC_oms_2, /* Optional members */ diff --git a/src/ranap/RANAP_CriticalityDiagnostics-IE-List.c b/src/ranap/RANAP_CriticalityDiagnostics-IE-List.c index 044a235..2a077a9 100644 --- a/src/ranap/RANAP_CriticalityDiagnostics-IE-List.c +++ b/src/ranap/RANAP_CriticalityDiagnostics-IE-List.c @@ -12,7 +12,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_MemberG_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct MemberG, iECriticality), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberG, iECriticality), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_Criticality, @@ -21,7 +21,7 @@ 0, "iECriticality" }, - { ATF_NOFLAGS, 0, offsetof(struct MemberG, iE_ID), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberG, iE_ID), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_ProtocolIE_ID, @@ -30,7 +30,7 @@ 0, "iE-ID" }, - { ATF_POINTER, 2, offsetof(struct MemberG, repetitionNumber), + { ATF_POINTER, 2, offsetof(struct ranap_MemberG, repetitionNumber), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_RepetitionNumber0, @@ -39,7 +39,7 @@ 0, "repetitionNumber" }, - { ATF_POINTER, 1, offsetof(struct MemberG, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct ranap_MemberG, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_IE_Extensions, @@ -60,8 +60,8 @@ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_MemberG_specs_2 = { - sizeof(struct MemberG), - offsetof(struct MemberG, _asn_ctx), + sizeof(struct ranap_MemberG), + offsetof(struct ranap_MemberG, _asn_ctx), asn_MAP_MemberG_tag2el_2, 4, /* Count of tags in the map */ asn_MAP_MemberG_oms_2, /* Optional members */ diff --git a/src/ranap/RANAP_DataVolumeList.c b/src/ranap/RANAP_DataVolumeList.c index 5be74e1..b3ab16b 100644 --- a/src/ranap/RANAP_DataVolumeList.c +++ b/src/ranap/RANAP_DataVolumeList.c @@ -12,7 +12,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_MemberH_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct MemberH, dl_UnsuccessfullyTransmittedDataVolume), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberH, dl_UnsuccessfullyTransmittedDataVolume), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_UnsuccessfullyTransmittedDataVolume, @@ -21,7 +21,7 @@ 0, "dl-UnsuccessfullyTransmittedDataVolume" }, - { ATF_POINTER, 2, offsetof(struct MemberH, dataVolumeReference), + { ATF_POINTER, 2, offsetof(struct ranap_MemberH, dataVolumeReference), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_DataVolumeReference, @@ -30,7 +30,7 @@ 0, "dataVolumeReference" }, - { ATF_POINTER, 1, offsetof(struct MemberH, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct ranap_MemberH, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_ProtocolExtensionContainer, @@ -50,8 +50,8 @@ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_MemberH_specs_2 = { - sizeof(struct MemberH), - offsetof(struct MemberH, _asn_ctx), + sizeof(struct ranap_MemberH), + offsetof(struct ranap_MemberH, _asn_ctx), asn_MAP_MemberH_tag2el_2, 3, /* Count of tags in the map */ asn_MAP_MemberH_oms_2, /* Optional members */ diff --git a/src/ranap/RANAP_DirectTransfer.c b/src/ranap/RANAP_DirectTransfer.c index 03fed10..ec89e2d 100644 --- a/src/ranap/RANAP_DirectTransfer.c +++ b/src/ranap/RANAP_DirectTransfer.c @@ -58,8 +58,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_directTransfer_ies_specs_2 = { - sizeof(struct directTransfer_ies), - offsetof(struct directTransfer_ies, _asn_ctx), + sizeof(struct ranap_directTransfer_ies), + offsetof(struct ranap_directTransfer_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/ranap/RANAP_EUTRANFrequencies.c b/src/ranap/RANAP_EUTRANFrequencies.c index f6faca6..47ffcd8 100644 --- a/src/ranap/RANAP_EUTRANFrequencies.c +++ b/src/ranap/RANAP_EUTRANFrequencies.c @@ -42,7 +42,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_MemberJ_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct MemberJ, earfcn), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberJ, earfcn), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_NativeInteger, @@ -51,7 +51,7 @@ 0, "earfcn" }, - { ATF_POINTER, 2, offsetof(struct MemberJ, measBand), + { ATF_POINTER, 2, offsetof(struct ranap_MemberJ, measBand), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_MeasBand, @@ -60,7 +60,7 @@ 0, "measBand" }, - { ATF_POINTER, 1, offsetof(struct MemberJ, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct ranap_MemberJ, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_IE_Extensions, @@ -80,8 +80,8 @@ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_MemberJ_specs_2 = { - sizeof(struct MemberJ), - offsetof(struct MemberJ, _asn_ctx), + sizeof(struct ranap_MemberJ), + offsetof(struct ranap_MemberJ, _asn_ctx), asn_MAP_MemberJ_tag2el_2, 3, /* Count of tags in the map */ asn_MAP_MemberJ_oms_2, /* Optional members */ diff --git a/src/ranap/RANAP_ErrorIndication.c b/src/ranap/RANAP_ErrorIndication.c index 4fcb502..71e9c4d 100644 --- a/src/ranap/RANAP_ErrorIndication.c +++ b/src/ranap/RANAP_ErrorIndication.c @@ -58,8 +58,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_errorIndication_ies_specs_2 = { - sizeof(struct errorIndication_ies), - offsetof(struct errorIndication_ies, _asn_ctx), + sizeof(struct ranap_errorIndication_ies), + offsetof(struct ranap_errorIndication_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/ranap/RANAP_GA-Polygon.c b/src/ranap/RANAP_GA-Polygon.c index 0e9979f..7aea850 100644 --- a/src/ranap/RANAP_GA-Polygon.c +++ b/src/ranap/RANAP_GA-Polygon.c @@ -12,7 +12,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_Member_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct Member, geographicalCoordinates), + { ATF_NOFLAGS, 0, offsetof(struct ranap_Member, geographicalCoordinates), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_GeographicalCoordinates, @@ -21,7 +21,7 @@ 0, "geographicalCoordinates" }, - { ATF_POINTER, 1, offsetof(struct Member, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct ranap_Member, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_IE_Extensions, @@ -40,8 +40,8 @@ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { - sizeof(struct Member), - offsetof(struct Member, _asn_ctx), + sizeof(struct ranap_Member), + offsetof(struct ranap_Member, _asn_ctx), asn_MAP_Member_tag2el_2, 2, /* Count of tags in the map */ asn_MAP_Member_oms_2, /* Optional members */ diff --git a/src/ranap/RANAP_JoinedMBMSBearerService-IEs.c b/src/ranap/RANAP_JoinedMBMSBearerService-IEs.c index 4055055..b6aa203 100644 --- a/src/ranap/RANAP_JoinedMBMSBearerService-IEs.c +++ b/src/ranap/RANAP_JoinedMBMSBearerService-IEs.c @@ -12,7 +12,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_MemberF_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct MemberF, tMGI), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberF, tMGI), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_TMGI, @@ -21,7 +21,7 @@ 0, "tMGI" }, - { ATF_NOFLAGS, 0, offsetof(struct MemberF, mBMS_PTP_RAB_ID), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberF, mBMS_PTP_RAB_ID), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_MBMS_PTP_RAB_ID, @@ -30,7 +30,7 @@ 0, "mBMS-PTP-RAB-ID" }, - { ATF_POINTER, 1, offsetof(struct MemberF, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct ranap_MemberF, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_ProtocolExtensionContainer, @@ -50,8 +50,8 @@ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_MemberF_specs_2 = { - sizeof(struct MemberF), - offsetof(struct MemberF, _asn_ctx), + sizeof(struct ranap_MemberF), + offsetof(struct ranap_MemberF, _asn_ctx), asn_MAP_MemberF_tag2el_2, 3, /* Count of tags in the map */ asn_MAP_MemberF_oms_2, /* Optional members */ diff --git a/src/ranap/RANAP_LA-LIST.c b/src/ranap/RANAP_LA-LIST.c index 59793d8..dbe62fc 100644 --- a/src/ranap/RANAP_LA-LIST.c +++ b/src/ranap/RANAP_LA-LIST.c @@ -12,7 +12,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_MemberA_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct MemberA, lAC), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberA, lAC), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_LAC, @@ -21,7 +21,7 @@ 0, "lAC" }, - { ATF_NOFLAGS, 0, offsetof(struct MemberA, listOF_SNAs), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberA, listOF_SNAs), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_ListOF_SNAs, @@ -30,7 +30,7 @@ 0, "listOF-SNAs" }, - { ATF_POINTER, 1, offsetof(struct MemberA, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct ranap_MemberA, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_IE_Extensions, @@ -50,8 +50,8 @@ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_MemberA_specs_2 = { - sizeof(struct MemberA), - offsetof(struct MemberA, _asn_ctx), + sizeof(struct ranap_MemberA), + offsetof(struct ranap_MemberA, _asn_ctx), asn_MAP_MemberA_tag2el_2, 3, /* Count of tags in the map */ asn_MAP_MemberA_oms_2, /* Optional members */ diff --git a/src/ranap/RANAP_LeftMBMSBearerService-IEs.c b/src/ranap/RANAP_LeftMBMSBearerService-IEs.c index b6f00f1..05f2eb3 100644 --- a/src/ranap/RANAP_LeftMBMSBearerService-IEs.c +++ b/src/ranap/RANAP_LeftMBMSBearerService-IEs.c @@ -12,7 +12,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_MemberK_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct MemberK, tMGI), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberK, tMGI), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_TMGI, @@ -21,7 +21,7 @@ 0, "tMGI" }, - { ATF_POINTER, 1, offsetof(struct MemberK, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct ranap_MemberK, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_ProtocolExtensionContainer, @@ -40,8 +40,8 @@ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_MemberK_specs_2 = { - sizeof(struct MemberK), - offsetof(struct MemberK, _asn_ctx), + sizeof(struct ranap_MemberK), + offsetof(struct ranap_MemberK, _asn_ctx), asn_MAP_MemberK_tag2el_2, 2, /* Count of tags in the map */ asn_MAP_MemberK_oms_2, /* Optional members */ diff --git a/src/ranap/RANAP_MessageStructure.c b/src/ranap/RANAP_MessageStructure.c index 92dab9d..0fe6257 100644 --- a/src/ranap/RANAP_MessageStructure.c +++ b/src/ranap/RANAP_MessageStructure.c @@ -12,7 +12,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_MemberL_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct MemberL, iE_ID), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberL, iE_ID), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_ProtocolIE_ID, @@ -21,7 +21,7 @@ 0, "iE-ID" }, - { ATF_POINTER, 2, offsetof(struct MemberL, repetitionNumber), + { ATF_POINTER, 2, offsetof(struct ranap_MemberL, repetitionNumber), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_RepetitionNumber1, @@ -30,7 +30,7 @@ 0, "repetitionNumber" }, - { ATF_POINTER, 1, offsetof(struct MemberL, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct ranap_MemberL, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_IE_Extensions, @@ -50,8 +50,8 @@ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_MemberL_specs_2 = { - sizeof(struct MemberL), - offsetof(struct MemberL, _asn_ctx), + sizeof(struct ranap_MemberL), + offsetof(struct ranap_MemberL, _asn_ctx), asn_MAP_MemberL_tag2el_2, 3, /* Count of tags in the map */ asn_MAP_MemberL_oms_2, /* Optional members */ diff --git a/src/ranap/RANAP_PLMNs-in-shared-network.c b/src/ranap/RANAP_PLMNs-in-shared-network.c index e98d5e2..d504509 100644 --- a/src/ranap/RANAP_PLMNs-in-shared-network.c +++ b/src/ranap/RANAP_PLMNs-in-shared-network.c @@ -12,7 +12,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_MemberM_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct MemberM, pLMNidentity), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberM, pLMNidentity), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_PLMNidentity, @@ -21,7 +21,7 @@ 0, "pLMNidentity" }, - { ATF_NOFLAGS, 0, offsetof(struct MemberM, lA_LIST), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberM, lA_LIST), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_LA_LIST, @@ -30,7 +30,7 @@ 0, "lA-LIST" }, - { ATF_POINTER, 1, offsetof(struct MemberM, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct ranap_MemberM, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_IE_Extensions, @@ -50,8 +50,8 @@ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_MemberM_specs_2 = { - sizeof(struct MemberM), - offsetof(struct MemberM, _asn_ctx), + sizeof(struct ranap_MemberM), + offsetof(struct ranap_MemberM, _asn_ctx), asn_MAP_MemberM_tag2el_2, 3, /* Count of tags in the map */ asn_MAP_MemberM_oms_2, /* Optional members */ diff --git a/src/ranap/RANAP_RABDataVolumeReport.c b/src/ranap/RANAP_RABDataVolumeReport.c index 6be90da..b049046 100644 --- a/src/ranap/RANAP_RABDataVolumeReport.c +++ b/src/ranap/RANAP_RABDataVolumeReport.c @@ -12,7 +12,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_MemberN_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct MemberN, dl_UnsuccessfullyTransmittedDataVolume), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberN, dl_UnsuccessfullyTransmittedDataVolume), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_UnsuccessfullyTransmittedDataVolume, @@ -21,7 +21,7 @@ 0, "dl-UnsuccessfullyTransmittedDataVolume" }, - { ATF_POINTER, 2, offsetof(struct MemberN, dataVolumeReference), + { ATF_POINTER, 2, offsetof(struct ranap_MemberN, dataVolumeReference), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_DataVolumeReference, @@ -30,7 +30,7 @@ 0, "dataVolumeReference" }, - { ATF_POINTER, 1, offsetof(struct MemberN, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct ranap_MemberN, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_IE_Extensions, @@ -50,8 +50,8 @@ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_MemberN_specs_2 = { - sizeof(struct MemberN), - offsetof(struct MemberN, _asn_ctx), + sizeof(struct ranap_MemberN), + offsetof(struct ranap_MemberN, _asn_ctx), asn_MAP_MemberN_tag2el_2, 3, /* Count of tags in the map */ asn_MAP_MemberN_oms_2, /* Optional members */ diff --git a/src/ranap/RANAP_RABParametersList.c b/src/ranap/RANAP_RABParametersList.c index 89fe75b..5dc60c2 100644 --- a/src/ranap/RANAP_RABParametersList.c +++ b/src/ranap/RANAP_RABParametersList.c @@ -12,7 +12,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_MemberB_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct MemberB, rab_Id), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberB, rab_Id), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_RAB_ID, @@ -21,7 +21,7 @@ 0, "rab-Id" }, - { ATF_NOFLAGS, 0, offsetof(struct MemberB, cn_domain), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberB, cn_domain), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_CN_DomainIndicator, @@ -30,7 +30,7 @@ 0, "cn-domain" }, - { ATF_POINTER, 3, offsetof(struct MemberB, rabDataVolumeReport), + { ATF_POINTER, 3, offsetof(struct ranap_MemberB, rabDataVolumeReport), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_RABDataVolumeReport, @@ -39,7 +39,7 @@ 0, "rabDataVolumeReport" }, - { ATF_POINTER, 2, offsetof(struct MemberB, upInformation), + { ATF_POINTER, 2, offsetof(struct ranap_MemberB, upInformation), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_UPInformation, @@ -48,7 +48,7 @@ 0, "upInformation" }, - { ATF_POINTER, 1, offsetof(struct MemberB, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct ranap_MemberB, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (4 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_IE_Extensions, @@ -70,8 +70,8 @@ { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_MemberB_specs_2 = { - sizeof(struct MemberB), - offsetof(struct MemberB, _asn_ctx), + sizeof(struct ranap_MemberB), + offsetof(struct ranap_MemberB, _asn_ctx), asn_MAP_MemberB_tag2el_2, 5, /* Count of tags in the map */ asn_MAP_MemberB_oms_2, /* Optional members */ diff --git a/src/ranap/RANAP_UnsuccessfulLinking-IEs.c b/src/ranap/RANAP_UnsuccessfulLinking-IEs.c index 9b18171..3a0974a 100644 --- a/src/ranap/RANAP_UnsuccessfulLinking-IEs.c +++ b/src/ranap/RANAP_UnsuccessfulLinking-IEs.c @@ -12,7 +12,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_MemberD_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct MemberD, tMGI), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberD, tMGI), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_TMGI, @@ -21,7 +21,7 @@ 0, "tMGI" }, - { ATF_NOFLAGS, 0, offsetof(struct MemberD, cause), + { ATF_NOFLAGS, 0, offsetof(struct ranap_MemberD, cause), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), +1, /* EXPLICIT tag at current level */ &asn_DEF_RANAP_Cause, @@ -30,7 +30,7 @@ 0, "cause" }, - { ATF_POINTER, 1, offsetof(struct MemberD, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct ranap_MemberD, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RANAP_ProtocolExtensionContainer, @@ -50,8 +50,8 @@ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_MemberD_specs_2 = { - sizeof(struct MemberD), - offsetof(struct MemberD, _asn_ctx), + sizeof(struct ranap_MemberD), + offsetof(struct ranap_MemberD, _asn_ctx), asn_MAP_MemberD_tag2el_2, 3, /* Count of tags in the map */ asn_MAP_MemberD_oms_2, /* Optional members */ diff --git a/src/rua/RUA_CriticalityDiagnostics-IE-List.c b/src/rua/RUA_CriticalityDiagnostics-IE-List.c index 55e4657..8ef0e4f 100644 --- a/src/rua/RUA_CriticalityDiagnostics-IE-List.c +++ b/src/rua/RUA_CriticalityDiagnostics-IE-List.c @@ -12,7 +12,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_Member_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct Member, iECriticality), + { ATF_NOFLAGS, 0, offsetof(struct rua_Member, iECriticality), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_Criticality, @@ -21,7 +21,7 @@ 0, "iECriticality" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, iE_ID), + { ATF_NOFLAGS, 0, offsetof(struct rua_Member, iE_ID), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_ProtocolIE_ID, @@ -30,7 +30,7 @@ 0, "iE-ID" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, typeOfError), + { ATF_NOFLAGS, 0, offsetof(struct rua_Member, typeOfError), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_TypeOfError, @@ -39,7 +39,7 @@ 0, "typeOfError" }, - { ATF_POINTER, 1, offsetof(struct Member, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct rua_Member, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_IE_Extensions, @@ -60,8 +60,8 @@ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { - sizeof(struct Member), - offsetof(struct Member, _asn_ctx), + sizeof(struct rua_Member), + offsetof(struct rua_Member, _asn_ctx), asn_MAP_Member_tag2el_2, 4, /* Count of tags in the map */ asn_MAP_Member_oms_2, /* Optional members */ diff --git a/src/rua/RUA_DirectTransfer.c b/src/rua/RUA_DirectTransfer.c index 8036517..aeb0675 100644 --- a/src/rua/RUA_DirectTransfer.c +++ b/src/rua/RUA_DirectTransfer.c @@ -58,8 +58,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_directTransfer_ies_specs_2 = { - sizeof(struct directTransfer_ies), - offsetof(struct directTransfer_ies, _asn_ctx), + sizeof(struct rua_directTransfer_ies), + offsetof(struct rua_directTransfer_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/rua/RUA_ErrorIndication.c b/src/rua/RUA_ErrorIndication.c index d95ff32..f3210ee 100644 --- a/src/rua/RUA_ErrorIndication.c +++ b/src/rua/RUA_ErrorIndication.c @@ -58,8 +58,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_errorIndication_ies_specs_2 = { - sizeof(struct errorIndication_ies), - offsetof(struct errorIndication_ies, _asn_ctx), + sizeof(struct rua_errorIndication_ies), + offsetof(struct rua_errorIndication_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_CriticalityDiagnostics-IE-List.c b/src/sabp/SABP_CriticalityDiagnostics-IE-List.c index 8d5c403..3aaf867 100644 --- a/src/sabp/SABP_CriticalityDiagnostics-IE-List.c +++ b/src/sabp/SABP_CriticalityDiagnostics-IE-List.c @@ -12,7 +12,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_Member_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct Member, iECriticality), + { ATF_NOFLAGS, 0, offsetof(struct sabp_Member, iECriticality), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_Criticality, @@ -21,7 +21,7 @@ 0, "iECriticality" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, iE_ID), + { ATF_NOFLAGS, 0, offsetof(struct sabp_Member, iE_ID), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_ProtocolIE_ID, @@ -30,7 +30,7 @@ 0, "iE-ID" }, - { ATF_POINTER, 2, offsetof(struct Member, repetitionNumber), + { ATF_POINTER, 2, offsetof(struct sabp_Member, repetitionNumber), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_RepetitionNumber0, @@ -39,7 +39,7 @@ 0, "repetitionNumber" }, - { ATF_POINTER, 1, offsetof(struct Member, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct sabp_Member, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_IE_Extensions, @@ -60,8 +60,8 @@ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { - sizeof(struct Member), - offsetof(struct Member, _asn_ctx), + sizeof(struct sabp_Member), + offsetof(struct sabp_Member, _asn_ctx), asn_MAP_Member_tag2el_2, 4, /* Count of tags in the map */ asn_MAP_Member_oms_2, /* Optional members */ diff --git a/src/sabp/SABP_MessageStructure.c b/src/sabp/SABP_MessageStructure.c index db4c0d6..3c60c1b 100644 --- a/src/sabp/SABP_MessageStructure.c +++ b/src/sabp/SABP_MessageStructure.c @@ -12,7 +12,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_MemberA_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct MemberA, iE_ID), + { ATF_NOFLAGS, 0, offsetof(struct sabp_MemberA, iE_ID), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_ProtocolIE_ID, @@ -21,7 +21,7 @@ 0, "iE-ID" }, - { ATF_POINTER, 2, offsetof(struct MemberA, repetitionNumber), + { ATF_POINTER, 2, offsetof(struct sabp_MemberA, repetitionNumber), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_RepetitionNumber1, @@ -30,7 +30,7 @@ 0, "repetitionNumber" }, - { ATF_POINTER, 1, offsetof(struct MemberA, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct sabp_MemberA, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_IE_Extensions, @@ -50,8 +50,8 @@ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_MemberA_specs_2 = { - sizeof(struct MemberA), - offsetof(struct MemberA, _asn_ctx), + sizeof(struct sabp_MemberA), + offsetof(struct sabp_MemberA, _asn_ctx), asn_MAP_MemberA_tag2el_2, 3, /* Count of tags in the map */ asn_MAP_MemberA_oms_2, /* Optional members */ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I552fc028c7d08c880fdb844ece75816602c5bb67 Gerrit-Change-Number: 25888 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 16:57:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 16:57:10 +0000 Subject: Change in osmo-iuh[master]: RFC: Add lib prefix to structs with duplicated names In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/25888 to look at the new patch set (#2). Change subject: RFC: Add lib prefix to structs with duplicated names ...................................................................... RFC: Add lib prefix to structs with duplicated names Otherwise it's impossible to include eg. rua/*.h and ranap/*.h since they will collision and gcc will error. Following commands are used to generate this patch: """ for t in hnbap ranap rua sabp; do ag -l "struct Member" include/osmocom/$t src/$t/ | xargs sed -i "s/struct Member/struct ${t}_Member/g"; done for t in hnbap ranap rua sabp; do ag -l "struct errorIndication_ies" include/osmocom/$t src/$t/ | xargs sed -i "s/struct errorIndication_ies/struct ${t}_errorIndication_ies/g"; done for t in hnbap ranap rua sabp; do ag -l "struct directTransfer_ies" include/osmocom/$t src/$t/ | xargs sed -i "s/struct directTransfer_ies/struct ${t}_directTransfer_ies/g"; done for t in hnbap ranap rua sabp; do ag -l "struct privateMessage_ies" include/osmocom/$t src/$t/ | xargs sed -i "s/struct privateMessage_ies/struct ${t}_privateMessage_ies/g"; done """ Change-Id: I552fc028c7d08c880fdb844ece75816602c5bb67 --- M include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h M include/osmocom/hnbap/ErrorIndication.h M include/osmocom/hnbap/PrivateMessage.h M include/osmocom/ranap/RANAP_AuthorisedPLMNs.h M include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h M include/osmocom/ranap/RANAP_DataVolumeList.h M include/osmocom/ranap/RANAP_DirectTransfer.h M include/osmocom/ranap/RANAP_EUTRANFrequencies.h M include/osmocom/ranap/RANAP_ErrorIndication.h M include/osmocom/ranap/RANAP_GA-Polygon.h M include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h M include/osmocom/ranap/RANAP_LA-LIST.h M include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h M include/osmocom/ranap/RANAP_MessageStructure.h M include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h M include/osmocom/ranap/RANAP_PrivateMessage.h M include/osmocom/ranap/RANAP_RABDataVolumeReport.h M include/osmocom/ranap/RANAP_RABParametersList.h M include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h M include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h M include/osmocom/rua/RUA_DirectTransfer.h M include/osmocom/rua/RUA_ErrorIndication.h M include/osmocom/rua/RUA_PrivateMessage.h M include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h M include/osmocom/sabp/SABP_MessageStructure.h M src/hnbap/CriticalityDiagnostics-IE-List.c M src/hnbap/ErrorIndication.c M src/hnbap/PrivateMessage.c M src/ranap/RANAP_AuthorisedPLMNs.c M src/ranap/RANAP_CriticalityDiagnostics-IE-List.c M src/ranap/RANAP_DataVolumeList.c M src/ranap/RANAP_DirectTransfer.c M src/ranap/RANAP_EUTRANFrequencies.c M src/ranap/RANAP_ErrorIndication.c M src/ranap/RANAP_GA-Polygon.c M src/ranap/RANAP_JoinedMBMSBearerService-IEs.c M src/ranap/RANAP_LA-LIST.c M src/ranap/RANAP_LeftMBMSBearerService-IEs.c M src/ranap/RANAP_MessageStructure.c M src/ranap/RANAP_PLMNs-in-shared-network.c M src/ranap/RANAP_PrivateMessage.c M src/ranap/RANAP_RABDataVolumeReport.c M src/ranap/RANAP_RABParametersList.c M src/ranap/RANAP_UnsuccessfulLinking-IEs.c M src/rua/RUA_CriticalityDiagnostics-IE-List.c M src/rua/RUA_DirectTransfer.c M src/rua/RUA_ErrorIndication.c M src/rua/RUA_PrivateMessage.c M src/sabp/SABP_CriticalityDiagnostics-IE-List.c M src/sabp/SABP_MessageStructure.c 50 files changed, 130 insertions(+), 130 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/88/25888/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I552fc028c7d08c880fdb844ece75816602c5bb67 Gerrit-Change-Number: 25888 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 17:16:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 21 Oct 2021 17:16:54 +0000 Subject: Change in osmo-iuh[master]: RFC: Add lib prefix to structs with duplicated names In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25888 ) Change subject: RFC: Add lib prefix to structs with duplicated names ...................................................................... Patch Set 2: We really need to regenerate all the code adding per-lib prefixes per lib (I think as1nc supports passing a prefix). Is it documented somewhere how to regenerate the code? There's even enums and enum fields colliding: """ In file included from /build/new/out/include/osmocom/ranap/RANAP_GA-Point.h:14, from /build/new/out/include/osmocom/ranap/RANAP_GeographicalArea.h:14, from /build/new/out/include/osmocom/ranap/RANAP_AreaIdentity.h:15, from /build/new/out/include/osmocom/ranap/ranap_common.h:29, from /git/osmo-hnodeb/src/osmo-hnodeb/main.c:69: /build/new/out/include/osmocom/ranap/RANAP_GeographicalCoordinates.h:24:14: error: redeclaration of ?enum latitudeSign? 24 | typedef enum latitudeSign { | ^~~~~~~~~~~~ In file included from /build/new/out/include/osmocom/hnbap/hnbap_common.h:41, from /git/osmo-hnodeb/src/osmo-hnodeb/main.c:54: /build/new/out/include/osmocom/hnbap/GeographicalCoordinates.h:24:14: note: originally defined here 24 | typedef enum latitudeSign { | ^~~~~~~~~~~~ In file included from /build/new/out/include/osmocom/ranap/RANAP_GA-Point.h:14, from /build/new/out/include/osmocom/ranap/RANAP_GeographicalArea.h:14, from /build/new/out/include/osmocom/ranap/RANAP_AreaIdentity.h:15, from /build/new/out/include/osmocom/ranap/ranap_common.h:29, from /git/osmo-hnodeb/src/osmo-hnodeb/main.c:69: /build/new/out/include/osmocom/ranap/RANAP_GeographicalCoordinates.h:25:9: error: redeclaration of enumerator ?latitudeSign_north? 25 | latitudeSign_north = 0, | ^~~~~~~~~~~~~~~~~~ In file included from /build/new/out/include/osmocom/hnbap/hnbap_common.h:41, from /git/osmo-hnodeb/src/osmo-hnodeb/main.c:54: /build/new/out/include/osmocom/hnbap/GeographicalCoordinates.h:25:9: note: previous definition of ?latitudeSign_north? with type ?enum latitudeSign? 25 | latitudeSign_north = 0, | ^~~~~~~~~~~~~~~~~~ """" -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I552fc028c7d08c880fdb844ece75816602c5bb67 Gerrit-Change-Number: 25888 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 21 Oct 2021 17:16:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 18:04:26 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 18:04:26 +0000 Subject: Change in libosmocore[master]: gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25866 ) Change subject: gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/libosmocore/+/25866/1/include/osmocom/gsm/protocol/gsm_08_58.h File include/osmocom/gsm/protocol/gsm_08_58.h: https://gerrit.osmocom.org/c/libosmocore/+/25866/1/include/osmocom/gsm/protocol/gsm_08_58.h at 145 PS1, Line 145: uint8_t sacch:1, > I'd rename those to sacch_enabled and alike, otherwise it's confusing imho. ACK, I was thinking about adding _enable too. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia28293a12de0af71f55e701fb65c46e905dae217 Gerrit-Change-Number: 25866 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Oct 2021 18:04:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 18:11:38 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 18:11:38 +0000 Subject: Change in libosmocore[master]: gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/25866 to look at the new patch set (#2). Change subject: gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap ...................................................................... gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap This change adds new [bit-]fields in order to allow: * selectively enabling SACCH and/or FACCH, * setting the RxQual (BER) threshold. Change-Id: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M include/osmocom/gsm/protocol/gsm_08_58.h 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/66/25866/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia28293a12de0af71f55e701fb65c46e905dae217 Gerrit-Change-Number: 25866 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 18:11:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 18:11:57 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: fix copy-pasted warning message In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25868 ) Change subject: [overpower] VTY: fix copy-pasted warning message ...................................................................... Patch Set 1: Code-Review+2 Trivial change. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie0bc0b503c7c7e893b5c94597c84c47fa881874d Gerrit-Change-Number: 25868 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 21 Oct 2021 18:11:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 18:12:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 18:12:04 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: cosmetic: fix lower case in command description In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25867 ) Change subject: [overpower] VTY: cosmetic: fix lower case in command description ...................................................................... [overpower] VTY: cosmetic: fix lower case in command description Change-Id: Iadce870b599b4af4269b9026bd8fbe746f1f4979 Related: SYS#5319 --- M src/osmo-bsc/bts_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index a05d965..3696ca8 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -754,7 +754,7 @@ "overpower dl-acch <1-4>", TOP_ACCH_STR "Enable ACCH overpower for this BTS\n" - "overpower value in dB\n") + "Overpower value in dB\n") { struct gsm_bts *bts = vty->index; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iadce870b599b4af4269b9026bd8fbe746f1f4979 Gerrit-Change-Number: 25867 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 18:12:05 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 18:12:05 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: fix copy-pasted warning message In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25868 ) Change subject: [overpower] VTY: fix copy-pasted warning message ...................................................................... [overpower] VTY: fix copy-pasted warning message Change-Id: Ie0bc0b503c7c7e893b5c94597c84c47fa881874d Related: SYS#5319 --- M src/osmo-bsc/bts_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 3696ca8..8eae2a4 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -759,7 +759,7 @@ struct gsm_bts *bts = vty->index; if (bts->model->type != GSM_BTS_TYPE_OSMOBTS) { - vty_out(vty, "%% repeated ACCH not supported by BTS %u%s", + vty_out(vty, "%% ACCH overpower is not supported by BTS %u%s", bts->nr, VTY_NEWLINE); return CMD_WARNING; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie0bc0b503c7c7e893b5c94597c84c47fa881874d Gerrit-Change-Number: 25868 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 18:22:27 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 18:22:27 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: add more ACCH overpower related parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25869 ) Change subject: [overpower] VTY: add more ACCH overpower related parameters ...................................................................... Patch Set 3: (3 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25869/3/src/osmo-bsc/bts_vty.c File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25869/3/src/osmo-bsc/bts_vty.c at 721 PS3, Line 721: "rxqual (0|1|2|3|4|5|6|7)" > I wonder why isn't this specified as <0-7> (I know it's not related to this patch, but anyway). Because with '<0-7>' we would not be able to describe every possible value. https://gerrit.osmocom.org/c/osmo-bsc/+/25869/3/src/osmo-bsc/bts_vty.c at 724 PS3, Line 724: "BER >= 0% (always on)\n" \ > if changed above, this can be rewritten to simply point to the 3GPP TS where this table is specified [?] I personally find it useful to have the exact 'BER >= x' bands in the interactive VTY help. This way there is no need to open the specs. and look up every value... https://gerrit.osmocom.org/c/osmo-bsc/+/25869/3/src/osmo-bsc/bts_vty.c at 4309 PS3, Line 4309: mode, top->overpower_db, VTY_NEWLINE); > what if mode is NULL here? top->sacch and top->facch being false. This should not happen (see cfg_bts_top_dl_acch_cmd below). If 'overpower_db > 0' is true, then at least one of top->sacch / top->facch shall be true. I can add an ASSERT here, just to be safe. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Gerrit-Change-Number: 25869 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 21 Oct 2021 18:22:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 18:26:31 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 18:26:31 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: add more ACCH overpower related parameters In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 to look at the new patch set (#4). Change subject: [overpower] VTY: add more ACCH overpower related parameters ...................................................................... [overpower] VTY: add more ACCH overpower related parameters The new fields in 'struct abis_rsl_osmo_temp_ovp_acch_cap' allow: * selectively enabling SACCH and/or FACCH, * setting the RxQual (BER) threshold. Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Depends: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M src/osmo-bsc/bts.c M src/osmo-bsc/bts_vty.c 2 files changed, 73 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/25869/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Gerrit-Change-Number: 25869 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 18:38:58 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 18:38:58 +0000 Subject: Change in osmo-iuh[master]: cosmetic: src/ranap/Makefile.am: Drop trailing whitespace In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25883 ) Change subject: cosmetic: src/ranap/Makefile.am: Drop trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I934b7be7ca1fac05410df6640428ee8e9c70c3e7 Gerrit-Change-Number: 25883 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 21 Oct 2021 18:38:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 18:39:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 18:39:24 +0000 Subject: Change in osmo-iuh[master]: src/tests/Makefile.am: Drop reference to non-existent RANAP_FILES var In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25884 ) Change subject: src/tests/Makefile.am: Drop reference to non-existent RANAP_FILES var ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25884 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3f196d5c2bb35826709bfc32d10e6b3683b552ee Gerrit-Change-Number: 25884 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 21 Oct 2021 18:39:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 18:44:01 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 18:44:01 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-hnbap as a public shared library In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25880 ) Change subject: Provide libosmo-hnbap as a public shared library ...................................................................... Patch Set 4: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-iuh/+/25880/4//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-iuh/+/25880/4//COMMIT_MSG at 11 PS4, Line 11: Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 I would like to know which SYS#xxxx or OS#xxxx ticket this patch is related to. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 Gerrit-Change-Number: 25880 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 21 Oct 2021 18:44:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 18:49:58 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 18:49:58 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-rua as a public shared library In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25887 ) Change subject: Provide libosmo-rua as a public shared library ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-iuh/+/25887/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-iuh/+/25887/1//COMMIT_MSG at 11 PS1, Line 11: Change-Id: I8b800baacbfe3a3c424c51b418b5ac2e2848b3ba I would like to know which SYS#xxxx or OS#xxxx ticket this patch is related to. https://gerrit.osmocom.org/c/osmo-iuh/+/25887/1/contrib/osmo-iuh.spec.in File contrib/osmo-iuh.spec.in: https://gerrit.osmocom.org/c/osmo-iuh/+/25887/1/contrib/osmo-iuh.spec.in at 83 PS1, Line 83: HNBAP, RUA, RANAP Is it correct? It looks like we gonna have one library for each of the APs in braces. Not one for all of them. https://gerrit.osmocom.org/c/osmo-iuh/+/25887/1/src/rua/Makefile.am File src/rua/Makefile.am: https://gerrit.osmocom.org/c/osmo-iuh/+/25887/1/src/rua/Makefile.am at a89 PS1, Line 89: Not critical, but still unrelated. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I8b800baacbfe3a3c424c51b418b5ac2e2848b3ba Gerrit-Change-Number: 25887 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 21 Oct 2021 18:49:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 18:51:03 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 18:51:03 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-hnbap as a public shared library In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25880 ) Change subject: Provide libosmo-hnbap as a public shared library ...................................................................... Patch Set 4: -Code-Review (2 comments) https://gerrit.osmocom.org/c/osmo-iuh/+/25880/4/debian/control File debian/control: https://gerrit.osmocom.org/c/osmo-iuh/+/25880/4/debian/control at 54 PS4, Line 54: HNBAP, RUA, RANAP Is it correct? It looks like we gonna have one library for each of the APs in braces. Not one for all of them. https://gerrit.osmocom.org/c/osmo-iuh/+/25880/4/src/tests/Makefile.am File src/tests/Makefile.am: https://gerrit.osmocom.org/c/osmo-iuh/+/25880/4/src/tests/Makefile.am at a77 PS4, Line 77: Unrelated. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 Gerrit-Change-Number: 25880 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Thu, 21 Oct 2021 18:51:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 19:16:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 19:16:20 +0000 Subject: Change in osmo-ci[master]: coverity: allow passing configure args to build_default() In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/25856 to look at the new patch set (#2). Change subject: coverity: allow passing configure args to build_default() ...................................................................... coverity: allow passing configure args to build_default() Change-Id: I79aa2c65cd0d3b06c0bd9ec4f44288b21e40c3b7 --- M coverity/build_Osmocom.sh 1 file changed, 9 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/56/25856/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I79aa2c65cd0d3b06c0bd9ec4f44288b21e40c3b7 Gerrit-Change-Number: 25856 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 19:16:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 19:16:20 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-{msc, sgsn} with --enable-iu In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/25857 to look at the new patch set (#2). Change subject: coverity: build osmo-{msc,sgsn} with --enable-iu ...................................................................... coverity: build osmo-{msc,sgsn} with --enable-iu This allows Coverity to analyze the Iu (UMTS) specific code. Change-Id: I3ef08fcf42950b33e18b3bfcddff890547308364 --- M coverity/build_Osmocom.sh 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/57/25857/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3ef08fcf42950b33e18b3bfcddff890547308364 Gerrit-Change-Number: 25857 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 19:16:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 19:16:20 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-msc with --enable-smpp In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/25858 to look at the new patch set (#2). Change subject: coverity: build osmo-msc with --enable-smpp ...................................................................... coverity: build osmo-msc with --enable-smpp This allows Coverity to analyze the SMPP specific code. Change-Id: Ie1e4f1610d86fe57d940527ac64d3d1beb7165e0 --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/58/25858/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie1e4f1610d86fe57d940527ac64d3d1beb7165e0 Gerrit-Change-Number: 25858 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 19:16:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 19:16:20 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-trx with UHD+LMS+IPC support In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/25859 to look at the new patch set (#2). Change subject: coverity: build osmo-trx with UHD+LMS+IPC support ...................................................................... coverity: build osmo-trx with UHD+LMS+IPC support This allows Coverity to analyze the UHD/LMS/IPC specific code. Change-Id: Ib58bee277414596cb46e523c798d42514c0eb78d --- M coverity/build_Osmocom.sh 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/59/25859/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib58bee277414596cb46e523c798d42514c0eb78d Gerrit-Change-Number: 25859 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 19:16:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 19:16:20 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-trx with USRP1 support In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/25860 to look at the new patch set (#2). Change subject: coverity: build osmo-trx with USRP1 support ...................................................................... coverity: build osmo-trx with USRP1 support This allows Coverity to analyze the libusrp specific code. Change-Id: I36df72149a32cb0df43c74af910d1fbb92b88f4a --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmcocom.sh 2 files changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/60/25860/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I36df72149a32cb0df43c74af910d1fbb92b88f4a Gerrit-Change-Number: 25860 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 19:16:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 19:16:20 +0000 Subject: Change in osmo-ci[master]: coverity: also build and check SIMTrace host tools In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/25861 to look at the new patch set (#2). Change subject: coverity: also build and check SIMTrace host tools ...................................................................... coverity: also build and check SIMTrace host tools Change-Id: I74da8b523c9d51887d5eceb01ca0f505bb846812 --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmcocom.sh 2 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/61/25861/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I74da8b523c9d51887d5eceb01ca0f505bb846812 Gerrit-Change-Number: 25861 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 19:16:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 19:16:20 +0000 Subject: Change in osmo-ci[master]: coverity: also build and check osmo-{cbc, gbproxy} In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/25862 to look at the new patch set (#2). Change subject: coverity: also build and check osmo-{cbc,gbproxy} ...................................................................... coverity: also build and check osmo-{cbc,gbproxy} Change-Id: Ibbff2bdf3163ba33dac11ccaa2e405894a7a0f10 --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmcocom.sh 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/62/25862/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibbff2bdf3163ba33dac11ccaa2e405894a7a0f10 Gerrit-Change-Number: 25862 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 21:38:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 21:38:21 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: add more ACCH overpower related parameters In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 to look at the new patch set (#5). Change subject: [overpower] VTY: add more ACCH overpower related parameters ...................................................................... [overpower] VTY: add more ACCH overpower related parameters The new fields in 'struct abis_rsl_osmo_temp_ovp_acch_cap' allow: * selectively enabling SACCH and/or FACCH, * setting the RxQual (BER) threshold. Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Depends: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M src/osmo-bsc/bts.c M src/osmo-bsc/bts_vty.c 2 files changed, 73 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/25869/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Gerrit-Change-Number: 25869 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 21:39:05 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 21:39:05 +0000 Subject: Change in osmo-bsc[master]: [overpower] Add VTY transcript tests for all commands In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25870 to look at the new patch set (#4). Change subject: [overpower] Add VTY transcript tests for all commands ...................................................................... [overpower] Add VTY transcript tests for all commands Change-Id: Iefbdbeb36a4692102dbb76d86113a183e4f381a7 Related: SYS#5319 --- M tests/Makefile.am A tests/acch_overpower.vty 2 files changed, 71 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/70/25870/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefbdbeb36a4692102dbb76d86113a183e4f381a7 Gerrit-Change-Number: 25870 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 23:54:05 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 23:54:05 +0000 Subject: Change in osmo-bts[master]: rsl: rsl_tx_meas_res() does not change l3, make it const References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25889 ) Change subject: rsl: rsl_tx_meas_res() does not change l3, make it const ...................................................................... rsl: rsl_tx_meas_res() does not change l3, make it const Change-Id: Ie60a34f90f7872464e503dc7b56935aee95f0f80 --- M include/osmo-bts/rsl.h M src/common/rsl.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/89/25889/1 diff --git a/include/osmo-bts/rsl.h b/include/osmo-bts/rsl.h index 9d5ec31..dcd476c 100644 --- a/include/osmo-bts/rsl.h +++ b/include/osmo-bts/rsl.h @@ -32,6 +32,6 @@ int rsl_tx_cbch_load_indication(struct gsm_bts *bts, bool ext_cbch, bool overflow, uint8_t amount); -int rsl_tx_meas_res(struct gsm_lchan *lchan, uint8_t *l3, int l3_len, int timing_offset); +int rsl_tx_meas_res(struct gsm_lchan *lchan, const uint8_t *l3, int l3_len, int timing_offset); #endif // _RSL_H */ diff --git a/src/common/rsl.c b/src/common/rsl.c index 145cc8a..d14395b 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3464,7 +3464,7 @@ } __attribute__((packed)); /* Compose and send 8.4.8 MEASUREMENT RESult via RSL. (timing_offset=-1 -> not present) */ -int rsl_tx_meas_res(struct gsm_lchan *lchan, uint8_t *l3, int l3_len, int timing_offset) +int rsl_tx_meas_res(struct gsm_lchan *lchan, const uint8_t *l3, int l3_len, int timing_offset) { struct msgb *msg; uint8_t meas_res[16]; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie60a34f90f7872464e503dc7b56935aee95f0f80 Gerrit-Change-Number: 25889 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 23:54:06 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 23:54:06 +0000 Subject: Change in osmo-bts[master]: rsl: send NACK if BTS_FEAT_ACCH_REP is not supported References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25890 ) Change subject: rsl: send NACK if BTS_FEAT_ACCH_REP is not supported ...................................................................... rsl: send NACK if BTS_FEAT_ACCH_REP is not supported Change-Id: I7993cf7842ffde561f2bdc50f56516c3a188b2bc Related: SYS#5114 --- M src/common/rsl.c 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/90/25890/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index d14395b..3cbfff6 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1566,7 +1566,7 @@ } /* Parse RSL_IE_OSMO_REP_ACCH_CAP */ -static void parse_repeated_acch_capability(struct gsm_lchan *lchan, struct tlv_parsed *tp) +static int parse_repeated_acch_capability(struct gsm_lchan *lchan, struct tlv_parsed *tp) { /* 3GPP TS 24.008, section 10.5.1.7 defines a Repeated ACCH Capability * bit that indicates if REPEATED FACCH/SACCH is supported or not. @@ -1577,10 +1577,15 @@ memset(&lchan->repeated_acch_capability, 0, sizeof(lchan->repeated_acch_capability)); if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_REP_ACCH_CAP, sizeof(lchan->repeated_acch_capability))) - return; + return 0; + + if (!osmo_bts_has_feature(lchan->ts->trx->bts->features, BTS_FEAT_ACCH_REP)) + return -RSL_ERR_OPT_IE_ERROR; memcpy(&lchan->repeated_acch_capability, TLVP_VAL(tp, RSL_IE_OSMO_REP_ACCH_CAP), sizeof(lchan->repeated_acch_capability)); + + return 0; } /* Parse RSL_IE_OSMO_TOP_ACCH_CAP */ @@ -1912,7 +1917,9 @@ /* Remember to send an RSL ACK once the lchan is active */ lchan->rel_act_kind = LCHAN_REL_ACT_RSL; - parse_repeated_acch_capability(lchan, &tp); + rc = parse_repeated_acch_capability(lchan, &tp); + if (rc < 0) + return rsl_tx_chan_act_acknack(lchan, -rc); rc = parse_temporary_overpower_acch_capability(lchan, &tp); if (rc < 0) return rsl_tx_chan_act_acknack(lchan, -rc); @@ -2180,7 +2187,9 @@ /* 9.3.53 MultiRate Control */ /* 9.3.54 Supported Codec Types */ - parse_repeated_acch_capability(lchan, &tp); + rc = parse_repeated_acch_capability(lchan, &tp); + if (rc < 0) + return rsl_tx_mode_modif_nack(lchan, -rc); rc = parse_temporary_overpower_acch_capability(lchan, &tp); if (rc < 0) return rsl_tx_mode_modif_nack(lchan, -rc); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7993cf7842ffde561f2bdc50f56516c3a188b2bc Gerrit-Change-Number: 25890 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 23:54:06 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 23:54:06 +0000 Subject: Change in osmo-bts[master]: measurement: handle_ms_meas_report() accepts const gh References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25891 ) Change subject: measurement: handle_ms_meas_report() accepts const gh ...................................................................... measurement: handle_ms_meas_report() accepts const gh Change-Id: Iba37c1a92b8b17a8ba8c958fb6c296747578cb1b --- M include/osmo-bts/measurement.h M src/common/measurement.c 2 files changed, 8 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/91/25891/1 diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index 481b7be..f63a05a 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -20,6 +20,8 @@ int is_meas_complete(struct gsm_lchan *lchan, uint32_t fn); -int handle_ms_meas_report(struct gsm_lchan *lchan, struct gsm48_hdr *gh, unsigned int len); +int handle_ms_meas_report(struct gsm_lchan *lchan, + const struct gsm48_hdr *gh, + unsigned int len); #endif diff --git a/src/common/measurement.c b/src/common/measurement.c index 87e853e..0a8a182 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -791,7 +791,9 @@ /* Called every time a Measurement Result (TS 08.58 8.4.8) is received from * lower layers and has to be forwarded to BSC */ -int handle_ms_meas_report(struct gsm_lchan *lchan, struct gsm48_hdr *gh, unsigned int len) +int handle_ms_meas_report(struct gsm_lchan *lchan, + const struct gsm48_hdr *gh, + unsigned int len) { int timing_offset, rc; struct lapdm_entity *le; @@ -804,7 +806,7 @@ le = &lchan->lapdm_ch.lapdm_acch; timing_offset = ms_to_valid(lchan) ? ms_to2rsl(lchan, le) : -1; - rc = rsl_tx_meas_res(lchan, (uint8_t *)gh, len, timing_offset); + rc = rsl_tx_meas_res(lchan, (const uint8_t *)gh, len, timing_offset); if (rc == 0) /* Count successful transmissions */ lchan->meas.res_nr++; @@ -849,7 +851,7 @@ lchan_ms_ta_ctrl(lchan, ms_ta, lchan->meas.ms_toa256); lchan_ms_pwr_ctrl(lchan, ms_pwr, ul_rssi, ul_ci_cb); if (gh) - lchan_bs_pwr_ctrl(lchan, (const struct gsm48_hdr *) gh); + lchan_bs_pwr_ctrl(lchan, gh); /* Reset state for next iteration */ lchan->tch.dtx.dl_active = false; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iba37c1a92b8b17a8ba8c958fb6c296747578cb1b Gerrit-Change-Number: 25891 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 23:54:06 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 23:54:06 +0000 Subject: Change in osmo-bts[master]: measurement: move repeated_dl_facch_active_decision() here References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25892 ) Change subject: measurement: move repeated_dl_facch_active_decision() here ...................................................................... measurement: move repeated_dl_facch_active_decision() here For the sake of consistency, call repeated_dl_facch_active_decision() from handle_ms_meas_report(), so we have all functions using the measurement results for Downlink executed in a single place. Change-Id: Ibd5377ce642e49161f320ac8c33e9f966b3ddfaf Related: SYS#5114, SYS#5319 --- M include/osmo-bts/l1sap.h M src/common/l1sap.c M src/common/measurement.c M src/common/rsl.c 4 files changed, 76 insertions(+), 78 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/92/25892/1 diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index f78d114..93c532f 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -144,7 +144,4 @@ int is_ccch_for_agch(struct gsm_bts_trx *trx, uint32_t fn); -void repeated_dl_facch_active_decision(struct gsm_lchan *lchan, - const uint8_t *l3, size_t l3_len); - #endif /* L1SAP_H */ diff --git a/src/common/l1sap.c b/src/common/l1sap.c index f5d2364..a6cd21d 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1026,80 +1026,6 @@ return msg; } -/* Decide if repeated FACCH should be applied or not. If RXQUAL level, that the - * MS reports is high enough, FACCH repetition is not needed. */ -void repeated_dl_facch_active_decision(struct gsm_lchan *lchan, const uint8_t *l3, - size_t l3_len) -{ - const struct gsm48_meas_res *meas_res; - uint8_t upper; - uint8_t lower; - uint8_t rxqual; - bool prev_repeated_dl_facch_active = lchan->repeated_dl_facch_active; - - /* This is an optimization so that we exit as quickly as possible if - * there are no FACCH repetition capabilities present. However If the - * repeated FACCH capabilities vanish for whatever reason, we must be - * sure that FACCH repetition is disabled. */ - if (!lchan->repeated_acch_capability.dl_facch_cmd - && !lchan->repeated_acch_capability.dl_facch_all) { - lchan->repeated_dl_facch_active = false; - goto out; - } - - /* Threshold disabled (always on) */ - if (lchan->repeated_acch_capability.rxqual == 0) { - lchan->repeated_dl_facch_active = true; - goto out; - } - - /* When the MS sets the SRR bit in the UL-SACCH L1 header - * (repeated SACCH requested) then it makes sense to enable - * FACCH repetition too. */ - if (lchan->meas.l1_info.srr_sro) { - lchan->repeated_dl_facch_active = true; - goto out; - } - - /* Parse MS measurement results */ - if (l3_len <= sizeof(struct gsm48_meas_res *) + 2) - goto out; - if (l3[0] != GSM48_PDISC_RR) - goto out; - if (l3[1] != GSM48_MT_RR_MEAS_REP) - goto out; - l3 += 2; - meas_res = (struct gsm48_meas_res *)l3; - - /* If the RXQUAL level at the MS drops under a certain threshold - * we enable FACCH repetition. */ - upper = lchan->repeated_acch_capability.rxqual; - if (upper > 2) - lower = lchan->repeated_acch_capability.rxqual - 2; - else - lower = 0; - - /* When downlink DTX is applied, use RXQUAL-SUB, otherwise use - * RXQUAL-FULL. */ - if (meas_res->dtx_used) - rxqual = meas_res->rxqual_sub; - else - rxqual = meas_res->rxqual_full; - - if (rxqual >= upper) - lchan->repeated_dl_facch_active = true; - else if (rxqual <= lower) - lchan->repeated_dl_facch_active = false; - -out: - if (lchan->repeated_dl_facch_active == prev_repeated_dl_facch_active) - return; - if (lchan->repeated_dl_facch_active) - LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: inactive => active\n"); - else - LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: active => inactive\n"); -} - /* Special dequeueing function with SACCH repetition (3GPP TS 44.006, section 11) */ static inline struct msgb *lapdm_phsap_dequeue_msg_sacch(struct gsm_lchan *lchan, struct lapdm_entity *le) { diff --git a/src/common/measurement.c b/src/common/measurement.c index 0a8a182..3a17869 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -789,6 +789,80 @@ return (lchan->ms_t_offs >= 0) || (lchan->p_offs >= 0); } +/* Decide if repeated FACCH should be applied or not. If RXQUAL level, that the + * MS reports is high enough, FACCH repetition is not needed. */ +static void repeated_dl_facch_active_decision(struct gsm_lchan *lchan, + const struct gsm48_hdr *gh) +{ + const struct gsm48_meas_res *meas_res; + uint8_t upper; + uint8_t lower; + uint8_t rxqual; + bool prev_repeated_dl_facch_active = lchan->repeated_dl_facch_active; + + /* This is an optimization so that we exit as quickly as possible if + * there are no FACCH repetition capabilities present. However If the + * repeated FACCH capabilities vanish for whatever reason, we must be + * sure that FACCH repetition is disabled. */ + if (!lchan->repeated_acch_capability.dl_facch_cmd + && !lchan->repeated_acch_capability.dl_facch_all) { + lchan->repeated_dl_facch_active = false; + goto out; + } + + /* Threshold disabled (always on) */ + if (lchan->repeated_acch_capability.rxqual == 0) { + lchan->repeated_dl_facch_active = true; + goto out; + } + + /* When the MS sets the SRR bit in the UL-SACCH L1 header + * (repeated SACCH requested) then it makes sense to enable + * FACCH repetition too. */ + if (lchan->meas.l1_info.srr_sro) { + lchan->repeated_dl_facch_active = true; + goto out; + } + + /* Parse MS measurement results */ + if (gh == NULL) + goto out; + /* Check if this is a Measurement Report */ + if (gh->proto_discr != GSM48_PDISC_RR) + goto out; + if (gh->msg_type != GSM48_MT_RR_MEAS_REP) + goto out; + meas_res = (const struct gsm48_meas_res *) gh->data; + + /* If the RXQUAL level at the MS drops under a certain threshold + * we enable FACCH repetition. */ + upper = lchan->repeated_acch_capability.rxqual; + if (upper > 2) + lower = lchan->repeated_acch_capability.rxqual - 2; + else + lower = 0; + + /* When downlink DTX is applied, use RXQUAL-SUB, otherwise use + * RXQUAL-FULL. */ + if (meas_res->dtx_used) + rxqual = meas_res->rxqual_sub; + else + rxqual = meas_res->rxqual_full; + + if (rxqual >= upper) + lchan->repeated_dl_facch_active = true; + else if (rxqual <= lower) + lchan->repeated_dl_facch_active = false; + +out: + if (lchan->repeated_dl_facch_active == prev_repeated_dl_facch_active) + return; + if (lchan->repeated_dl_facch_active) + LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: inactive => active\n"); + else + LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: active => inactive\n"); +} + /* Called every time a Measurement Result (TS 08.58 8.4.8) is received from * lower layers and has to be forwarded to BSC */ int handle_ms_meas_report(struct gsm_lchan *lchan, @@ -853,6 +927,8 @@ if (gh) lchan_bs_pwr_ctrl(lchan, gh); + repeated_dl_facch_active_decision(lchan, gh); + /* Reset state for next iteration */ lchan->tch.dtx.dl_active = false; lchan->meas.flags &= ~LC_UL_M_F_OSMO_EXT_VALID; diff --git a/src/common/rsl.c b/src/common/rsl.c index 3cbfff6..11f2f86 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3586,7 +3586,6 @@ return 0; } - repeated_dl_facch_active_decision(lchan, msgb_l3(msg), msgb_l3len(msg)); rc = handle_ms_meas_report(lchan, (struct gsm48_hdr *)msgb_l3(msg), msgb_l3len(msg)); msgb_free(msg); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibd5377ce642e49161f320ac8c33e9f966b3ddfaf Gerrit-Change-Number: 25892 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 23:54:07 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 23:54:07 +0000 Subject: Change in osmo-bts[master]: measurement: make sure that DL measurements are valid References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25893 ) Change subject: measurement: make sure that DL measurements are valid ...................................................................... measurement: make sure that DL measurements are valid In repeated_dl_facch_active_decision() we rely on the Measurement Report message, that in some cases may not contain valid Downlink measurements. In this case, we should simply ignore it. Change-Id: I0d72b454f2b770d5762303fb70a15a8cdc9d07d7 Related: SYS#5114 --- M src/common/measurement.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/93/25893/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index 3a17869..626f3b1 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -833,6 +833,8 @@ if (gh->msg_type != GSM48_MT_RR_MEAS_REP) goto out; meas_res = (const struct gsm48_meas_res *) gh->data; + if (meas_res->meas_valid != 0) /* 0 = valid */ + goto out; /* If the RXQUAL level at the MS drops under a certain threshold * we enable FACCH repetition. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0d72b454f2b770d5762303fb70a15a8cdc9d07d7 Gerrit-Change-Number: 25893 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 23:54:07 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 23:54:07 +0000 Subject: Change in osmo-bts[master]: cosmetic: s/repeated_acch_capability/rep_acch_cap/g References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25894 ) Change subject: cosmetic: s/repeated_acch_capability/rep_acch_cap/g ...................................................................... cosmetic: s/repeated_acch_capability/rep_acch_cap/g Shorter symbol names are easier to read. Change-Id: Ib1d51f91139b4c2fe794e37fc8543b2d7a9b9c07 Related: SYS#5114 --- M include/osmo-bts/lchan.h M src/common/l1sap.c M src/common/lchan.c M src/common/measurement.c M src/common/rsl.c M src/common/vty.c 6 files changed, 23 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/94/25894/1 diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index ccc6760..03b3144 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -304,7 +304,7 @@ /* ECU (Error Concealment Unit) state */ struct osmo_ecu_state *ecu_state; - struct abis_rsl_osmo_rep_acch_cap repeated_acch_capability; + struct abis_rsl_osmo_rep_acch_cap rep_acch_cap; bool repeated_dl_facch_active; bool repeated_ul_sacch_active; bool repeated_dl_sacch_active; diff --git a/src/common/l1sap.c b/src/common/l1sap.c index a6cd21d..cbe43b4 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1006,7 +1006,7 @@ * If the MS explicitly indicated that repeated ACCH is * supported, than all FACCH frames may be repeated * see also: 3GPP TS 44.006, section 10.3). */ - if (!(lchan->repeated_acch_capability.dl_facch_all || msg->data[0] & 0x02)) + if (!(lchan->rep_acch_cap.dl_facch_all || msg->data[0] & 0x02)) return msg; /* ... and store the message buffer for repetition. */ @@ -1147,7 +1147,7 @@ p[0] |= 0x40; /* See also: 3GPP TS 44.004, section 7.1 */ p[1] = lchan->ta_ctrl.current; le = &lchan->lapdm_ch.lapdm_acch; - if (lchan->repeated_acch_capability.dl_sacch) { + if (lchan->rep_acch_cap.dl_sacch) { /* Check if MS requests SACCH repetition and update state accordingly */ if (lchan->meas.l1_info.srr_sro) { if (lchan->repeated_dl_sacch_active == false) @@ -1433,13 +1433,13 @@ * there are no uplink SACCH repetition capabilities present. * However If the repeated UL-SACCH capabilities vanish for whatever * reason, we must be sure that UL-SACCH repetition is disabled. */ - if (!lchan->repeated_acch_capability.ul_sacch) { + if (!lchan->rep_acch_cap.ul_sacch) { lchan->repeated_ul_sacch_active = false; goto out; } /* Threshold disabled (repetition is always on) */ - if (lchan->repeated_acch_capability.rxqual == 0) { + if (lchan->rep_acch_cap.rxqual == 0) { lchan->repeated_ul_sacch_active = true; goto out; } @@ -1454,8 +1454,8 @@ * of the table in GSM 05.08, section 8.2.4. The lower vector is just * the upper vector shifted by 2. */ - upper = ber10k_by_rxqual_upper[lchan->repeated_acch_capability.rxqual]; - lower = ber10k_by_rxqual_lower[lchan->repeated_acch_capability.rxqual]; + upper = ber10k_by_rxqual_upper[lchan->rep_acch_cap.rxqual]; + lower = ber10k_by_rxqual_lower[lchan->rep_acch_cap.rxqual]; /* If upper/rxqual == 0, then repeated UL-SACCH is always on */ if (ber10k >= upper) diff --git a/src/common/lchan.c b/src/common/lchan.c index e532615..9661010 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -67,7 +67,7 @@ t200_ms_acch[DL_SAPI0] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; t200_ms_acch[DL_SAPI3] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; - if (lchan->repeated_acch_capability.dl_facch_all && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { + if (lchan->rep_acch_cap.dl_facch_all && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { t200_ms_acch[DL_SAPI0] *= 2; t200_ms_acch[DL_SAPI3] *= 2; } diff --git a/src/common/measurement.c b/src/common/measurement.c index 626f3b1..ec06131 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -804,14 +804,14 @@ * there are no FACCH repetition capabilities present. However If the * repeated FACCH capabilities vanish for whatever reason, we must be * sure that FACCH repetition is disabled. */ - if (!lchan->repeated_acch_capability.dl_facch_cmd - && !lchan->repeated_acch_capability.dl_facch_all) { + if (!lchan->rep_acch_cap.dl_facch_cmd + && !lchan->rep_acch_cap.dl_facch_all) { lchan->repeated_dl_facch_active = false; goto out; } /* Threshold disabled (always on) */ - if (lchan->repeated_acch_capability.rxqual == 0) { + if (lchan->rep_acch_cap.rxqual == 0) { lchan->repeated_dl_facch_active = true; goto out; } @@ -838,9 +838,9 @@ /* If the RXQUAL level at the MS drops under a certain threshold * we enable FACCH repetition. */ - upper = lchan->repeated_acch_capability.rxqual; + upper = lchan->rep_acch_cap.rxqual; if (upper > 2) - lower = lchan->repeated_acch_capability.rxqual - 2; + lower = lchan->rep_acch_cap.rxqual - 2; else lower = 0; diff --git a/src/common/rsl.c b/src/common/rsl.c index 11f2f86..a0afc30 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1574,16 +1574,16 @@ * should be communicated in the RSL CHANNEL ACTIVATION. For osmo-bts * we will use a propritary IE. */ - memset(&lchan->repeated_acch_capability, 0, sizeof(lchan->repeated_acch_capability)); + memset(&lchan->rep_acch_cap, 0, sizeof(lchan->rep_acch_cap)); - if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_REP_ACCH_CAP, sizeof(lchan->repeated_acch_capability))) + if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_REP_ACCH_CAP, sizeof(lchan->rep_acch_cap))) return 0; if (!osmo_bts_has_feature(lchan->ts->trx->bts->features, BTS_FEAT_ACCH_REP)) return -RSL_ERR_OPT_IE_ERROR; - memcpy(&lchan->repeated_acch_capability, TLVP_VAL(tp, RSL_IE_OSMO_REP_ACCH_CAP), - sizeof(lchan->repeated_acch_capability)); + memcpy(&lchan->rep_acch_cap, TLVP_VAL(tp, RSL_IE_OSMO_REP_ACCH_CAP), + sizeof(lchan->rep_acch_cap)); return 0; } diff --git a/src/common/vty.c b/src/common/vty.c index 576835b..b894ba8 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1707,18 +1707,18 @@ { cfg_out(vty, "ACCH repetition:%s", VTY_NEWLINE); indent += 2; - if (lchan->repeated_acch_capability.rxqual) + if (lchan->rep_acch_cap.rxqual) cfg_out(vty, "Enable RXQUAL threshold: %u%s", - lchan->repeated_acch_capability.rxqual, VTY_NEWLINE); + lchan->rep_acch_cap.rxqual, VTY_NEWLINE); else cfg_out(vty, "Enable RXQUAL threshold: (none, alway on)%s", VTY_NEWLINE); cfg_out(vty, "DL-FACCH:%s", VTY_NEWLINE); indent += 2; - if (lchan->repeated_acch_capability.dl_facch_all) + if (lchan->rep_acch_cap.dl_facch_all) cfg_out(vty, "retramsit all LAPDM block types%s", VTY_NEWLINE); - else if (lchan->repeated_acch_capability.dl_facch_cmd) + else if (lchan->rep_acch_cap.dl_facch_cmd) cfg_out(vty, "retramsit only LAPDM command blocks%s", VTY_NEWLINE); else @@ -1732,7 +1732,7 @@ cfg_out(vty, "DL-SACCH:%s", VTY_NEWLINE); indent += 2; - if (lchan->repeated_acch_capability.ul_sacch) + if (lchan->rep_acch_cap.ul_sacch) cfg_out(vty, "retramsit all SACCH blocks for SAPI=0%s", VTY_NEWLINE); else @@ -1746,7 +1746,7 @@ cfg_out(vty, "UL-SACCH:%s", VTY_NEWLINE); indent += 2; - if (lchan->repeated_acch_capability.dl_sacch) + if (lchan->rep_acch_cap.dl_sacch) cfg_out(vty, "retramsit all SACCH blocks for SAPI=0%s", VTY_NEWLINE); else -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib1d51f91139b4c2fe794e37fc8543b2d7a9b9c07 Gerrit-Change-Number: 25894 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 23:54:07 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 23:54:07 +0000 Subject: Change in osmo-bts[master]: struct gsm_lchan: group ACCH repetition state fields References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25895 ) Change subject: struct gsm_lchan: group ACCH repetition state fields ...................................................................... struct gsm_lchan: group ACCH repetition state fields Change-Id: I2680c88f2a51b64f085a92233bc125338622babf Related: SYS#5114 --- M include/osmo-bts/lchan.h M src/common/l1sap.c M src/common/lchan.c M src/common/measurement.c M src/common/vty.c M src/osmo-bts-trx/sched_lchan_xcch.c 6 files changed, 41 insertions(+), 38 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/95/25895/1 diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 03b3144..3eb4f93 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -304,13 +304,16 @@ /* ECU (Error Concealment Unit) state */ struct osmo_ecu_state *ecu_state; + /* Repeated ACCH capabilities and current state */ struct abis_rsl_osmo_rep_acch_cap rep_acch_cap; - bool repeated_dl_facch_active; - bool repeated_ul_sacch_active; - bool repeated_dl_sacch_active; + struct { + bool dl_facch_active; + bool ul_sacch_active; + bool dl_sacch_active; - /* Message buffer to store DL-SACCH repeation candidate */ - struct msgb *rep_sacch; + /* Message buffer to store DL-SACCH repeation candidate */ + struct msgb *dl_sacch_msg; + } rep_acch; /* Cached early Immediate Assignment message: if the Immediate Assignment arrives before the channel is * confirmed active, then cache it here and send it once the channel is confirmed to be active. This is related diff --git a/src/common/l1sap.c b/src/common/l1sap.c index cbe43b4..d94e3bc 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1037,15 +1037,15 @@ * possible candidates in order to have one ready in case the MS enables * SACCH repetition. */ - if (lchan->rep_sacch) { + if (lchan->rep_acch.dl_sacch_msg) { if (lchan->meas.l1_info.srr_sro == 0) { /* Toss previous repetition candidate */ - msgb_free(lchan->rep_sacch); - lchan->rep_sacch = NULL; + msgb_free(lchan->rep_acch.dl_sacch_msg); + lchan->rep_acch.dl_sacch_msg = NULL; } else { /* Use previous repetition candidate */ - msg = lchan->rep_sacch; - lchan->rep_sacch = NULL; + msg = lchan->rep_acch.dl_sacch_msg; + lchan->rep_acch.dl_sacch_msg = NULL; return msg; } } @@ -1059,7 +1059,7 @@ /* Only LAPDm frames for SAPI 0 may become a repetition * candidate. */ if (sapi == 0) - lchan->rep_sacch = msgb_copy(msg, "rep_sacch"); + lchan->rep_acch.dl_sacch_msg = msgb_copy(msg, "rep_sacch"); return msg; } @@ -1143,20 +1143,20 @@ p = msgb_put(msg, GSM_MACBLOCK_LEN); /* L1-header, if not set/modified by layer 1 */ p[0] = lchan->ms_power_ctrl.current; - if (lchan->repeated_ul_sacch_active) + if (lchan->rep_acch.ul_sacch_active) p[0] |= 0x40; /* See also: 3GPP TS 44.004, section 7.1 */ p[1] = lchan->ta_ctrl.current; le = &lchan->lapdm_ch.lapdm_acch; if (lchan->rep_acch_cap.dl_sacch) { /* Check if MS requests SACCH repetition and update state accordingly */ if (lchan->meas.l1_info.srr_sro) { - if (lchan->repeated_dl_sacch_active == false) + if (lchan->rep_acch.dl_sacch_active == false) LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-SACCH repetition: inactive => active\n"); - lchan->repeated_dl_sacch_active = true; + lchan->rep_acch.dl_sacch_active = true; } else { - if (lchan->repeated_dl_sacch_active == true) + if (lchan->rep_acch.dl_sacch_active == true) LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-SACCH repetition: active => inactive\n"); - lchan->repeated_dl_sacch_active = false; + lchan->rep_acch.dl_sacch_active = false; } pp_msg = lapdm_phsap_dequeue_msg_sacch(lchan, le); } else { @@ -1166,7 +1166,7 @@ if (lchan->ts->trx->bts->dtxd) dtxd_facch = true; le = &lchan->lapdm_ch.lapdm_dcch; - if (lchan->repeated_dl_facch_active && lchan->rsl_cmode != RSL_CMOD_SPD_SIGN) + if (lchan->rep_acch.dl_facch_active && lchan->rsl_cmode != RSL_CMOD_SPD_SIGN) pp_msg = lapdm_phsap_dequeue_msg_facch(lchan, le, fn); else pp_msg = lapdm_phsap_dequeue_msg(le); @@ -1427,20 +1427,20 @@ { uint16_t upper = 0; uint16_t lower = 0; - bool prev_repeated_ul_sacch_active = lchan->repeated_ul_sacch_active; + bool prev_repeated_ul_sacch_active = lchan->rep_acch.ul_sacch_active; /* This is an optimization so that we exit as quickly as possible if * there are no uplink SACCH repetition capabilities present. * However If the repeated UL-SACCH capabilities vanish for whatever * reason, we must be sure that UL-SACCH repetition is disabled. */ if (!lchan->rep_acch_cap.ul_sacch) { - lchan->repeated_ul_sacch_active = false; + lchan->rep_acch.ul_sacch_active = false; goto out; } /* Threshold disabled (repetition is always on) */ if (lchan->rep_acch_cap.rxqual == 0) { - lchan->repeated_ul_sacch_active = true; + lchan->rep_acch.ul_sacch_active = true; goto out; } @@ -1459,14 +1459,14 @@ /* If upper/rxqual == 0, then repeated UL-SACCH is always on */ if (ber10k >= upper) - lchan->repeated_ul_sacch_active = true; + lchan->rep_acch.ul_sacch_active = true; else if (ber10k <= lower) - lchan->repeated_ul_sacch_active = false; + lchan->rep_acch.ul_sacch_active = false; out: - if (lchan->repeated_ul_sacch_active == prev_repeated_ul_sacch_active) + if (lchan->rep_acch.ul_sacch_active == prev_repeated_ul_sacch_active) return; - if (lchan->repeated_ul_sacch_active) + if (lchan->rep_acch.ul_sacch_active) LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "UL-SACCH repetition: inactive => active\n"); else LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "UL-SACCH repetition: active => inactive\n"); diff --git a/src/common/lchan.c b/src/common/lchan.c index 9661010..423ecc1 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -296,8 +296,8 @@ msgb_free(lchan->tch.rep_facch[1].msg); lchan->tch.rep_facch[0].msg = NULL; lchan->tch.rep_facch[1].msg = NULL; - msgb_free(lchan->rep_sacch); - lchan->rep_sacch = NULL; + msgb_free(lchan->rep_acch.dl_sacch_msg); + lchan->rep_acch.dl_sacch_msg = NULL; /* fall through */ default: if (lchan->early_rr_ia) { diff --git a/src/common/measurement.c b/src/common/measurement.c index ec06131..52431c5 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -798,7 +798,7 @@ uint8_t upper; uint8_t lower; uint8_t rxqual; - bool prev_repeated_dl_facch_active = lchan->repeated_dl_facch_active; + bool prev_repeated_dl_facch_active = lchan->rep_acch.dl_facch_active; /* This is an optimization so that we exit as quickly as possible if * there are no FACCH repetition capabilities present. However If the @@ -806,13 +806,13 @@ * sure that FACCH repetition is disabled. */ if (!lchan->rep_acch_cap.dl_facch_cmd && !lchan->rep_acch_cap.dl_facch_all) { - lchan->repeated_dl_facch_active = false; + lchan->rep_acch.dl_facch_active = false; goto out; } /* Threshold disabled (always on) */ if (lchan->rep_acch_cap.rxqual == 0) { - lchan->repeated_dl_facch_active = true; + lchan->rep_acch.dl_facch_active = true; goto out; } @@ -820,7 +820,7 @@ * (repeated SACCH requested) then it makes sense to enable * FACCH repetition too. */ if (lchan->meas.l1_info.srr_sro) { - lchan->repeated_dl_facch_active = true; + lchan->rep_acch.dl_facch_active = true; goto out; } @@ -852,14 +852,14 @@ rxqual = meas_res->rxqual_full; if (rxqual >= upper) - lchan->repeated_dl_facch_active = true; + lchan->rep_acch.dl_facch_active = true; else if (rxqual <= lower) - lchan->repeated_dl_facch_active = false; + lchan->rep_acch.dl_facch_active = false; out: - if (lchan->repeated_dl_facch_active == prev_repeated_dl_facch_active) + if (lchan->rep_acch.dl_facch_active == prev_repeated_dl_facch_active) return; - if (lchan->repeated_dl_facch_active) + if (lchan->rep_acch.dl_facch_active) LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: inactive => active\n"); else LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: active => inactive\n"); diff --git a/src/common/vty.c b/src/common/vty.c index b894ba8..124f7ef 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1723,7 +1723,7 @@ VTY_NEWLINE); else cfg_out(vty, "no retransmission (disabled)%s", VTY_NEWLINE); - if (lchan->repeated_dl_facch_active) + if (lchan->rep_acch.dl_facch_active) cfg_out(vty, "retransmission currently active%s", VTY_NEWLINE); else cfg_out(vty, "retransmission currently inactive%s", @@ -1737,7 +1737,7 @@ VTY_NEWLINE); else cfg_out(vty, "no retransmission (disabled)%s", VTY_NEWLINE); - if (lchan->repeated_dl_sacch_active) + if (lchan->rep_acch.dl_sacch_active) cfg_out(vty, "retransmission currently active%s", VTY_NEWLINE); else cfg_out(vty, "retransmission currently inactive%s", @@ -1751,7 +1751,7 @@ VTY_NEWLINE); else cfg_out(vty, "no retransmission (disabled)%s", VTY_NEWLINE); - if (lchan->repeated_ul_sacch_active) + if (lchan->rep_acch.ul_sacch_active) cfg_out(vty, "retransmission currently active%s", VTY_NEWLINE); else cfg_out(vty, "retransmission currently inactive%s", diff --git a/src/osmo-bts-trx/sched_lchan_xcch.c b/src/osmo-bts-trx/sched_lchan_xcch.c index e2baefd..e8f46c1 100644 --- a/src/osmo-bts-trx/sched_lchan_xcch.c +++ b/src/osmo-bts-trx/sched_lchan_xcch.c @@ -60,7 +60,7 @@ uint16_t ber10k; int rc; struct gsm_lchan *lchan = chan_state->lchan; - bool rep_sacch = L1SAP_IS_LINK_SACCH(trx_chan_desc[bi->chan].link_id) && lchan->repeated_ul_sacch_active; + bool rep_sacch = L1SAP_IS_LINK_SACCH(trx_chan_desc[bi->chan].link_id) && lchan->rep_acch.ul_sacch_active; /* If handover RACH detection is turned on, treat this burst as an Access Burst. * Handle NOPE.ind as usually to ensure proper Uplink measurement reporting. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2680c88f2a51b64f085a92233bc125338622babf Gerrit-Change-Number: 25895 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 21 23:54:07 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 21 Oct 2021 23:54:07 +0000 Subject: Change in osmo-bts[master]: struct gsm_lchan: move tch.rep_facch to rep_acch.dl_facch References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25896 ) Change subject: struct gsm_lchan: move tch.rep_facch to rep_acch.dl_facch ...................................................................... struct gsm_lchan: move tch.rep_facch to rep_acch.dl_facch Finally we have all ACCH repetition state variables in one place. Change-Id: I1469619528bb69c78c2fdc25bc1db208ead936d0 Related: SYS#5114 --- M include/osmo-bts/lchan.h M src/common/l1sap.c M src/common/lchan.c 3 files changed, 18 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/25896/1 diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 3eb4f93..a7e9004 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -254,9 +254,6 @@ uint8_t last_cmr; uint32_t last_fn; - /* SLOT #0 and #1 to store FACCH for repetition */ - struct gsm_rep_facch rep_facch[2]; - } tch; /* 3GPP TS 48.058 ? 9.3.37: [0; 255] ok, -1 means invalid*/ @@ -311,7 +308,8 @@ bool ul_sacch_active; bool dl_sacch_active; - /* Message buffer to store DL-SACCH repeation candidate */ + /* Message buffers to store repeation candidates */ + struct gsm_rep_facch dl_facch[2]; struct msgb *dl_sacch_msg; } rep_acch; diff --git a/src/common/l1sap.c b/src/common/l1sap.c index d94e3bc..c89b2c3 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -987,14 +987,14 @@ /* Note: The repeated version of the FACCH block must be scheduled 8 or 9 bursts after the original * transmission. see 3GPP TS 44.006, section 10.2 for a more detailed explaination. */ - if (lchan->tch.rep_facch[0].msg && GSM_TDMA_FN_SUB(fn, lchan->tch.rep_facch[0].fn) >= 8) { + if (lchan->rep_acch.dl_facch[0].msg && GSM_TDMA_FN_SUB(fn, lchan->rep_acch.dl_facch[0].fn) >= 8) { /* Re-use stored FACCH message buffer from SLOT #0 for repetition. */ - msg = lchan->tch.rep_facch[0].msg; - lchan->tch.rep_facch[0].msg = NULL; - } else if (lchan->tch.rep_facch[1].msg && GSM_TDMA_FN_SUB(fn, lchan->tch.rep_facch[1].fn) >= 8) { + msg = lchan->rep_acch.dl_facch[0].msg; + lchan->rep_acch.dl_facch[0].msg = NULL; + } else if (lchan->rep_acch.dl_facch[1].msg && GSM_TDMA_FN_SUB(fn, lchan->rep_acch.dl_facch[1].fn) >= 8) { /* Re-use stored FACCH message buffer from SLOT #1 for repetition. */ - msg = lchan->tch.rep_facch[1].msg; - lchan->tch.rep_facch[1].msg = NULL; + msg = lchan->rep_acch.dl_facch[1].msg; + lchan->rep_acch.dl_facch[1].msg = NULL; } else { /* Fetch new FACCH from queue ... */ if (lapdm_phsap_dequeue_prim(le, &pp) < 0) @@ -1010,12 +1010,12 @@ return msg; /* ... and store the message buffer for repetition. */ - if (lchan->tch.rep_facch[0].msg == NULL) { - lchan->tch.rep_facch[0].msg = msgb_copy(msg, "rep_facch_0"); - lchan->tch.rep_facch[0].fn = fn; - } else if (lchan->tch.rep_facch[1].msg == NULL) { - lchan->tch.rep_facch[1].msg = msgb_copy(msg, "rep_facch_1"); - lchan->tch.rep_facch[1].fn = fn; + if (lchan->rep_acch.dl_facch[0].msg == NULL) { + lchan->rep_acch.dl_facch[0].msg = msgb_copy(msg, "rep_facch_0"); + lchan->rep_acch.dl_facch[0].fn = fn; + } else if (lchan->rep_acch.dl_facch[1].msg == NULL) { + lchan->rep_acch.dl_facch[1].msg = msgb_copy(msg, "rep_facch_1"); + lchan->rep_acch.dl_facch[1].fn = fn; } else { /* By definition 3GPP TS 05.02 does not allow more than two (for TCH/H only one) FACCH blocks * to be transmitted simultaniously. */ diff --git a/src/common/lchan.c b/src/common/lchan.c index 423ecc1..9f27409 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -292,10 +292,10 @@ lapdm_channel_exit(&lchan->lapdm_ch); /* Also ensure that there are no leftovers from repeated FACCH or * repeated SACCH that might cause memory leakage. */ - msgb_free(lchan->tch.rep_facch[0].msg); - msgb_free(lchan->tch.rep_facch[1].msg); - lchan->tch.rep_facch[0].msg = NULL; - lchan->tch.rep_facch[1].msg = NULL; + msgb_free(lchan->rep_acch.dl_facch[0].msg); + msgb_free(lchan->rep_acch.dl_facch[1].msg); + lchan->rep_acch.dl_facch[0].msg = NULL; + lchan->rep_acch.dl_facch[1].msg = NULL; msgb_free(lchan->rep_acch.dl_sacch_msg); lchan->rep_acch.dl_sacch_msg = NULL; /* fall through */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1469619528bb69c78c2fdc25bc1db208ead936d0 Gerrit-Change-Number: 25896 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 01:00:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 01:00:35 +0000 Subject: Change in osmo-bts[master]: [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25897 ) Change subject: [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP ...................................................................... [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP Change-Id: I370c8f95fb64eceb60a9dc2eae1412f8a0df0f4e Related: SYS#5319 --- M include/osmo-bts/lchan.h M src/common/rsl.c M src/common/scheduler.c 3 files changed, 8 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/97/25897/1 diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index a7e9004..b463b24 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -293,8 +293,8 @@ struct gsm_power_ctrl_params ms_dpc_params; struct gsm_power_ctrl_params bs_dpc_params; - /* Temporary Overpower for SACCH/FACCH */ - uint8_t bs_acch_overpower_db; + /* Temporary ACCH overpower capabilities */ + struct abis_rsl_osmo_temp_ovp_acch_cap top_acch_cap; struct msgb *pending_rel_ind_msg; diff --git a/src/common/rsl.c b/src/common/rsl.c index a0afc30..7fc4f3e 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1592,18 +1592,17 @@ static int parse_temporary_overpower_acch_capability(struct gsm_lchan *lchan, const struct tlv_parsed *tp) { - struct abis_rsl_osmo_temp_ovp_acch_cap *top; + memset(&lchan->top_acch_cap, 0, sizeof(lchan->top_acch_cap)); - lchan->bs_acch_overpower_db = 0; - - if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP, sizeof(*top))) + if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP, sizeof(lchan->top_acch_cap))) return 0; if (!osmo_bts_has_feature(lchan->ts->trx->bts->features, BTS_FEAT_ACCH_TEMP_OVP)) return -RSL_ERR_OPT_IE_ERROR; - top = (struct abis_rsl_osmo_temp_ovp_acch_cap *)TLVP_VAL(tp, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP); - lchan->bs_acch_overpower_db = top->overpower_db; + memcpy(&lchan->top_acch_cap, + TLVP_VAL(tp, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP), + sizeof(lchan->top_acch_cap)); return 0; } diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 2a729e4..463a5b8 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -1299,7 +1299,7 @@ struct trx_dl_burst_req *br) { const struct trx_chan_desc *desc = &trx_chan_desc[br->chan]; - const uint8_t overpower_db = lchan->bs_acch_overpower_db; + const uint8_t overpower_db = lchan->top_acch_cap.overpower_db; /* Current BS power reduction value in dB */ br->att = lchan->bs_power_ctrl.current; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I370c8f95fb64eceb60a9dc2eae1412f8a0df0f4e Gerrit-Change-Number: 25897 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 01:00:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 01:00:35 +0000 Subject: Change in osmo-bts[master]: [overpower] scheduler: handle {sacch, facch}_enabled flags References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25898 ) Change subject: [overpower] scheduler: handle {sacch,facch}_enabled flags ...................................................................... [overpower] scheduler: handle {sacch,facch}_enabled flags The new [bit-]fields in the RSL_IE_OSMO_TEMP_OVP_ACCH_CAP allow more fine-grained control over the overpower feature, which can be enabled: * for both SACCH and FACCH, * for SACCH only, or * for FACCH only. Change-Id: Iaaab675a20bbefece832d913963c8c5ae32ff80c Depends: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M src/common/scheduler.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/25898/1 diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 463a5b8..94900c6 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -1299,17 +1299,17 @@ struct trx_dl_burst_req *br) { const struct trx_chan_desc *desc = &trx_chan_desc[br->chan]; - const uint8_t overpower_db = lchan->top_acch_cap.overpower_db; /* Current BS power reduction value in dB */ br->att = lchan->bs_power_ctrl.current; /* Temporary Overpower for SACCH/FACCH bursts */ - if (overpower_db == 0) + if (lchan->top_acch_cap.overpower_db == 0) return; - if (desc->link_id == LID_SACCH || br->flags & TRX_BR_F_FACCH) { + if ((lchan->top_acch_cap.sacch_enabled && desc->link_id == LID_SACCH) + || (lchan->top_acch_cap.facch_enabled && br->flags & TRX_BR_F_FACCH)) { if (br->att > overpower_db) - br->att -= overpower_db; + br->att -= lchan->top_acch_cap.overpower_db; else br->att = 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaaab675a20bbefece832d913963c8c5ae32ff80c Gerrit-Change-Number: 25898 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 01:00:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 01:00:35 +0000 Subject: Change in osmo-bts[master]: [overpower] Turn it on and off depending on DL RxQual References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25899 ) Change subject: [overpower] Turn it on and off depending on DL RxQual ...................................................................... [overpower] Turn it on and off depending on DL RxQual Change-Id: Iaa812d4661ee17c4cd4a8c4ae4bd3e94c1a2e6cc Depends: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M include/osmo-bts/lchan.h M src/common/measurement.c M src/common/rsl.c M src/common/scheduler.c 4 files changed, 75 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/99/25899/1 diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index b463b24..b1e3a96 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -293,8 +293,9 @@ struct gsm_power_ctrl_params ms_dpc_params; struct gsm_power_ctrl_params bs_dpc_params; - /* Temporary ACCH overpower capabilities */ + /* Temporary ACCH overpower capabilities and state */ struct abis_rsl_osmo_temp_ovp_acch_cap top_acch_cap; + bool top_acch_active; struct msgb *pending_rel_ind_msg; diff --git a/src/common/measurement.c b/src/common/measurement.c index 52431c5..5036128 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -865,6 +865,56 @@ LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: active => inactive\n"); } +static void acch_overpower_active_decision(struct gsm_lchan *lchan, + const struct gsm48_hdr *gh) +{ + const bool old = lchan->top_acch_active; + const struct gsm48_meas_res *meas_res; + uint8_t upper, lower, rxqual; + + /* ACCH overpower is not allowed => nothing to do */ + if (lchan->top_acch_cap.overpower_db == 0) + return; + /* RxQual threshold is disabled => overpower is always on */ + if (lchan->top_acch_cap.rxqual == 0) + return; + + /* Parse MS measurement results */ + if (gh == NULL) + return; + /* Check if this is a Measurement Report */ + if (gh->proto_discr != GSM48_PDISC_RR) + return; + if (gh->msg_type != GSM48_MT_RR_MEAS_REP) + return; + meas_res = (const struct gsm48_meas_res *) gh->data; + if (meas_res->meas_valid != 0) /* 0 = valid */ + goto out; + + /* If DTx is active on Downlink, use the '-SUB' */ + if (meas_res->dtx_used) + rxqual = meas_res->rxqual_sub; + else /* ... otherwise use the '-FULL' */ + rxqual = meas_res->rxqual_full; + + upper = lchan->top_acch_cap.rxqual; + if (upper > 2) + lower = upper - 2; + else + lower = 0; + + if (rxqual >= upper) + lchan->top_acch_active = true; + else if (rxqual <= lower) + lchan->top_acch_active = false; + + if (lchan->top_acch_active != old) { + LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "Temporary ACCH overpower: %s\n", + lchan->top_acch_active ? "inactive => active" + : "active => inactive"); + } +} + /* Called every time a Measurement Result (TS 08.58 8.4.8) is received from * lower layers and has to be forwarded to BSC */ int handle_ms_meas_report(struct gsm_lchan *lchan, @@ -929,7 +979,10 @@ if (gh) lchan_bs_pwr_ctrl(lchan, gh); + /* Trigger ACCH repetition/overpower decision logic */ + /* TODO: parse RxQual once, feed it to both functions */ repeated_dl_facch_active_decision(lchan, gh); + acch_overpower_active_decision(lchan, gh); /* Reset state for next iteration */ lchan->tch.dtx.dl_active = false; diff --git a/src/common/rsl.c b/src/common/rsl.c index 7fc4f3e..1555579 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1604,6 +1604,11 @@ TLVP_VAL(tp, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP), sizeof(lchan->top_acch_cap)); + /* Simplify checking whether the overpower is enabled at all: allow + * testing just one parameter (overpower_db > 0) instead of all three. */ + if (!lchan->top_acch_cap.sacch_enabled && !lchan->top_acch_cap.facch_enabled) + lchan->top_acch_cap.overpower_db = 0; + return 0; } @@ -1923,6 +1928,13 @@ if (rc < 0) return rsl_tx_chan_act_acknack(lchan, -rc); + /* Take the first ACCH overpower decision (if allowed): it can be + * enabled immediately if the RxQual threshold is disabled (0). */ + if (lchan->top_acch_cap.overpower_db > 0) + lchan->top_acch_active = !lchan->top_acch_cap.rxqual; + else + lchan->top_acch_active = false; + /* actually activate the channel in the BTS */ rc = l1sap_chan_act(lchan->ts->trx, dch->chan_nr, &tp); if (rc < 0) @@ -2193,6 +2205,13 @@ if (rc < 0) return rsl_tx_mode_modif_nack(lchan, -rc); + /* Immediately disable ACCH overpower if the value is 0 dB, + * or enable if the RxQual threshold becomes disabled (0). */ + if (lchan->top_acch_cap.overpower_db == 0) + lchan->top_acch_active = false; + else if (lchan->top_acch_cap.rxqual == 0) + lchan->top_acch_active = true; + l1sap_chan_modify(lchan->ts->trx, dch->chan_nr); /* FIXME: delay this until L1 says OK? */ diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 94900c6..4f97db5 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -1304,7 +1304,7 @@ br->att = lchan->bs_power_ctrl.current; /* Temporary Overpower for SACCH/FACCH bursts */ - if (lchan->top_acch_cap.overpower_db == 0) + if (!lchan->top_acch_active) return; if ((lchan->top_acch_cap.sacch_enabled && desc->link_id == LID_SACCH) || (lchan->top_acch_cap.facch_enabled && br->flags & TRX_BR_F_FACCH)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25899 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaa812d4661ee17c4cd4a8c4ae4bd3e94c1a2e6cc Gerrit-Change-Number: 25899 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 07:15:11 2021 From: gerrit-no-reply at lists.osmocom.org (herlesupreeth) Date: Fri, 22 Oct 2021 07:15:11 +0000 Subject: Change in pysim[master]: ARA-M related command support In-Reply-To: References: Message-ID: herlesupreeth has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25885 ) Change subject: ARA-M related command support ...................................................................... Patch Set 1: Code-Review+1 Nice addition. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25885 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ia9107a4629c3d68320f32bbd4dd26e1f430717da Gerrit-Change-Number: 25885 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: herlesupreeth Gerrit-Comment-Date: Fri, 22 Oct 2021 07:15:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Fri Oct 22 08:59:21 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 22 Oct 2021 08:59:21 +0000 Subject: Build failure of network:osmocom:nightly/simtrace2 in Debian_11/i586 In-Reply-To: References: Message-ID: <61727d71b6abf_56852abb46b54600470516@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/simtrace2/Debian_11/i586 Package network:osmocom:nightly/simtrace2 failed to build in Debian_11/i586 Check out the package for editing: osc checkout network:osmocom:nightly simtrace2 Last lines of build log: [ 15s] swapon /dev/vdb [ 15s] WARNING: udev not running, creating extra device nodes [ 15s] logging output to //.build.log... [ 15s] processing recipe /.build-srcdir/simtrace2_0.7.0.157.17bf.202110210026.dsc ... [ 15s] init_buildsystem --configdir /.build/configs --cachedir /var/cache/build /.build-srcdir/simtrace2_0.7.0.157.17bf.202110210026.dsc build ... [ 15s] running base-files postinstall script [ 15s] chown: invalid user: 'root:root' [ 15s] running base-passwd preinstall script [ 15s] running base-passwd postinstall script [ 16s] running gawk postinstall script [ 16s] running user-setup postinstall script [ 16s] querying package ids... [ 17s] [1/222] installing autotools-dev-20180224.1+nmu1 [ 17s] [2/222] installing binutils-common-2.35.2-2 [ 17s] [3/222] installing gcc-10-base-10.2.1-6 [ 17s] [4/222] installing git-man-1:2.30.2-1 [ 17s] [5/222] installing libaudit-common-1:3.0-2 [ 17s] [6/222] installing libmagic-mgc-1:5.39-3 [ 17s] [7/222] installing libnewlib-dev-3.3.0-1 [ 18s] [8/222] installing libsemanage-common-3.1-1 [ 18s] [9/222] installing libtirpc-common-1.3.1-1 [ 18s] [10/222] installing linux-libc-dev-5.10.46-4 [28827s] qemu-kvm: terminating on signal 15 from pid 109625 () Job seems to be stuck here, killed. (after 28800 seconds of inactivity) [28827s] ### VM INTERACTION END ### [28827s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [28827s] or the build host has a kernel or hardware problem... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Oct 22 09:30:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 22 Oct 2021 09:30:06 +0000 Subject: Change in osmo-bts[master]: rsl: rsl_tx_meas_res() does not change l3, make it const In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25889 ) Change subject: rsl: rsl_tx_meas_res() does not change l3, make it const ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie60a34f90f7872464e503dc7b56935aee95f0f80 Gerrit-Change-Number: 25889 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 22 Oct 2021 09:30:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 09:30:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 22 Oct 2021 09:30:29 +0000 Subject: Change in osmo-bts[master]: rsl: send NACK if BTS_FEAT_ACCH_REP is not supported In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25890 ) Change subject: rsl: send NACK if BTS_FEAT_ACCH_REP is not supported ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7993cf7842ffde561f2bdc50f56516c3a188b2bc Gerrit-Change-Number: 25890 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 22 Oct 2021 09:30:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 09:30:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 22 Oct 2021 09:30:48 +0000 Subject: Change in osmo-bts[master]: measurement: handle_ms_meas_report() accepts const gh In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25891 ) Change subject: measurement: handle_ms_meas_report() accepts const gh ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iba37c1a92b8b17a8ba8c958fb6c296747578cb1b Gerrit-Change-Number: 25891 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 22 Oct 2021 09:30:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 09:31:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 22 Oct 2021 09:31:18 +0000 Subject: Change in osmo-bts[master]: measurement: move repeated_dl_facch_active_decision() here In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25892 ) Change subject: measurement: move repeated_dl_facch_active_decision() here ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibd5377ce642e49161f320ac8c33e9f966b3ddfaf Gerrit-Change-Number: 25892 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 22 Oct 2021 09:31:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 09:31:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 22 Oct 2021 09:31:48 +0000 Subject: Change in osmo-bts[master]: measurement: make sure that DL measurements are valid In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25893 ) Change subject: measurement: make sure that DL measurements are valid ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0d72b454f2b770d5762303fb70a15a8cdc9d07d7 Gerrit-Change-Number: 25893 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 22 Oct 2021 09:31:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 09:32:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 22 Oct 2021 09:32:02 +0000 Subject: Change in osmo-bts[master]: cosmetic: s/repeated_acch_capability/rep_acch_cap/g In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25894 ) Change subject: cosmetic: s/repeated_acch_capability/rep_acch_cap/g ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib1d51f91139b4c2fe794e37fc8543b2d7a9b9c07 Gerrit-Change-Number: 25894 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 22 Oct 2021 09:32:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 09:32:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 22 Oct 2021 09:32:21 +0000 Subject: Change in osmo-bts[master]: struct gsm_lchan: group ACCH repetition state fields In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25895 ) Change subject: struct gsm_lchan: group ACCH repetition state fields ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2680c88f2a51b64f085a92233bc125338622babf Gerrit-Change-Number: 25895 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 22 Oct 2021 09:32:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 09:32:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 22 Oct 2021 09:32:40 +0000 Subject: Change in osmo-bts[master]: struct gsm_lchan: move tch.rep_facch to rep_acch.dl_facch In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25896 ) Change subject: struct gsm_lchan: move tch.rep_facch to rep_acch.dl_facch ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1469619528bb69c78c2fdc25bc1db208ead936d0 Gerrit-Change-Number: 25896 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 22 Oct 2021 09:32:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:05:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:05:58 +0000 Subject: Change in libosmocore[master]: gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25866 ) Change subject: gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia28293a12de0af71f55e701fb65c46e905dae217 Gerrit-Change-Number: 25866 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 13:05:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:07:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:07:01 +0000 Subject: Change in osmo-iuh[master]: cosmetic: src/ranap/Makefile.am: Drop trailing whitespace In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25883 ) Change subject: cosmetic: src/ranap/Makefile.am: Drop trailing whitespace ...................................................................... cosmetic: src/ranap/Makefile.am: Drop trailing whitespace Change-Id: I934b7be7ca1fac05410df6640428ee8e9c70c3e7 --- M src/ranap/Makefile.am 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/ranap/Makefile.am b/src/ranap/Makefile.am index 0fb3cdf..0bb36a0 100644 --- a/src/ranap/Makefile.am +++ b/src/ranap/Makefile.am @@ -1188,4 +1188,3 @@ sed -i 's/Member/MemberN/' RANAP_RABDataVolumeReport.[ch] # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/ranap $(ASN_MODULE_INC) - -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25883 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I934b7be7ca1fac05410df6640428ee8e9c70c3e7 Gerrit-Change-Number: 25883 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:07:02 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:07:02 +0000 Subject: Change in osmo-iuh[master]: src/tests/Makefile.am: Drop reference to non-existent RANAP_FILES var In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25884 ) Change subject: src/tests/Makefile.am: Drop reference to non-existent RANAP_FILES var ...................................................................... src/tests/Makefile.am: Drop reference to non-existent RANAP_FILES var It was no longer needed since .la was used. Change-Id: I3f196d5c2bb35826709bfc32d10e6b3683b552ee --- M src/tests/Makefile.am 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 72a3300..28eedb9 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -23,11 +23,11 @@ hnb_test_SOURCES = $(HNBAP_FILES) $(RUA_FILES) hnb-test.c test_common.c hnb-test-ranap.c hnb-test-rua.c hnb_test_LDADD = $(COMMON_LIBS) $(top_builddir)/src/hnbap/libosmo-asn1-hnbap.a $(top_builddir)/src/rua/libosmo-asn1-rua.a $(top_builddir)/src/libosmo-ranap.la -test_ranap_SOURCES = $(RANAP_FILES) test-ranap.c test_common.c +test_ranap_SOURCES = test-ranap.c test_common.c test_ranap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la # TODO: re-add using SCCP? -#dummy_cn_SOURCES = $(RANAP_FILES) test_common.c dummy_cn_sua.c +#dummy_cn_SOURCES = test_common.c dummy_cn_sua.c #dummy_cn_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la $(top_builddir)/src/libosmo-ranap.la: -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25884 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I3f196d5c2bb35826709bfc32d10e6b3683b552ee Gerrit-Change-Number: 25884 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:09:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:09:09 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-hnbap as a public shared library In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25880 ) Change subject: Provide libosmo-hnbap as a public shared library ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-iuh/+/25880/4/debian/control File debian/control: https://gerrit.osmocom.org/c/osmo-iuh/+/25880/4/debian/control at 54 PS4, Line 54: HNBAP, RUA, RANAP > Is it correct? It looks like we gonna have one library for each of the APs in braces. [?] Well it was neither the case before, this is just a generic description. So in any case updating the xistent one and new ones would be a different separate patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 Gerrit-Change-Number: 25880 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 22 Oct 2021 13:09:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:09:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:09:38 +0000 Subject: Change in osmo-ci[master]: coverity: allow passing configure args to build_default() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25856 ) Change subject: coverity: allow passing configure args to build_default() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I79aa2c65cd0d3b06c0bd9ec4f44288b21e40c3b7 Gerrit-Change-Number: 25856 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 13:09:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:11:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:11:12 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: add more ACCH overpower related parameters In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25869 ) Change subject: [overpower] VTY: add more ACCH overpower related parameters ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25869/3/src/osmo-bsc/bts_vty.c File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25869/3/src/osmo-bsc/bts_vty.c at 4309 PS3, Line 4309: mode, top->overpower_db, VTY_NEWLINE); > This should not happen (see cfg_bts_top_dl_acch_cmd below). [?] ASSERT: good idea imho, even if it's only for informative purposes. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Gerrit-Change-Number: 25869 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 13:11:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:11:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:11:19 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: add more ACCH overpower related parameters In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25869 ) Change subject: [overpower] VTY: add more ACCH overpower related parameters ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Gerrit-Change-Number: 25869 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 13:11:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:12:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:12:10 +0000 Subject: Change in osmo-bsc[master]: [overpower] Add VTY transcript tests for all commands In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25870 ) Change subject: [overpower] Add VTY transcript tests for all commands ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefbdbeb36a4692102dbb76d86113a183e4f381a7 Gerrit-Change-Number: 25870 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 13:12:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:16:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:16:12 +0000 Subject: Change in osmo-bts[master]: [overpower] scheduler: handle {sacch, facch}_enabled flags In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25898 ) Change subject: [overpower] scheduler: handle {sacch,facch}_enabled flags ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25898/1/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/25898/1/src/common/scheduler.c at 1310 PS1, Line 1310: || (lchan->top_acch_cap.facch_enabled && br->flags & TRX_BR_F_FACCH)) { this way of writting the || before the initial "(" looks wrong to me. Do it: """ if ((lchan->top_acch_cap.sacch_enabled && desc->link_id == LID_SACCH) || (lchan->top_acch_cap.facch_enabled && br->flags & TRX_BR_F_FACCH)) """ Or what I call Neel's style: ;) """ if ((lchan->top_acch_cap.sacch_enabled && desc->link_id == LID_SACCH) || (lchan->top_acch_cap.facch_enabled && br->flags & TRX_BR_F_FACCH)) """ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaaab675a20bbefece832d913963c8c5ae32ff80c Gerrit-Change-Number: 25898 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 13:16:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:17:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:17:13 +0000 Subject: Change in osmo-bts[master]: rsl: rsl_tx_meas_res() does not change l3, make it const In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25889 ) Change subject: rsl: rsl_tx_meas_res() does not change l3, make it const ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie60a34f90f7872464e503dc7b56935aee95f0f80 Gerrit-Change-Number: 25889 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 13:17:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:17:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:17:55 +0000 Subject: Change in osmo-bts[master]: rsl: send NACK if BTS_FEAT_ACCH_REP is not supported In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25890 ) Change subject: rsl: send NACK if BTS_FEAT_ACCH_REP is not supported ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7993cf7842ffde561f2bdc50f56516c3a188b2bc Gerrit-Change-Number: 25890 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 13:17:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:18:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:18:21 +0000 Subject: Change in osmo-bts[master]: measurement: handle_ms_meas_report() accepts const gh In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25891 ) Change subject: measurement: handle_ms_meas_report() accepts const gh ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iba37c1a92b8b17a8ba8c958fb6c296747578cb1b Gerrit-Change-Number: 25891 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 13:18:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:19:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:19:42 +0000 Subject: Change in osmo-bts[master]: measurement: move repeated_dl_facch_active_decision() here In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25892 ) Change subject: measurement: move repeated_dl_facch_active_decision() here ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibd5377ce642e49161f320ac8c33e9f966b3ddfaf Gerrit-Change-Number: 25892 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 13:19:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:20:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:20:05 +0000 Subject: Change in osmo-bts[master]: measurement: make sure that DL measurements are valid In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25893 ) Change subject: measurement: make sure that DL measurements are valid ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0d72b454f2b770d5762303fb70a15a8cdc9d07d7 Gerrit-Change-Number: 25893 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 13:20:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:20:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:20:37 +0000 Subject: Change in osmo-bts[master]: cosmetic: s/repeated_acch_capability/rep_acch_cap/g In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25894 ) Change subject: cosmetic: s/repeated_acch_capability/rep_acch_cap/g ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib1d51f91139b4c2fe794e37fc8543b2d7a9b9c07 Gerrit-Change-Number: 25894 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 13:20:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:21:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:21:57 +0000 Subject: Change in osmo-bts[master]: struct gsm_lchan: group ACCH repetition state fields In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25895 ) Change subject: struct gsm_lchan: group ACCH repetition state fields ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25895/1/include/osmo-bts/lchan.h File include/osmo-bts/lchan.h: https://gerrit.osmocom.org/c/osmo-bts/+/25895/1/include/osmo-bts/lchan.h at 314 PS1, Line 314: /* Message buffer to store DL-SACCH repeation candidate */ repeation means "repetition" here? I know it comes from previous state but you could fix it here since you are anyway changing the line. Or submit a new commit. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2680c88f2a51b64f085a92233bc125338622babf Gerrit-Change-Number: 25895 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 13:21:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:23:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:23:16 +0000 Subject: Change in osmo-bts[master]: struct gsm_lchan: move tch.rep_facch to rep_acch.dl_facch In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25896 ) Change subject: struct gsm_lchan: move tch.rep_facch to rep_acch.dl_facch ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1469619528bb69c78c2fdc25bc1db208ead936d0 Gerrit-Change-Number: 25896 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 13:23:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:43:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:43:29 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-hnbap as a public shared library In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/25880 to look at the new patch set (#5). Change subject: Provide libosmo-hnbap as a public shared library ...................................................................... Provide libosmo-hnbap as a public shared library It is needed by the new osmo-hnodeb project. Related: SYS#5516 Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 --- M Makefile.am M configure.ac M contrib/osmo-iuh.spec.in M debian/control A debian/libosmo-hnbap-dev.install A debian/libosmo-hnbap0.install M debian/rules M include/osmocom/hnbap/Makefile.am A libosmo-hnbap.pc.in M src/Makefile.am M src/hnbap/Makefile.am M src/tests/Makefile.am 12 files changed, 84 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/80/25880/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 Gerrit-Change-Number: 25880 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:43:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:43:29 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-rua as a public shared library In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/25887 to look at the new patch set (#2). Change subject: Provide libosmo-rua as a public shared library ...................................................................... Provide libosmo-rua as a public shared library It is needed by the new osmo-hnodeb project. Related: SYS#5516 Change-Id: I8b800baacbfe3a3c424c51b418b5ac2e2848b3ba --- M Makefile.am M configure.ac M contrib/osmo-iuh.spec.in M debian/control A debian/libosmo-rua-dev.install A debian/libosmo-rua0.install M debian/rules M include/osmocom/rua/Makefile.am A libosmo-rua.pc.in M src/Makefile.am M src/rua/Makefile.am M src/tests/Makefile.am 12 files changed, 81 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/87/25887/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I8b800baacbfe3a3c424c51b418b5ac2e2848b3ba Gerrit-Change-Number: 25887 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:43:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:43:29 +0000 Subject: Change in osmo-iuh[master]: RFC: Add lib prefix to structs with duplicated names In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/25888 to look at the new patch set (#3). Change subject: RFC: Add lib prefix to structs with duplicated names ...................................................................... RFC: Add lib prefix to structs with duplicated names Otherwise it's impossible to include eg. rua/*.h and ranap/*.h since they will collision and gcc will error. Following commands are used to generate this patch: """ for t in hnbap ranap rua sabp; do ag -l "struct Member" include/osmocom/$t src/$t/ | xargs sed -i "s/struct Member/struct ${t}_Member/g"; done for t in hnbap ranap rua sabp; do ag -l "struct errorIndication_ies" include/osmocom/$t src/$t/ | xargs sed -i "s/struct errorIndication_ies/struct ${t}_errorIndication_ies/g"; done for t in hnbap ranap rua sabp; do ag -l "struct directTransfer_ies" include/osmocom/$t src/$t/ | xargs sed -i "s/struct directTransfer_ies/struct ${t}_directTransfer_ies/g"; done for t in hnbap ranap rua sabp; do ag -l "struct privateMessage_ies" include/osmocom/$t src/$t/ | xargs sed -i "s/struct privateMessage_ies/struct ${t}_privateMessage_ies/g"; done """ Change-Id: I552fc028c7d08c880fdb844ece75816602c5bb67 --- M include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h M include/osmocom/hnbap/ErrorIndication.h M include/osmocom/hnbap/PrivateMessage.h M include/osmocom/ranap/RANAP_AuthorisedPLMNs.h M include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h M include/osmocom/ranap/RANAP_DataVolumeList.h M include/osmocom/ranap/RANAP_DirectTransfer.h M include/osmocom/ranap/RANAP_EUTRANFrequencies.h M include/osmocom/ranap/RANAP_ErrorIndication.h M include/osmocom/ranap/RANAP_GA-Polygon.h M include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h M include/osmocom/ranap/RANAP_LA-LIST.h M include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h M include/osmocom/ranap/RANAP_MessageStructure.h M include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h M include/osmocom/ranap/RANAP_PrivateMessage.h M include/osmocom/ranap/RANAP_RABDataVolumeReport.h M include/osmocom/ranap/RANAP_RABParametersList.h M include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h M include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h M include/osmocom/rua/RUA_DirectTransfer.h M include/osmocom/rua/RUA_ErrorIndication.h M include/osmocom/rua/RUA_PrivateMessage.h M include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h M include/osmocom/sabp/SABP_MessageStructure.h M src/hnbap/CriticalityDiagnostics-IE-List.c M src/hnbap/ErrorIndication.c M src/hnbap/PrivateMessage.c M src/ranap/RANAP_AuthorisedPLMNs.c M src/ranap/RANAP_CriticalityDiagnostics-IE-List.c M src/ranap/RANAP_DataVolumeList.c M src/ranap/RANAP_DirectTransfer.c M src/ranap/RANAP_EUTRANFrequencies.c M src/ranap/RANAP_ErrorIndication.c M src/ranap/RANAP_GA-Polygon.c M src/ranap/RANAP_JoinedMBMSBearerService-IEs.c M src/ranap/RANAP_LA-LIST.c M src/ranap/RANAP_LeftMBMSBearerService-IEs.c M src/ranap/RANAP_MessageStructure.c M src/ranap/RANAP_PLMNs-in-shared-network.c M src/ranap/RANAP_PrivateMessage.c M src/ranap/RANAP_RABDataVolumeReport.c M src/ranap/RANAP_RABParametersList.c M src/ranap/RANAP_UnsuccessfulLinking-IEs.c M src/rua/RUA_CriticalityDiagnostics-IE-List.c M src/rua/RUA_DirectTransfer.c M src/rua/RUA_ErrorIndication.c M src/rua/RUA_PrivateMessage.c M src/sabp/SABP_CriticalityDiagnostics-IE-List.c M src/sabp/SABP_MessageStructure.c 50 files changed, 130 insertions(+), 130 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/88/25888/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I552fc028c7d08c880fdb844ece75816602c5bb67 Gerrit-Change-Number: 25888 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:43:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 13:43:31 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Fix trailing whitespace References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25900 ) Change subject: src/*/Makefile.am: Fix trailing whitespace ...................................................................... src/*/Makefile.am: Fix trailing whitespace Change-Id: Ie22df146cfaf6aaf9c7cef884a964e6a3dfcc8ad --- M src/rua/Makefile.am M src/tests/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/00/25900/1 diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am index d8fb042..1623178 100644 --- a/src/rua/Makefile.am +++ b/src/rua/Makefile.am @@ -86,4 +86,3 @@ @rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.* # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/rua $(ASN_MODULE_INC) - diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 28eedb9..003ea51 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -74,4 +74,3 @@ $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 $(AUTOTEST) -I '$(top_srcdir)/include' -I '$(srcdir)' -o $@.tmp $@.at mv $@.tmp $@ - -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ie22df146cfaf6aaf9c7cef884a964e6a3dfcc8ad Gerrit-Change-Number: 25900 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:52:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 13:52:04 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: add more ACCH overpower related parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25869 ) Change subject: [overpower] VTY: add more ACCH overpower related parameters ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25869/3/src/osmo-bsc/bts_vty.c File src/osmo-bsc/bts_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25869/3/src/osmo-bsc/bts_vty.c at 4309 PS3, Line 4309: mode, top->overpower_db, VTY_NEWLINE); > ASSERT: good idea imho, even if it's only for informative purposes. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Gerrit-Change-Number: 25869 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 13:52:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:54:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 13:54:21 +0000 Subject: Change in osmo-bts[master]: rsl: rsl_tx_meas_res() does not change l3, make it const In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25889 ) Change subject: rsl: rsl_tx_meas_res() does not change l3, make it const ...................................................................... rsl: rsl_tx_meas_res() does not change l3, make it const Change-Id: Ie60a34f90f7872464e503dc7b56935aee95f0f80 --- M include/osmo-bts/rsl.h M src/common/rsl.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmo-bts/rsl.h b/include/osmo-bts/rsl.h index 9d5ec31..dcd476c 100644 --- a/include/osmo-bts/rsl.h +++ b/include/osmo-bts/rsl.h @@ -32,6 +32,6 @@ int rsl_tx_cbch_load_indication(struct gsm_bts *bts, bool ext_cbch, bool overflow, uint8_t amount); -int rsl_tx_meas_res(struct gsm_lchan *lchan, uint8_t *l3, int l3_len, int timing_offset); +int rsl_tx_meas_res(struct gsm_lchan *lchan, const uint8_t *l3, int l3_len, int timing_offset); #endif // _RSL_H */ diff --git a/src/common/rsl.c b/src/common/rsl.c index 145cc8a..d14395b 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3464,7 +3464,7 @@ } __attribute__((packed)); /* Compose and send 8.4.8 MEASUREMENT RESult via RSL. (timing_offset=-1 -> not present) */ -int rsl_tx_meas_res(struct gsm_lchan *lchan, uint8_t *l3, int l3_len, int timing_offset) +int rsl_tx_meas_res(struct gsm_lchan *lchan, const uint8_t *l3, int l3_len, int timing_offset) { struct msgb *msg; uint8_t meas_res[16]; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie60a34f90f7872464e503dc7b56935aee95f0f80 Gerrit-Change-Number: 25889 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:54:22 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 13:54:22 +0000 Subject: Change in osmo-bts[master]: rsl: send NACK if BTS_FEAT_ACCH_REP is not supported In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25890 ) Change subject: rsl: send NACK if BTS_FEAT_ACCH_REP is not supported ...................................................................... rsl: send NACK if BTS_FEAT_ACCH_REP is not supported Change-Id: I7993cf7842ffde561f2bdc50f56516c3a188b2bc Related: SYS#5114 --- M src/common/rsl.c 1 file changed, 13 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index d14395b..3cbfff6 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1566,7 +1566,7 @@ } /* Parse RSL_IE_OSMO_REP_ACCH_CAP */ -static void parse_repeated_acch_capability(struct gsm_lchan *lchan, struct tlv_parsed *tp) +static int parse_repeated_acch_capability(struct gsm_lchan *lchan, struct tlv_parsed *tp) { /* 3GPP TS 24.008, section 10.5.1.7 defines a Repeated ACCH Capability * bit that indicates if REPEATED FACCH/SACCH is supported or not. @@ -1577,10 +1577,15 @@ memset(&lchan->repeated_acch_capability, 0, sizeof(lchan->repeated_acch_capability)); if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_REP_ACCH_CAP, sizeof(lchan->repeated_acch_capability))) - return; + return 0; + + if (!osmo_bts_has_feature(lchan->ts->trx->bts->features, BTS_FEAT_ACCH_REP)) + return -RSL_ERR_OPT_IE_ERROR; memcpy(&lchan->repeated_acch_capability, TLVP_VAL(tp, RSL_IE_OSMO_REP_ACCH_CAP), sizeof(lchan->repeated_acch_capability)); + + return 0; } /* Parse RSL_IE_OSMO_TOP_ACCH_CAP */ @@ -1912,7 +1917,9 @@ /* Remember to send an RSL ACK once the lchan is active */ lchan->rel_act_kind = LCHAN_REL_ACT_RSL; - parse_repeated_acch_capability(lchan, &tp); + rc = parse_repeated_acch_capability(lchan, &tp); + if (rc < 0) + return rsl_tx_chan_act_acknack(lchan, -rc); rc = parse_temporary_overpower_acch_capability(lchan, &tp); if (rc < 0) return rsl_tx_chan_act_acknack(lchan, -rc); @@ -2180,7 +2187,9 @@ /* 9.3.53 MultiRate Control */ /* 9.3.54 Supported Codec Types */ - parse_repeated_acch_capability(lchan, &tp); + rc = parse_repeated_acch_capability(lchan, &tp); + if (rc < 0) + return rsl_tx_mode_modif_nack(lchan, -rc); rc = parse_temporary_overpower_acch_capability(lchan, &tp); if (rc < 0) return rsl_tx_mode_modif_nack(lchan, -rc); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25890 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7993cf7842ffde561f2bdc50f56516c3a188b2bc Gerrit-Change-Number: 25890 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:54:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 13:54:24 +0000 Subject: Change in osmo-bts[master]: measurement: handle_ms_meas_report() accepts const gh In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25891 ) Change subject: measurement: handle_ms_meas_report() accepts const gh ...................................................................... measurement: handle_ms_meas_report() accepts const gh Change-Id: Iba37c1a92b8b17a8ba8c958fb6c296747578cb1b --- M include/osmo-bts/measurement.h M src/common/measurement.c 2 files changed, 8 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index 481b7be..f63a05a 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -20,6 +20,8 @@ int is_meas_complete(struct gsm_lchan *lchan, uint32_t fn); -int handle_ms_meas_report(struct gsm_lchan *lchan, struct gsm48_hdr *gh, unsigned int len); +int handle_ms_meas_report(struct gsm_lchan *lchan, + const struct gsm48_hdr *gh, + unsigned int len); #endif diff --git a/src/common/measurement.c b/src/common/measurement.c index 87e853e..0a8a182 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -791,7 +791,9 @@ /* Called every time a Measurement Result (TS 08.58 8.4.8) is received from * lower layers and has to be forwarded to BSC */ -int handle_ms_meas_report(struct gsm_lchan *lchan, struct gsm48_hdr *gh, unsigned int len) +int handle_ms_meas_report(struct gsm_lchan *lchan, + const struct gsm48_hdr *gh, + unsigned int len) { int timing_offset, rc; struct lapdm_entity *le; @@ -804,7 +806,7 @@ le = &lchan->lapdm_ch.lapdm_acch; timing_offset = ms_to_valid(lchan) ? ms_to2rsl(lchan, le) : -1; - rc = rsl_tx_meas_res(lchan, (uint8_t *)gh, len, timing_offset); + rc = rsl_tx_meas_res(lchan, (const uint8_t *)gh, len, timing_offset); if (rc == 0) /* Count successful transmissions */ lchan->meas.res_nr++; @@ -849,7 +851,7 @@ lchan_ms_ta_ctrl(lchan, ms_ta, lchan->meas.ms_toa256); lchan_ms_pwr_ctrl(lchan, ms_pwr, ul_rssi, ul_ci_cb); if (gh) - lchan_bs_pwr_ctrl(lchan, (const struct gsm48_hdr *) gh); + lchan_bs_pwr_ctrl(lchan, gh); /* Reset state for next iteration */ lchan->tch.dtx.dl_active = false; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iba37c1a92b8b17a8ba8c958fb6c296747578cb1b Gerrit-Change-Number: 25891 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:54:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 13:54:24 +0000 Subject: Change in osmo-bts[master]: measurement: move repeated_dl_facch_active_decision() here In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25892 ) Change subject: measurement: move repeated_dl_facch_active_decision() here ...................................................................... measurement: move repeated_dl_facch_active_decision() here For the sake of consistency, call repeated_dl_facch_active_decision() from handle_ms_meas_report(), so we have all functions using the measurement results for Downlink executed in a single place. Change-Id: Ibd5377ce642e49161f320ac8c33e9f966b3ddfaf Related: SYS#5114, SYS#5319 --- M include/osmo-bts/l1sap.h M src/common/l1sap.c M src/common/measurement.c M src/common/rsl.c 4 files changed, 76 insertions(+), 78 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h index f78d114..93c532f 100644 --- a/include/osmo-bts/l1sap.h +++ b/include/osmo-bts/l1sap.h @@ -144,7 +144,4 @@ int is_ccch_for_agch(struct gsm_bts_trx *trx, uint32_t fn); -void repeated_dl_facch_active_decision(struct gsm_lchan *lchan, - const uint8_t *l3, size_t l3_len); - #endif /* L1SAP_H */ diff --git a/src/common/l1sap.c b/src/common/l1sap.c index f5d2364..a6cd21d 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1026,80 +1026,6 @@ return msg; } -/* Decide if repeated FACCH should be applied or not. If RXQUAL level, that the - * MS reports is high enough, FACCH repetition is not needed. */ -void repeated_dl_facch_active_decision(struct gsm_lchan *lchan, const uint8_t *l3, - size_t l3_len) -{ - const struct gsm48_meas_res *meas_res; - uint8_t upper; - uint8_t lower; - uint8_t rxqual; - bool prev_repeated_dl_facch_active = lchan->repeated_dl_facch_active; - - /* This is an optimization so that we exit as quickly as possible if - * there are no FACCH repetition capabilities present. However If the - * repeated FACCH capabilities vanish for whatever reason, we must be - * sure that FACCH repetition is disabled. */ - if (!lchan->repeated_acch_capability.dl_facch_cmd - && !lchan->repeated_acch_capability.dl_facch_all) { - lchan->repeated_dl_facch_active = false; - goto out; - } - - /* Threshold disabled (always on) */ - if (lchan->repeated_acch_capability.rxqual == 0) { - lchan->repeated_dl_facch_active = true; - goto out; - } - - /* When the MS sets the SRR bit in the UL-SACCH L1 header - * (repeated SACCH requested) then it makes sense to enable - * FACCH repetition too. */ - if (lchan->meas.l1_info.srr_sro) { - lchan->repeated_dl_facch_active = true; - goto out; - } - - /* Parse MS measurement results */ - if (l3_len <= sizeof(struct gsm48_meas_res *) + 2) - goto out; - if (l3[0] != GSM48_PDISC_RR) - goto out; - if (l3[1] != GSM48_MT_RR_MEAS_REP) - goto out; - l3 += 2; - meas_res = (struct gsm48_meas_res *)l3; - - /* If the RXQUAL level at the MS drops under a certain threshold - * we enable FACCH repetition. */ - upper = lchan->repeated_acch_capability.rxqual; - if (upper > 2) - lower = lchan->repeated_acch_capability.rxqual - 2; - else - lower = 0; - - /* When downlink DTX is applied, use RXQUAL-SUB, otherwise use - * RXQUAL-FULL. */ - if (meas_res->dtx_used) - rxqual = meas_res->rxqual_sub; - else - rxqual = meas_res->rxqual_full; - - if (rxqual >= upper) - lchan->repeated_dl_facch_active = true; - else if (rxqual <= lower) - lchan->repeated_dl_facch_active = false; - -out: - if (lchan->repeated_dl_facch_active == prev_repeated_dl_facch_active) - return; - if (lchan->repeated_dl_facch_active) - LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: inactive => active\n"); - else - LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: active => inactive\n"); -} - /* Special dequeueing function with SACCH repetition (3GPP TS 44.006, section 11) */ static inline struct msgb *lapdm_phsap_dequeue_msg_sacch(struct gsm_lchan *lchan, struct lapdm_entity *le) { diff --git a/src/common/measurement.c b/src/common/measurement.c index 0a8a182..3a17869 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -789,6 +789,80 @@ return (lchan->ms_t_offs >= 0) || (lchan->p_offs >= 0); } +/* Decide if repeated FACCH should be applied or not. If RXQUAL level, that the + * MS reports is high enough, FACCH repetition is not needed. */ +static void repeated_dl_facch_active_decision(struct gsm_lchan *lchan, + const struct gsm48_hdr *gh) +{ + const struct gsm48_meas_res *meas_res; + uint8_t upper; + uint8_t lower; + uint8_t rxqual; + bool prev_repeated_dl_facch_active = lchan->repeated_dl_facch_active; + + /* This is an optimization so that we exit as quickly as possible if + * there are no FACCH repetition capabilities present. However If the + * repeated FACCH capabilities vanish for whatever reason, we must be + * sure that FACCH repetition is disabled. */ + if (!lchan->repeated_acch_capability.dl_facch_cmd + && !lchan->repeated_acch_capability.dl_facch_all) { + lchan->repeated_dl_facch_active = false; + goto out; + } + + /* Threshold disabled (always on) */ + if (lchan->repeated_acch_capability.rxqual == 0) { + lchan->repeated_dl_facch_active = true; + goto out; + } + + /* When the MS sets the SRR bit in the UL-SACCH L1 header + * (repeated SACCH requested) then it makes sense to enable + * FACCH repetition too. */ + if (lchan->meas.l1_info.srr_sro) { + lchan->repeated_dl_facch_active = true; + goto out; + } + + /* Parse MS measurement results */ + if (gh == NULL) + goto out; + /* Check if this is a Measurement Report */ + if (gh->proto_discr != GSM48_PDISC_RR) + goto out; + if (gh->msg_type != GSM48_MT_RR_MEAS_REP) + goto out; + meas_res = (const struct gsm48_meas_res *) gh->data; + + /* If the RXQUAL level at the MS drops under a certain threshold + * we enable FACCH repetition. */ + upper = lchan->repeated_acch_capability.rxqual; + if (upper > 2) + lower = lchan->repeated_acch_capability.rxqual - 2; + else + lower = 0; + + /* When downlink DTX is applied, use RXQUAL-SUB, otherwise use + * RXQUAL-FULL. */ + if (meas_res->dtx_used) + rxqual = meas_res->rxqual_sub; + else + rxqual = meas_res->rxqual_full; + + if (rxqual >= upper) + lchan->repeated_dl_facch_active = true; + else if (rxqual <= lower) + lchan->repeated_dl_facch_active = false; + +out: + if (lchan->repeated_dl_facch_active == prev_repeated_dl_facch_active) + return; + if (lchan->repeated_dl_facch_active) + LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: inactive => active\n"); + else + LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: active => inactive\n"); +} + /* Called every time a Measurement Result (TS 08.58 8.4.8) is received from * lower layers and has to be forwarded to BSC */ int handle_ms_meas_report(struct gsm_lchan *lchan, @@ -853,6 +927,8 @@ if (gh) lchan_bs_pwr_ctrl(lchan, gh); + repeated_dl_facch_active_decision(lchan, gh); + /* Reset state for next iteration */ lchan->tch.dtx.dl_active = false; lchan->meas.flags &= ~LC_UL_M_F_OSMO_EXT_VALID; diff --git a/src/common/rsl.c b/src/common/rsl.c index 3cbfff6..11f2f86 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3586,7 +3586,6 @@ return 0; } - repeated_dl_facch_active_decision(lchan, msgb_l3(msg), msgb_l3len(msg)); rc = handle_ms_meas_report(lchan, (struct gsm48_hdr *)msgb_l3(msg), msgb_l3len(msg)); msgb_free(msg); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibd5377ce642e49161f320ac8c33e9f966b3ddfaf Gerrit-Change-Number: 25892 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:54:25 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 13:54:25 +0000 Subject: Change in osmo-bts[master]: measurement: make sure that DL measurements are valid In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25893 ) Change subject: measurement: make sure that DL measurements are valid ...................................................................... measurement: make sure that DL measurements are valid In repeated_dl_facch_active_decision() we rely on the Measurement Report message, that in some cases may not contain valid Downlink measurements. In this case, we should simply ignore it. Change-Id: I0d72b454f2b770d5762303fb70a15a8cdc9d07d7 Related: SYS#5114 --- M src/common/measurement.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/common/measurement.c b/src/common/measurement.c index 3a17869..626f3b1 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -833,6 +833,8 @@ if (gh->msg_type != GSM48_MT_RR_MEAS_REP) goto out; meas_res = (const struct gsm48_meas_res *) gh->data; + if (meas_res->meas_valid != 0) /* 0 = valid */ + goto out; /* If the RXQUAL level at the MS drops under a certain threshold * we enable FACCH repetition. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0d72b454f2b770d5762303fb70a15a8cdc9d07d7 Gerrit-Change-Number: 25893 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:54:25 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 13:54:25 +0000 Subject: Change in osmo-bts[master]: cosmetic: s/repeated_acch_capability/rep_acch_cap/g In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25894 ) Change subject: cosmetic: s/repeated_acch_capability/rep_acch_cap/g ...................................................................... cosmetic: s/repeated_acch_capability/rep_acch_cap/g Shorter symbol names are easier to read. Change-Id: Ib1d51f91139b4c2fe794e37fc8543b2d7a9b9c07 Related: SYS#5114 --- M include/osmo-bts/lchan.h M src/common/l1sap.c M src/common/lchan.c M src/common/measurement.c M src/common/rsl.c M src/common/vty.c 6 files changed, 23 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index ccc6760..03b3144 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -304,7 +304,7 @@ /* ECU (Error Concealment Unit) state */ struct osmo_ecu_state *ecu_state; - struct abis_rsl_osmo_rep_acch_cap repeated_acch_capability; + struct abis_rsl_osmo_rep_acch_cap rep_acch_cap; bool repeated_dl_facch_active; bool repeated_ul_sacch_active; bool repeated_dl_sacch_active; diff --git a/src/common/l1sap.c b/src/common/l1sap.c index a6cd21d..cbe43b4 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1006,7 +1006,7 @@ * If the MS explicitly indicated that repeated ACCH is * supported, than all FACCH frames may be repeated * see also: 3GPP TS 44.006, section 10.3). */ - if (!(lchan->repeated_acch_capability.dl_facch_all || msg->data[0] & 0x02)) + if (!(lchan->rep_acch_cap.dl_facch_all || msg->data[0] & 0x02)) return msg; /* ... and store the message buffer for repetition. */ @@ -1147,7 +1147,7 @@ p[0] |= 0x40; /* See also: 3GPP TS 44.004, section 7.1 */ p[1] = lchan->ta_ctrl.current; le = &lchan->lapdm_ch.lapdm_acch; - if (lchan->repeated_acch_capability.dl_sacch) { + if (lchan->rep_acch_cap.dl_sacch) { /* Check if MS requests SACCH repetition and update state accordingly */ if (lchan->meas.l1_info.srr_sro) { if (lchan->repeated_dl_sacch_active == false) @@ -1433,13 +1433,13 @@ * there are no uplink SACCH repetition capabilities present. * However If the repeated UL-SACCH capabilities vanish for whatever * reason, we must be sure that UL-SACCH repetition is disabled. */ - if (!lchan->repeated_acch_capability.ul_sacch) { + if (!lchan->rep_acch_cap.ul_sacch) { lchan->repeated_ul_sacch_active = false; goto out; } /* Threshold disabled (repetition is always on) */ - if (lchan->repeated_acch_capability.rxqual == 0) { + if (lchan->rep_acch_cap.rxqual == 0) { lchan->repeated_ul_sacch_active = true; goto out; } @@ -1454,8 +1454,8 @@ * of the table in GSM 05.08, section 8.2.4. The lower vector is just * the upper vector shifted by 2. */ - upper = ber10k_by_rxqual_upper[lchan->repeated_acch_capability.rxqual]; - lower = ber10k_by_rxqual_lower[lchan->repeated_acch_capability.rxqual]; + upper = ber10k_by_rxqual_upper[lchan->rep_acch_cap.rxqual]; + lower = ber10k_by_rxqual_lower[lchan->rep_acch_cap.rxqual]; /* If upper/rxqual == 0, then repeated UL-SACCH is always on */ if (ber10k >= upper) diff --git a/src/common/lchan.c b/src/common/lchan.c index e532615..9661010 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -67,7 +67,7 @@ t200_ms_acch[DL_SAPI0] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; t200_ms_acch[DL_SAPI3] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; - if (lchan->repeated_acch_capability.dl_facch_all && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { + if (lchan->rep_acch_cap.dl_facch_all && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { t200_ms_acch[DL_SAPI0] *= 2; t200_ms_acch[DL_SAPI3] *= 2; } diff --git a/src/common/measurement.c b/src/common/measurement.c index 626f3b1..ec06131 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -804,14 +804,14 @@ * there are no FACCH repetition capabilities present. However If the * repeated FACCH capabilities vanish for whatever reason, we must be * sure that FACCH repetition is disabled. */ - if (!lchan->repeated_acch_capability.dl_facch_cmd - && !lchan->repeated_acch_capability.dl_facch_all) { + if (!lchan->rep_acch_cap.dl_facch_cmd + && !lchan->rep_acch_cap.dl_facch_all) { lchan->repeated_dl_facch_active = false; goto out; } /* Threshold disabled (always on) */ - if (lchan->repeated_acch_capability.rxqual == 0) { + if (lchan->rep_acch_cap.rxqual == 0) { lchan->repeated_dl_facch_active = true; goto out; } @@ -838,9 +838,9 @@ /* If the RXQUAL level at the MS drops under a certain threshold * we enable FACCH repetition. */ - upper = lchan->repeated_acch_capability.rxqual; + upper = lchan->rep_acch_cap.rxqual; if (upper > 2) - lower = lchan->repeated_acch_capability.rxqual - 2; + lower = lchan->rep_acch_cap.rxqual - 2; else lower = 0; diff --git a/src/common/rsl.c b/src/common/rsl.c index 11f2f86..a0afc30 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1574,16 +1574,16 @@ * should be communicated in the RSL CHANNEL ACTIVATION. For osmo-bts * we will use a propritary IE. */ - memset(&lchan->repeated_acch_capability, 0, sizeof(lchan->repeated_acch_capability)); + memset(&lchan->rep_acch_cap, 0, sizeof(lchan->rep_acch_cap)); - if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_REP_ACCH_CAP, sizeof(lchan->repeated_acch_capability))) + if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_REP_ACCH_CAP, sizeof(lchan->rep_acch_cap))) return 0; if (!osmo_bts_has_feature(lchan->ts->trx->bts->features, BTS_FEAT_ACCH_REP)) return -RSL_ERR_OPT_IE_ERROR; - memcpy(&lchan->repeated_acch_capability, TLVP_VAL(tp, RSL_IE_OSMO_REP_ACCH_CAP), - sizeof(lchan->repeated_acch_capability)); + memcpy(&lchan->rep_acch_cap, TLVP_VAL(tp, RSL_IE_OSMO_REP_ACCH_CAP), + sizeof(lchan->rep_acch_cap)); return 0; } diff --git a/src/common/vty.c b/src/common/vty.c index 576835b..b894ba8 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1707,18 +1707,18 @@ { cfg_out(vty, "ACCH repetition:%s", VTY_NEWLINE); indent += 2; - if (lchan->repeated_acch_capability.rxqual) + if (lchan->rep_acch_cap.rxqual) cfg_out(vty, "Enable RXQUAL threshold: %u%s", - lchan->repeated_acch_capability.rxqual, VTY_NEWLINE); + lchan->rep_acch_cap.rxqual, VTY_NEWLINE); else cfg_out(vty, "Enable RXQUAL threshold: (none, alway on)%s", VTY_NEWLINE); cfg_out(vty, "DL-FACCH:%s", VTY_NEWLINE); indent += 2; - if (lchan->repeated_acch_capability.dl_facch_all) + if (lchan->rep_acch_cap.dl_facch_all) cfg_out(vty, "retramsit all LAPDM block types%s", VTY_NEWLINE); - else if (lchan->repeated_acch_capability.dl_facch_cmd) + else if (lchan->rep_acch_cap.dl_facch_cmd) cfg_out(vty, "retramsit only LAPDM command blocks%s", VTY_NEWLINE); else @@ -1732,7 +1732,7 @@ cfg_out(vty, "DL-SACCH:%s", VTY_NEWLINE); indent += 2; - if (lchan->repeated_acch_capability.ul_sacch) + if (lchan->rep_acch_cap.ul_sacch) cfg_out(vty, "retramsit all SACCH blocks for SAPI=0%s", VTY_NEWLINE); else @@ -1746,7 +1746,7 @@ cfg_out(vty, "UL-SACCH:%s", VTY_NEWLINE); indent += 2; - if (lchan->repeated_acch_capability.dl_sacch) + if (lchan->rep_acch_cap.dl_sacch) cfg_out(vty, "retramsit all SACCH blocks for SAPI=0%s", VTY_NEWLINE); else -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib1d51f91139b4c2fe794e37fc8543b2d7a9b9c07 Gerrit-Change-Number: 25894 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:54:26 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 13:54:26 +0000 Subject: Change in osmo-bts[master]: struct gsm_lchan: group ACCH repetition state fields In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25895 ) Change subject: struct gsm_lchan: group ACCH repetition state fields ...................................................................... struct gsm_lchan: group ACCH repetition state fields Change-Id: I2680c88f2a51b64f085a92233bc125338622babf Related: SYS#5114 --- M include/osmo-bts/lchan.h M src/common/l1sap.c M src/common/lchan.c M src/common/measurement.c M src/common/vty.c M src/osmo-bts-trx/sched_lchan_xcch.c 6 files changed, 41 insertions(+), 38 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 03b3144..3eb4f93 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -304,13 +304,16 @@ /* ECU (Error Concealment Unit) state */ struct osmo_ecu_state *ecu_state; + /* Repeated ACCH capabilities and current state */ struct abis_rsl_osmo_rep_acch_cap rep_acch_cap; - bool repeated_dl_facch_active; - bool repeated_ul_sacch_active; - bool repeated_dl_sacch_active; + struct { + bool dl_facch_active; + bool ul_sacch_active; + bool dl_sacch_active; - /* Message buffer to store DL-SACCH repeation candidate */ - struct msgb *rep_sacch; + /* Message buffer to store DL-SACCH repeation candidate */ + struct msgb *dl_sacch_msg; + } rep_acch; /* Cached early Immediate Assignment message: if the Immediate Assignment arrives before the channel is * confirmed active, then cache it here and send it once the channel is confirmed to be active. This is related diff --git a/src/common/l1sap.c b/src/common/l1sap.c index cbe43b4..d94e3bc 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1037,15 +1037,15 @@ * possible candidates in order to have one ready in case the MS enables * SACCH repetition. */ - if (lchan->rep_sacch) { + if (lchan->rep_acch.dl_sacch_msg) { if (lchan->meas.l1_info.srr_sro == 0) { /* Toss previous repetition candidate */ - msgb_free(lchan->rep_sacch); - lchan->rep_sacch = NULL; + msgb_free(lchan->rep_acch.dl_sacch_msg); + lchan->rep_acch.dl_sacch_msg = NULL; } else { /* Use previous repetition candidate */ - msg = lchan->rep_sacch; - lchan->rep_sacch = NULL; + msg = lchan->rep_acch.dl_sacch_msg; + lchan->rep_acch.dl_sacch_msg = NULL; return msg; } } @@ -1059,7 +1059,7 @@ /* Only LAPDm frames for SAPI 0 may become a repetition * candidate. */ if (sapi == 0) - lchan->rep_sacch = msgb_copy(msg, "rep_sacch"); + lchan->rep_acch.dl_sacch_msg = msgb_copy(msg, "rep_sacch"); return msg; } @@ -1143,20 +1143,20 @@ p = msgb_put(msg, GSM_MACBLOCK_LEN); /* L1-header, if not set/modified by layer 1 */ p[0] = lchan->ms_power_ctrl.current; - if (lchan->repeated_ul_sacch_active) + if (lchan->rep_acch.ul_sacch_active) p[0] |= 0x40; /* See also: 3GPP TS 44.004, section 7.1 */ p[1] = lchan->ta_ctrl.current; le = &lchan->lapdm_ch.lapdm_acch; if (lchan->rep_acch_cap.dl_sacch) { /* Check if MS requests SACCH repetition and update state accordingly */ if (lchan->meas.l1_info.srr_sro) { - if (lchan->repeated_dl_sacch_active == false) + if (lchan->rep_acch.dl_sacch_active == false) LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-SACCH repetition: inactive => active\n"); - lchan->repeated_dl_sacch_active = true; + lchan->rep_acch.dl_sacch_active = true; } else { - if (lchan->repeated_dl_sacch_active == true) + if (lchan->rep_acch.dl_sacch_active == true) LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-SACCH repetition: active => inactive\n"); - lchan->repeated_dl_sacch_active = false; + lchan->rep_acch.dl_sacch_active = false; } pp_msg = lapdm_phsap_dequeue_msg_sacch(lchan, le); } else { @@ -1166,7 +1166,7 @@ if (lchan->ts->trx->bts->dtxd) dtxd_facch = true; le = &lchan->lapdm_ch.lapdm_dcch; - if (lchan->repeated_dl_facch_active && lchan->rsl_cmode != RSL_CMOD_SPD_SIGN) + if (lchan->rep_acch.dl_facch_active && lchan->rsl_cmode != RSL_CMOD_SPD_SIGN) pp_msg = lapdm_phsap_dequeue_msg_facch(lchan, le, fn); else pp_msg = lapdm_phsap_dequeue_msg(le); @@ -1427,20 +1427,20 @@ { uint16_t upper = 0; uint16_t lower = 0; - bool prev_repeated_ul_sacch_active = lchan->repeated_ul_sacch_active; + bool prev_repeated_ul_sacch_active = lchan->rep_acch.ul_sacch_active; /* This is an optimization so that we exit as quickly as possible if * there are no uplink SACCH repetition capabilities present. * However If the repeated UL-SACCH capabilities vanish for whatever * reason, we must be sure that UL-SACCH repetition is disabled. */ if (!lchan->rep_acch_cap.ul_sacch) { - lchan->repeated_ul_sacch_active = false; + lchan->rep_acch.ul_sacch_active = false; goto out; } /* Threshold disabled (repetition is always on) */ if (lchan->rep_acch_cap.rxqual == 0) { - lchan->repeated_ul_sacch_active = true; + lchan->rep_acch.ul_sacch_active = true; goto out; } @@ -1459,14 +1459,14 @@ /* If upper/rxqual == 0, then repeated UL-SACCH is always on */ if (ber10k >= upper) - lchan->repeated_ul_sacch_active = true; + lchan->rep_acch.ul_sacch_active = true; else if (ber10k <= lower) - lchan->repeated_ul_sacch_active = false; + lchan->rep_acch.ul_sacch_active = false; out: - if (lchan->repeated_ul_sacch_active == prev_repeated_ul_sacch_active) + if (lchan->rep_acch.ul_sacch_active == prev_repeated_ul_sacch_active) return; - if (lchan->repeated_ul_sacch_active) + if (lchan->rep_acch.ul_sacch_active) LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "UL-SACCH repetition: inactive => active\n"); else LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "UL-SACCH repetition: active => inactive\n"); diff --git a/src/common/lchan.c b/src/common/lchan.c index 9661010..423ecc1 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -296,8 +296,8 @@ msgb_free(lchan->tch.rep_facch[1].msg); lchan->tch.rep_facch[0].msg = NULL; lchan->tch.rep_facch[1].msg = NULL; - msgb_free(lchan->rep_sacch); - lchan->rep_sacch = NULL; + msgb_free(lchan->rep_acch.dl_sacch_msg); + lchan->rep_acch.dl_sacch_msg = NULL; /* fall through */ default: if (lchan->early_rr_ia) { diff --git a/src/common/measurement.c b/src/common/measurement.c index ec06131..52431c5 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -798,7 +798,7 @@ uint8_t upper; uint8_t lower; uint8_t rxqual; - bool prev_repeated_dl_facch_active = lchan->repeated_dl_facch_active; + bool prev_repeated_dl_facch_active = lchan->rep_acch.dl_facch_active; /* This is an optimization so that we exit as quickly as possible if * there are no FACCH repetition capabilities present. However If the @@ -806,13 +806,13 @@ * sure that FACCH repetition is disabled. */ if (!lchan->rep_acch_cap.dl_facch_cmd && !lchan->rep_acch_cap.dl_facch_all) { - lchan->repeated_dl_facch_active = false; + lchan->rep_acch.dl_facch_active = false; goto out; } /* Threshold disabled (always on) */ if (lchan->rep_acch_cap.rxqual == 0) { - lchan->repeated_dl_facch_active = true; + lchan->rep_acch.dl_facch_active = true; goto out; } @@ -820,7 +820,7 @@ * (repeated SACCH requested) then it makes sense to enable * FACCH repetition too. */ if (lchan->meas.l1_info.srr_sro) { - lchan->repeated_dl_facch_active = true; + lchan->rep_acch.dl_facch_active = true; goto out; } @@ -852,14 +852,14 @@ rxqual = meas_res->rxqual_full; if (rxqual >= upper) - lchan->repeated_dl_facch_active = true; + lchan->rep_acch.dl_facch_active = true; else if (rxqual <= lower) - lchan->repeated_dl_facch_active = false; + lchan->rep_acch.dl_facch_active = false; out: - if (lchan->repeated_dl_facch_active == prev_repeated_dl_facch_active) + if (lchan->rep_acch.dl_facch_active == prev_repeated_dl_facch_active) return; - if (lchan->repeated_dl_facch_active) + if (lchan->rep_acch.dl_facch_active) LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: inactive => active\n"); else LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: active => inactive\n"); diff --git a/src/common/vty.c b/src/common/vty.c index b894ba8..124f7ef 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1723,7 +1723,7 @@ VTY_NEWLINE); else cfg_out(vty, "no retransmission (disabled)%s", VTY_NEWLINE); - if (lchan->repeated_dl_facch_active) + if (lchan->rep_acch.dl_facch_active) cfg_out(vty, "retransmission currently active%s", VTY_NEWLINE); else cfg_out(vty, "retransmission currently inactive%s", @@ -1737,7 +1737,7 @@ VTY_NEWLINE); else cfg_out(vty, "no retransmission (disabled)%s", VTY_NEWLINE); - if (lchan->repeated_dl_sacch_active) + if (lchan->rep_acch.dl_sacch_active) cfg_out(vty, "retransmission currently active%s", VTY_NEWLINE); else cfg_out(vty, "retransmission currently inactive%s", @@ -1751,7 +1751,7 @@ VTY_NEWLINE); else cfg_out(vty, "no retransmission (disabled)%s", VTY_NEWLINE); - if (lchan->repeated_ul_sacch_active) + if (lchan->rep_acch.ul_sacch_active) cfg_out(vty, "retransmission currently active%s", VTY_NEWLINE); else cfg_out(vty, "retransmission currently inactive%s", diff --git a/src/osmo-bts-trx/sched_lchan_xcch.c b/src/osmo-bts-trx/sched_lchan_xcch.c index e2baefd..e8f46c1 100644 --- a/src/osmo-bts-trx/sched_lchan_xcch.c +++ b/src/osmo-bts-trx/sched_lchan_xcch.c @@ -60,7 +60,7 @@ uint16_t ber10k; int rc; struct gsm_lchan *lchan = chan_state->lchan; - bool rep_sacch = L1SAP_IS_LINK_SACCH(trx_chan_desc[bi->chan].link_id) && lchan->repeated_ul_sacch_active; + bool rep_sacch = L1SAP_IS_LINK_SACCH(trx_chan_desc[bi->chan].link_id) && lchan->rep_acch.ul_sacch_active; /* If handover RACH detection is turned on, treat this burst as an Access Burst. * Handle NOPE.ind as usually to ensure proper Uplink measurement reporting. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2680c88f2a51b64f085a92233bc125338622babf Gerrit-Change-Number: 25895 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 13:54:26 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 13:54:26 +0000 Subject: Change in osmo-bts[master]: struct gsm_lchan: move tch.rep_facch to rep_acch.dl_facch In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25896 ) Change subject: struct gsm_lchan: move tch.rep_facch to rep_acch.dl_facch ...................................................................... struct gsm_lchan: move tch.rep_facch to rep_acch.dl_facch Finally we have all ACCH repetition state variables in one place. Change-Id: I1469619528bb69c78c2fdc25bc1db208ead936d0 Related: SYS#5114 --- M include/osmo-bts/lchan.h M src/common/l1sap.c M src/common/lchan.c 3 files changed, 18 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 3eb4f93..a7e9004 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -254,9 +254,6 @@ uint8_t last_cmr; uint32_t last_fn; - /* SLOT #0 and #1 to store FACCH for repetition */ - struct gsm_rep_facch rep_facch[2]; - } tch; /* 3GPP TS 48.058 ? 9.3.37: [0; 255] ok, -1 means invalid*/ @@ -311,7 +308,8 @@ bool ul_sacch_active; bool dl_sacch_active; - /* Message buffer to store DL-SACCH repeation candidate */ + /* Message buffers to store repeation candidates */ + struct gsm_rep_facch dl_facch[2]; struct msgb *dl_sacch_msg; } rep_acch; diff --git a/src/common/l1sap.c b/src/common/l1sap.c index d94e3bc..c89b2c3 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -987,14 +987,14 @@ /* Note: The repeated version of the FACCH block must be scheduled 8 or 9 bursts after the original * transmission. see 3GPP TS 44.006, section 10.2 for a more detailed explaination. */ - if (lchan->tch.rep_facch[0].msg && GSM_TDMA_FN_SUB(fn, lchan->tch.rep_facch[0].fn) >= 8) { + if (lchan->rep_acch.dl_facch[0].msg && GSM_TDMA_FN_SUB(fn, lchan->rep_acch.dl_facch[0].fn) >= 8) { /* Re-use stored FACCH message buffer from SLOT #0 for repetition. */ - msg = lchan->tch.rep_facch[0].msg; - lchan->tch.rep_facch[0].msg = NULL; - } else if (lchan->tch.rep_facch[1].msg && GSM_TDMA_FN_SUB(fn, lchan->tch.rep_facch[1].fn) >= 8) { + msg = lchan->rep_acch.dl_facch[0].msg; + lchan->rep_acch.dl_facch[0].msg = NULL; + } else if (lchan->rep_acch.dl_facch[1].msg && GSM_TDMA_FN_SUB(fn, lchan->rep_acch.dl_facch[1].fn) >= 8) { /* Re-use stored FACCH message buffer from SLOT #1 for repetition. */ - msg = lchan->tch.rep_facch[1].msg; - lchan->tch.rep_facch[1].msg = NULL; + msg = lchan->rep_acch.dl_facch[1].msg; + lchan->rep_acch.dl_facch[1].msg = NULL; } else { /* Fetch new FACCH from queue ... */ if (lapdm_phsap_dequeue_prim(le, &pp) < 0) @@ -1010,12 +1010,12 @@ return msg; /* ... and store the message buffer for repetition. */ - if (lchan->tch.rep_facch[0].msg == NULL) { - lchan->tch.rep_facch[0].msg = msgb_copy(msg, "rep_facch_0"); - lchan->tch.rep_facch[0].fn = fn; - } else if (lchan->tch.rep_facch[1].msg == NULL) { - lchan->tch.rep_facch[1].msg = msgb_copy(msg, "rep_facch_1"); - lchan->tch.rep_facch[1].fn = fn; + if (lchan->rep_acch.dl_facch[0].msg == NULL) { + lchan->rep_acch.dl_facch[0].msg = msgb_copy(msg, "rep_facch_0"); + lchan->rep_acch.dl_facch[0].fn = fn; + } else if (lchan->rep_acch.dl_facch[1].msg == NULL) { + lchan->rep_acch.dl_facch[1].msg = msgb_copy(msg, "rep_facch_1"); + lchan->rep_acch.dl_facch[1].fn = fn; } else { /* By definition 3GPP TS 05.02 does not allow more than two (for TCH/H only one) FACCH blocks * to be transmitted simultaniously. */ diff --git a/src/common/lchan.c b/src/common/lchan.c index 423ecc1..9f27409 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -292,10 +292,10 @@ lapdm_channel_exit(&lchan->lapdm_ch); /* Also ensure that there are no leftovers from repeated FACCH or * repeated SACCH that might cause memory leakage. */ - msgb_free(lchan->tch.rep_facch[0].msg); - msgb_free(lchan->tch.rep_facch[1].msg); - lchan->tch.rep_facch[0].msg = NULL; - lchan->tch.rep_facch[1].msg = NULL; + msgb_free(lchan->rep_acch.dl_facch[0].msg); + msgb_free(lchan->rep_acch.dl_facch[1].msg); + lchan->rep_acch.dl_facch[0].msg = NULL; + lchan->rep_acch.dl_facch[1].msg = NULL; msgb_free(lchan->rep_acch.dl_sacch_msg); lchan->rep_acch.dl_sacch_msg = NULL; /* fall through */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1469619528bb69c78c2fdc25bc1db208ead936d0 Gerrit-Change-Number: 25896 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 14:28:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 14:28:53 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Fix trailing whitespace In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25900 ) Change subject: src/*/Makefile.am: Fix trailing whitespace ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ie22df146cfaf6aaf9c7cef884a964e6a3dfcc8ad Gerrit-Change-Number: 25900 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 22 Oct 2021 14:28:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 14:46:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 14:46:22 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Fix trailing whitespace In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25900 ) Change subject: src/*/Makefile.am: Fix trailing whitespace ...................................................................... src/*/Makefile.am: Fix trailing whitespace Change-Id: Ie22df146cfaf6aaf9c7cef884a964e6a3dfcc8ad --- M src/rua/Makefile.am M src/tests/Makefile.am 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am index d8fb042..1623178 100644 --- a/src/rua/Makefile.am +++ b/src/rua/Makefile.am @@ -86,4 +86,3 @@ @rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.* # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/rua $(ASN_MODULE_INC) - diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 28eedb9..003ea51 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -74,4 +74,3 @@ $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 $(AUTOTEST) -I '$(top_srcdir)/include' -I '$(srcdir)' -o $@.tmp $@.at mv $@.tmp $@ - -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ie22df146cfaf6aaf9c7cef884a964e6a3dfcc8ad Gerrit-Change-Number: 25900 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 16:07:54 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 16:07:54 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-hnbap as a public shared library In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25880 ) Change subject: Provide libosmo-hnbap as a public shared library ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 Gerrit-Change-Number: 25880 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 22 Oct 2021 16:07:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 16:08:12 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 16:08:12 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-rua as a public shared library In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25887 ) Change subject: Provide libosmo-rua as a public shared library ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I8b800baacbfe3a3c424c51b418b5ac2e2848b3ba Gerrit-Change-Number: 25887 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 22 Oct 2021 16:08:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 16:41:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 16:41:18 +0000 Subject: Change in osmo-iuh[master]: WIP: introduce script to regenerate code from asn files References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25901 ) Change subject: WIP: introduce script to regenerate code from asn files ...................................................................... WIP: introduce script to regenerate code from asn files Change-Id: If3b6fab781592266276c349a8586ff88954f34a8 --- A asn1/regen.sh 1 file changed, 42 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/01/25901/1 diff --git a/asn1/regen.sh b/asn1/regen.sh new file mode 100755 index 0000000..14c0e46 --- /dev/null +++ b/asn1/regen.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +set -e + +ASN1C_BIN="/home/pespin/dev/sysmocom/build/new/out/bin/asn1c" +ASN1C_SKEL="/home/pespin/dev/sysmocom/git/asn1c/skeletons/" + +git_topdir="$(git rev-parse --show-toplevel)" + + +gen_rua() { + name="rua" + name_caps="RUA" + srcdir="$git_topdir/src/$name"; + + pushd $srcdir + pfx="../../asn1/$name"; + ASN1C_PREFIX="${name_caps}_" $ASN1C_BIN -S "$ASN1C_SKEL" -R -gen-PER $pfx/${name_caps}-CommonDataTypes.asn $pfx/${name_caps}-Constants.asn $pfx/${name_caps}-Containers.asn $pfx/${name_caps}-PDU.asn $pfx/${name_caps}-IEs.asn #$pfx/${name_caps}-PDU-Contents.asn $pfx/${name_caps}-PDU-Descriptions.asn + mv $srcdir/*.h ${git_topdir}/include/osmocom/${name}/ + # FIXME: Adding $pfx/RUA-PDU-Contents.asn above fails with: + # ASN.1 grammar parse error near line 69 (token "id-CN-DomainIndicator"): syntax error, unexpected TOK_identifier, expecting '}' + popd +} + + +gen_ranap() { + name="ranap" + name_caps="RANAP" + srcdir="$git_topdir/src/$name"; + + pushd $srcdir + pfx="../../asn1/$name"; + ASN1C_PREFIX="${name_caps}_" $ASN1C_BIN -S "$ASN1C_SKEL" -R -gen-PER $pfx/${name_caps}-CommonDataTypes.asn $pfx/${name_caps}-Constants.asn $pfx/${name_caps}-Containers.asn $pfx/${name_caps}-PDU.asn $pfx/${name_caps}-IEs.asn #$pfx/${name_caps}-PDU-Contents.asn $pfx/${name_caps}-PDU-Descriptions.asn + mv $pfx/*.h ${git_topdir}/include/osmocom/${name}/ + # FIXME: Adding $pfx/RANAP-PDU-Contents.asn above fails with: + # ASN.1 grammar parse error near line 69 (token "id-CN-DomainIndicator"): syntax error, unexpected TOK_identifier, expecting '}' + popd +} + + +gen_rua +#gen_ranap -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: If3b6fab781592266276c349a8586ff88954f34a8 Gerrit-Change-Number: 25901 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 17:04:00 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 17:04:00 +0000 Subject: Change in osmo-bts[master]: [overpower] scheduler: handle {sacch, facch}_enabled flags In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25898 to look at the new patch set (#2). Change subject: [overpower] scheduler: handle {sacch,facch}_enabled flags ...................................................................... [overpower] scheduler: handle {sacch,facch}_enabled flags The new [bit-]fields in the RSL_IE_OSMO_TEMP_OVP_ACCH_CAP allow more fine-grained control over the overpower feature, which can be enabled: * for both SACCH and FACCH, * for SACCH only, or * for FACCH only. Change-Id: Iaaab675a20bbefece832d913963c8c5ae32ff80c Depends: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M src/common/scheduler.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/98/25898/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaaab675a20bbefece832d913963c8c5ae32ff80c Gerrit-Change-Number: 25898 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 17:04:01 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 17:04:01 +0000 Subject: Change in osmo-bts[master]: [overpower] lchan_dump_full_vty(): print overpower state References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25902 ) Change subject: [overpower] lchan_dump_full_vty(): print overpower state ...................................................................... [overpower] lchan_dump_full_vty(): print overpower state Change-Id: I052f1d68b27b2dc7203835b4a93d40c94b0c8d82 Depends: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M src/common/vty.c 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/02/25902/1 diff --git a/src/common/vty.c b/src/common/vty.c index 124f7ef..97bd658 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1759,6 +1759,34 @@ indent -= 2; } +static void lchan_acch_top_state_dump(struct vty *vty, unsigned int indent, + const struct gsm_lchan *lchan) +{ + if (lchan->top_acch_cap.overpower_db == 0) + return; + + cfg_out(vty, "Temporary ACCH overpower:%s", VTY_NEWLINE); + indent += 2; + + cfg_out(vty, "Overpower value: %u dB%s", + lchan->top_acch_cap.overpower_db, VTY_NEWLINE); + + cfg_out(vty, "SACCH overpower: %sabled%s", + lchan->top_acch_cap.sacch_enable ? "en" : "dis", + VTY_NEWLINE); + cfg_out(vty, "FACCH overpower: %sabled%s", + lchan->top_acch_cap.facch_enable ? "en" : "dis", + VTY_NEWLINE); + + if (lchan->top_acch_cap.rxqual == 0) { + cfg_out(vty, "RxQual threshold: disabled " + "(overpower is always on)%s", VTY_NEWLINE); + } else { + cfg_out(vty, "RxQual threshold: %u%s", + lchan->top_acch_cap.rxqual, VTY_NEWLINE); + } +} + static void lchan_dump_full_vty(struct vty *vty, const struct gsm_lchan *lchan) { struct in_addr ia; @@ -1841,7 +1869,10 @@ /* BS/MS Power Control state and parameters */ lchan_bs_power_ctrl_state_dump(vty, 2, lchan); lchan_ms_power_ctrl_state_dump(vty, 2, lchan); + + /* ACCH repetition / overpower state */ lchan_acch_rep_state_dump(vty, 2, lchan); + lchan_acch_top_state_dump(vty, 2, lchan); } static void lchan_dump_short_vty(struct vty *vty, const struct gsm_lchan *lchan) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I052f1d68b27b2dc7203835b4a93d40c94b0c8d82 Gerrit-Change-Number: 25902 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 17:09:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 17:09:53 +0000 Subject: Change in osmo-bts[master]: [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25897 ) Change subject: [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I370c8f95fb64eceb60a9dc2eae1412f8a0df0f4e Gerrit-Change-Number: 25897 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 22 Oct 2021 17:09:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 18:10:24 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 18:10:24 +0000 Subject: Change in osmo-iuh[master]: WIP: introduce script to regenerate code from asn files In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/25901 to look at the new patch set (#2). Change subject: WIP: introduce script to regenerate code from asn files ...................................................................... WIP: introduce script to regenerate code from asn files Change-Id: If3b6fab781592266276c349a8586ff88954f34a8 --- A asn1/regen.sh 1 file changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/01/25901/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: If3b6fab781592266276c349a8586ff88954f34a8 Gerrit-Change-Number: 25901 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 18:11:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 18:11:01 +0000 Subject: Change in osmo-bts[master]: [overpower] scheduler: handle {sacch, facch}_enabled flags In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25898 ) Change subject: [overpower] scheduler: handle {sacch,facch}_enabled flags ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaaab675a20bbefece832d913963c8c5ae32ff80c Gerrit-Change-Number: 25898 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 18:11:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 18:11:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 18:11:22 +0000 Subject: Change in osmo-bts[master]: [overpower] lchan_dump_full_vty(): print overpower state In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25902 ) Change subject: [overpower] lchan_dump_full_vty(): print overpower state ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I052f1d68b27b2dc7203835b4a93d40c94b0c8d82 Gerrit-Change-Number: 25902 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 22 Oct 2021 18:11:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 18:12:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 18:12:11 +0000 Subject: Change in osmo-bts[master]: [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25897 ) Change subject: [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I370c8f95fb64eceb60a9dc2eae1412f8a0df0f4e Gerrit-Change-Number: 25897 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 22 Oct 2021 18:12:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 20:33:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 20:33:53 +0000 Subject: Change in osmo-iuh[master]: WIP: introduce script to regenerate code from asn files In-Reply-To: References: Message-ID: pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25901 ) Change subject: WIP: introduce script to regenerate code from asn files ...................................................................... Abandoned I just found out related stuff is included in src/*/Makefile.am -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: If3b6fab781592266276c349a8586ff88954f34a8 Gerrit-Change-Number: 25901 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 21:19:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 21:19:09 +0000 Subject: Change in osmo-iuh[master]: move-asn1-header-files.sh: Replace original asn file path in generate... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25903 ) Change subject: move-asn1-header-files.sh: Replace original asn file path in generated asn1 header files ...................................................................... move-asn1-header-files.sh: Replace original asn file path in generated asn1 header files This makes builds reproducible and keep the existing relative path. This should have been done in a previous commit changing the paths being passed to asn1c to be absolute (top_srcdir). Fixes: f67803684f47077de3c9e06eb7dc007e0bc86b28 Change-Id: I19537f136cbb654950172ee532027920d353a556 --- M move-asn1-header-files.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/03/25903/1 diff --git a/move-asn1-header-files.sh b/move-asn1-header-files.sh index b968323..ec94e24 100755 --- a/move-asn1-header-files.sh +++ b/move-asn1-header-files.sh @@ -22,6 +22,7 @@ shift echo "s,^#include \"$fname\"$,#include <$include_subdir/$fname>," + echo "s, \* \tfound in \"${base_dir}, * \tfound in \"../..," done } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I19537f136cbb654950172ee532027920d353a556 Gerrit-Change-Number: 25903 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 21:19:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 22 Oct 2021 21:19:10 +0000 Subject: Change in osmo-iuh[master]: README.md: Document how to re-generate code from ASN1 files References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25904 ) Change subject: README.md: Document how to re-generate code from ASN1 files ...................................................................... README.md: Document how to re-generate code from ASN1 files Change-Id: Ie3e5b7fb88caf2a795fccdcf214f559f9683070c --- M README.md 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/04/25904/1 diff --git a/README.md b/README.md index edbde9f..984ac85 100644 --- a/README.md +++ b/README.md @@ -99,5 +99,6 @@ you will need a modified asn1c which has the following features: * APER support (the patch from Eurecom, or its forward-ported version from the aper branch of git://git.osmocom.org/asn1c) -* support for prefixing the generated types (aper-prefix branch of +* Support for prefixing the generated types (aper-prefix branch of git://git.osmocom.org/asn1c) +* Then in osmo-iuh.git: make -C src/ regen -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ie3e5b7fb88caf2a795fccdcf214f559f9683070c Gerrit-Change-Number: 25904 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 22 22:42:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 22 Oct 2021 22:42:53 +0000 Subject: Change in osmo-bts[master]: lchan_set_state(): also free pending messages if any References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25905 ) Change subject: lchan_set_state(): also free pending messages if any ...................................................................... lchan_set_state(): also free pending messages if any A logical channel may have associated messages, which are pending for transmission until some event occurs. Do not leak them. Change-Id: I3264e6caa007e9e9cb9c1c2f8627c408bbb28b9e --- M src/common/lchan.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/05/25905/1 diff --git a/src/common/lchan.c b/src/common/lchan.c index 9f27409..c2b0144 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -298,6 +298,11 @@ lchan->rep_acch.dl_facch[1].msg = NULL; msgb_free(lchan->rep_acch.dl_sacch_msg); lchan->rep_acch.dl_sacch_msg = NULL; + /* free() pending messages */ + msgb_free(lchan->pending_rel_ind_msg); + lchan->pending_rel_ind_msg = NULL; + msgb_free(lchan->pending_chan_activ); + lchan->pending_chan_activ = NULL; /* fall through */ default: if (lchan->early_rr_ia) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3264e6caa007e9e9cb9c1c2f8627c408bbb28b9e Gerrit-Change-Number: 25905 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 23 09:25:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 23 Oct 2021 09:25:51 +0000 Subject: Change in osmo-iuh[master]: move-asn1-header-files.sh: Replace original asn file path in generate... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25903 ) Change subject: move-asn1-header-files.sh: Replace original asn file path in generated asn1 header files ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I19537f136cbb654950172ee532027920d353a556 Gerrit-Change-Number: 25903 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sat, 23 Oct 2021 09:25:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 23 10:46:32 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 23 Oct 2021 10:46:32 +0000 Subject: Change in osmo-bts[master]: lchan: introduce and use lchan_is_tch() helper References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25906 ) Change subject: lchan: introduce and use lchan_is_tch() helper ...................................................................... lchan: introduce and use lchan_is_tch() helper Change-Id: Icd832667cad1189e3e819c88bde837c4260aa252 --- M include/osmo-bts/lchan.h M src/common/lchan.c M src/common/rsl.c 3 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/06/25906/1 diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index a7e9004..57999b1 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -365,3 +365,6 @@ return false; } } + +#define lchan_is_tch(lchan) \ + ((lchan)->type == GSM_LCHAN_TCH_F || (lchan)->type == GSM_LCHAN_TCH_H) diff --git a/src/common/lchan.c b/src/common/lchan.c index c2b0144..29fd247 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -67,7 +67,7 @@ t200_ms_acch[DL_SAPI0] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; t200_ms_acch[DL_SAPI3] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; - if (lchan->rep_acch_cap.dl_facch_all && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { + if (lchan->rep_acch_cap.dl_facch_all && lchan_is_tch(lchan)) { t200_ms_acch[DL_SAPI0] *= 2; t200_ms_acch[DL_SAPI3] *= 2; } diff --git a/src/common/rsl.c b/src/common/rsl.c index e8f9aa0..a88201e 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3579,8 +3579,7 @@ rsl_msg_name(rh->msg_type)); /* REL_IND handling */ - if (rh->msg_type == RSL_MT_REL_IND && - (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { + if (rh->msg_type == RSL_MT_REL_IND && lchan_is_tch(lchan)) LOGPLCHAN(lchan, DRSL, LOGL_INFO, "Scheduling %s to L3 in next associated TCH-RTS.ind\n", rsl_msg_name(rh->msg_type)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icd832667cad1189e3e819c88bde837c4260aa252 Gerrit-Change-Number: 25906 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 23 12:42:36 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 23 Oct 2021 12:42:36 +0000 Subject: Change in osmo-bts[master]: lchan: introduce and use lchan_is_tch() helper In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25906 to look at the new patch set (#2). Change subject: lchan: introduce and use lchan_is_tch() helper ...................................................................... lchan: introduce and use lchan_is_tch() helper Change-Id: Icd832667cad1189e3e819c88bde837c4260aa252 --- M include/osmo-bts/lchan.h M src/common/lchan.c M src/common/rsl.c 3 files changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/06/25906/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icd832667cad1189e3e819c88bde837c4260aa252 Gerrit-Change-Number: 25906 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Sat Oct 23 21:32:07 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 23 Oct 2021 21:32:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-hlr in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <61747f646cacd_24ca2af300e165f43430a3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-hlr/openSUSE_Tumbleweed/i586 Package network:osmocom:latest/osmo-hlr failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:latest osmo-hlr Last lines of build log: [ 43s] libpython3_8-1_0-3.8.12-1.3 ######################################## [ 44s] python38-base-3.8.12-1.3 ######################################## [ 46s] python38-3.8.12-1.2 ######################################## [ 46s] rpm-build-python-4.16.1.3-3.2 ######################################## [ 52s] patch-2.7.6-3.43 ######################################## [ 52s] rpm-build-4.16.1.3-3.2 ######################################## [ 52s] rpmlint-mini-2.1+git20211015.6dc5311-2######################################## [ 52s] gcc-PIE-11-4.1 ######################################## [ 52s] sqlite3-devel-3.36.0-1.2 ######################################## [ 52s] zlib-devel-1.2.11-18.17 ######################################## [ 52s] libosmoabis-devel-1.1.1-2.24 ######################################## [ 52s] libosmoctrl-devel-1.5.2-1.3 ######################################## [ 52s] libosmovty-devel-1.5.2-1.3 ######################################## [ 52s] libtool-2.4.6-8.33 ######################################## [ 52s] build-compare-20210921T214418.86d06d9-######################################## [ 52s] brp-check-suse-84.87+git20210706.41c04######################################## [ 52s] compat-usrmerge-build-84.87-5.1 ######################################## [ 52s] post-build-checks-84.87+git20210304.df######################################## [ 52s] attr-2.5.1-1.13 ######################################## [ 52s] hostname-3.23-2.7 ######################################## [ 52s] build-mkbaselibs-20210902-1.2 ######################################## [ 53s] kernel-obs-build-5.14.11-2.1 ######################################## [ 5456s] qemu-kvm: terminating on signal 15 from pid 20827 (fuser) Job seems to be stuck here, killed. (after 5400 seconds of inactivity) [ 5456s] ### VM INTERACTION END ### [ 5456s] No buildstatus set, either the base system is broken (kernel/initrd/udev/glibc/bash/perl) [ 5456s] or the build host has a kernel or hardware problem... -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Oct 23 22:44:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 23 Oct 2021 22:44:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 ) Change subject: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() ...................................................................... BTS_Tests: separate RACH / IMM ASS from f_est_dchan() Given that the test suite acts as the BSC, it's known in advance which exact logical channel is going to be activated. Therefore, it's not necessary to send an Immediate Assignment with the known Channel Description IE over the Um interface (via L1CTL). On the other hand, we may still want to validate the process of dedicated channel establishment, involving the use of Immediate Assignment procedure. So instead of doing this every time when a ConnHdlr component needs to activate a logical channel, let's split the existing logic into a separate test case - TC_est_dchan. This change facilitates the goal of running test cases against additional transceivers (not only against C0). Currently this is not possible, because a ConnHdlr component has no access to C0/AGCH when executed on Cx > 0. Change-Id: I8df3db36f35190241735629a961f09d73bd0e5f5 --- M bts/BTS_Tests.ttcn 1 file changed, 62 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/25907/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 03519d9..394468c 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2232,13 +2232,7 @@ /* Establish dedicated channel: L1CTL + RSL side */ private function f_est_dchan(boolean encr_enable := false, RSL_IE_List more_ies := {}) runs on ConnHdlr { - var GsmFrameNumber fn; - var ImmediateAssignment imm_ass; var ChannelDescription ch_desc; - var integer ra := 23; - - /* Send RACH request and wait for ChanReq */ - fn := f_rach_req_wait_chan_rqd(ra); /* Activate channel on BTS side */ f_rsl_chan_act(g_pars.chan_mode, encr_enable, more_ies); @@ -2250,21 +2244,9 @@ ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx_pars[0].arfcn, g_pars.tsc)); } - /* Send IMM.ASS via CCHAN */ - var GsmRrMessage rr_msg := valueof(ts_IMM_ASS(ra, fn, 0, ch_desc, g_pars.fhp.ma_map)); - RSL.send(ts_RSL_IMM_ASSIGN(enc_GsmRrMessage(rr_msg))); - - /* receive IMM.ASS on MS side */ - var ImmediateAssignment ia_um; - ia_um := f_L1CTL_WAIT_IMM_ASS(L1CTL, ra, fn); - - /* Make sure that IMM.ASS contains hopping parameters (if enabled) */ - if (ch_desc.h != ia_um.chan_desc.h) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Hopping parameters mismatch"); - } - /* enable dedicated mode */ - f_L1CTL_DM_EST_REQ_IA(L1CTL, ia_um, ma := g_pars.fhp.ma); + f_l1ctl_est_dchan(L1CTL, g_pars); + /* enable encryption, if requested */ if (encr_enable) { var uint8_t alg_id := f_alg_id_to_l1ctl(g_pars.encr.alg_id); @@ -7829,6 +7811,65 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +private function f_TC_est_dchan(charstring id) runs on ConnHdlr { + var integer ra := oct2int(f_rnd_ra_cs()); + var ChannelDescription ch_desc; + + /* Tune the MS to BCCH */ + f_l1_tune(L1CTL); + + /* Send RACH request and wait for ChanReq */ + var GsmFrameNumber fn := f_rach_req_wait_chan_rqd(ra); + + /* Activate channel on the BTS side */ + f_rsl_chan_act(g_pars.chan_mode); + + /* Craft channel description (with or without frequency hopping parameters) */ + if (g_pars.fhp.enabled) { + ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.fhp.maio_hsn, g_pars.tsc)); + } else { + ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx_pars[0].arfcn, g_pars.tsc)); + } + + /* Send IMM.ASS via CCHAN */ + var GsmRrMessage rr_msg := valueof(ts_IMM_ASS(ra, fn, 0, ch_desc, g_pars.fhp.ma_map)); + RSL.send(ts_RSL_IMM_ASSIGN(enc_GsmRrMessage(rr_msg))); + + /* Receive IMM.ASS on the MS side */ + var ImmediateAssignment imm_ass := f_L1CTL_WAIT_IMM_ASS(L1CTL, ra, fn); + + /* Match the Channel Description IE in received IMM.ASS */ + if (not match(imm_ass.chan_desc, ch_desc)) { + setverdict(fail, "Channel Description IE does not match"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } + + /* Tune the MS to a dedicated channel indicated in the IMM.ASS */ + f_L1CTL_DM_EST_REQ_IA(L1CTL, imm_ass, g_pars.fhp.ma); + + /* Expect SACCH frames on Downlink */ + L1CTL.clear; + f_exp_sacch(true); + + /* We're done, deactivate and release */ + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rsl_chan_deact(); +} +testcase TC_est_dchan() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + for (var integer i := 0; i < sizeof(g_AllChannels); i := i + 1) { + pars := valueof(t_Pars(g_AllChannels[i], ts_RSL_ChanMode_SIGN)); + vc_conn := f_start_handler(refers(f_TC_est_dchan), pars); + vc_conn.done; + } + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} + /* test generation of RLL ERR IND based on Um errors (TS 48.058 3.9) */ /* protocol error as per 44.006 */ /* link layer failure (repetition of I-frame N200 times without ACK */ @@ -7860,6 +7901,7 @@ */ control { + execute( TC_est_dchan() ); execute( TC_chan_act_stress() ); execute( TC_chan_act_react() ); execute( TC_chan_deact_not_active() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8df3db36f35190241735629a961f09d73bd0e5f5 Gerrit-Change-Number: 25907 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 23 22:44:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 23 Oct 2021 22:44:53 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: execute test cases for BS power control on TRX1 References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25908 ) Change subject: BTS_Tests: execute test cases for BS power control on TRX1 ...................................................................... BTS_Tests: execute test cases for BS power control on TRX1 Otherwise they fail, because BS power control is normally not permitted on the BCCH carrier (unless it's in power saving mode). Change-Id: Ied3e38986690850f0323d4db072cf59b6975587e Related: SYS#4918 --- M bts/BTS_Tests.ttcn 1 file changed, 14 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/25908/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 17e7e6c..35c408c 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2673,26 +2673,28 @@ testcase TC_rsl_bs_pwr_static_ass() runs on test_CT { var ConnHdlr vc_conn; var ConnHdlrPars pars; + f_init(); - for (var integer tn := 1; tn <= 4; tn := tn+1) { - pars := valueof(t_Pars(t_RslChanNr_Bm(tn), ts_RSL_ChanMode_SIGN)); - vc_conn := f_start_handler(refers(f_TC_rsl_bs_pwr_static_ass), pars, - pcu_comp := false, trxc_comp := true); - vc_conn.done; - } + + pars := valueof(t_Pars(t_RslChanNr_Bm(0), ts_RSL_ChanMode_SIGN, trx_nr := 1)); + vc_conn := f_start_handler(refers(f_TC_rsl_bs_pwr_static_ass), pars, + pcu_comp := false, trxc_comp := true); + vc_conn.done; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } testcase TC_rsl_bs_pwr_static_power_control() runs on test_CT { var ConnHdlr vc_conn; var ConnHdlrPars pars; + f_init(); - for (var integer tn := 1; tn <= 4; tn := tn+1) { - pars := valueof(t_Pars(t_RslChanNr_Bm(tn), ts_RSL_ChanMode_SIGN)); - vc_conn := f_start_handler(refers(f_TC_rsl_bs_pwr_static_power_control), pars, - pcu_comp := false, trxc_comp := true); - vc_conn.done; - } + + pars := valueof(t_Pars(t_RslChanNr_Bm(0), ts_RSL_ChanMode_SIGN, trx_nr := 1)); + vc_conn := f_start_handler(refers(f_TC_rsl_bs_pwr_static_power_control), pars, + pcu_comp := false, trxc_comp := true); + vc_conn.done; + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25908 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ied3e38986690850f0323d4db072cf59b6975587e Gerrit-Change-Number: 25908 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 23 22:45:09 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 23 Oct 2021 22:45:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: make TRX number configurable for ConnHdlr In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21317 ) Change subject: BTS_Tests: make TRX number configurable for ConnHdlr ...................................................................... Patch Set 4: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifed3891658501e0a04ff89563d0a02f08211eed3 Gerrit-Change-Number: 21317 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Sat, 23 Oct 2021 22:45:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:27:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:27:59 +0000 Subject: Change in pysim[master]: pySim-shell: Add support for GSM-R SIM Cards with DF.EIRENE In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25839 ) Change subject: pySim-shell: Add support for GSM-R SIM Cards with DF.EIRENE ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4034d09292a08d277d4abcbed9a0ec2808daaacb Gerrit-Change-Number: 25839 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:27:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:28:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:28:02 +0000 Subject: Change in pysim[master]: pySim-shell: Add suspend_uicc command In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25840 ) Change subject: pySim-shell: Add suspend_uicc command ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icc726ffd672744e56cc8dd3762891af507942c1e Gerrit-Change-Number: 25840 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:28:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:28:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:28:05 +0000 Subject: Change in pysim[master]: pySim-shell: Use iteration when unregistering command sets In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25871 ) Change subject: pySim-shell: Use iteration when unregistering command sets ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I53ecf03d330fe1eb80ee920e6f9c8185f9be48fd Gerrit-Change-Number: 25871 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:28:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:28:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:28:07 +0000 Subject: Change in pysim[master]: tlv: Fix recursive initialization from_dict() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25878 ) Change subject: tlv: Fix recursive initialization from_dict() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I795a33ed8dfa8454dc9079c189ab7b2ba64a3b72 Gerrit-Change-Number: 25878 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:28:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:28:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:28:10 +0000 Subject: Change in pysim[master]: utils: Fix BER-TLV tag decode for multi-byte tags In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25881 ) Change subject: utils: Fix BER-TLV tag decode for multi-byte tags ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5d64ce9ef1d973804daabae0b15c2e2349e6fab9 Gerrit-Change-Number: 25881 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:28:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:28:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:28:13 +0000 Subject: Change in pysim[master]: pySim-shell: Improve documentation In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25882 ) Change subject: pySim-shell: Improve documentation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ide7ba68ad90f6e5c2a41a2e3de22534258ebb7fd Gerrit-Change-Number: 25882 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:28:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:28:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:28:25 +0000 Subject: Change in pysim[master]: tlv: Don't require encoder/decoder methods for TLV without value In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/25872 ) Change subject: tlv: Don't require encoder/decoder methods for TLV without value ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie8eb2830e8eefa81e94b8b8b157062c085aeb777 Gerrit-Change-Number: 25872 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:28:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:28:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:28:30 +0000 Subject: Change in pysim[master]: pySim-shell: Add support for GSM-R SIM Cards with DF.EIRENE In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25839 ) Change subject: pySim-shell: Add support for GSM-R SIM Cards with DF.EIRENE ...................................................................... pySim-shell: Add support for GSM-R SIM Cards with DF.EIRENE GSM-R SIM cards have an additional directory (DF.EIRENE) with a number of files. This is all specified in the following document: UIC Reference P38 T 9001 5.0 "FFFIS for GSM-R SIM Cards" Change-Id: I4034d09292a08d277d4abcbed9a0ec2808daaacb --- M pySim-shell.py A pySim/gsm_r.py 2 files changed, 260 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index ca47fb3..4cf32a4 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -49,6 +49,7 @@ from pySim.ts_102_221 import CardProfileUICC from pySim.ts_31_102 import CardApplicationUSIM from pySim.ts_31_103 import CardApplicationISIM +from pySim.gsm_r import DF_EIRENE # we need to import this module so that the SysmocomSJA2 sub-class of # CardModel is created, which will add the ATR-based matching and @@ -90,6 +91,7 @@ # FIXME: do this dynamically rs.mf.add_file(DF_TELECOM()) rs.mf.add_file(DF_GSM()) + rs.mf.add_file(DF_EIRENE()) CardModel.apply_matching_models(scc, rs) diff --git a/pySim/gsm_r.py b/pySim/gsm_r.py new file mode 100644 index 0000000..7cd7529 --- /dev/null +++ b/pySim/gsm_r.py @@ -0,0 +1,258 @@ +# -*- coding: utf-8 -*- + +# without this, pylint will fail when inner classes are used +# within the 'nested' kwarg of our TlvMeta metaclass on python 3.7 :( +# pylint: disable=undefined-variable + +""" +The File (and its derived classes) uses the classes of pySim.filesystem in +order to describe the files specified in UIC Reference P38 T 9001 5.0 "FFFIS for GSM-R SIM Cards" +""" + +# +# Copyright (C) 2021 Harald Welte +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + + +from pySim.utils import * +#from pySim.tlv import * +from struct import pack, unpack +from construct import * +from construct import Optional as COptional +from pySim.construct import * +import enum + +from pySim.filesystem import * +import pySim.ts_102_221 +import pySim.ts_51_011 + +###################################################################### +# DF.EIRENE (FFFIS for GSM-R SIM Cards) +###################################################################### + +class FuncNTypeAdapter(Adapter): + def _decode(self, obj, context, path): + bcd = swap_nibbles(b2h(obj)) + last_digit = bcd[-1] + return {'functional_number': bcd[:-1], + 'presentation_of_only_this_fn': last_digit & 4, + 'permanent_fn': last_digit & 8 } + def _encode(self, obj, context, path): + return 'FIXME' + +class EF_FN(LinFixedEF): + """Section 7.2""" + def __init__(self): + super().__init__(fid='6ff1', sfid=None, name='EF.EN', desc='Functional numbers', rec_len={9,9}) + self._construct = Struct('functional_number_and_type'/FuncNTypeAdapter(Bytes(8)), + 'list_number'/Int8ub) + + +class PlConfAdapter(Adapter): + """Section 7.4.3""" + def _decode(self, obj, context, path): + num = int(obj) & 0x7 + if num == 0: + return 'None' + elif num == 1: + return 4 + elif num == 2: + return 3 + elif num == 3: + return 2 + elif num == 4: + return 1 + elif num == 5: + return 0 + def _encode(self, obj, context, path): + if obj == 'None': + return 0 + obj = int(obj) + if obj == 4: + return 1 + elif obj == 3: + return 2 + elif obj == 2: + return 3 + elif obj == 1: + return 4 + elif obj == 0: + return 5 + +class PlCallAdapter(Adapter): + """Section 7.4.12""" + def _decode(self, obj, context, path): + num = int(obj) & 0x7 + if num == 0: + return 'None' + elif num == 1: + return 4 + elif num == 2: + return 3 + elif num == 3: + return 2 + elif num == 4: + return 1 + elif num == 5: + return 0 + elif num == 6: + return 'B' + elif num == 7: + return 'A' + def _encode(self, obj, context, path): + if obj == 'None': + return 0 + if obj == 4: + return 1 + elif obj == 3: + return 2 + elif obj == 2: + return 3 + elif obj == 1: + return 4 + elif obj == 0: + return 5 + elif obj == 'B': + return 6 + elif obj == 'A': + return 7 + +NextTableType = Enum(Byte, decision=0xf0, predefined=0xf1, num_dial_digits=0xf2, ic=0xf3, empty=0xff) + +class EF_CallconfC(TransparentEF): + """Section 7.3""" + def __init__(self): + super().__init__(fid='6ff2', sfid=None, name='EF.CallconfC', size={24,24}, + desc='Call Configuration of emergency calls Configuration') + self._construct = Struct('pl_conf'/PlConfAdapter(Int8ub), + 'conf_nr'/BcdAdapter(Bytes(8)), + 'max_rand'/Int8ub, + 'n_ack_max'/Int16ub, + 'pl_ack'/PlCallAdapter(Int8ub), + 'n_nested_max'/Int8ub, + 'train_emergency_gid'/Int8ub, + 'shunting_emergency_gid'/Int8ub, + 'imei'/BcdAdapter(Bytes(8))) + +class EF_CallconfI(LinFixedEF): + """Section 7.5""" + def __init__(self): + super().__init__(fid='6ff3', sfid=None, name='EF.CallconfI', rec_len={21,21}, + desc='Call Configuration of emergency calls Information') + self._construct = Struct('t_dur'/Int24ub, + 't_relcalc'/Int32ub, + 'pl_call'/PlCallAdapter(Int8ub), + 'cause'/FlagsEnum(Int8ub, powered_off=1, radio_link_error=2, user_command=5), + 'gcr'/BcdAdapter(Bytes(4)), + 'fnr'/BcdAdapter(Bytes(8))) + +class EF_Shunting(TransparentEF): + """Section 7.6""" + def __init__(self): + super().__init__(fid='6ff4', sfid=None, name='EF.Shunting', desc='Shunting', size={8,8}) + self._construct = Struct('common_gid'/Int8ub, + 'shunting_gid'/Bytes(7)) + +class EF_GsmrPLMN(LinFixedEF): + """Section 7.7""" + def __init__(self): + super().__init__(fid='6ff5', sfid=None, name='EF.GsmrPLMN', desc='GSM-R network selection', rec_len={9,9}) + self._construct = Struct('plmn'/BcdAdapter(Bytes(3)), + 'class_of_network'/BitStruct('supported'/FlagsEnum(BitsInteger(5), vbs=1, vgcs=2, emlpp=4, fn=8, eirene=16), + 'preference'/BitsInteger(3)), + 'ic_incoming_ref_tbl'/HexAdapter(Bytes(2)), + 'outgoing_ref_tbl'/HexAdapter(Bytes(2)), + 'ic_table_ref'/HexAdapter(Bytes(1))) + +class EF_IC(LinFixedEF): + """Section 7.8""" + def __init__(self): + super().__init__(fid='6f8d', sfid=None, name='EF.IC', desc='International Code', rec_len={7,7}) + self._construct = Struct('next_table_type'/NextTableType, + 'id_of_next_table'/HexAdapter(Bytes(2)), + 'ic_decision_value'/BcdAdapter(Bytes(2)), + 'network_string_table_index'/Int8ub) + +class EF_NW(LinFixedEF): + """Section 7.9""" + def __init__(self): + super().__init__(fid='6f80', sfid=None, name='EF.NW', desc='Network Name', rec_len={8,8}) + self._construct = GsmString(8) + +class EF_Switching(LinFixedEF): + """Section 8.4""" + def __init__(self, fid, name, desc): + super().__init__(fid=fid, sfid=None, name=name, desc=desc, rec_len={6,6}) + self._construct = Struct('next_table_type'/NextTableType, + 'id_of_next_table'/HexAdapter(Bytes(2)), + 'decision_value'/BcdAdapter(Bytes(2)), + 'string_table_index'/Int8ub) + +class EF_Predefined(LinFixedEF): + """Section 8.5""" + def __init__(self, fid, name, desc): + super().__init__(fid=fid, sfid=None, name=name, desc=desc, rec_len={3,3}) + # header and other records have different structure. WTF !?! + self._construct = Struct('next_table_type'/NextTableType, + 'id_of_next_table'/HexAdapter(Bytes(2)), + 'predefined_value1'/HexAdapter(Bytes(2)), + 'string_table_index1'/Int8ub) + # TODO: predefined value n, ... + +class EF_DialledVals(TransparentEF): + """Section 8.6""" + def __init__(self, fid, name, desc): + super().__init__(fid=fid, sfid=None, name=name, desc=desc, size={4,4}) + self._construct = Struct('next_table_type'/NextTableType, + 'id_of_next_table'/HexAdapter(Bytes(2)), + 'dialed_digits'/BcdAdapter(Bytes(1))) + + +class DF_EIRENE(CardDF): + def __init__(self, fid='7fe0', name='DF.EIRENE', desc='GSM-R EIRENE'): + super().__init__(fid=fid, name=name, desc=desc) + files = [ + # Section 7.1.6 / Table 10 EIRENE GSM EFs + EF_FN(), + EF_CallconfC(), + EF_CallconfI(), + EF_Shunting(), + EF_GsmrPLMN(), + EF_IC(), + EF_NW(), + + # support of the numbering plan + EF_Switching(fid='6f8e', name='EF.CT', desc='Call Type'), + EF_Switching(fid='6f8f', name='EF.SC', desc='Short Code'), + EF_Predefined(fid='6f88', name='EF.FC', desc='Function Code'), + EF_Predefined(fid='6f89', name='EF.Service', desc='VGCS/VBS Service Code'), + EF_Predefined(fid='6f8a', name='EF.Call', desc='First digit of the group ID'), + EF_Predefined(fid='6f8b', name='EF.FctTeam', desc='Call Type 6 Team Type + Team member function'), + EF_Predefined(fid='6f92', name='EF.Controller', desc='Call Type 7 Controller function code'), + EF_Predefined(fid='6f8c', name='EF.Gateway', desc='Access to external networks'), + EF_DialledVals(fid='6f81', name='EF.5to8digits', desc='Call Type 2 User Identity Number length'), + EF_DialledVals(fid='6f82', name='EF.2digits', desc='2 digits input'), + EF_DialledVals(fid='6f83', name='EF.8digits', desc='8 digits input'), + EF_DialledVals(fid='6f84', name='EF.9digits', desc='9 digits input'), + EF_DialledVals(fid='6f85', name='EF.SSSSS', desc='Group call area input'), + EF_DialledVals(fid='6f86', name='EF.LLLLL', desc='Location number Call Type 6'), + EF_DialledVals(fid='6f91', name='EF.Location', desc='Location number Call Type 7'), + EF_DialledVals(fid='6f87', name='EF.FreeNumber', desc='Free Number Call Type 0 and 8'), + ] + self.add_files(files) + + def decode_select_response(self, data_hex): + return pySim.ts_51_011.decode_select_response(data_hex) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25839 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4034d09292a08d277d4abcbed9a0ec2808daaacb Gerrit-Change-Number: 25839 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:28:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:28:30 +0000 Subject: Change in pysim[master]: pySim-shell: Add suspend_uicc command In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25840 ) Change subject: pySim-shell: Add suspend_uicc command ...................................................................... pySim-shell: Add suspend_uicc command This is an optional command, and it is not supported by e.g. sysmoISIM-SJA2 Change-Id: Icc726ffd672744e56cc8dd3762891af507942c1e --- M docs/shell.rst M pySim-shell.py M pySim/commands.py 3 files changed, 65 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/docs/shell.rst b/docs/shell.rst index 5bc86ae..3d56c6d 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -156,6 +156,20 @@ :func: Iso7816Commands.close_chan_parser +suspend_uicc +~~~~~~~~~~~~ +This command allows you to perform the SUSPEND UICC command on the card. This is a relatively +recent power-saving addition to the UICC specifications, allowing for suspend/resume while maintaining +state, as opposed to a full power-off (deactivate) and power-on (activate) of the card. + +The pySim command just sends that SUSPEND UICC command and doesn't perform the full related sequence +including the electrical power down. + +.. argparse:: + :module: pySim-shell + :func: Iso7816Commands.suspend_uicc_parser + + pySim commands -------------- diff --git a/pySim-shell.py b/pySim-shell.py index 4cf32a4..ff12396 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -718,6 +718,20 @@ fcp_dec = self._cmd.rs.status() self._cmd.poutput_json(fcp_dec) + suspend_uicc_parser = argparse.ArgumentParser() + suspend_uicc_parser.add_argument('--min-duration-secs', type=int, default=60, + help='Proposed minimum duration of suspension') + suspend_uicc_parser.add_argument('--max-duration-secs', type=int, default=24*60*60, + help='Proposed maximum duration of suspension') + + # not ISO7816-4 but TS 102 221 + @cmd2.with_argparser(suspend_uicc_parser) + def do_suspend_uicc(self, opts): + """Perform the SUSPEND UICC command. Only supported on some UICC.""" + (duration, token, sw) = self._cmd.card._scc.suspend_uicc(min_len_secs=opts.min_duration_secs, + max_len_secs=opts.max_duration_secs) + self._cmd.poutput('Negotiated Duration: %u secs, Token: %s, SW: %s' % (duration, token, sw)) + option_parser = argparse.ArgumentParser(prog='pySim-shell', description='interactive SIM card shell', formatter_class=argparse.ArgumentDefaultsHelpFormatter) diff --git a/pySim/commands.py b/pySim/commands.py index d53cb3e..7d09fa9 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -23,7 +23,7 @@ from construct import * from pySim.construct import LV -from pySim.utils import rpad, b2h, h2b, sw_match, bertlv_encode_len +from pySim.utils import rpad, b2h, h2b, sw_match, bertlv_encode_len, Hexstr, h2i from pySim.exceptions import SwMatchError class SimCardCommands(object): @@ -448,3 +448,39 @@ data_length = len(payload) // 2 data, sw = self._tp.send_apdu(('80100000%02x' % data_length) + payload) return (data, sw) + + # ETSI TS 102 221 11.1.22 + def suspend_uicc(self, min_len_secs:int=60, max_len_secs:int=43200): + """Send SUSPEND UICC to the card.""" + def encode_duration(secs:int) -> Hexstr: + if secs >= 10*24*60*60: + return '04%02x' % (secs // (10*24*60*60)) + elif secs >= 24*60*60: + return '03%02x' % (secs // (24*60*60)) + elif secs >= 60*60: + return '02%02x' % (secs // (60*60)) + elif secs >= 60: + return '01%02x' % (secs // 60) + else: + return '00%02x' % secs + def decode_duration(enc:Hexstr) -> int: + time_unit = enc[:2] + length = h2i(enc[2:4]) + if time_unit == '04': + return length * 10*24*60*60 + elif time_unit == '03': + return length * 24*60*60 + elif time_unit == '02': + return length * 60*60 + elif time_unit == '01': + return length * 60 + elif time_unit == '00': + return length + else: + raise ValueError('Time unit must be 0x00..0x04') + min_dur_enc = encode_duration(min_len_secs) + max_dur_enc = encode_duration(max_len_secs) + data, sw = self._tp.send_apdu_checksw('8076000004' + min_dur_enc + max_dur_enc) + negotiated_duration_secs = decode_duration(data[:4]) + resume_token = data[4:] + return (negotiated_duration_secs, resume_token, sw) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Icc726ffd672744e56cc8dd3762891af507942c1e Gerrit-Change-Number: 25840 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:28:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:28:30 +0000 Subject: Change in pysim[master]: pySim-shell: Use iteration when unregistering command sets In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25871 ) Change subject: pySim-shell: Use iteration when unregistering command sets ...................................................................... pySim-shell: Use iteration when unregistering command sets This makes it more easy to extend in the future Change-Id: I53ecf03d330fe1eb80ee920e6f9c8185f9be48fd --- M pySim-shell.py 1 file changed, 4 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index ff12396..1fc09ef 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -138,12 +138,10 @@ # Unequip everything from pySim-shell that would not work in unequipped state if self.rs: self.rs.unregister_cmds(self) - cmd_set = self.find_commandsets(Iso7816Commands) - if cmd_set: - self.unregister_command_set(cmd_set[0]) - cmd_set = self.find_commandsets(PySimCommands) - if cmd_set: - self.unregister_command_set(cmd_set[0]) + for cmds in [Iso7816Commands, PySimCommands]: + cmd_set = self.find_commandsets(cmds) + if cmd_set: + self.unregister_command_set(cmd_set[0]) self.card = card self.rs = rs -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I53ecf03d330fe1eb80ee920e6f9c8185f9be48fd Gerrit-Change-Number: 25871 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:28:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:28:31 +0000 Subject: Change in pysim[master]: tlv: Don't require encoder/decoder methods for TLV without value In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25872 ) Change subject: tlv: Don't require encoder/decoder methods for TLV without value ...................................................................... tlv: Don't require encoder/decoder methods for TLV without value There are instances where a TLV IE is used as just a flag, i.e. length zero and no value part. In those situations, it would require a lot of boilerplate code to require the TLV_IE class definitions to have _to_bytes/_from_bytes methods that do nothing. So instead, add a shortcut: If we want to encode 'None', then return b'', and if we want to decode b'' return None. Change-Id: Ie8eb2830e8eefa81e94b8b8b157062c085aeb777 --- M pySim/tlv.py 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/tlv.py b/pySim/tlv.py index 05f824e..0dc746b 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -80,7 +80,9 @@ def to_bytes(self) -> bytes: """Convert from internal representation to binary bytes. Store the binary result in the internal state and return it.""" - if self._construct: + if not self.decoded: + do = b'' + elif self._construct: do = self._construct.build(self.decoded, total_len=None) elif self.__class__._construct: do = self.__class__._construct.build(self.decoded, total_len=None) @@ -97,7 +99,9 @@ """Convert from binary bytes to internal representation. Store the decoded result in the internal state and return it.""" self.encoded = do - if self._construct: + if self.encoded == b'': + self.decoded = None + elif self._construct: self.decoded = parse_construct(self._construct, do) elif self.__class__._construct: self.decoded = parse_construct(self.__class__._construct, do) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25872 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie8eb2830e8eefa81e94b8b8b157062c085aeb777 Gerrit-Change-Number: 25872 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:28:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:28:31 +0000 Subject: Change in pysim[master]: tlv: Fix recursive initialization from_dict() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25878 ) Change subject: tlv: Fix recursive initialization from_dict() ...................................................................... tlv: Fix recursive initialization from_dict() When calling from_dict() on a hierarchy of nested BER_TLV_IE, only the first/outer layer of TLV_IE_Collection would get its 'decoded' initialized correctly from the dict. Subsequent layers were not, as the 'decoded=' was passed as parameter during instance initialization. If we first instantiate the class and then call the from_dict() method, the recursive initialization down the full hierarchy works as expected. Change-Id: I795a33ed8dfa8454dc9079c189ab7b2ba64a3b72 --- M pySim/tlv.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/tlv.py b/pySim/tlv.py index 0dc746b..e1e2852 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -373,7 +373,8 @@ for k in i.keys(): if k in self.members_by_name: cls = self.members_by_name[k] - inst = cls(decoded=i[k]) + inst = cls() + inst.from_dict(i[k]) res.append(inst) else: raise ValueError('%s: Unknown TLV Class %s in %s; expected %s' % -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25878 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I795a33ed8dfa8454dc9079c189ab7b2ba64a3b72 Gerrit-Change-Number: 25878 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:28:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:28:31 +0000 Subject: Change in pysim[master]: utils: Fix BER-TLV tag decode for multi-byte tags In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25881 ) Change subject: utils: Fix BER-TLV tag decode for multi-byte tags ...................................................................... utils: Fix BER-TLV tag decode for multi-byte tags We cannot simply skip anything that has 0xFF as first byte to detect the padding after the end of a TLV object: 0xFF may very well be a valid first octet of a multi-octet TAG: Tags of private class (11) with constructed (1) payload will have 0xFF as first octet. So let's expand the check to only detect padding in case of either only a single byte FF being left, or two FF following each other [with whatever suffix]. Change-Id: I5d64ce9ef1d973804daabae0b15c2e2349e6fab9 --- M pySim/utils.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 777638c..def88f0 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -173,7 +173,8 @@ Returns: Tuple of (tag:int, remainder:bytes) """ - if binary[0] == 0xff: + # check for FF padding at the end, as customary in SIM card files + if binary[0] == 0xff and len(binary) == 1 or binary[0] == 0xff and binary[1] == 0xff: return None, binary tag = binary[0] & 0x1f if tag <= 30: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25881 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5d64ce9ef1d973804daabae0b15c2e2349e6fab9 Gerrit-Change-Number: 25881 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:28:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:28:32 +0000 Subject: Change in pysim[master]: pySim-shell: Improve documentation In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/25882 ) Change subject: pySim-shell: Improve documentation ...................................................................... pySim-shell: Improve documentation A number of new commands were recently introduced without proper coverage in the documentation (user manual). This includes equip, bulk_script and others. Change-Id: Ide7ba68ad90f6e5c2a41a2e3de22534258ebb7fd --- M docs/shell.rst M pySim-shell.py 2 files changed, 37 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/docs/shell.rst b/docs/shell.rst index 3d56c6d..e5d70a0 100644 --- a/docs/shell.rst +++ b/docs/shell.rst @@ -196,6 +196,15 @@ :module: pySim-shell :func: PySimCommands.export_parser +Please note that `export` works relative to the current working +directory, so if you are in `MF`, then the export will contain all known +files on the card. However, if you are in `ADF.ISIM`, only files below +that ADF will be part of the export. + +Furthermore, it is strongly advised to first enter the ADM1 pin +(`verify_adm`) to maximize the chance of having permission to read +all/most files. + tree ~~~~ @@ -216,9 +225,35 @@ reset ~~~~~ - Perform card reset and display the card ATR. +intro +~~~~~ +[Re-]Display the introductory banner + + +equip +~~~~~ +Equip pySim-shell with a card; particularly useful if the program was +started before a card was present, or after a card has been replaced by +the user while pySim-shell was kept running. + +bulk_script +~~~~~~~~~~~ +.. argparse:: + :module: pySim-shell + :func: PysimApp.bulk_script_parser + +Run a script for bulk-provisioning of multiple cards. + + +echo +~~~~ +.. argparse:: + :module: pySim-shell + :func: PysimApp.echo_parser + + Linear Fixed EF commands ------------------------ diff --git a/pySim-shell.py b/pySim-shell.py index 1fc09ef..3fc5859 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -380,6 +380,7 @@ @cmd2.with_argparser(echo_parser) @cmd2.with_category(CUSTOM_CATEGORY) def do_echo(self, opts): + """Echo (print) a string on the console""" self.poutput(opts.string) @with_default_category('pySim Commands') -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25882 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ide7ba68ad90f6e5c2a41a2e3de22534258ebb7fd Gerrit-Change-Number: 25882 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:29:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:29:36 +0000 Subject: Change in osmo-ci[master]: coverity: drop --enable-sysmocom-bts for osmo-pcu In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25854 ) Change subject: coverity: drop --enable-sysmocom-bts for osmo-pcu ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7f06f3d804acd97526a9eb0f93a23375ec555ee8 Gerrit-Change-Number: 25854 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:29:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:29:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:29:43 +0000 Subject: Change in osmo-ci[master]: coverity: also specify --with-sysmobts for osmo-pcu In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25855 ) Change subject: coverity: also specify --with-sysmobts for osmo-pcu ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie17e2f9f81258e4d60c8cecf0a7af38e8372f9dd Gerrit-Change-Number: 25855 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:29:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:29:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:29:58 +0000 Subject: Change in osmo-ci[master]: coverity: allow passing configure args to build_default() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25856 ) Change subject: coverity: allow passing configure args to build_default() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I79aa2c65cd0d3b06c0bd9ec4f44288b21e40c3b7 Gerrit-Change-Number: 25856 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:29:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:30:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:30:05 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-{msc, sgsn} with --enable-iu In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25857 ) Change subject: coverity: build osmo-{msc,sgsn} with --enable-iu ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3ef08fcf42950b33e18b3bfcddff890547308364 Gerrit-Change-Number: 25857 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:30:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:30:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:30:12 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-msc with --enable-smpp In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25858 ) Change subject: coverity: build osmo-msc with --enable-smpp ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie1e4f1610d86fe57d940527ac64d3d1beb7165e0 Gerrit-Change-Number: 25858 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:30:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:30:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:30:21 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-trx with UHD+LMS+IPC support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25859 ) Change subject: coverity: build osmo-trx with UHD+LMS+IPC support ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib58bee277414596cb46e523c798d42514c0eb78d Gerrit-Change-Number: 25859 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:30:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:30:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:30:29 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-trx with USRP1 support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25860 ) Change subject: coverity: build osmo-trx with USRP1 support ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I36df72149a32cb0df43c74af910d1fbb92b88f4a Gerrit-Change-Number: 25860 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:30:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:30:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:30:40 +0000 Subject: Change in osmo-ci[master]: coverity: also build and check SIMTrace host tools In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25861 ) Change subject: coverity: also build and check SIMTrace host tools ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I74da8b523c9d51887d5eceb01ca0f505bb846812 Gerrit-Change-Number: 25861 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:30:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:30:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:30:49 +0000 Subject: Change in osmo-ci[master]: coverity: also build and check osmo-{cbc, gbproxy} In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25862 ) Change subject: coverity: also build and check osmo-{cbc,gbproxy} ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibbff2bdf3163ba33dac11ccaa2e405894a7a0f10 Gerrit-Change-Number: 25862 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:30:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:30:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:30:50 +0000 Subject: Change in osmo-ci[master]: coverity: drop --enable-sysmocom-bts for osmo-pcu In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25854 ) Change subject: coverity: drop --enable-sysmocom-bts for osmo-pcu ...................................................................... coverity: drop --enable-sysmocom-bts for osmo-pcu There is no such parameter in osmo-pcu's configure script. Change-Id: I7f06f3d804acd97526a9eb0f93a23375ec555ee8 --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 3b47b70..4c69adc 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -48,7 +48,7 @@ build_osmopcu() { pushd osmo-pcu - do_build --enable-sysmocom-bts=yes --enable-sysmocom-dsp=yes + do_build --enable-sysmocom-dsp=yes popd } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25854 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7f06f3d804acd97526a9eb0f93a23375ec555ee8 Gerrit-Change-Number: 25854 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:30:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:30:51 +0000 Subject: Change in osmo-ci[master]: coverity: also specify --with-sysmobts for osmo-pcu In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25855 ) Change subject: coverity: also specify --with-sysmobts for osmo-pcu ...................................................................... coverity: also specify --with-sysmobts for osmo-pcu It's present in build_osmobts(), so let's add it for consistency. Change-Id: Ie17e2f9f81258e4d60c8cecf0a7af38e8372f9dd --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 4c69adc..fb5ed81 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -48,7 +48,7 @@ build_osmopcu() { pushd osmo-pcu - do_build --enable-sysmocom-dsp=yes + do_build --enable-sysmocom-dsp=yes --with-sysmobts="$prefix/include/" popd } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie17e2f9f81258e4d60c8cecf0a7af38e8372f9dd Gerrit-Change-Number: 25855 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:30:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:30:52 +0000 Subject: Change in osmo-ci[master]: coverity: allow passing configure args to build_default() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25856 ) Change subject: coverity: allow passing configure args to build_default() ...................................................................... coverity: allow passing configure args to build_default() Change-Id: I79aa2c65cd0d3b06c0bd9ec4f44288b21e40c3b7 --- M coverity/build_Osmocom.sh 1 file changed, 9 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index fb5ed81..2e00273 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -20,7 +20,8 @@ build_default() { pushd $1 - do_build + shift + do_build $* popd } @@ -38,20 +39,6 @@ popd } -build_osmobts() { - pushd osmo-bts - - do_build --enable-sysmocom-bts --with-sysmobts="$prefix/include/" --enable-trx - popd -} - -build_osmopcu() { - pushd osmo-pcu - - do_build --enable-sysmocom-dsp=yes --with-sysmobts="$prefix/include/" - popd -} - build_osmocombb() { pushd osmocom-bb/src/ make nofirmware @@ -72,8 +59,13 @@ build_default libsmpp34 build_default osmo-ggsn build_default osmo-iuh -build_osmopcu -build_osmobts +build_default osmo-pcu \ + --with-sysmobts="$prefix/include/" \ + --enable-sysmocom-dsp=yes +build_default osmo-bts \ + --with-sysmobts="$prefix/include/" \ + --enable-sysmocom-bts \ + --enable-trx build_default osmo-sysmon build_default osmo-mgw build_default osmo-bsc -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I79aa2c65cd0d3b06c0bd9ec4f44288b21e40c3b7 Gerrit-Change-Number: 25856 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:30:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:30:53 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-{msc, sgsn} with --enable-iu In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25857 ) Change subject: coverity: build osmo-{msc,sgsn} with --enable-iu ...................................................................... coverity: build osmo-{msc,sgsn} with --enable-iu This allows Coverity to analyze the Iu (UMTS) specific code. Change-Id: I3ef08fcf42950b33e18b3bfcddff890547308364 --- M coverity/build_Osmocom.sh 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 2e00273..e0cb237 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -70,8 +70,10 @@ build_default osmo-mgw build_default osmo-bsc build_default osmo-hlr -build_default osmo-msc -build_default osmo-sgsn +build_default osmo-msc \ + --enable-iu +build_default osmo-sgsn \ + --enable-iu build_default osmo-smlc # GMR -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3ef08fcf42950b33e18b3bfcddff890547308364 Gerrit-Change-Number: 25857 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:30:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:30:53 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-msc with --enable-smpp In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25858 ) Change subject: coverity: build osmo-msc with --enable-smpp ...................................................................... coverity: build osmo-msc with --enable-smpp This allows Coverity to analyze the SMPP specific code. Change-Id: Ie1e4f1610d86fe57d940527ac64d3d1beb7165e0 --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index e0cb237..2d561cd 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -71,6 +71,7 @@ build_default osmo-bsc build_default osmo-hlr build_default osmo-msc \ + --enable-smpp \ --enable-iu build_default osmo-sgsn \ --enable-iu -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie1e4f1610d86fe57d940527ac64d3d1beb7165e0 Gerrit-Change-Number: 25858 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:30:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:30:53 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-trx with UHD+LMS+IPC support In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25859 ) Change subject: coverity: build osmo-trx with UHD+LMS+IPC support ...................................................................... coverity: build osmo-trx with UHD+LMS+IPC support This allows Coverity to analyze the UHD/LMS/IPC specific code. Change-Id: Ib58bee277414596cb46e523c798d42514c0eb78d --- M coverity/build_Osmocom.sh 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 2d561cd..78767ee 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -84,7 +84,10 @@ # MNCC to SIP build_default osmo-sip-connector -build_default osmo-trx +build_default osmo-trx \ + --with-uhd \ + --with-lms \ + --with-ipc # OsmocomBB (without firmware) build_osmocombb -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib58bee277414596cb46e523c798d42514c0eb78d Gerrit-Change-Number: 25859 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:30:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:30:53 +0000 Subject: Change in osmo-ci[master]: coverity: build osmo-trx with USRP1 support In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25860 ) Change subject: coverity: build osmo-trx with USRP1 support ...................................................................... coverity: build osmo-trx with USRP1 support This allows Coverity to analyze the libusrp specific code. Change-Id: I36df72149a32cb0df43c74af910d1fbb92b88f4a --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmcocom.sh 2 files changed, 12 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 78767ee..cf71a6f 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -39,6 +39,15 @@ popd } +build_libusrp() { + pushd libusrp + PM=$PARALLEL_MAKE + PARALLEL_MAKE="" + do_build + PARALLEL_MAKE=$PM + popd +} + build_osmocombb() { pushd osmocom-bb/src/ make nofirmware @@ -53,6 +62,7 @@ build_default asn1c build_default libosmocore build_libasn1c +build_libusrp build_default libosmo-abis build_default libosmo-netif build_default libosmo-sccp @@ -85,6 +95,7 @@ build_default osmo-sip-connector build_default osmo-trx \ + --with-usrp1 \ --with-uhd \ --with-lms \ --with-ipc diff --git a/coverity/prepare_source_Osmcocom.sh b/coverity/prepare_source_Osmcocom.sh index ab1525e..cad9b16 100755 --- a/coverity/prepare_source_Osmcocom.sh +++ b/coverity/prepare_source_Osmcocom.sh @@ -13,6 +13,7 @@ libosmo-netif \ libosmo-sccp \ libsmpp34 \ + libusrp \ osmo-bsc \ osmo-msc \ osmo-mgw \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I36df72149a32cb0df43c74af910d1fbb92b88f4a Gerrit-Change-Number: 25860 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:30:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:30:54 +0000 Subject: Change in osmo-ci[master]: coverity: also build and check SIMTrace host tools In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25861 ) Change subject: coverity: also build and check SIMTrace host tools ...................................................................... coverity: also build and check SIMTrace host tools Change-Id: I74da8b523c9d51887d5eceb01ca0f505bb846812 --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmcocom.sh 2 files changed, 9 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index cf71a6f..65277fd 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -54,6 +54,12 @@ popd } +build_simtrace2() { + pushd simtrace + make -C host + popd +} + cd "$src_dir" rm -rf "$prefix" @@ -102,3 +108,5 @@ # OsmocomBB (without firmware) build_osmocombb +# SIMTrace host tools +build_simtrace2 diff --git a/coverity/prepare_source_Osmcocom.sh b/coverity/prepare_source_Osmcocom.sh index cad9b16..8dbcbce 100755 --- a/coverity/prepare_source_Osmcocom.sh +++ b/coverity/prepare_source_Osmcocom.sh @@ -29,6 +29,7 @@ osmo-hlr \ osmocom-bb \ osmo-smlc \ + simtrace2 \ ; do if [ -d $proj ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I74da8b523c9d51887d5eceb01ca0f505bb846812 Gerrit-Change-Number: 25861 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:30:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:30:54 +0000 Subject: Change in osmo-ci[master]: coverity: also build and check osmo-{cbc, gbproxy} In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25862 ) Change subject: coverity: also build and check osmo-{cbc,gbproxy} ...................................................................... coverity: also build and check osmo-{cbc,gbproxy} Change-Id: Ibbff2bdf3163ba33dac11ccaa2e405894a7a0f10 --- M coverity/build_Osmocom.sh M coverity/prepare_source_Osmcocom.sh 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 65277fd..5c2c71e 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -74,6 +74,7 @@ build_default libosmo-sccp build_default libsmpp34 build_default osmo-ggsn +build_default osmo-gbproxy build_default osmo-iuh build_default osmo-pcu \ --with-sysmobts="$prefix/include/" \ @@ -92,6 +93,7 @@ build_default osmo-sgsn \ --enable-iu build_default osmo-smlc +build_default osmo-cbc # GMR build_default libosmo-dsp diff --git a/coverity/prepare_source_Osmcocom.sh b/coverity/prepare_source_Osmcocom.sh index 8dbcbce..7a86b7d 100755 --- a/coverity/prepare_source_Osmcocom.sh +++ b/coverity/prepare_source_Osmcocom.sh @@ -18,6 +18,7 @@ osmo-msc \ osmo-mgw \ osmo-ggsn \ + osmo-gbproxy \ osmo-sgsn \ osmo-bts \ osmo-gmr \ @@ -29,6 +30,7 @@ osmo-hlr \ osmocom-bb \ osmo-smlc \ + osmo-cbc \ simtrace2 \ ; do -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ibbff2bdf3163ba33dac11ccaa2e405894a7a0f10 Gerrit-Change-Number: 25862 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:31:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:31:38 +0000 Subject: Change in libosmocore[master]: gprs_ns2: add vty `nse <0-65535> restart sns` In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/23184 ) Change subject: gprs_ns2: add vty `nse <0-65535> restart sns` ...................................................................... Patch Set 1: ping? would be good to get this wrapped up -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/23184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icb55d8449908d348ab10572eebcf971737fba00d Gerrit-Change-Number: 23184 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:31:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:32:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:32:21 +0000 Subject: Change in osmo-bsc[2021q1]: assignment_fsm: Check for conn->lchan In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25837 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25837 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:32:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:32:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:32:23 +0000 Subject: Change in osmo-bsc[2021q1]: assignment_fsm: Check for conn->lchan In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25837 ) Change subject: assignment_fsm: Check for conn->lchan ...................................................................... assignment_fsm: Check for conn->lchan When the SDCCH gets released while the TCH still beeing activated, then the ChanActivACK that is received after the TCH is activated will trigger a segmentation fault in the assignment_fsm. The reason for this is that conn->lchan, which holds the SDCCH at that point in time, is now NULL. To prevent osmo-bsc from crashing, the FSM should check for the presence of conn->lchan first. If it does not exist, the FSM should terminate. (Assignment failed) Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Related: SYS#5627, OS#5255 --- M src/osmo-bsc/assignment_fsm.c 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index faaec53..3eda129 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -611,6 +611,15 @@ int rc; struct gsm_subscriber_connection *conn = assignment_fi_conn(fi); + /* There may be situations where the SDCCH gets released while the TCH is still being activated. We will then + * receive ChanActivAck message from the BTS when the TCH is ready. Since the SDCCH is already released by + * then conn->lchan will be NULL in this case. */ + if (!conn->lchan) { + assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE, + "Unable to send RR Assignment Command: conn without lchan"); + return; + } + rc = gsm48_send_rr_ass_cmd(conn->lchan, conn->assignment.new_lchan, conn->lchan->ms_power); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25837 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: I3b1cd88bea62ef0032f6c035bac95d3df9fdca7a Gerrit-Change-Number: 25837 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:32:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:32:34 +0000 Subject: Change in osmo-bsc[2021q1]: lchan_fsm: fix potential NULL-pointer dereference In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25838 ) Change subject: lchan_fsm: fix potential NULL-pointer dereference ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Gerrit-Change-Number: 25838 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:32:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:32:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:32:36 +0000 Subject: Change in osmo-bsc[2021q1]: lchan_fsm: fix potential NULL-pointer dereference In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25838 ) Change subject: lchan_fsm: fix potential NULL-pointer dereference ...................................................................... lchan_fsm: fix potential NULL-pointer dereference Test case TC_lost_sdcch_during_assignment from ttcn3-bsc-test causes osmo-bsc to crash due to for_conn being NULL. Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Related: SYS#5526, OS#5255 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 4eb95ff..ccd8858 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -114,6 +114,18 @@ case FOR_ASSIGNMENT: LOG_LCHAN(lchan, LOGL_NOTICE, "Signalling Assignment FSM of error (%s)\n", lchan->last_error ? : "unknown error"); + if (!for_conn) { + LOG_LCHAN(lchan, LOGL_ERROR, + "lchan activation for Assignment failed, but activation request has" + " no conn\n"); + break; + } + if (!for_conn->assignment.fi) { + LOG_LCHAN(lchan, LOGL_ERROR, + "lchan activation for Assignment failed, but conn has no ongoing" + " assignment procedure\n"); + break; + } _osmo_fsm_inst_dispatch(for_conn->assignment.fi, ASSIGNMENT_EV_LCHAN_ERROR, lchan, file, line); return; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25838 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q1 Gerrit-Change-Id: I373855b95f8bde0ce8f9c2ae7bf95c9135d33484 Gerrit-Change-Number: 25838 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:33:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:33:37 +0000 Subject: Change in libosmocore[master]: gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25866 ) Change subject: gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia28293a12de0af71f55e701fb65c46e905dae217 Gerrit-Change-Number: 25866 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:33:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:33:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:33:39 +0000 Subject: Change in libosmocore[master]: gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25866 ) Change subject: gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap ...................................................................... gsm_08_58: extend struct abis_rsl_osmo_temp_ovp_acch_cap This change adds new [bit-]fields in order to allow: * selectively enabling SACCH and/or FACCH, * setting the RxQual (BER) threshold. Change-Id: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M include/osmocom/gsm/protocol/gsm_08_58.h 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index fd22d91..b46f9f5 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -141,7 +141,17 @@ /* Osmocom specific IE to negotiate temporary overpower of ACCH channels */ struct abis_rsl_osmo_temp_ovp_acch_cap { - uint8_t overpower_db; +#if OSMO_IS_BIG_ENDIAN + uint8_t sacch_enable:1, + facch_enable:1, + rxqual:3, + overpower_db:3; +#elif OSMO_IS_LITTLE_ENDIAN + uint8_t overpower_db:3, + rxqual:3, + facch_enable:1, + sacch_enable:1; +#endif } __attribute__ ((packed)); /* Chapter 9.1 */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia28293a12de0af71f55e701fb65c46e905dae217 Gerrit-Change-Number: 25866 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:34:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:34:45 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: add more ACCH overpower related parameters In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25869 ) Change subject: [overpower] VTY: add more ACCH overpower related parameters ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Gerrit-Change-Number: 25869 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:34:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:35:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:35:14 +0000 Subject: Change in osmo-bsc[master]: [overpower] Add VTY transcript tests for all commands In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25870 ) Change subject: [overpower] Add VTY transcript tests for all commands ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefbdbeb36a4692102dbb76d86113a183e4f381a7 Gerrit-Change-Number: 25870 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:35:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:36:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:36:39 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: add rate counter for Uplink block decoding errors In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25270 ) Change subject: osmo-bts-trx: add rate counter for Uplink block decoding errors ...................................................................... Patch Set 3: > ping? another ping? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7aea0529771ad73d5d6bcaf0865f9b0d4ecace6b Gerrit-Change-Number: 25270 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:36:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:37:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:37:34 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: use LOGL_DEBUG for Uplink block decoding errors In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25271 ) Change subject: osmo-bts-trx: use LOGL_DEBUG for Uplink block decoding errors ...................................................................... Patch Set 3: ping? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8cb3c054fe6d750d44bbb4ecf7ccd1788fcdc66c Gerrit-Change-Number: 25271 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:37:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:38:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:38:47 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: set don't-fragment flag on all TRXD packets In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23814 ) Change subject: osmo-bts-trx: set don't-fragment flag on all TRXD packets ...................................................................... Patch Set 5: ping? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I25415b76b69ccf43f83ddfb0e7dd1e330fb23aa7 Gerrit-Change-Number: 23814 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:38:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:39:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:39:04 +0000 Subject: Change in osmo-bts[master]: measurement: fix wrong operator used in handle_ms_meas_report() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25863 ) Change subject: measurement: fix wrong operator used in handle_ms_meas_report() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iad781dde0406d341bf385734ceddf51999558dd3 Gerrit-Change-Number: 25863 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:39:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:39:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:39:41 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: fix potential NULL pointer dereference In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25864 ) Change subject: osmo-bts-trx: fix potential NULL pointer dereference ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic9c1f3a3fb9c151bba4f6c3e605746fc8d43f44f Gerrit-Change-Number: 25864 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:39:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:40:02 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:40:02 +0000 Subject: Change in osmo-bts[master]: lchan_set_state(): also free pending messages if any In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25905 ) Change subject: lchan_set_state(): also free pending messages if any ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3264e6caa007e9e9cb9c1c2f8627c408bbb28b9e Gerrit-Change-Number: 25905 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 08:40:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:40:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:40:07 +0000 Subject: Change in osmo-bts[master]: measurement: fix wrong operator used in handle_ms_meas_report() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25863 ) Change subject: measurement: fix wrong operator used in handle_ms_meas_report() ...................................................................... measurement: fix wrong operator used in handle_ms_meas_report() Change-Id: Iad781dde0406d341bf385734ceddf51999558dd3 Fixes: CID#240263 --- M src/common/measurement.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/common/measurement.c b/src/common/measurement.c index 52431c5..a83be34 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -902,7 +902,7 @@ ms_pwr = lchan->ms_power_ctrl.current; } else { /* if len!=0, it means we were able to parse L1Header in UL SACCH: */ - OSMO_ASSERT(lchan->meas.flags | LC_UL_M_F_L1_VALID); + OSMO_ASSERT(lchan->meas.flags & LC_UL_M_F_L1_VALID); ms_ta = lchan->meas.l1_info.ta; ms_pwr = lchan->meas.l1_info.ms_pwr; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iad781dde0406d341bf385734ceddf51999558dd3 Gerrit-Change-Number: 25863 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:40:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:40:08 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: fix potential NULL pointer dereference In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25864 ) Change subject: osmo-bts-trx: fix potential NULL pointer dereference ...................................................................... osmo-bts-trx: fix potential NULL pointer dereference Change-Id: Ic9c1f3a3fb9c151bba4f6c3e605746fc8d43f44f Fixes: CID#240207 --- M src/osmo-bts-trx/trx_provision_fsm.c 1 file changed, 6 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-bts-trx/trx_provision_fsm.c b/src/osmo-bts-trx/trx_provision_fsm.c index 273b491..5deecd7 100644 --- a/src/osmo-bts-trx/trx_provision_fsm.c +++ b/src/osmo-bts-trx/trx_provision_fsm.c @@ -369,11 +369,13 @@ trx_provision_reset(l1h); - /* Apply initial RFMUTE state */ - if (pinst->trx != NULL) - trx_if_cmd_rfmute(l1h, pinst->trx->mo.nm_state.administrative != NM_STATE_UNLOCKED); - else + if (pinst->trx == NULL) { trx_if_cmd_rfmute(l1h, true); + return; + } + + /* Apply initial RFMUTE state */ + trx_if_cmd_rfmute(l1h, pinst->trx->mo.nm_state.administrative != NM_STATE_UNLOCKED); osmo_fsm_inst_dispatch(pinst->trx->mo.fi, NM_EV_SW_ACT, NULL); osmo_fsm_inst_dispatch(pinst->trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic9c1f3a3fb9c151bba4f6c3e605746fc8d43f44f Gerrit-Change-Number: 25864 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:40:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:40:52 +0000 Subject: Change in osmo-bts[master]: lchan: introduce and use lchan_is_tch() helper In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25906 ) Change subject: lchan: introduce and use lchan_is_tch() helper ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icd832667cad1189e3e819c88bde837c4260aa252 Gerrit-Change-Number: 25906 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:40:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:42:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:42:28 +0000 Subject: Change in osmo-iuh[master]: RFC: WIP: Fix compilation warnings In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25886 ) Change subject: RFC: WIP: Fix compilation warnings ...................................................................... Patch Set 1: Code-Review-2 we certainly will not apply patches to asn1c-generated code. If this is to be fixed (I doubt it), we either have to fix the code generation in asn1c, or have some kind of post-processing script that performs the related changes after code generation. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25886 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I36b6dc391af58334ab87986e76a0b63c4c3dfffa Gerrit-Change-Number: 25886 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Sun, 24 Oct 2021 08:42:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:43:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:43:14 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-hnbap as a public shared library In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25880 ) Change subject: Provide libosmo-hnbap as a public shared library ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 Gerrit-Change-Number: 25880 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:43:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:43:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:43:32 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-rua as a public shared library In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25887 ) Change subject: Provide libosmo-rua as a public shared library ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I8b800baacbfe3a3c424c51b418b5ac2e2848b3ba Gerrit-Change-Number: 25887 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:43:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:44:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:44:32 +0000 Subject: Change in osmo-iuh[master]: RFC: Add lib prefix to structs with duplicated names In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25888 ) Change subject: RFC: Add lib prefix to structs with duplicated names ...................................................................... Patch Set 3: Code-Review-1 if you want to make changes to generated code, then either a) use [or add] prefixing support to asn1c, or b) apply a patch to the asn files and regenerate the sources from asn -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I552fc028c7d08c880fdb844ece75816602c5bb67 Gerrit-Change-Number: 25888 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:44:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:46:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:46:49 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 ) Change subject: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() ...................................................................... Patch Set 1: I'm not 100% sure I like this approach. Wouldn't it make sense to have some kind of 'CCCH access' port from the ConnHdlr to TRX0 so it can perform the RACH procedure? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8df3db36f35190241735629a961f09d73bd0e5f5 Gerrit-Change-Number: 25907 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:46:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:47:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:47:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: make TRX number configurable for ConnHdlr In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21317 ) Change subject: BTS_Tests: make TRX number configurable for ConnHdlr ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifed3891658501e0a04ff89563d0a02f08211eed3 Gerrit-Change-Number: 21317 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:47:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:48:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:48:22 +0000 Subject: Change in osmo-iuh[master]: README.md: Document how to re-generate code from ASN1 files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25904 ) Change subject: README.md: Document how to re-generate code from ASN1 files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ie3e5b7fb88caf2a795fccdcf214f559f9683070c Gerrit-Change-Number: 25904 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:48:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:48:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:48:48 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 ) Change subject: Add project skeleton ...................................................................... Patch Set 15: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 15 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 08:48:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:48:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:48:51 +0000 Subject: Change in osmo-hnodeb[master]: Add project skeleton In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 ) Change subject: Add project skeleton ...................................................................... Add project skeleton This commit contains all the relevant project structure to build the osmo-hnodeb binary, its doc, tests, packaging, etc. The osmo-hnodeb binary itself is still just an empty main(). Related: SYS#5516 Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 --- A .gitignore A .gitreview A AUTHORS A COPYING A Makefile.am M README.md A TODO-RELEASE A configure.ac A contrib/Makefile.am A contrib/jenkins.sh A contrib/osmo-hnodeb.spec.in A contrib/systemd/Makefile.am A contrib/systemd/osmo-hnodeb.service A debian/changelog A debian/compat A debian/control A debian/copyright A debian/osmo-hnodeb.install A debian/rules A debian/source/format A doc/Makefile.am A doc/examples/Makefile.am A doc/examples/osmo-hnodeb/osmo-hnodeb.cfg A doc/manuals/Makefile.am A doc/manuals/chapters/overview.adoc A doc/manuals/osmohnodeb-usermanual-docinfo.xml A doc/manuals/osmohnodeb-usermanual.adoc A doc/manuals/osmohnodeb-vty-reference.xml A doc/manuals/regen_doc.sh A doc/manuals/vty/hnodeb_vty_additions.xml A git-version-gen A include/Makefile.am A include/osmocom/Makefile.am A include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnodeb.h A osmoappdesc.py A src/Makefile.am A src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/main.c A tests/Makefile.am A tests/atlocal.in A tests/ctrl_test_runner.py A tests/osmo-hnodeb.vty A tests/testsuite.at 44 files changed, 2,152 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0518b6f --- /dev/null +++ b/.gitignore @@ -0,0 +1,71 @@ +debian/*.log +*.o +*.lo +*.a +.deps +Makefile +Makefile.in +config.h +config.h.in +*.pc +*~ + +*.*~ +*.sw? +.libs +*.pyc +*.gcda +*.gcno + +**/TAGS + +#configure +aclocal.m4 +autom4te.cache/ +config.log +config.status +config.guess +config.sub +configure +compile +depcomp +install-sh +missing +stamp-h1 +libtool +ltmain.sh +m4/*.m4 + +# git-version-gen magic +.tarball-version +.version +osmo-hnodeb-*.tar.bz2 +osmo-hnodeb-*.tar.gz + +tags +/deps + +#tests +tests/testsuite.dir +tests/*/*_test + +tests/atconfig +tests/atlocal +tests/package.m4 +tests/testsuite +tests/testsuite.log + +writtenconfig/ + +# manuals +doc/manuals/*.html +doc/manuals/*.svg +doc/manuals/*.pdf +doc/manuals/*__*.png +doc/manuals/*.check +doc/manuals/generated/ +doc/manuals/osmohnodeb-usermanual.xml +doc/manuals/common +doc/manuals/build + +contrib/osmo-hnodeb.spec diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..b08b10a --- /dev/null +++ b/.gitreview @@ -0,0 +1,3 @@ +[gerrit] +host=gerrit.osmocom.org +project=osmo-hnodeb diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..f621811 --- /dev/null +++ b/AUTHORS @@ -0,0 +1 @@ +Pau Espin Pedrol diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..dba13ed --- /dev/null +++ b/COPYING @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..3fdc737 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,36 @@ +AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 + +## FIXME: automake >= 1.13 or autoconf >= 2.70 provide better suited AC_CONFIG_MACRO_DIRS for configure.ac +## remove line below when OE toolchain is updated to version which include those +ACLOCAL_AMFLAGS = -I m4 +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + $(NULL) + +SUBDIRS = \ + include \ + src \ + tests \ + doc \ + contrib \ + $(NULL) + +BUILT_SOURCES = $(top_srcdir)/.version +EXTRA_DIST = \ + .version \ + contrib/osmo-hnodeb.spec.in \ + debian \ + git-version-gen \ + osmoappdesc.py \ + $(NULL) + +AM_DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + + at RELMAKE@ + +$(top_srcdir)/.version: + echo $(VERSION) > $@-t && mv $@-t $@ +dist-hook: + echo $(VERSION) > $(distdir)/.tarball-version diff --git a/README.md b/README.md index 8b13789..2f09148 100644 --- a/README.md +++ b/README.md @@ -1 +1,64 @@ +osmo-hnodeb - Osmocom hNodeB Implementation +=========================================== +This repository contains a C-language implementation of a 3G Home NodeB (hNodeB). +It is part of the [Osmocom](https://osmocom.org/) Open Source Mobile Communications +project. + +You can use it to interface Iuh-speaking Home NodeB Gateway (HNB-GW), such as osmo-hnbgw. + +IMPORTANT: This is a first step towards implementing a minimal hNodeB upper +layer part, mainly handling HNBAP/RUA/RANAP messages on the Iuh interface. This +is not expected to be a full / usable hNodeB anytime soon [if ever]. + +Homepage +-------- + +The official homepage of the project is +https://osmocom.org/projects/osmohnodeb/wiki + +GIT Repository +-------------- + +You can clone from the official osmo-hnodeb.git repository using + + git clone git://git.osmocom.org/osmo-hnodeb.git + +There is a cgit interface at https://git.osmocom.org/osmo-hnodeb/ + +Documentation +------------- + +User Manuals and VTY reference manuals are [optionally] built in PDF form +as part of the build process. + +Pre-rendered PDF version of the current "master" can be found at +[User Manual](https://ftp.osmocom.org/docs/latest/osmohnodeb-usermanual.pdf) +as well as the [VTY Reference Manual](https://ftp.osmocom.org/docs/latest/osmohnodeb-vty-reference.pdf) + + +Mailing List +------------ + +Discussions related to osmo-bts are happening on the +openbsc at lists.osmocom.org mailing list, please see +https://lists.osmocom.org/mailman/listinfo/openbsc for subscription +options and the list archive. + +Please observe the [Osmocom Mailing List +Rules](https://osmocom.org/projects/cellular-infrastructure/wiki/Mailing_List_Rules) +when posting. + +Contributing +------------ + +Our coding standards are described at +https://osmocom.org/projects/cellular-infrastructure/wiki/Coding_standards + +We us a gerrit based patch submission/review process for managing +contributions. Please see +https://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit for +more details + +The current patch queue for osmo-bts can be seen at +https://gerrit.osmocom.org/#/q/project:osmo-hnodeb+status:open diff --git a/TODO-RELEASE b/TODO-RELEASE new file mode 100644 index 0000000..d0852fc --- /dev/null +++ b/TODO-RELEASE @@ -0,0 +1,9 @@ +# When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install +# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info +# In short: +# LIBVERSION=c:r:a +# If the library source code has changed at all since the last update, then increment revision: c:r + 1:a. +# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0. +# If any interfaces have been added since the last public release: c:r:a + 1. +# If any interfaces have been removed or changed since the last public release: c:r:0. +#library what description / commit summary line diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..649cf55 --- /dev/null +++ b/configure.ac @@ -0,0 +1,228 @@ +dnl Process this file with autoconf to produce a configure script +AC_INIT([osmo-hnodeb], + m4_esyscmd([./git-version-gen .tarball-version]), + [openbsc at lists.osmocom.org]) + +dnl *This* is the root dir, even if an install-sh exists in ../ or ../../ +AC_CONFIG_AUX_DIR([.]) + +AM_INIT_AUTOMAKE([dist-bzip2]) +AC_CONFIG_TESTDIR(tests) + +CFLAGS="$CFLAGS -std=gnu11" + +dnl kernel style compile messages +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + +dnl checks for programs +AC_PROG_MAKE_SET +AC_PROG_CC +AC_PROG_INSTALL +LT_INIT + +dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang +AS_CASE(["$LD"],[*clang*], + [AS_CASE(["${host_os}"], + [*linux*],[archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'])]) + +dnl check for pkg-config (explained in detail in libosmocore/configure.ac) +AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no) +if test "x$PKG_CONFIG_INSTALLED" = "xno"; then + AC_MSG_WARN([You need to install pkg-config]) +fi +PKG_PROG_PKG_CONFIG([0.20]) + +dnl check for AX_CHECK_COMPILE_FLAG +m4_ifdef([AX_CHECK_COMPILE_FLAG], [], [ + AC_MSG_ERROR([Please install autoconf-archive; re-run 'autoreconf -fi' for it to take effect.]) + ]) + +dnl checks for libraries +AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DL="$LIBS";LIBS=""]) +AC_SUBST(LIBRARY_DL) + +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) +PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.4.0) + +dnl checks for header files +AC_HEADER_STDC + +dnl Checks for typedefs, structures and compiler characteristics + +AC_ARG_ENABLE(sanitize, + [AS_HELP_STRING( + [--enable-sanitize], + [Compile with address sanitizer enabled], + )], + [sanitize=$enableval], [sanitize="no"]) +if test x"$sanitize" = x"yes" +then + CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined" + CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined" +fi + +AC_ARG_ENABLE(werror, + [AS_HELP_STRING( + [--enable-werror], + [Turn all compiler warnings into errors, with exceptions: + a) deprecation (allow upstream to mark deprecation without breaking builds); + b) "#warning" pragmas (allow to remind ourselves of errors without breaking builds) + ] + )], + [werror=$enableval], [werror="no"]) +if test x"$werror" = x"yes" +then + WERROR_FLAGS="-Werror" + WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" + WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" + CFLAGS="$CFLAGS $WERROR_FLAGS" + CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" +fi + +# The following test is taken from WebKit's webkit.m4 +saved_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -fvisibility=hidden " +AC_MSG_CHECKING([if ${CC} supports -fvisibility=hidden]) +AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])], + [ AC_MSG_RESULT([yes]) + SYMBOL_VISIBILITY="-fvisibility=hidden"], + AC_MSG_RESULT([no])) +CFLAGS="$saved_CFLAGS" +AC_SUBST(SYMBOL_VISIBILITY) + +AX_CHECK_COMPILE_FLAG([-Werror=implicit], [CFLAGS="$CFLAGS -Werror=implicit"]) +AX_CHECK_COMPILE_FLAG([-Werror=maybe-uninitialized], [CFLAGS="$CFLAGS -Werror=maybe-uninitialized"]) +AX_CHECK_COMPILE_FLAG([-Werror=memset-transposed-args], [CFLAGS="$CFLAGS -Werror=memset-transposed-args"]) +AX_CHECK_COMPILE_FLAG([-Wnull-dereference], [CFLAGS="$CFLAGS -Wnull-dereference"]) +AX_CHECK_COMPILE_FLAG([-Werror=sizeof-array-argument], [CFLAGS="$CFLAGS -Werror=sizeof-array-argument"]) +AX_CHECK_COMPILE_FLAG([-Werror=sizeof-pointer-memaccess], [CFLAGS="$CFLAGS -Werror=sizeof-pointer-memaccess"]) + +# Coverage build taken from WebKit's configure.in +AC_MSG_CHECKING([whether to enable code coverage support]) +AC_ARG_ENABLE(coverage, + AC_HELP_STRING([--enable-coverage], + [enable code coverage support [default=no]]), + [],[enable_coverage="no"]) +AC_MSG_RESULT([$enable_coverage]) +if test "$enable_coverage" = "yes"; then + COVERAGE_CFLAGS="-ftest-coverage -fprofile-arcs" + COVERAGE_LDFLAGS="-ftest-coverage -fprofile-arcs" + AC_SUBST([COVERAGE_CFLAGS]) + AC_SUBST([COVERAGE_LDFLAGS]) +fi + +AC_ARG_ENABLE(profile, + [AS_HELP_STRING([--enable-profile], [Compile with profiling support enabled], )], + [profile=$enableval], [profile="no"]) +if test x"$profile" = x"yes" +then + CFLAGS="$CFLAGS -pg" + CPPFLAGS="$CPPFLAGS -pg" +fi + +AC_ARG_ENABLE([external_tests], + AC_HELP_STRING([--enable-external-tests], + [Include the VTY/CTRL tests in make check [default=no]]), + [enable_ext_tests="$enableval"],[enable_ext_tests="no"]) +if test "x$enable_ext_tests" = "xyes" ; then + AC_CHECK_PROG(PYTHON3_AVAIL,python3,yes) + if test "x$PYTHON3_AVAIL" != "xyes" ; then + AC_MSG_ERROR([Please install python3 to run the VTY/CTRL tests.]) + fi + AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes) + if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then + AC_MSG_ERROR([Please install git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.]) + fi +fi +AC_MSG_CHECKING([whether to enable VTY/CTRL tests]) +AC_MSG_RESULT([$enable_ext_tests]) +AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") + +# Generate manuals +AC_ARG_ENABLE(manuals, + [AS_HELP_STRING( + [--enable-manuals], + [Generate manual PDFs [default=no]], + )], + [osmo_ac_build_manuals=$enableval], [osmo_ac_build_manuals="no"]) +AM_CONDITIONAL([BUILD_MANUALS], [test x"$osmo_ac_build_manuals" = x"yes"]) +AC_ARG_VAR(OSMO_GSM_MANUALS_DIR, [path to common osmo-gsm-manuals files, overriding pkg-config and "../osmo-gsm-manuals" + fallback]) +if test x"$osmo_ac_build_manuals" = x"yes" +then + # Find OSMO_GSM_MANUALS_DIR (env, pkg-conf, fallback) + if test -n "$OSMO_GSM_MANUALS_DIR"; then + echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (from env)" + else + OSMO_GSM_MANUALS_DIR="$($PKG_CONFIG osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null)" + if test -n "$OSMO_GSM_MANUALS_DIR"; then + echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (from pkg-conf)" + else + OSMO_GSM_MANUALS_DIR="../osmo-gsm-manuals" + echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (fallback)" + fi + fi + if ! test -d "$OSMO_GSM_MANUALS_DIR"; then + AC_MSG_ERROR("OSMO_GSM_MANUALS_DIR does not exist! Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR.") + fi + + # Find and run check-depends + CHECK_DEPENDS="$OSMO_GSM_MANUALS_DIR/check-depends.sh" + if ! test -x "$CHECK_DEPENDS"; then + CHECK_DEPENDS="osmo-gsm-manuals-check-depends" + fi + if ! $CHECK_DEPENDS; then + AC_MSG_ERROR("missing dependencies for --enable-manuals") + fi + + # Put in Makefile with absolute path + OSMO_GSM_MANUALS_DIR="$(realpath "$OSMO_GSM_MANUALS_DIR")" + AC_SUBST([OSMO_GSM_MANUALS_DIR]) +fi + +# https://www.freedesktop.org/software/systemd/man/daemon.html +AC_ARG_WITH([systemdsystemunitdir], + [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, + [with_systemdsystemunitdir=auto]) +AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [ + def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + + AS_IF([test "x$def_systemdsystemunitdir" = "x"], + [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"], + [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])]) + with_systemdsystemunitdir=no], + [with_systemdsystemunitdir="$def_systemdsystemunitdir"])]) +AS_IF([test "x$with_systemdsystemunitdir" != "xno"], + [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])]) +AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"]) + +AC_MSG_RESULT([CFLAGS="$CFLAGS"]) +AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) + +dnl Generate the output +AM_CONFIG_HEADER(config.h) + +AC_OUTPUT( + include/Makefile + include/osmocom/Makefile + include/osmocom/hnodeb/Makefile + src/Makefile + src/osmo-hnodeb/Makefile + tests/Makefile + tests/atlocal + doc/Makefile + doc/examples/Makefile + doc/manuals/Makefile + contrib/Makefile + contrib/systemd/Makefile + contrib/osmo-hnodeb.spec + Makefile) diff --git a/contrib/Makefile.am b/contrib/Makefile.am new file mode 100644 index 0000000..3439c97 --- /dev/null +++ b/contrib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = systemd diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh new file mode 100755 index 0000000..85042d8 --- /dev/null +++ b/contrib/jenkins.sh @@ -0,0 +1,68 @@ +#!/usr/bin/env bash +# jenkins build helper script for osmo-hnodeb. This is how we build on jenkins.osmocom.org +# +# environment variables: +# * WITH_MANUALS: build manual PDFs if set to "1" +# * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1") +# + +if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then + echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !" + exit 2 +fi + + +set -ex + +base="$PWD" +deps="$base/deps" +inst="$deps/install" +export deps inst + +osmo-clean-workspace.sh + +mkdir "$deps" || true + +verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") + +export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH" +export LD_LIBRARY_PATH="$inst/lib" +export PATH="$inst/bin:$PATH" + +osmo-build-dep.sh libosmocore "" --disable-doxygen +osmo-build-dep.sh libosmo-abis +osmo-build-dep.sh libosmo-netif +osmo-build-dep.sh libosmo-sccp +osmo-build-dep.sh libasn1c + +# Additional configure options and depends +CONFIG="" +if [ "$WITH_MANUALS" = "1" ]; then + CONFIG="--enable-manuals" +fi + +set +x +echo +echo +echo +echo " =============================== osmo-hnodeb ===============================" +echo +set -x + +cd "$base" +autoreconf --install --force +./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG +$MAKE $PARALLEL_MAKE +LD_LIBRARY_PATH="$inst/lib" $MAKE check \ + || cat-testlogs.sh +LD_LIBRARY_PATH="$inst/lib" \ + DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests --enable-werror $CONFIG" \ + $MAKE $PARALLEL_MAKE distcheck \ + || cat-testlogs.sh + +if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then + make -C "$base/doc/manuals" publish +fi + +$MAKE $PARALLEL_MAKE maintainer-clean +osmo-clean-workspace.sh diff --git a/contrib/osmo-hnodeb.spec.in b/contrib/osmo-hnodeb.spec.in new file mode 100644 index 0000000..4dbb670 --- /dev/null +++ b/contrib/osmo-hnodeb.spec.in @@ -0,0 +1,91 @@ +# +# spec file for package osmo-hnodeb +# +# Copyright (c) 2017, Martin Hauke +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +## Disable LTO for now since it breaks compilation of the tests +## https://osmocom.org/issues/4113 +%define _lto_cflags %{nil} + +Name: osmo-hnodeb +Version: @VERSION@ +Release: 0 +Summary: Osmohnodeb: Osmocom's Base Station Controller for 2G CS mobile networks +License: AGPL-3.0-or-later AND GPL-2.0-or-later +Group: Hardware/Mobile +URL: https://osmocom.org/projects/osmohnodeb +Source: %{name}-%{version}.tar.xz +BuildRequires: automake >= 1.9 +BuildRequires: libtool >= 2 +BuildRequires: pkgconfig >= 0.20 +%if 0%{?suse_version} +BuildRequires: systemd-rpm-macros +%endif +BuildRequires: pkgconfig(libcrypto) >= 0.9.5 +BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 +BuildRequires: pkgconfig(libosmo-sigtran) >= 1.4.0 +BuildRequires: pkgconfig(libosmoabis) >= 1.1.0 +BuildRequires: pkgconfig(libosmocore) >= 1.5.0 +BuildRequires: pkgconfig(libosmoctrl) >= 1.5.0 +BuildRequires: pkgconfig(libosmogb) >= 1.5.0 +BuildRequires: pkgconfig(libosmogsm) >= 1.5.0 +BuildRequires: pkgconfig(libosmovty) >= 1.5.0 +BuildRequires: pkgconfig(talloc) +%{?systemd_requires} + +%description +OsmoHNodeB: Osmocom's Home NodeB for 3G mobile networks. + +%prep +%setup -q + +%build +echo "%{version}" >.tarball-version +autoreconf -fi +%configure \ + --docdir=%{_docdir}/%{name} \ + --with-systemdsystemunitdir=%{_unitdir} +make %{?_smp_mflags} + +%install +%make_install + +%if 0%{?suse_version} +%preun +%service_del_preun %{name}.service + +%postun +%service_del_postun %{name}.service + +%pre +%service_add_pre %{name}.service + +%post +%service_add_post %{name}.service +%endif + +%check +make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +) + +%files +%license COPYING +%doc AUTHORS README +%{_bindir}/osmo-hnodeb +%dir %{_docdir}/%{name}/examples +%dir %{_docdir}/%{name}/examples/osmo-hnodeb +%{_docdir}/%{name}/examples/osmo-hnodeb/osmo-hnodeb.cfg +%{_docdir}/%{name}/examples/osmo-hnodeb/*/osmo-hnodeb*.cfg +%dir %{_sysconfdir}/osmocom +%config(noreplace) %{_sysconfdir}/osmocom/osmo-hnodeb.cfg +%{_unitdir}/%{name}.service + +%changelog diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am new file mode 100644 index 0000000..b20cf20 --- /dev/null +++ b/contrib/systemd/Makefile.am @@ -0,0 +1,6 @@ +EXTRA_DIST = osmo-hnodeb.service + +if HAVE_SYSTEMD +systemdsystemunit_DATA = \ + osmo-hnodeb.service +endif diff --git a/contrib/systemd/osmo-hnodeb.service b/contrib/systemd/osmo-hnodeb.service new file mode 100644 index 0000000..037e0e8 --- /dev/null +++ b/contrib/systemd/osmo-hnodeb.service @@ -0,0 +1,11 @@ +[Unit] +Description=Osmocom Home NodeB (hNodeB) + +[Service] +Type=simple +Restart=always +ExecStart=/usr/bin/osmo-hnodeb -c /etc/osmocom/osmo-hnodeb.cfg +RestartSec=2 + +[Install] +WantedBy=multi-user.target diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/debian/changelog diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..a7316db --- /dev/null +++ b/debian/control @@ -0,0 +1,46 @@ +Source: osmo-hnodeb +Section: net +Priority: extra +Maintainer: Osmocom team +Build-Depends: debhelper (>=9), + dh-autoreconf, + autotools-dev, + autoconf, + automake, + libtool, + pkg-config, + python3-minimal, + libtalloc-dev, + libasn1c-dev, + libosmocore-dev (>= 1.5.0), + libosmo-sigtran-dev (>= 1.4.0), + libosmo-abis-dev (>= 1.1.0), + libosmo-netif-dev (>= 1.1.0), + osmo-gsm-manuals-dev (>= 1.1.0) +Standards-Version: 3.9.8 +Vcs-Git: git://git.osmocom.org/osmo-hnodeb.git +Vcs-Browser: https://git.osmocom.org/osmo-hnodeb/ +Homepage: https://projects.osmocom.org/projects/osmo-hnodeb + +Package: osmo-hnodeb +Architecture: any +Multi-Arch: foreign +Depends: ${misc:Depends}, ${shlibs:Depends} +Recommends: osmo-mgw +Description: OsmoHNodeB: Osmocom's Home NodeB for 3G mobile networks + +Package: osmo-hnodeb-dbg +Section: debug +Architecture: any +Multi-Arch: same +Depends: osmo-hnodeb (= ${binary:Version}), ${misc:Depends} +Description: OsmoHNodeB: Osmocom's Home NodeB for 3G mobile networks + +Package: osmo-hnodeb-doc +Architecture: all +Section: doc +Priority: optional +Depends: ${misc:Depends} +Description: ${misc:Package} PDF documentation + Various manuals: user manual, VTY reference manual and/or + protocol/interface manuals. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..8321a0e --- /dev/null +++ b/debian/copyright @@ -0,0 +1,19 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: osmo-hnodeb +Source: git://git.osmocom.org/osmo-hnodeb + +Files: * +Copyright: 2021 sysmocom - s.f.m.c. GmbH +License: AGPL-3.0+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + . + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . diff --git a/debian/osmo-hnodeb.install b/debian/osmo-hnodeb.install new file mode 100644 index 0000000..e875d68 --- /dev/null +++ b/debian/osmo-hnodeb.install @@ -0,0 +1,4 @@ +etc/osmocom/osmo-hnodeb.cfg +lib/systemd/system/osmo-hnodeb.service +usr/bin/osmo-hnodeb +usr/share/doc/osmo-hnodeb/examples/osmo-hnodeb/osmo-hnodeb.cfg usr/share/doc/osmo-hnodeb/examples diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..a6bcd45 --- /dev/null +++ b/debian/rules @@ -0,0 +1,66 @@ +#!/usr/bin/make -f +# You must remove unused comment lines for the released package. +# See debhelper(7) (uncomment to enable) +# This is an autogenerated template for debian/rules. +# +# Output every command that modifies files on the build system. +#export DH_VERBOSE = 1 +# +# Copy some variable definitions from pkg-info.mk and vendor.mk +# under /usr/share/dpkg/ to here if they are useful. +# +# See FEATURE AREAS/ENVIRONMENT in dpkg-buildflags(1) +# Apply all hardening options +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +# Package maintainers to append CFLAGS +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +# Package maintainers to append LDFLAGS +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +# +# With debhelper version 9 or newer, the dh command exports +# all buildflags. So there is no need to include the +# /usr/share/dpkg/buildflags.mk file here if compat is 9 or newer. +# +# These are rarely used code. (START) +# +# The following include for *.mk magically sets miscellaneous +# variables while honoring existing values of pertinent +# environment variables: +# +# Architecture-related variables such as DEB_TARGET_MULTIARCH: +#include /usr/share/dpkg/architecture.mk +# Vendor-related variables such as DEB_VENDOR: +#include /usr/share/dpkg/vendor.mk +# Package-related variables such as DEB_DISTRIBUTION +#include /usr/share/dpkg/pkg-info.mk +# +# You may alternatively set them susing a simple script such as: +# DEB_VENDOR ?= $(shell dpkg-vendor --query Vendor) +# +# These are rarely used code. (END) +# + +# main packaging script based on dh7 syntax +%: + dh $@ --with autoreconf + +# debmake generated override targets +CONFIGURE_FLAGS += --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals +override_dh_auto_configure: + dh_auto_configure -- $(CONFIGURE_FLAGS) +# +# Do not install libtool archive, python .pyc .pyo +#override_dh_install: +# dh_install --list-missing -X.la -X.pyc -X.pyo + +# See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg +override_dh_strip: + dh_strip -posmo-hnodeb --dbg-package=osmo-hnodeb-dbg + +# Print test results in case of a failure +override_dh_auto_test: + dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) + +# Don't create .pdf.gz files (barely saves space and they can't be opened directly by most pdf readers) +override_dh_compress: + dh_compress -X.pdf diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..15f36b7 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = \ + examples \ + manuals \ + $(NULL) diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am new file mode 100644 index 0000000..c533e4e --- /dev/null +++ b/doc/examples/Makefile.am @@ -0,0 +1,30 @@ +OSMOCONF_FILES = \ + osmo-hnodeb/osmo-hnodeb.cfg + +osmoconfdir = $(sysconfdir)/osmocom +osmoconf_DATA = $(OSMOCONF_FILES) + +EXTRA_DIST = $(OSMOCONF_FILES) + +CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' + +dist-hook: + for f in $$($(CFG_FILES)); do \ + j="$(distdir)/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +install-data-hook: + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +uninstall-hook: + @$(PRE_UNINSTALL) + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + $(RM) $$j; \ + done diff --git a/doc/examples/osmo-hnodeb/osmo-hnodeb.cfg b/doc/examples/osmo-hnodeb/osmo-hnodeb.cfg new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/doc/examples/osmo-hnodeb/osmo-hnodeb.cfg diff --git a/doc/manuals/Makefile.am b/doc/manuals/Makefile.am new file mode 100644 index 0000000..8fb3ed4 --- /dev/null +++ b/doc/manuals/Makefile.am @@ -0,0 +1,26 @@ +EXTRA_DIST = \ + osmohnodeb-usermanual.adoc \ + osmohnodeb-usermanual-docinfo.xml \ + osmohnodeb-vty-reference.xml \ + chapters \ + regen_doc.sh \ + vty + +if BUILD_MANUALS + ASCIIDOC = osmohnodeb-usermanual.adoc + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc + osmohnodeb-usermanual.pdf: $(srcdir)/chapters/*.adoc + +# TODO: enable once we have VTY available in osmo-hnodeb +# VTY_REFERENCE = osmohnodeb-vty-reference.xml + +# BUILT_REFERENCE_XML = $(builddir)/vty/hnodeb_vty_reference.xml +# $(builddir)/vty/hnodeb_vty_reference.xml: $(top_builddir)/src/osmo-hnodeb/osmo-hnodeb +# mkdir -p $(builddir)/vty +# $(top_builddir)/src/osmo-hnodeb/osmo-hnodeb --vty-ref-xml > $@ + +# include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc + + OSMO_REPOSITORY = osmo-hnodeb + include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc +endif diff --git a/doc/manuals/chapters/overview.adoc b/doc/manuals/chapters/overview.adoc new file mode 100644 index 0000000..d5fda70 --- /dev/null +++ b/doc/manuals/chapters/overview.adoc @@ -0,0 +1,14 @@ +OsmoHNodeB[[overview]] +== Overview + +This manual should help you getting started with OsmoHNodeB. It will cover +aspects of configuring and running the OsmoHNodeB. + +[[intro_overview]] +=== About OsmoHNodeB + +OsmoHNodeB is the Osmocom implementation of a 3G Home NodeB. It +implements: + +- An L2 Uu radio interface towards 3G UEs +- an Iuh interface towards Home Node BG Gateway HNBGW diff --git a/doc/manuals/osmohnodeb-usermanual-docinfo.xml b/doc/manuals/osmohnodeb-usermanual-docinfo.xml new file mode 100644 index 0000000..d3ddc8c --- /dev/null +++ b/doc/manuals/osmohnodeb-usermanual-docinfo.xml @@ -0,0 +1,47 @@ + + + 1 + October 2016 + PEP + + Initial OsmoHnodeB manual + + + + + + + Pau + Espin Pedrol + pespin at sysmocom.de + PE + + sysmocom + sysmocom - s.f.m.c. GmbH + Software Developer + + + + + + 2021 + sysmocom - s.f.m.c. GmbH + + + + + Permission is granted to copy, distribute and/or modify this + document under the terms of the GNU Free Documentation License, + Version 1.3 or any later version published by the Free Software + Foundation; with the Invariant Sections being just 'Foreword', + 'Acknowledgements' and 'Preface', with no Front-Cover Texts, + and no Back-Cover Texts. A copy of the license is included in + the section entitled "GNU Free Documentation License". + + + The Asciidoc source code of this manual can be found at + + http://git.osmocom.org/osmo-gsm-manuals/ + + + diff --git a/doc/manuals/osmohnodeb-usermanual.adoc b/doc/manuals/osmohnodeb-usermanual.adoc new file mode 100644 index 0000000..578c0b9 --- /dev/null +++ b/doc/manuals/osmohnodeb-usermanual.adoc @@ -0,0 +1,31 @@ +:gfdl-enabled: +:program-name: OsmoHNodeB + +OsmoHNodeB User Manual +====================== +Pau Espin Pedrol + + +include::./common/chapters/preface.adoc[] + +include::{srcdir}/chapters/overview.adoc[] + +include::./common/chapters/vty.adoc[] + +include::./common/chapters/logging.adoc[] + +include::./common/chapters/cs7-config.adoc[] + +include::./common/chapters/counters-overview.adoc[] + +include::./common/chapters/control_if.adoc[] + +include::./common/chapters/vty_cpu_sched.adoc[] + +include::./common/chapters/port_numbers.adoc[] + +include::./common/chapters/bibliography.adoc[] + +include::./common/chapters/glossary.adoc[] + +include::./common/chapters/gfdl.adoc[] diff --git a/doc/manuals/osmohnodeb-vty-reference.xml b/doc/manuals/osmohnodeb-vty-reference.xml new file mode 100644 index 0000000..d642ce5 --- /dev/null +++ b/doc/manuals/osmohnodeb-vty-reference.xml @@ -0,0 +1,37 @@ + + + + +]> + + + + + + v1 + 20th October 2021 + PEP + Initial + + + + OsmoHNodeB VTY Reference + + + 2021 + + + + This work is copyright by sysmocom - s.f.m.c. GmbH. All rights reserved. + + + + + + &chapter-vty; + diff --git a/doc/manuals/regen_doc.sh b/doc/manuals/regen_doc.sh new file mode 100755 index 0000000..81636ea --- /dev/null +++ b/doc/manuals/regen_doc.sh @@ -0,0 +1,17 @@ +#!/bin/sh -x + +if [ -z "$DOCKER_PLAYGROUND" ]; then + echo "You need to set DOCKER_PLAYGROUND" + exit 1 +fi + +SCRIPT=$(realpath "$0") +MANUAL_DIR=$(dirname "$SCRIPT") + +COMMIT=${COMMIT:-$(git log -1 --format=format:%H)} + +cd "$DOCKER_PLAYGROUND/scripts" || exit 1 + +OSMO_HNODEB_BRANCH=$COMMIT ./regen_doc.sh osmo-hnodeb 4273 \ + "$MANUAL_DIR/chapters/counters_generated.adoc" \ + "$MANUAL_DIR/vty/hnodeb_vty_reference.xml" diff --git a/doc/manuals/vty/hnodeb_vty_additions.xml b/doc/manuals/vty/hnodeb_vty_additions.xml new file mode 100644 index 0000000..a4c675e --- /dev/null +++ b/doc/manuals/vty/hnodeb_vty_additions.xml @@ -0,0 +1,2 @@ + + diff --git a/git-version-gen b/git-version-gen new file mode 100755 index 0000000..42cf3d2 --- /dev/null +++ b/git-version-gen @@ -0,0 +1,151 @@ +#!/bin/sh +# Print a version string. +scriptversion=2010-01-28.01 + +# Copyright (C) 2007-2010 Free Software Foundation, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. +# It may be run two ways: +# - from a git repository in which the "git describe" command below +# produces useful output (thus requiring at least one signed tag) +# - from a non-git-repo directory containing a .tarball-version file, which +# presumes this script is invoked like "./git-version-gen .tarball-version". + +# In order to use intra-version strings in your project, you will need two +# separate generated version string files: +# +# .tarball-version - present only in a distribution tarball, and not in +# a checked-out repository. Created with contents that were learned at +# the last time autoconf was run, and used by git-version-gen. Must not +# be present in either $(srcdir) or $(builddir) for git-version-gen to +# give accurate answers during normal development with a checked out tree, +# but must be present in a tarball when there is no version control system. +# Therefore, it cannot be used in any dependencies. GNUmakefile has +# hooks to force a reconfigure at distribution time to get the value +# correct, without penalizing normal development with extra reconfigures. +# +# .version - present in a checked-out repository and in a distribution +# tarball. Usable in dependencies, particularly for files that don't +# want to depend on config.h but do want to track version changes. +# Delete this file prior to any autoconf run where you want to rebuild +# files to pick up a version string change; and leave it stale to +# minimize rebuild time after unrelated changes to configure sources. +# +# It is probably wise to add these two files to .gitignore, so that you +# don't accidentally commit either generated file. +# +# Use the following line in your configure.ac, so that $(VERSION) will +# automatically be up-to-date each time configure is run (and note that +# since configure.ac no longer includes a version string, Makefile rules +# should not depend on configure.ac for version updates). +# +# AC_INIT([GNU project], +# m4_esyscmd([build-aux/git-version-gen .tarball-version]), +# [bug-project at example]) +# +# Then use the following lines in your Makefile.am, so that .version +# will be present for dependencies, and so that .tarball-version will +# exist in distribution tarballs. +# +# BUILT_SOURCES = $(top_srcdir)/.version +# $(top_srcdir)/.version: +# echo $(VERSION) > $@-t && mv $@-t $@ +# dist-hook: +# echo $(VERSION) > $(distdir)/.tarball-version + +case $# in + 1) ;; + *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;; +esac + +tarball_version_file=$1 +nl=' +' + +# First see if there is a tarball-only version file. +# then try "git describe", then default. +if test -f $tarball_version_file +then + v=`cat $tarball_version_file` || exit 1 + case $v in + *$nl*) v= ;; # reject multi-line output + [0-9]*) ;; + *) v= ;; + esac + test -z "$v" \ + && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 +fi + +if test -n "$v" +then + : # use $v +elif + v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ + && case $v in + [0-9]*) ;; + v[0-9]*) ;; + *) (exit 1) ;; + esac +then + # Is this a new git that lists number of commits since the last + # tag or the previous older version that did not? + # Newer: v6.10-77-g0f8faeb + # Older: v6.10-g0f8faeb + case $v in + *-*-*) : git describe is okay three part flavor ;; + *-*) + : git describe is older two part flavor + # Recreate the number of commits and rewrite such that the + # result is the same as if we were using the newer version + # of git describe. + vtag=`echo "$v" | sed 's/-.*//'` + numcommits=`git rev-list "$vtag"..HEAD | wc -l` + v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`; + ;; + esac + + # Change the first '-' to a '.', so version-comparing tools work properly. + # Remove the "g" in git describe's output string, to save a byte. + v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`; +else + v=UNKNOWN +fi + +v=`echo "$v" |sed 's/^v//'` + +# Don't declare a version "dirty" merely because a time stamp has changed. +git status > /dev/null 2>&1 + +dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +case "$dirty" in + '') ;; + *) # Append the suffix only if there isn't one already. + case $v in + *-dirty) ;; + *) v="$v-dirty" ;; + esac ;; +esac + +# Omit the trailing newline, so that m4_esyscmd can use the result directly. +echo "$v" | tr -d '\012' + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 0000000..9d963a0 --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + osmocom \ + $(NULL) diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am new file mode 100644 index 0000000..19b6348 --- /dev/null +++ b/include/osmocom/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + hnodeb \ + $(NULL) diff --git a/include/osmocom/hnodeb/Makefile.am b/include/osmocom/hnodeb/Makefile.am new file mode 100644 index 0000000..189ef37 --- /dev/null +++ b/include/osmocom/hnodeb/Makefile.am @@ -0,0 +1,3 @@ +noinst_HEADERS = \ + hnodeb.h \ + $(NULL) diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h new file mode 100644 index 0000000..6f70f09 --- /dev/null +++ b/include/osmocom/hnodeb/hnodeb.h @@ -0,0 +1 @@ +#pragma once diff --git a/osmoappdesc.py b/osmoappdesc.py new file mode 100644 index 0000000..3456fca --- /dev/null +++ b/osmoappdesc.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python3 + +# (C) 2021 by sysmocom - s.m.f.c. GmbH +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see + +app_configs = { + "osmo-hnodeb": ["doc/examples/osmo-hnodeb/osmo-hnodeb.cfg"] +} + +apps = [(4273, "src/osmo-hnodeb/osmo-hnodeb", "OsmoHNodeB", "osmo-hnodeb") + ] + +vty_command = ["./src/osmo-hnodeb/osmo-hnodeb", "-c", + "doc/examples/osmo-hnodeb/osmo-hnodeb.cfg"] + +vty_app = apps[0] diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..ba68ce8 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + osmo-hnodeb \ + $(NULL) diff --git a/src/osmo-hnodeb/Makefile.am b/src/osmo-hnodeb/Makefile.am new file mode 100644 index 0000000..2ec8b24 --- /dev/null +++ b/src/osmo-hnodeb/Makefile.am @@ -0,0 +1,40 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + -I$(top_builddir) \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOCTRL_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + $(NULL) + +bin_PROGRAMS = \ + osmo-hnodeb \ + $(NULL) + +osmo_hnodeb_SOURCES = \ + main.c \ + $(NULL) + +osmo_hnodeb_LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMONETIF_LIBS) \ + $(COVERAGE_LDFLAGS) \ + $(LIBOSMOABIS_LIBS) \ + $(LIBOSMOSIGTRAN_LIBS) \ + $(NULL) diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c new file mode 100644 index 0000000..96d9136 --- /dev/null +++ b/src/osmo-hnodeb/main.c @@ -0,0 +1,25 @@ +/* (C) 2021 by sysmocom - s.f.m.c. GmbH + * Author: Pau Espin Pedrol + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include "config.h" + +int main(int argc, char **argv) +{ + return 0; +} diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..ed101ae --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,77 @@ +SUBDIRS = \ + $(NULL) + +# The `:;' works around a Bash 3.2 bug when the output is not writeable. +$(srcdir)/package.m4: $(top_srcdir)/configure.ac + :;{ \ + echo '# Signature of the current package.' && \ + echo 'm4_define([AT_PACKAGE_NAME],' && \ + echo ' [$(PACKAGE_NAME)])' && \ + echo 'm4_define([AT_PACKAGE_TARNAME],' && \ + echo ' [$(PACKAGE_TARNAME)])' && \ + echo 'm4_define([AT_PACKAGE_VERSION],' && \ + echo ' [$(PACKAGE_VERSION)])' && \ + echo 'm4_define([AT_PACKAGE_STRING],' && \ + echo ' [$(PACKAGE_STRING)])' && \ + echo 'm4_define([AT_PACKAGE_BUGREPORT],' && \ + echo ' [$(PACKAGE_BUGREPORT)])'; \ + echo 'm4_define([AT_PACKAGE_URL],' && \ + echo ' [$(PACKAGE_URL)])'; \ + } >'$(srcdir)/package.m4' + +EXTRA_DIST = \ + testsuite.at \ + $(srcdir)/package.m4 \ + $(TESTSUITE) \ + ctrl_test_runner.py \ + osmo-hnodeb.vty \ + $(NULL) + +TESTSUITE = $(srcdir)/testsuite + +DISTCLEANFILES = \ + atconfig \ + $(NULL) + +if ENABLE_EXT_TESTS +python-tests: $(BUILT_SOURCES) + echo "" +# TODO: Enable once we have a VTY/CTRL interface: +# $(MAKE) vty-test +# osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v +# osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v +# $(srcdir)/ctrl_test_runner.py -w $(abs_top_builddir) -v +else +python-tests: $(BUILT_SOURCES) + echo "Not running python-based tests (determined at configure-time)" +endif + +# Run a specific test with: 'make vty-test VTY_TEST=osmo-hnodeb.vty' +VTY_TEST ?= *.vty + +# To update the VTY script from current application behavior, +# pass -u to vty_script_runner.py by doing: +# make vty-test U=-u +vty-test: + osmo_verify_transcript_vty.py -v \ + -n OsmoHNodeB -p 4273 \ + -r "$(top_builddir)/src/osmo-hnodeb/osmo-hnodeb -c $(top_srcdir)/doc/examples/osmo-hnodeb/osmo-hnodeb.cfg" \ + $(U) $(srcdir)/$(VTY_TEST) + +check-local: atconfig $(TESTSUITE) + $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) + $(MAKE) $(AM_MAKEFLAGS) python-tests + +installcheck-local: atconfig $(TESTSUITE) + $(SHELL) '$(TESTSUITE)' AUTOTEST_PATH='$(bindir)' \ + $(TESTSUITEFLAGS) + +clean-local: + test ! -f '$(TESTSUITE)' || \ + $(SHELL) '$(TESTSUITE)' --clean + +AUTOM4TE = $(SHELL) $(top_srcdir)/missing --run autom4te +AUTOTEST = $(AUTOM4TE) --language=autotest +$(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 + $(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at + mv $@.tmp $@ diff --git a/tests/atlocal.in b/tests/atlocal.in new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/atlocal.in diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py new file mode 100755 index 0000000..8908a65 --- /dev/null +++ b/tests/ctrl_test_runner.py @@ -0,0 +1,215 @@ +#!/usr/bin/env python3 + +# (C) 2013 by Jacob Erlbeck +# (C) 2014 by Holger Hans Peter Freyther +# based on vty_test_runner.py: +# (C) 2013 by Katerina Barone-Adesi +# (C) 2013 by Holger Hans Peter Freyther +# based on bsc_control.py. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import os +import time +import unittest +import socket +import sys +import struct + +import osmopy.obscvty as obscvty +import osmopy.osmoutil as osmoutil +from osmopy.osmo_ipa import Ctrl, IPA + +# to be able to find $top_srcdir/doc/... +confpath = os.path.join(sys.path[0], '..') +verbose = False + +class TestCtrlBase(unittest.TestCase): + + def ctrl_command(self): + raise Exception("Needs to be implemented by a subclass") + + def ctrl_app(self): + raise Exception("Needs to be implemented by a subclass") + + def setUp(self): + osmo_ctrl_cmd = self.ctrl_command()[:] + config_index = osmo_ctrl_cmd.index('-c') + if config_index: + cfi = config_index + 1 + osmo_ctrl_cmd[cfi] = os.path.join(confpath, osmo_ctrl_cmd[cfi]) + + try: + self.proc = osmoutil.popen_devnull(osmo_ctrl_cmd) + except OSError: + print("Current directory: %s" % os.getcwd(), file=sys.stderr) + print("Consider setting -b", file=sys.stderr) + + appstring = self.ctrl_app()[2] + appport = self.ctrl_app()[0] + self.connect("127.0.0.1", appport) + self.next_id = 1000 + + def tearDown(self): + self.disconnect() + osmoutil.end_proc(self.proc) + + def disconnect(self): + if not (self.sock is None): + self.sock.close() + + def connect(self, host, port): + if verbose: + print("Connecting to host %s:%i" % (host, port)) + + retries = 30 + while True: + try: + sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sck.setblocking(1) + sck.connect((host, port)) + except IOError: + retries -= 1 + if retries <= 0: + raise + time.sleep(.1) + continue + break + self.sock = sck + return sck + + def send(self, data): + if verbose: + print("Sending \"%s\"" %(data)) + data = Ctrl().add_header(data) + return self.sock.send(data) == len(data) + + def send_set(self, var, value, id): + setmsg = "SET %s %s %s" %(id, var, value) + return self.send(setmsg) + + def send_get(self, var, id): + getmsg = "GET %s %s" %(id, var) + return self.send(getmsg) + + def do_set(self, var, value): + id = self.next_id + self.next_id += 1 + self.send_set(var, value, id) + return self.recv_msgs()[id] + + def do_get(self, var): + id = self.next_id + self.next_id += 1 + self.send_get(var, id) + return self.recv_msgs()[id] + + def recv_msgs(self): + responses = {} + data = self.sock.recv(4096) + while (len(data)>0): + (head, data) = IPA().split_combined(data) + answer = Ctrl().rem_header(head).decode() + if verbose: + print("Got message:", answer) + (mtype, id, msg) = answer.split(None, 2) + id = int(id) + rsp = {'mtype': mtype, 'id': id} + if mtype == "ERROR": + rsp['error'] = msg + else: + split = msg.split(None, 1) + rsp['var'] = split[0] + if len(split) > 1: + rsp['value'] = split[1] + else: + rsp['value'] = None + responses[id] = rsp + + if verbose: + print("Decoded replies: ", responses) + + return responses + + +class TestCtrlHNB(TestCtrlBase): + + def tearDown(self): + TestCtrlBase.tearDown(self) + os.unlink("tmp_dummy_sock") + + def ctrl_command(self): + return ["./src/osmo-hnodeb/osmo-hnodeb", "-r", "tmp_dummy_sock", "-c", + "doc/examples/osmo-hnodeb/osmo-hnodeb.cfg"] + + def ctrl_app(self): + return (4249, "./src/osmo-hnodeb/osmo-hnodeb", "OsmoHNodeB", "hnb") + + def testCtrlErrs(self): + r = self.do_get('invalid') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Command not found') + + r = self.do_set('rf_locked', '999') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Value failed verification.') + + r = self.do_get('bts') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Error while parsing the index.') + + r = self.do_get('bts.999') + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Error while resolving object') + +def add_hnodeb_test(suite, workdir, klass): + if not os.path.isfile(os.path.join(workdir, "src/osmo-hnodeb/osmo-hnodeb")): + print("Skipping the hNodeB test") + return + test = unittest.TestLoader().loadTestsFromTestCase(klass) + suite.addTest(test) + +if __name__ == '__main__': + import argparse + import sys + + workdir = '.' + + parser = argparse.ArgumentParser() + parser.add_argument("-v", "--verbose", dest="verbose", + action="store_true", help="verbose mode") + parser.add_argument("-p", "--pythonconfpath", dest="p", + help="searchpath for config") + parser.add_argument("-w", "--workdir", dest="w", + help="Working directory") + args = parser.parse_args() + + verbose_level = 1 + if args.verbose: + verbose_level = 2 + verbose = True + + if args.w: + workdir = args.w + + if args.p: + confpath = args.p + + print("confpath %s, workdir %s" % (confpath, workdir)) + os.chdir(workdir) + print("Running tests for specific control commands") + suite = unittest.TestSuite() + add_hnodeb_test(suite, workdir, TestCtrlHNB) + res = unittest.TextTestRunner(verbosity=verbose_level).run(suite) + sys.exit(len(res.errors) + len(res.failures)) diff --git a/tests/osmo-hnodeb.vty b/tests/osmo-hnodeb.vty new file mode 100644 index 0000000..3791bf9 --- /dev/null +++ b/tests/osmo-hnodeb.vty @@ -0,0 +1,2 @@ +OsmoHNodeB> enable + diff --git a/tests/testsuite.at b/tests/testsuite.at new file mode 100644 index 0000000..65d1ca0 --- /dev/null +++ b/tests/testsuite.at @@ -0,0 +1,8 @@ +AT_INIT +AT_BANNER([Regression tests.]) + +#AT_SETUP([foobar]) +#AT_KEYWORDS([foobar]) +#cat $abs_srcdir/foobar/foobar_test.ok > expout +#AT_CHECK([$abs_top_builddir/tests/foobar/foobar_test], [], [expout], [ignore]) +#AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ae3215ae4b956689d2adc88db7c3ead5df14f37 Gerrit-Change-Number: 25874 Gerrit-PatchSet: 15 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:50:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:50:41 +0000 Subject: Change in osmo-bts[master]: Allow user to specify IP DSCP for OML and RSL, too In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23923 ) Change subject: Allow user to specify IP DSCP for OML and RSL, too ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ic302a695453514459fa27400027154e7e8b74e0e Gerrit-Change-Number: 23923 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 08:59:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 08:59:23 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20296 to look at the new patch set (#15). Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... logging: Change stderr + file target to use non-blocking write So far, we used blocking, buffered fwrite() to write to stderr and file targets. This causes problems if there are [slow] consumers causing delays, such as gnome-terminal (when the program is started interactively) or systemd/journald (where we observe 64..128ms blocks on stderr). This patch introduces stderr/file based logging via write_queue and osmo_select_main(), i.e. switch from glibc-buffered, blocking to internally buffered, non-blocking writes. * when osmo_stderr_target is created via application.c, we create it in blocking stream mode for backwards compatibility, particularly for [smaller] programs that don't use osmo_select_main() * when the VTY code encounters 'log stderr' or 'log file FILENAME', we switch that respective target to non-blocking write-queue mode, as this means the application is in fact using osmo_select_main() * The config file can now state 'log stderr blocking-io' or 'log file FILENAME blocking-io' to explicitly enforce using blocking stream based I/O * The application can at any time use API functions to switch either way Closes: OS#4311 Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da --- M include/osmocom/core/logging.h M src/logging.c M src/vty/logging_vty.c M tests/logging/logging_vty_test.c 4 files changed, 314 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/20296/15 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 15 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 09:22:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 09:22:36 +0000 Subject: Change in osmo-bts[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 to look at the new patch set (#4). Change subject: initial support for static userspace probes via systemtap ...................................................................... initial support for static userspace probes via systemtap This adds a --enable-systemtap configure option, which will then add static tracepoints to the generated osmo-bts-* binary. At this point, only two sets of tracepoints are supported, and only in osmo-bts-trx: ul_data_{start,done} and dl_rst_{start,done}. The probes are intended to be used for analyzing the amount of time needed for processing of uplink bursts / generation of downlink bursts. Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 --- M configure.ac M src/common/Makefile.am A src/common/probes.d M src/osmo-bts-trx/Makefile.am A src/osmo-bts-trx/probes.d M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_if.c 7 files changed, 71 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/22641/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 Gerrit-Change-Number: 22641 Gerrit-PatchSet: 4 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 09:24:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 09:24:52 +0000 Subject: Change in libosmocore[master]: logging: Avoid memcpy from stack to msgb in _file_output() In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20305 to look at the new patch set (#12). Change subject: logging: Avoid memcpy from stack to msgb in _file_output() ...................................................................... logging: Avoid memcpy from stack to msgb in _file_output() For file and stderr output, the existing code always generates the log string on a stack buffer, and then (in case of non-blocking write via write_queue) copies it over to a msgb. Let's optimize this by turning _file_output() into a raw_output callback which first allocates the msgb and then format-prints directly to that msgb instaed of stack + memcpy. This has the disadvantage that we don't know how long the buffer has to be in order to print the entire string to it. As a result we always have to allocate a 4k-sized buffer (plus msgb overhead). The write_queue length for log file output has been decreased from 1024 entries to 156 entries in order to stay within the same memory requirements for each log target memory pool (about 648 kBytes). Related: OS#4311 Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 --- M src/logging.c 1 file changed, 43 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/05/20305/12 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 Gerrit-Change-Number: 20305 Gerrit-PatchSet: 12 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 10:23:17 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 10:23:17 +0000 Subject: Change in osmo-ci[master]: fixup: coverity: also build and check SIMTrace host tools References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25909 ) Change subject: fixup: coverity: also build and check SIMTrace host tools ...................................................................... fixup: coverity: also build and check SIMTrace host tools Change-Id: I97b173a4b3fe47a119145e8d6fa0ad116fd38237 --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/09/25909/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 5c2c71e..3723842 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -55,7 +55,7 @@ } build_simtrace2() { - pushd simtrace + pushd simtrace2 make -C host popd } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I97b173a4b3fe47a119145e8d6fa0ad116fd38237 Gerrit-Change-Number: 25909 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 10:23:19 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 10:23:19 +0000 Subject: Change in osmo-ci[master]: coverity: disable Doxygen when building projects References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25910 ) Change subject: coverity: disable Doxygen when building projects ...................................................................... coverity: disable Doxygen when building projects Change-Id: I2fe2f80eb3ec00e9b6c0a3c0ee96e1a0da217b27 --- M coverity/build_Osmocom.sh 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/10/25910/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 3723842..92dbea2 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -12,7 +12,10 @@ do_build() { autoreconf --install --force - ./configure --prefix="$prefix" --with-systemdsystemunitdir=no $* + ./configure \ + --prefix="$prefix" \ + --with-systemdsystemunitdir=no $* \ + --disable-doxygen make $PARALLEL_MAKE make install -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2fe2f80eb3ec00e9b6c0a3c0ee96e1a0da217b27 Gerrit-Change-Number: 25910 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 10:24:07 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 10:24:07 +0000 Subject: Change in osmo-ci[master]: fixup: coverity: also build and check SIMTrace host tools In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25909 ) Change subject: fixup: coverity: also build and check SIMTrace host tools ...................................................................... Patch Set 1: Code-Review+2 This is an urgent fix, merging it now to fix 'Coverity-Upload' job. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I97b173a4b3fe47a119145e8d6fa0ad116fd38237 Gerrit-Change-Number: 25909 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 24 Oct 2021 10:24:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 10:24:25 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 10:24:25 +0000 Subject: Change in osmo-ci[master]: fixup: coverity: also build and check SIMTrace host tools In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25909 ) Change subject: fixup: coverity: also build and check SIMTrace host tools ...................................................................... fixup: coverity: also build and check SIMTrace host tools Change-Id: I97b173a4b3fe47a119145e8d6fa0ad116fd38237 --- M coverity/build_Osmocom.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 5c2c71e..3723842 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -55,7 +55,7 @@ } build_simtrace2() { - pushd simtrace + pushd simtrace2 make -C host popd } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25909 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I97b173a4b3fe47a119145e8d6fa0ad116fd38237 Gerrit-Change-Number: 25909 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 10:28:01 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 10:28:01 +0000 Subject: Change in osmo-iuh[master]: README.md: Document how to re-generate code from ASN1 files In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25904 ) Change subject: README.md: Document how to re-generate code from ASN1 files ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ie3e5b7fb88caf2a795fccdcf214f559f9683070c Gerrit-Change-Number: 25904 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 10:28:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 10:44:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 10:44:28 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 ) Change subject: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() ...................................................................... Patch Set 1: > Patch Set 1: > > I'm not 100% sure I like this approach. Wouldn't it make sense to have some kind of 'CCCH access' port from the ConnHdlr to TRX0 so it can perform the RACH procedure? Providing the access to CCCH was my initial plan (we already had a discussion in Ifed3891658501e0a04ff89563d0a02f08211eed3). However, implementing this turned out to be too complex. I spent hours trying to make it work, and in the end realized that it's just for sending Immediate Assignment in f_est_dchan(). I see no other reason why would a ConnHdlr component need access to CCCH. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8df3db36f35190241735629a961f09d73bd0e5f5 Gerrit-Change-Number: 25907 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 10:44:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 10:45:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 10:45:57 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: add more ACCH overpower related parameters In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 to look at the new patch set (#6). Change subject: [overpower] VTY: add more ACCH overpower related parameters ...................................................................... [overpower] VTY: add more ACCH overpower related parameters The new fields in 'struct abis_rsl_osmo_temp_ovp_acch_cap' allow: * selectively enabling SACCH and/or FACCH, * setting the RxQual (BER) threshold. Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Depends: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M src/osmo-bsc/bts.c M src/osmo-bsc/bts_vty.c 2 files changed, 73 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/25869/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Gerrit-Change-Number: 25869 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 10:46:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 10:46:56 +0000 Subject: Change in osmo-bsc[master]: [overpower] Add VTY transcript tests for all commands In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25870 ) Change subject: [overpower] Add VTY transcript tests for all commands ...................................................................... Patch Set 5: Code-Review+2 1+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefbdbeb36a4692102dbb76d86113a183e4f381a7 Gerrit-Change-Number: 25870 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 10:46:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 10:50:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 10:50:58 +0000 Subject: Change in osmo-bts[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 to look at the new patch set (#5). Change subject: initial support for static userspace probes via systemtap ...................................................................... initial support for static userspace probes via systemtap This adds a --enable-systemtap configure option, which will then add static tracepoints to the generated osmo-bts-* binary. At this point, only two sets of tracepoints are supported, and only in osmo-bts-trx: ul_data_{start,done} and dl_rst_{start,done}. The probes are intended to be used for analyzing the amount of time needed for processing of uplink bursts / generation of downlink bursts. Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 --- M configure.ac M src/common/Makefile.am A src/common/probes.d M src/osmo-bts-trx/Makefile.am A src/osmo-bts-trx/probes.d M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_if.c 7 files changed, 73 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/22641/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 Gerrit-Change-Number: 22641 Gerrit-PatchSet: 5 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 10:55:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 10:55:57 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: add more ACCH overpower related parameters In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 to look at the new patch set (#7). Change subject: [overpower] VTY: add more ACCH overpower related parameters ...................................................................... [overpower] VTY: add more ACCH overpower related parameters The new fields in 'struct abis_rsl_osmo_temp_ovp_acch_cap' allow: * selectively enabling SACCH and/or FACCH, * setting the RxQual (BER) threshold. Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Depends: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M src/osmo-bsc/bts.c M src/osmo-bsc/bts_vty.c 2 files changed, 73 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/69/25869/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Gerrit-Change-Number: 25869 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 10:55:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 10:55:57 +0000 Subject: Change in osmo-bsc[master]: [overpower] Add VTY transcript tests for all commands In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25870 to look at the new patch set (#6). Change subject: [overpower] Add VTY transcript tests for all commands ...................................................................... [overpower] Add VTY transcript tests for all commands Change-Id: Iefbdbeb36a4692102dbb76d86113a183e4f381a7 Related: SYS#5319 --- M tests/Makefile.am A tests/acch_overpower.vty 2 files changed, 71 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/70/25870/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefbdbeb36a4692102dbb76d86113a183e4f381a7 Gerrit-Change-Number: 25870 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 11:09:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 11:09:21 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: add more ACCH overpower related parameters In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25869 ) Change subject: [overpower] VTY: add more ACCH overpower related parameters ...................................................................... Patch Set 7: Code-Review+2 Re-applying CR+1+1 after the minor fixes: a) s/enabled/enable/ b) linter: spaces vs tabs. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Gerrit-Change-Number: 25869 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 11:09:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 11:09:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 11:09:35 +0000 Subject: Change in osmo-bsc[master]: [overpower] Add VTY transcript tests for all commands In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25870 ) Change subject: [overpower] Add VTY transcript tests for all commands ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefbdbeb36a4692102dbb76d86113a183e4f381a7 Gerrit-Change-Number: 25870 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 11:09:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 11:09:49 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 11:09:49 +0000 Subject: Change in osmo-bsc[master]: [overpower] VTY: add more ACCH overpower related parameters In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25869 ) Change subject: [overpower] VTY: add more ACCH overpower related parameters ...................................................................... [overpower] VTY: add more ACCH overpower related parameters The new fields in 'struct abis_rsl_osmo_temp_ovp_acch_cap' allow: * selectively enabling SACCH and/or FACCH, * setting the RxQual (BER) threshold. Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Depends: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M src/osmo-bsc/bts.c M src/osmo-bsc/bts_vty.c 2 files changed, 73 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index fe18b59..21ee01a 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -352,7 +352,9 @@ acc_mgr_init(&bts->acc_mgr, bts); acc_ramp_init(&bts->acc_ramp, bts); + /* Default RxQual threshold for ACCH repetition/overpower */ bts->repeated_acch_policy.rxqual = 4; + bts->temporary_overpower.rxqual = 4; /* MS Power Control parameters (defaults) */ power_ctrl_params_def_reset(&bts->ms_power_ctrl, GSM_PWR_CTRL_DIR_UL); diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 8eae2a4..8c2b100 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -716,21 +716,25 @@ return CMD_SUCCESS; } +/* See 3GPP TS 45.008, section 8.2.4 */ +#define RXQUAL_THRESH_CMD \ + "rxqual (0|1|2|3|4|5|6|7)" +#define RXQUAL_THRESH_CMD_DESC \ + "Set RxQual (BER) threshold (default 4)\n" \ + "BER >= 0% (always on)\n" \ + "BER >= 0.2%\n" \ + "BER >= 0.4%\n" \ + "BER >= 0.8%\n" \ + "BER >= 1.6% (default)\n" \ + "BER >= 3.2%\n" \ + "BER >= 6.4%\n" \ + "BER >= 12.8%\n" + DEFUN_USRATTR(cfg_bts_rep_rxqual, cfg_bts_rep_rxqual_cmd, X(BSC_VTY_ATTR_NEW_LCHAN), - "repeat rxqual (0|1|2|3|4|5|6|7)", - REP_ACCH_STR - "Set UL-SACCH/DL-FACCH rxqual threshold-ber\n" - "0 disabled (always on)\n" - "1 BER >= 0.2%\n" - "2 BER >= 0.4%\n" - "3 BER >= 0.8%\n" - "4 BER >= 1.6% (default)\n" - "5 BER >= 3.2%\n" - "6 BER >= 6.4%\n" - "7 BER >= 12.8%\n") - /* See also: GSM 05.08, section 8.2.4 */ + "repeat " RXQUAL_THRESH_CMD, + REP_ACCH_STR RXQUAL_THRESH_CMD_DESC) { struct gsm_bts *bts = vty->index; @@ -751,9 +755,11 @@ DEFUN_USRATTR(cfg_bts_top_dl_acch, cfg_bts_top_dl_acch_cmd, X(BSC_VTY_ATTR_NEW_LCHAN), - "overpower dl-acch <1-4>", + "overpower (dl-acch|dl-sacch|dl-facch) <1-4>", TOP_ACCH_STR - "Enable ACCH overpower for this BTS\n" + "Enable overpower for both SACCH and FACCH\n" + "Enable overpower for SACCH only\n" + "Enable overpower for FACCH only\n" "Overpower value in dB\n") { struct gsm_bts *bts = vty->index; @@ -764,7 +770,16 @@ return CMD_WARNING; } - bts->temporary_overpower.overpower_db = atoi(argv[0]); + bts->temporary_overpower.sacch_enable = 0; + bts->temporary_overpower.facch_enable = 0; + + if (!strcmp(argv[0], "dl-acch") || !strcmp(argv[0], "dl-sacch")) + bts->temporary_overpower.sacch_enable = 1; + if (!strcmp(argv[0], "dl-acch") || !strcmp(argv[0], "dl-facch")) + bts->temporary_overpower.facch_enable = 1; + + bts->temporary_overpower.overpower_db = atoi(argv[1]); + return CMD_SUCCESS; } @@ -778,6 +793,27 @@ struct gsm_bts *bts = vty->index; bts->temporary_overpower.overpower_db = 0; + bts->temporary_overpower.sacch_enable = 0; + bts->temporary_overpower.facch_enable = 0; + + return CMD_SUCCESS; +} + +DEFUN_USRATTR(cfg_bts_top_dl_acch_rxqual, + cfg_bts_top_dl_acch_rxqual_cmd, + X(BSC_VTY_ATTR_NEW_LCHAN), + "overpower " RXQUAL_THRESH_CMD, + TOP_ACCH_STR RXQUAL_THRESH_CMD_DESC) +{ + struct gsm_bts *bts = vty->index; + + if (bts->model->type != GSM_BTS_TYPE_OSMOBTS) { + vty_out(vty, "%% ACCH overpower is not supported by BTS %u%s", + bts->nr, VTY_NEWLINE); + return CMD_WARNING; + } + + bts->temporary_overpower.rxqual = atoi(argv[0]); return CMD_SUCCESS; } @@ -4257,8 +4293,25 @@ ho_vty_write_bts(vty, bts); - if (bts->temporary_overpower.overpower_db > 0) - vty_out(vty, " overpower dl-acch %u%s", bts->temporary_overpower.overpower_db, VTY_NEWLINE); + if (bts->temporary_overpower.overpower_db > 0) { + const struct abis_rsl_osmo_temp_ovp_acch_cap *top = \ + &bts->temporary_overpower; + const char *mode = NULL; + + if (top->sacch_enable && top->facch_enable) + mode = "dl-acch"; + else if (top->sacch_enable) + mode = "dl-sacch"; + else if (top->facch_enable) + mode = "dl-facch"; + else /* shall not happen */ + OSMO_ASSERT(0); + + vty_out(vty, " overpower %s %u%s", + mode, top->overpower_db, VTY_NEWLINE); + vty_out(vty, " overpower rxqual %u%s", + top->rxqual, VTY_NEWLINE); + } if (bts->repeated_acch_policy.dl_facch_all) vty_out(vty, " repeat dl-facch all%s", VTY_NEWLINE); @@ -4477,6 +4530,7 @@ install_element(BTS_NODE, &cfg_bts_rep_rxqual_cmd); install_element(BTS_NODE, &cfg_bts_top_dl_acch_cmd); install_element(BTS_NODE, &cfg_bts_top_no_dl_acch_cmd); + install_element(BTS_NODE, &cfg_bts_top_dl_acch_rxqual_cmd); install_element(BTS_NODE, &cfg_bts_interf_meas_avg_period_cmd); install_element(BTS_NODE, &cfg_bts_interf_meas_level_bounds_cmd); install_element(BTS_NODE, &cfg_bts_srvcc_fast_return_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia2e01e11d718ea0ba2a7e49ae2b871d57991f31c Gerrit-Change-Number: 25869 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 11:09:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 11:09:51 +0000 Subject: Change in osmo-bsc[master]: [overpower] Add VTY transcript tests for all commands In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25870 ) Change subject: [overpower] Add VTY transcript tests for all commands ...................................................................... [overpower] Add VTY transcript tests for all commands Change-Id: Iefbdbeb36a4692102dbb76d86113a183e4f381a7 Related: SYS#5319 --- M tests/Makefile.am A tests/acch_overpower.vty 2 files changed, 71 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index 0831dee..762561e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -42,6 +42,7 @@ timer.vty \ power_ctrl.vty \ interf_meas.vty \ + acch_overpower.vty \ ctrl/osmo-bsc-neigh-test.cfg \ ctrl/osmo-bsc-apply-config-file.cfg \ ctrl/osmo-bsc-apply-config-file-invalid.cfg \ diff --git a/tests/acch_overpower.vty b/tests/acch_overpower.vty new file mode 100644 index 0000000..0fc8a45 --- /dev/null +++ b/tests/acch_overpower.vty @@ -0,0 +1,70 @@ +OsmoBSC> enable + +OsmoBSC# ### Default configuration (overpower disabled) +OsmoBSC# show running-config +... !overpower + +OsmoBSC# configure terminal +OsmoBSC(config)# network +OsmoBSC(config-net)# bts 0 +OsmoBSC(config-net-bts)# list with-flags +... + . ..l overpower (dl-acch|dl-sacch|dl-facch) <1-4> + . ..l no overpower dl-acch + . ..l overpower rxqual (0|1|2|3|4|5|6|7) +... + +OsmoBSC(config-net-bts)# overpower? + overpower Temporary ACCH overpower +OsmoBSC(config-net-bts)# overpower ? + dl-acch Enable overpower for both SACCH and FACCH + dl-sacch Enable overpower for SACCH only + dl-facch Enable overpower for FACCH only + rxqual Set RxQual (BER) threshold (default 4) + +OsmoBSC(config-net-bts)# overpower dl-acch ? + <1-4> Overpower value in dB +OsmoBSC(config-net-bts)# overpower dl-acch 2 +OsmoBSC(config-net-bts)# show running-config +... + overpower dl-acch 2 + overpower rxqual 4 +... +OsmoBSC(config-net-bts)# overpower dl-sacch 3 +OsmoBSC(config-net-bts)# show running-config +... + overpower dl-sacch 3 + overpower rxqual 4 +... +OsmoBSC(config-net-bts)# overpower dl-facch 4 +OsmoBSC(config-net-bts)# show running-config +... + overpower dl-facch 4 + overpower rxqual 4 +... + +OsmoBSC(config-net-bts)# overpower rxqual ? + 0 BER >= 0% (always on) + 1 BER >= 0.2% + 2 BER >= 0.4% + 3 BER >= 0.8% + 4 BER >= 1.6% (default) + 5 BER >= 3.2% + 6 BER >= 6.4% + 7 BER >= 12.8% +OsmoBSC(config-net-bts)# overpower rxqual 0 +OsmoBSC(config-net-bts)# show running-config +... + overpower dl-facch 4 + overpower rxqual 0 +... +OsmoBSC(config-net-bts)# overpower rxqual 7 +OsmoBSC(config-net-bts)# show running-config +... + overpower dl-facch 4 + overpower rxqual 7 +... + +OsmoBSC(config-net-bts)# no overpower dl-acch +OsmoBSC(config-net-bts)# show running-config +... !overpower -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefbdbeb36a4692102dbb76d86113a183e4f381a7 Gerrit-Change-Number: 25870 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 11:10:55 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 11:10:55 +0000 Subject: Change in osmo-bts[master]: lchan_set_state(): also free pending messages if any In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25905 ) Change subject: lchan_set_state(): also free pending messages if any ...................................................................... lchan_set_state(): also free pending messages if any A logical channel may have associated messages, which are pending for transmission until some event occurs. Do not leak them. Change-Id: I3264e6caa007e9e9cb9c1c2f8627c408bbb28b9e --- M src/common/lchan.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/common/lchan.c b/src/common/lchan.c index 9f27409..c2b0144 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -298,6 +298,11 @@ lchan->rep_acch.dl_facch[1].msg = NULL; msgb_free(lchan->rep_acch.dl_sacch_msg); lchan->rep_acch.dl_sacch_msg = NULL; + /* free() pending messages */ + msgb_free(lchan->pending_rel_ind_msg); + lchan->pending_rel_ind_msg = NULL; + msgb_free(lchan->pending_chan_activ); + lchan->pending_chan_activ = NULL; /* fall through */ default: if (lchan->early_rr_ia) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3264e6caa007e9e9cb9c1c2f8627c408bbb28b9e Gerrit-Change-Number: 25905 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 11:25:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 11:25:10 +0000 Subject: Change in osmo-bts[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 to look at the new patch set (#6). Change subject: initial support for static userspace probes via systemtap ...................................................................... initial support for static userspace probes via systemtap This adds a --enable-systemtap configure option, which will then add static tracepoints to the generated osmo-bts-* binary. At this point, only two sets of tracepoints are supported, and only in osmo-bts-trx: ul_data_{start,done} and dl_rst_{start,done}. The probes are intended to be used for analyzing the amount of time needed for processing of uplink bursts / generation of downlink bursts. Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 --- M configure.ac M src/common/Makefile.am A src/common/probes.d M src/osmo-bts-trx/Makefile.am A src/osmo-bts-trx/probes.d M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_if.c 7 files changed, 93 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/22641/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 Gerrit-Change-Number: 22641 Gerrit-PatchSet: 6 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 11:28:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 11:28:55 +0000 Subject: Change in osmo-bts[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 to look at the new patch set (#7). Change subject: initial support for static userspace probes via systemtap ...................................................................... initial support for static userspace probes via systemtap This adds a --enable-systemtap configure option, which will then add static tracepoints to the generated osmo-bts-* binary. At this point, only two sets of tracepoints are supported, and only in osmo-bts-trx: ul_data_{start,done} and dl_rst_{start,done}. The probes are intended to be used for analyzing the amount of time needed for processing of uplink bursts / generation of downlink bursts. Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 --- M configure.ac M src/common/Makefile.am A src/common/probes.d M src/osmo-bts-trx/Makefile.am A src/osmo-bts-trx/probes.d M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_if.c 7 files changed, 97 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/22641/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 Gerrit-Change-Number: 22641 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 12:55:49 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 12:55:49 +0000 Subject: Change in osmo-bts[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22641 ) Change subject: initial support for static userspace probes via systemtap ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 Gerrit-Change-Number: 22641 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 24 Oct 2021 12:55:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 13:23:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 13:23:32 +0000 Subject: Change in osmo-bts[master]: rsl: fix handling of REL IND in lapdm_rll_tx_cb() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/6966 ) Change subject: rsl: fix handling of REL IND in lapdm_rll_tx_cb() ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/6966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I823c9101bcca72d5792e16379b02d3602ffc2726 Gerrit-Change-Number: 6966 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 13:23:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 13:24:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 13:24:37 +0000 Subject: Change in osmo-bts[master]: rsl: fix handling of REL IND in lapdm_rll_tx_cb() In-Reply-To: References: Message-ID: laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/6966 ) Change subject: rsl: fix handling of REL IND in lapdm_rll_tx_cb() ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/6966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I823c9101bcca72d5792e16379b02d3602ffc2726 Gerrit-Change-Number: 6966 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 13:24:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 13:24:54 +0000 Subject: Change in osmo-bts[master]: rsl: fix handling of REL IND in lapdm_rll_tx_cb() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/6966 ) Change subject: rsl: fix handling of REL IND in lapdm_rll_tx_cb() ...................................................................... Patch Set 7: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/6966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I823c9101bcca72d5792e16379b02d3602ffc2726 Gerrit-Change-Number: 6966 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 13:24:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 13:24:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 24 Oct 2021 13:24:56 +0000 Subject: Change in osmo-bts[master]: rsl: fix handling of REL IND in lapdm_rll_tx_cb() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/6966 ) Change subject: rsl: fix handling of REL IND in lapdm_rll_tx_cb() ...................................................................... rsl: fix handling of REL IND in lapdm_rll_tx_cb() During the merge of [1] the patch hunk was applied at a slightly wrong location, so the code path has become unreacheable. Change-Id: I823c9101bcca72d5792e16379b02d3602ffc2726 Fixes: [1] Ie4f70c75f0137b4bd72d579b3a32575bac2fca3 --- M src/common/rsl.c 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved; Verified diff --git a/src/common/rsl.c b/src/common/rsl.c index a0afc30..e8f9aa0 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3569,6 +3569,15 @@ LOGPLCHAN(lchan, DRSL, LOGL_INFO, "Handing RLL msg %s from LAPDm to MEAS REP\n", rsl_msg_name(rh->msg_type)); + rc = handle_ms_meas_report(lchan, (struct gsm48_hdr *)msgb_l3(msg), msgb_l3len(msg)); + msgb_free(msg); + return rc; + } else if (rslms_is_gprs_susp_req(msg)) { + return handle_gprs_susp_req(msg); + } else { + LOGPLCHAN(lchan, DRSL, LOGL_INFO, "Fwd RLL msg %s from LAPDm to A-bis\n", + rsl_msg_name(rh->msg_type)); + /* REL_IND handling */ if (rh->msg_type == RSL_MT_REL_IND && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { @@ -3586,15 +3595,6 @@ return 0; } - rc = handle_ms_meas_report(lchan, (struct gsm48_hdr *)msgb_l3(msg), msgb_l3len(msg)); - msgb_free(msg); - return rc; - } else if (rslms_is_gprs_susp_req(msg)) { - return handle_gprs_susp_req(msg); - } else { - LOGPLCHAN(lchan, DRSL, LOGL_INFO, "Fwd RLL msg %s from LAPDm to A-bis\n", - rsl_msg_name(rh->msg_type)); - return abis_bts_rsl_sendmsg(msg); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/6966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I823c9101bcca72d5792e16379b02d3602ffc2726 Gerrit-Change-Number: 6966 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 13:44:45 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 13:44:45 +0000 Subject: Change in osmo-ci[master]: coverity: disable Doxygen when building projects In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/25910 to look at the new patch set (#2). Change subject: coverity: disable Doxygen when building projects ...................................................................... coverity: disable Doxygen when building projects Change-Id: I2fe2f80eb3ec00e9b6c0a3c0ee96e1a0da217b27 --- M coverity/build_Osmocom.sh 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/10/25910/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2fe2f80eb3ec00e9b6c0a3c0ee96e1a0da217b27 Gerrit-Change-Number: 25910 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 13:44:45 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 13:44:45 +0000 Subject: Change in osmo-ci[master]: coverity: fix build_simtrace2(): generate Makefile using autotools References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25922 ) Change subject: coverity: fix build_simtrace2(): generate Makefile using autotools ...................................................................... coverity: fix build_simtrace2(): generate Makefile using autotools Starting from I57e77f927ee9e169cc794c5dc6b128a2d590201b, autotools are required in order to configure and build the project. Change-Id: I48696af1ccb5eb884f5de9085bcda37fc41766fb Fixes: I74da8b523c9d51887d5eceb01ca0f505bb846812 --- M coverity/build_Osmocom.sh 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/25922/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 3723842..3ab1313 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -55,8 +55,8 @@ } build_simtrace2() { - pushd simtrace2 - make -C host + pushd simtrace2/host + do_build popd } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I48696af1ccb5eb884f5de9085bcda37fc41766fb Gerrit-Change-Number: 25922 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 13:46:17 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 13:46:17 +0000 Subject: Change in osmo-ci[master]: coverity: fix build_simtrace2(): generate Makefile using autotools In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25922 ) Change subject: coverity: fix build_simtrace2(): generate Makefile using autotools ...................................................................... Patch Set 1: Code-Review+2 Another urgent fix. My local copy of simtrace2 was outdated... -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I48696af1ccb5eb884f5de9085bcda37fc41766fb Gerrit-Change-Number: 25922 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 24 Oct 2021 13:46:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 13:46:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 13:46:24 +0000 Subject: Change in osmo-ci[master]: coverity: fix build_simtrace2(): generate Makefile using autotools In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25922 ) Change subject: coverity: fix build_simtrace2(): generate Makefile using autotools ...................................................................... coverity: fix build_simtrace2(): generate Makefile using autotools Starting from I57e77f927ee9e169cc794c5dc6b128a2d590201b, autotools are required in order to configure and build the project. Change-Id: I48696af1ccb5eb884f5de9085bcda37fc41766fb Fixes: I74da8b523c9d51887d5eceb01ca0f505bb846812 --- M coverity/build_Osmocom.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 3723842..3ab1313 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -55,8 +55,8 @@ } build_simtrace2() { - pushd simtrace2 - make -C host + pushd simtrace2/host + do_build popd } -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I48696af1ccb5eb884f5de9085bcda37fc41766fb Gerrit-Change-Number: 25922 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 13:53:06 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 13:53:06 +0000 Subject: Change in osmo-ci[master]: Add osmo-hnodeb to ansible/jenkins/coverity setup In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25875 ) Change subject: Add osmo-hnodeb to ansible/jenkins/coverity setup ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie4b03aefeda13d216706bd648145689cf2ef93bb Gerrit-Change-Number: 25875 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 13:53:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 13:53:52 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 13:53:52 +0000 Subject: Change in osmo-ci[master]: Build and test osmo-hnodeb nightly packages In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25876 ) Change subject: Build and test osmo-hnodeb nightly packages ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I53c2b357b0669f5101ceec7896c4ba30e69605c2 Gerrit-Change-Number: 25876 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 24 Oct 2021 13:53:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 19:48:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 19:48:20 +0000 Subject: Change in osmo-trx[master]: IPCDevice: check value returned from select() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/25923 ) Change subject: IPCDevice: check value returned from select() ...................................................................... IPCDevice: check value returned from select() Change-Id: I1c823317659547bb2391c57ac4d7931de1a383e3 Fxies: CID#240744 --- M Transceiver52M/device/ipc/IPCDevice.cpp 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/23/25923/1 diff --git a/Transceiver52M/device/ipc/IPCDevice.cpp b/Transceiver52M/device/ipc/IPCDevice.cpp index 5ed428e..752a2d0 100644 --- a/Transceiver52M/device/ipc/IPCDevice.cpp +++ b/Transceiver52M/device/ipc/IPCDevice.cpp @@ -849,7 +849,10 @@ FD_SET(curr_fd->fd, &cwfds); } - select(max_fd + 1, &crfds, &cwfds, 0, &wait); + if (select(max_fd + 1, &crfds, &cwfds, 0, &wait) < 0) { + LOGP(DDEV, LOGL_ERROR, "select() failed: %s\n", strerror(errno)); + return; + } for (unsigned int i = 0; i < chans; i++) { int flags = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1c823317659547bb2391c57ac4d7931de1a383e3 Gerrit-Change-Number: 25923 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 20:21:32 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 20:21:32 +0000 Subject: Change in simtrace2[master]: host: fix process_usb_msg(): rc may be uninitialized References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/25924 ) Change subject: host: fix process_usb_msg(): rc may be uninitialized ...................................................................... host: fix process_usb_msg(): rc may be uninitialized Change-Id: Idce87adabc9a1bb21f395755aa15b17d6edef6fb Fixes: CID#240740 --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/24/25924/1 diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index df191df..576de61 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -199,6 +199,7 @@ break; case SIMTRACE_MSGT_BD_CEMU_CONFIG: /* firmware confirms configuration change; ignore */ + rc = 0; break; default: printf("unknown simtrace msg type 0x%02x\n", sh->msg_type); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Idce87adabc9a1bb21f395755aa15b17d6edef6fb Gerrit-Change-Number: 25924 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 20:39:14 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 20:39:14 +0000 Subject: Change in libusrp[master]: usrp_standard: fix out-of-bounds read in set_rx_freq() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/25925 ) Change subject: usrp_standard: fix out-of-bounds read in set_rx_freq() ...................................................................... usrp_standard: fix out-of-bounds read in set_rx_freq() Change-Id: I3e3ba31e5a68f92a330c5791ee72ad1ffab83da9 Fixes: CID#240737 --- M host/lib/usrp_standard.cc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/25/25925/1 diff --git a/host/lib/usrp_standard.cc b/host/lib/usrp_standard.cc index fe5afab..69145ab 100644 --- a/host/lib/usrp_standard.cc +++ b/host/lib/usrp_standard.cc @@ -649,7 +649,7 @@ bool usrp_standard_rx::set_rx_freq (int channel, double freq) { - if (channel < 0 || channel > MAX_CHAN) + if (channel < 0 || channel >= MAX_CHAN) return false; unsigned int v = -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/25925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I3e3ba31e5a68f92a330c5791ee72ad1ffab83da9 Gerrit-Change-Number: 25925 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 20:48:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 20:48:51 +0000 Subject: Change in osmo-cbc[master]: rest_api: fix api_cb_message_del(): unsigned compared against 0 References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/25926 ) Change subject: rest_api: fix api_cb_message_del(): unsigned compared against 0 ...................................................................... rest_api: fix api_cb_message_del(): unsigned compared against 0 Change-Id: Ie0d710516bdafb8acc9e78d9de14bd3fe115021d Fixes: CID#240731 --- M src/rest_api.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/26/25926/1 diff --git a/src/rest_api.c b/src/rest_api.c index c70d096..cecc1fc 100644 --- a/src/rest_api.c +++ b/src/rest_api.c @@ -611,7 +611,7 @@ goto err; } message_id = atoi(message_id_str); - if (message_id < 0 || message_id > 65535) { + if (message_id > 65535) { status = 400; goto err; } -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/25926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie0d710516bdafb8acc9e78d9de14bd3fe115021d Gerrit-Change-Number: 25926 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 21:19:30 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 21:19:30 +0000 Subject: Change in libusrp[master]: usrp_prims_common: fix use-after-free in get_proto_filename() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/25927 ) Change subject: usrp_prims_common: fix use-after-free in get_proto_filename() ...................................................................... usrp_prims_common: fix use-after-free in get_proto_filename() Every time the get_proto_filename() is called, a new instance of std::string is allocated for the first argument. When the function returns, this instance gets deallocated. Therefore, the returned user_filename.c_str() points to free()d memory. Change-Id: Ib0007e9aebd9e77c28531c1ec70c61f1723a2d0d Fixes: CID#240724 --- M host/lib/usrp_prims_common.cc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/27/25927/1 diff --git a/host/lib/usrp_prims_common.cc b/host/lib/usrp_prims_common.cc index 20a5565..ca9b447 100644 --- a/host/lib/usrp_prims_common.cc +++ b/host/lib/usrp_prims_common.cc @@ -85,7 +85,7 @@ } static const char * -get_proto_filename(const std::string user_filename, const char *env_var, const char *def) +get_proto_filename(const std::string &user_filename, const char *env_var, const char *def) { if (user_filename.length() != 0) return user_filename.c_str(); -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/25927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ib0007e9aebd9e77c28531c1ec70c61f1723a2d0d Gerrit-Change-Number: 25927 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 21:30:52 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 21:30:52 +0000 Subject: Change in osmo-trx[master]: LMSDevice::open(): LMS_GetDeviceList() may return a negative number References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/25928 ) Change subject: LMSDevice::open(): LMS_GetDeviceList() may return a negative number ...................................................................... LMSDevice::open(): LMS_GetDeviceList() may return a negative number Change-Id: I855bd8ea6d9cb0f285f4dbbf3bcd09bff4e71044 Fixes: CID#240718 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/28/25928/1 diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 6e5002c..7aafcf2 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -269,8 +269,7 @@ lms_info_str_t* info_list; lms_range_t range_sr; float_type sr_host, sr_rf; - unsigned int i, n; - int rc, dev_id; + int rc, dev_id, i, n; struct dev_desc dev_desc; LOGC(DDEV, INFO) << "Opening LMS device.."; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I855bd8ea6d9cb0f285f4dbbf3bcd09bff4e71044 Gerrit-Change-Number: 25928 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 21:33:54 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 21:33:54 +0000 Subject: Change in libusrp[master]: libusb_get_device_list() may return a negative number References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libusrp/+/25929 ) Change subject: libusb_get_device_list() may return a negative number ...................................................................... libusb_get_device_list() may return a negative number Change-Id: Ibf5f88d51c36ff9577f748c004562bd8ed2e96bf Fixes: CID#240717 --- M host/lib/usrp_prims_libusb1.cc 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libusrp refs/changes/29/25929/1 diff --git a/host/lib/usrp_prims_libusb1.cc b/host/lib/usrp_prims_libusb1.cc index 5dfe416..3a348b9 100644 --- a/host/lib/usrp_prims_libusb1.cc +++ b/host/lib/usrp_prims_libusb1.cc @@ -183,8 +183,8 @@ // skipped if you know what you're doing. assert (ctx != NULL); - size_t cnt = libusb_get_device_list(ctx, &list); - size_t i = 0; + ssize_t cnt = libusb_get_device_list(ctx, &list); + ssize_t i = 0; if (cnt < 0) fprintf(stderr, "usrp: libusb_get_device_list failed: %s\n", -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/25929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ibf5f88d51c36ff9577f748c004562bd8ed2e96bf Gerrit-Change-Number: 25929 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 24 21:49:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 24 Oct 2021 21:49:51 +0000 Subject: Change in osmo-msc[master]: smpp_smsc: use osmo_talloc_replace_string() in smpp_smsc_conf() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/25930 ) Change subject: smpp_smsc: use osmo_talloc_replace_string() in smpp_smsc_conf() ...................................................................... smpp_smsc: use osmo_talloc_replace_string() in smpp_smsc_conf() Change-Id: Ie3dc0d9673a0410a5908cba77fc352d581bac6f6 Fixes: CID#240711 --- M src/libmsc/smpp_smsc.c 1 file changed, 1 insertion(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/30/25930/1 diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index a5c6165..503a279 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -987,14 +987,8 @@ /* Avoid use-after-free if bind_addr == smsc->bind_addr */ if (smsc->bind_addr == bind_addr) return 0; + osmo_talloc_replace_string(&smsc->bind_addr, bind_addr); - talloc_free((void*)smsc->bind_addr); - smsc->bind_addr = NULL; - if (bind_addr) { - smsc->bind_addr = bind_addr ? talloc_strdup(smsc, bind_addr) : NULL; - if (!smsc->bind_addr) - return -ENOMEM; - } return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie3dc0d9673a0410a5908cba77fc352d581bac6f6 Gerrit-Change-Number: 25930 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 06:10:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 06:10:15 +0000 Subject: Change in osmo-cbc[master]: varaible for atoi() result shouild be signed integer References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/25931 ) Change subject: varaible for atoi() result shouild be signed integer ...................................................................... varaible for atoi() result shouild be signed integer ... otherwise we won't detect < 0 cases. Fixes: CID#240731 Change-Id: I650fce5bd64752823ee57d8b528d2b371fada857 --- M src/rest_api.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/31/25931/1 diff --git a/src/rest_api.c b/src/rest_api.c index c70d096..52bf25e 100644 --- a/src/rest_api.c +++ b/src/rest_api.c @@ -602,7 +602,7 @@ { const char *message_id_str = u_map_get(req->map_url, "message_id"); struct rest_it_op *riop = talloc_zero(g_cbc, struct rest_it_op); - uint16_t message_id; + int message_id; int status = 404; int rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/25931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I650fce5bd64752823ee57d8b528d2b371fada857 Gerrit-Change-Number: 25931 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 06:12:31 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 06:12:31 +0000 Subject: Change in simtrace2[master]: cardem-pcsc: Fix return of uninitialized variable References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/25932 ) Change subject: cardem-pcsc: Fix return of uninitialized variable ...................................................................... cardem-pcsc: Fix return of uninitialized variable Fixes: CID#240740 Change-Id: I97431f491f60e2a6537502ef88042907723b7de6 --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/32/25932/1 diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index df191df..576de61 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -199,6 +199,7 @@ break; case SIMTRACE_MSGT_BD_CEMU_CONFIG: /* firmware confirms configuration change; ignore */ + rc = 0; break; default: printf("unknown simtrace msg type 0x%02x\n", sh->msg_type); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I97431f491f60e2a6537502ef88042907723b7de6 Gerrit-Change-Number: 25932 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 06:20:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 06:20:08 +0000 Subject: Change in osmo-msc[master]: smpp_mirror: Factor-out reset of SMPP read state References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/25933 ) Change subject: smpp_mirror: Factor-out reset of SMPP read state ...................................................................... smpp_mirror: Factor-out reset of SMPP read state Change-Id: Ib9f210316eaddae19cb74db92b922016864dd786 --- M src/utils/smpp_mirror.c 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/33/25933/1 diff --git a/src/utils/smpp_mirror.c b/src/utils/smpp_mirror.c index 3053553..883c498 100644 --- a/src/utils/smpp_mirror.c +++ b/src/utils/smpp_mirror.c @@ -214,6 +214,14 @@ return rc; } +static void esme_read_state_reset(struct esme *esme) +{ + esme->read_msg = NULL; + esme->read_idx = 0; + esme->read_len = 0; + esme->read_state = READ_ST_IN_LEN; +} + /* FIXME: merge with smpp_smsc.c */ static int esme_read_cb(struct osmo_fd *ofd) { @@ -264,10 +272,7 @@ if (esme->read_idx >= esme->read_len) { rc = smpp_pdu_rx(esme, esme->read_msg); - esme->read_msg = NULL; - esme->read_idx = 0; - esme->read_len = 0; - esme->read_state = READ_ST_IN_LEN; + esme_read_state_reset(esme); } break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib9f210316eaddae19cb74db92b922016864dd786 Gerrit-Change-Number: 25933 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 06:20:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 06:20:09 +0000 Subject: Change in osmo-msc[master]: smpp_mirror: Don't allocated msgb's for unrealistic amounts of memory References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/25934 ) Change subject: smpp_mirror: Don't allocated msgb's for unrealistic amounts of memory ...................................................................... smpp_mirror: Don't allocated msgb's for unrealistic amounts of memory If the remote ESME would send us 0xffffffff as length field, don't try to allocte 4GB of memory, but bail out. Change-Id: I561f75210811826de06ea1673eca1df24faaa210 Fixes: CID#240738 --- M src/utils/smpp_mirror.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/34/25934/1 diff --git a/src/utils/smpp_mirror.c b/src/utils/smpp_mirror.c index 883c498..72d15e3 100644 --- a/src/utils/smpp_mirror.c +++ b/src/utils/smpp_mirror.c @@ -246,6 +246,10 @@ esme->read_idx += rc; if (esme->read_idx >= sizeof(uint32_t)) { esme->read_len = ntohl(len); + if (esme->read_len > 65535) { + /* unrealistic */ + goto dead_socket; + } msg = msgb_alloc(esme->read_len, "SMPP Rx"); if (!msg) return -ENOMEM; @@ -283,6 +287,7 @@ osmo_fd_unregister(&esme->wqueue.bfd); close(esme->wqueue.bfd.fd); esme->wqueue.bfd.fd = -1; + esme_read_state_reset(esme); exit(2342); return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I561f75210811826de06ea1673eca1df24faaa210 Gerrit-Change-Number: 25934 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 08:52:25 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 08:52:25 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-hnbap as a public shared library In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25880 ) Change subject: Provide libosmo-hnbap as a public shared library ...................................................................... Provide libosmo-hnbap as a public shared library It is needed by the new osmo-hnodeb project. Related: SYS#5516 Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 --- M Makefile.am M configure.ac M contrib/osmo-iuh.spec.in M debian/control A debian/libosmo-hnbap-dev.install A debian/libosmo-hnbap0.install M debian/rules M include/osmocom/hnbap/Makefile.am A libosmo-hnbap.pc.in M src/Makefile.am M src/hnbap/Makefile.am M src/tests/Makefile.am 12 files changed, 84 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index fd684e7..1dc00d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = src include doc contrib pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libosmo-ranap.pc libosmo-sabp.pc +pkgconfig_DATA = libosmo-hnbap.pc libosmo-ranap.pc libosmo-sabp.pc EXTRA_DIST = \ .version \ diff --git a/configure.ac b/configure.ac index e2d9f56..93c5bb1 100644 --- a/configure.ac +++ b/configure.ac @@ -150,6 +150,7 @@ AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) AC_OUTPUT( + libosmo-hnbap.pc libosmo-ranap.pc libosmo-sabp.pc src/Makefile diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in index c8bdea2..592b168 100644 --- a/contrib/osmo-iuh.spec.in +++ b/contrib/osmo-iuh.spec.in @@ -42,6 +42,21 @@ %description Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) +%package -n libosmo-hnbap0 +Summary: Shared Library part of libosmo-hnbap +Group: System/Libraries + +%description -n libosmo-hnbap0 +Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + +%package -n libosmo-hnbap-devel +Summary: Development files for Osmocom HNBAP library +Group: Development/Libraries/C and C++ +Requires: libosmo-hnbap0 = %{version} + +%description -n libosmo-hnbap-devel +Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + %package -n libosmo-ranap3 Summary: Shared Library part of libosmo-ranap Group: System/Libraries @@ -121,6 +136,14 @@ %config %{_sysconfdir}/osmocom/osmo-hnbgw.cfg %{_unitdir}/osmo-hnbgw.service +%files -n libosmo-hnbap0 +%{_libdir}/libosmo-hnbap.so.0* + +%files -n libosmo-hnbap-devel +%{_includedir}/* +%{_libdir}/libosmo-hnbap.so +%{_libdir}/pkgconfig/libosmo-hnbap.pc + %files -n libosmo-ranap3 %{_libdir}/libosmo-ranap.so.3* diff --git a/debian/control b/debian/control index 236e853..e13834f 100644 --- a/debian/control +++ b/debian/control @@ -45,6 +45,28 @@ Various manuals: user manual, VTY reference manual and/or protocol/interface manuals. +Package: libosmo-hnbap0 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + +Package: libosmo-hnbap-dbg +Section: debug +Architecture: any +Multi-Arch: same +Depends: libosmo-hnbap0 (= ${binary:Version}), ${misc:Depends} +Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + +Package: libosmo-hnbap-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libosmo-hnbap0 (= ${binary:Version}), ${misc:Depends} +Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + Package: libosmo-ranap3 Section: libs Architecture: any diff --git a/debian/libosmo-hnbap-dev.install b/debian/libosmo-hnbap-dev.install new file mode 100644 index 0000000..4191a57 --- /dev/null +++ b/debian/libosmo-hnbap-dev.install @@ -0,0 +1,3 @@ +usr/include/osmocom/hnbap +usr/lib/*/libosmo-hnbap.so +usr/lib/*/pkgconfig/libosmo-hnbap.pc diff --git a/debian/libosmo-hnbap0.install b/debian/libosmo-hnbap0.install new file mode 100644 index 0000000..766f1f1 --- /dev/null +++ b/debian/libosmo-hnbap0.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-hnbap*.so.* diff --git a/debian/rules b/debian/rules index e1f6124..714ef8b 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,7 @@ # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg override_dh_strip: + dh_strip -plibosmo-hnbap0 --dbg-package=libosmo-hnbap-dbg dh_strip -plibosmo-ranap3 --dbg-package=libosmo-ranap-dbg dh_strip -plibosmo-sabp0 --dbg-package=libosmo-sabp-dbg dh_strip -posmo-hnbgw --dbg-package=osmo-hnbgw-dbg diff --git a/include/osmocom/hnbap/Makefile.am b/include/osmocom/hnbap/Makefile.am index cd9b720..871549e 100644 --- a/include/osmocom/hnbap/Makefile.am +++ b/include/osmocom/hnbap/Makefile.am @@ -1,4 +1,4 @@ -noinst_HEADERS = \ +hnbap_HEADERS = \ hnbap_common.h hnbap_ies_defs.h \ AccessResult.h \ Access-stratum-release-indicator.h \ @@ -116,5 +116,7 @@ U-RNTIQueryResponse.h \ UTRANCellID.h +hnbapdir = $(includedir)/osmocom/hnbap + DISTCLEANFILES = \ hnbap_ies_defs.h diff --git a/libosmo-hnbap.pc.in b/libosmo-hnbap.pc.in new file mode 100644 index 0000000..db05756 --- /dev/null +++ b/libosmo-hnbap.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Osmocom HNBAP protocol library +Description: C Utility Library +Version: @VERSION@ +Libs: -L${libdir} -losmo-hnbap +Cflags: -I${includedir}/ diff --git a/src/Makefile.am b/src/Makefile.am index 524f7b2..3414a01 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -61,9 +61,15 @@ # build the shared RANAP + SABP library # +HNBAP_LIBVERSION=0:0:0 RANAP_LIBVERSION=4:0:1 SABP_LIBVERSION=0:0:0 -lib_LTLIBRARIES = libosmo-ranap.la libosmo-sabp.la +lib_LTLIBRARIES = libosmo-hnbap.la libosmo-ranap.la libosmo-sabp.la +libosmo_hnbap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HNBAP_LIBVERSION) +libosmo_hnbap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ + $(ASN1C_LIBS) hnbap/libosmo-asn1-hnbap.la +libosmo_hnbap_la_SOURCES = hnbap_common.c hnbap_encoder.c hnbap_decoder.c + libosmo_ranap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(RANAP_LIBVERSION) libosmo_ranap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ $(ASN1C_LIBS) ranap/libosmo-asn1-ranap.la @@ -80,8 +86,7 @@ # bin_PROGRAMS = osmo-hnbgw -osmo_hnbgw_SOURCES = hnbap_encoder.c hnbap_decoder.c hnbap_common.c \ - rua_encoder.c rua_decoder.c rua_common.c \ +osmo_hnbgw_SOURCES = rua_encoder.c rua_decoder.c rua_common.c \ rua_msg_factory.c \ hnbgw.c hnbgw_hnbap.c hnbgw_rua.c hnbgw_ranap.c \ hnbgw_vty.c \ @@ -90,8 +95,8 @@ osmo_hnbgw_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOCTRL_LIBS) \ $(ASN1C_LIBS) $(OSMOSIGTRAN_LIBS) \ $(OSMONETIF_LIBS) \ - hnbap/libosmo-asn1-hnbap.a rua/libosmo-asn1-rua.a \ - libosmo-ranap.la + rua/libosmo-asn1-rua.a \ + libosmo-hnbap.la libosmo-ranap.la regen: regenerate-from-asn1-source diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am index 8a2c56a..c4a8c29 100644 --- a/src/hnbap/Makefile.am +++ b/src/hnbap/Makefile.am @@ -236,9 +236,9 @@ HNBAP_ASN1 = $(top_srcdir)/asn1/hnbap -noinst_LIBRARIES=libosmo-asn1-hnbap.a -libosmo_asn1_hnbap_a_SOURCES=$(ASN_MODULE_SOURCES) -libosmo_asn1_hnbap_a_LIBADD=$(ASN1C_LDADD) +noinst_LTLIBRARIES=libosmo-asn1-hnbap.la +libosmo_asn1_hnbap_la_SOURCES=$(ASN_MODULE_SOURCES) +libosmo_asn1_hnbap_la_LIBADD=$(ASN1C_LDADD) regen: regenerate-from-asn1-source diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 003ea51..dfc8fe6 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -11,17 +11,16 @@ noinst_HEADERS = test_common.h hnb-test.h hnb-test-layers.h -HNBAP_FILES = $(top_srcdir)/src/hnbap_common.c $(top_builddir)/src/hnbap_decoder.c $(top_builddir)/src/hnbap_encoder.c RUA_FILES = $(top_srcdir)/src/rua_common.c $(top_builddir)/src/rua_decoder.c $(top_builddir)/src/rua_encoder.c $(top_srcdir)/src/rua_msg_factory.c test_helpers_SOURCES = test-helpers.c test_common.c test_helpers_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la test_hnbap_SOURCES = $(top_srcdir)/src/hnbap_common.c $(top_builddir)/src/hnbap_decoder.c test-hnbap.c test_common.c -test_hnbap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/hnbap/libosmo-asn1-hnbap.a $(top_builddir)/src/libosmo-ranap.la +test_hnbap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-hnbap.la $(top_builddir)/src/libosmo-ranap.la -hnb_test_SOURCES = $(HNBAP_FILES) $(RUA_FILES) hnb-test.c test_common.c hnb-test-ranap.c hnb-test-rua.c -hnb_test_LDADD = $(COMMON_LIBS) $(top_builddir)/src/hnbap/libosmo-asn1-hnbap.a $(top_builddir)/src/rua/libosmo-asn1-rua.a $(top_builddir)/src/libosmo-ranap.la +hnb_test_SOURCES = $(RUA_FILES) hnb-test.c test_common.c hnb-test-ranap.c hnb-test-rua.c +hnb_test_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-hnbap.la $(top_builddir)/src/rua/libosmo-asn1-rua.a $(top_builddir)/src/libosmo-ranap.la test_ranap_SOURCES = test-ranap.c test_common.c test_ranap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la @@ -30,6 +29,9 @@ #dummy_cn_SOURCES = test_common.c dummy_cn_sua.c #dummy_cn_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la +$(top_builddir)/src/libosmo-hnbap.la: + $(MAKE) -C $(top_builddir)/src libosmo-hnbap.la + $(top_builddir)/src/libosmo-ranap.la: $(MAKE) -C $(top_builddir)/src libosmo-ranap.la -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25880 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I0d0862e9d59d3b206f3f7dfae4b39ae4032bb762 Gerrit-Change-Number: 25880 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 08:52:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 08:52:26 +0000 Subject: Change in osmo-iuh[master]: Provide libosmo-rua as a public shared library In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25887 ) Change subject: Provide libosmo-rua as a public shared library ...................................................................... Provide libosmo-rua as a public shared library It is needed by the new osmo-hnodeb project. Related: SYS#5516 Change-Id: I8b800baacbfe3a3c424c51b418b5ac2e2848b3ba --- M Makefile.am M configure.ac M contrib/osmo-iuh.spec.in M debian/control A debian/libosmo-rua-dev.install A debian/libosmo-rua0.install M debian/rules M include/osmocom/rua/Makefile.am A libosmo-rua.pc.in M src/Makefile.am M src/rua/Makefile.am M src/tests/Makefile.am 12 files changed, 81 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 1dc00d6..f40cbd1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = src include doc contrib pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libosmo-hnbap.pc libosmo-ranap.pc libosmo-sabp.pc +pkgconfig_DATA = libosmo-hnbap.pc libosmo-ranap.pc libosmo-rua.pc libosmo-sabp.pc EXTRA_DIST = \ .version \ diff --git a/configure.ac b/configure.ac index 93c5bb1..5490348 100644 --- a/configure.ac +++ b/configure.ac @@ -152,6 +152,7 @@ AC_OUTPUT( libosmo-hnbap.pc libosmo-ranap.pc + libosmo-rua.pc libosmo-sabp.pc src/Makefile src/hnbap/Makefile diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in index 592b168..2ef38a3 100644 --- a/contrib/osmo-iuh.spec.in +++ b/contrib/osmo-iuh.spec.in @@ -75,6 +75,20 @@ This subpackage contains libraries and header files for developing applications that want to make use of libosmoranap. +%package -n libosmo-rua0 +Summary: Shared Library part of libosmo-rua +Group: System/Libraries + +%description -n libosmo-rua0 +Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + +%package -n libosmo-rua-devel +Summary: Development files for Osmocom RUA library +Group: Development/Libraries/C and C++ +Requires: libosmo-rua0 = %{version} + +%description -n libosmo-rua-devel +Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) %package -n libosmo-sabp0 Summary: Shared Library part of libosmo-sabp @@ -152,6 +166,14 @@ %{_libdir}/libosmo-ranap.so %{_libdir}/pkgconfig/libosmo-ranap.pc +%files -n libosmo-rua0 +%{_libdir}/libosmo-rua.so.0* + +%files -n libosmo-rua-devel +%{_includedir}/* +%{_libdir}/libosmo-rua.so +%{_libdir}/pkgconfig/libosmo-rua.pc + %files -n libosmo-sabp0 %{_libdir}/libosmo-sabp.so.0* diff --git a/debian/control b/debian/control index e13834f..f89869a 100644 --- a/debian/control +++ b/debian/control @@ -89,6 +89,28 @@ Depends: libosmo-ranap3 (= ${binary:Version}), ${misc:Depends} Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) +Package: libosmo-rua0 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + +Package: libosmo-rua-dbg +Section: debug +Architecture: any +Multi-Arch: same +Depends: libosmo-rua0 (= ${binary:Version}), ${misc:Depends} +Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + +Package: libosmo-rua-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: libosmo-rua0 (= ${binary:Version}), ${misc:Depends} +Description: Osmocom code for the Iuh interface (HNBAP, RUA, RANAP) + Package: libosmo-sabp0 Section: libs Architecture: any diff --git a/debian/libosmo-rua-dev.install b/debian/libosmo-rua-dev.install new file mode 100644 index 0000000..b615076 --- /dev/null +++ b/debian/libosmo-rua-dev.install @@ -0,0 +1,3 @@ +usr/include/osmocom/rua +usr/lib/*/libosmo-rua.so +usr/lib/*/pkgconfig/libosmo-rua.pc diff --git a/debian/libosmo-rua0.install b/debian/libosmo-rua0.install new file mode 100644 index 0000000..ac07bed --- /dev/null +++ b/debian/libosmo-rua0.install @@ -0,0 +1 @@ +usr/lib/*/libosmo-rua*.so.* diff --git a/debian/rules b/debian/rules index 714ef8b..b85b0d2 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,7 @@ override_dh_strip: dh_strip -plibosmo-hnbap0 --dbg-package=libosmo-hnbap-dbg dh_strip -plibosmo-ranap3 --dbg-package=libosmo-ranap-dbg + dh_strip -plibosmo-rua0 --dbg-package=libosmo-rua-dbg dh_strip -plibosmo-sabp0 --dbg-package=libosmo-sabp-dbg dh_strip -posmo-hnbgw --dbg-package=osmo-hnbgw-dbg diff --git a/include/osmocom/rua/Makefile.am b/include/osmocom/rua/Makefile.am index 307f123..37b9384 100644 --- a/include/osmocom/rua/Makefile.am +++ b/include/osmocom/rua/Makefile.am @@ -1,4 +1,4 @@ -noinst_HEADERS = \ +rua_HEADERS = \ rua_common.h rua_ies_defs.h rua_msg_factory.h \ RUA_Ansi-41-IDNNS.h \ RUA_Cause.h \ @@ -36,5 +36,7 @@ RUA_TypeOfError.h \ RUA_UnsuccessfulOutcome.h +ruadir = $(includedir)/osmocom/rua + DISTCLEANFILES = \ rua_ies_defs.h diff --git a/libosmo-rua.pc.in b/libosmo-rua.pc.in new file mode 100644 index 0000000..b9bd1d4 --- /dev/null +++ b/libosmo-rua.pc.in @@ -0,0 +1,10 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Osmocom RUA protocol library +Description: C Utility Library +Version: @VERSION@ +Libs: -L${libdir} -losmo-rua +Cflags: -I${includedir}/ diff --git a/src/Makefile.am b/src/Makefile.am index 3414a01..c1508ad 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -63,8 +63,9 @@ # HNBAP_LIBVERSION=0:0:0 RANAP_LIBVERSION=4:0:1 +RUA_LIBVERSION=0:0:0 SABP_LIBVERSION=0:0:0 -lib_LTLIBRARIES = libosmo-hnbap.la libosmo-ranap.la libosmo-sabp.la +lib_LTLIBRARIES = libosmo-hnbap.la libosmo-ranap.la libosmo-rua.la libosmo-sabp.la libosmo_hnbap_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HNBAP_LIBVERSION) libosmo_hnbap_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ $(ASN1C_LIBS) hnbap/libosmo-asn1-hnbap.la @@ -76,6 +77,11 @@ libosmo_ranap_la_SOURCES = ranap_common.c ranap_encoder.c ranap_decoder.c ranap_msg_factory.c iu_helpers.c \ ranap_common_cn.c iu_client.c iu_client_vty.c +libosmo_rua_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HNBAP_LIBVERSION) +libosmo_rua_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ + $(ASN1C_LIBS) rua/libosmo-asn1-rua.la +libosmo_rua_la_SOURCES = rua_common.c rua_encoder.c rua_decoder.c rua_msg_factory.c + libosmo_sabp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(SABP_LIBVERSION) libosmo_sabp_la_LIBADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOSIGTRAN_LIBS) \ $(ASN1C_LIBS) sabp/libosmo-asn1-sabp.la @@ -86,17 +92,14 @@ # bin_PROGRAMS = osmo-hnbgw -osmo_hnbgw_SOURCES = rua_encoder.c rua_decoder.c rua_common.c \ - rua_msg_factory.c \ - hnbgw.c hnbgw_hnbap.c hnbgw_rua.c hnbgw_ranap.c \ +osmo_hnbgw_SOURCES = hnbgw.c hnbgw_hnbap.c hnbgw_rua.c hnbgw_ranap.c \ hnbgw_vty.c \ context_map.c hnbgw_cn.c osmo_hnbgw_LDADD = $(OSMOCORE_LIBS) $(OSMOGSM_LIBS) $(OSMOVTY_LIBS) $(OSMOCTRL_LIBS) \ $(ASN1C_LIBS) $(OSMOSIGTRAN_LIBS) \ $(OSMONETIF_LIBS) \ - rua/libosmo-asn1-rua.a \ - libosmo-hnbap.la libosmo-ranap.la + libosmo-hnbap.la libosmo-rua.la libosmo-ranap.la regen: regenerate-from-asn1-source diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am index 1623178..7e1d18e 100644 --- a/src/rua/Makefile.am +++ b/src/rua/Makefile.am @@ -74,9 +74,9 @@ AM_CFLAGS = -I$(top_srcdir)/include $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS) -noinst_LIBRARIES=libosmo-asn1-rua.a -libosmo_asn1_rua_a_SOURCES=$(ASN_MODULE_SOURCES) -libosmo_asn1_rua_a_LIBADD=$(ASN1C_LDADD) +noinst_LTLIBRARIES=libosmo-asn1-rua.la +libosmo_asn1_rua_la_SOURCES=$(ASN_MODULE_SOURCES) +libosmo_asn1_rua_la_LIBADD=$(ASN1C_LDADD) regen: regenerate-from-asn1-source diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index dfc8fe6..2063524 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -11,16 +11,14 @@ noinst_HEADERS = test_common.h hnb-test.h hnb-test-layers.h -RUA_FILES = $(top_srcdir)/src/rua_common.c $(top_builddir)/src/rua_decoder.c $(top_builddir)/src/rua_encoder.c $(top_srcdir)/src/rua_msg_factory.c - test_helpers_SOURCES = test-helpers.c test_common.c test_helpers_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la test_hnbap_SOURCES = $(top_srcdir)/src/hnbap_common.c $(top_builddir)/src/hnbap_decoder.c test-hnbap.c test_common.c test_hnbap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-hnbap.la $(top_builddir)/src/libosmo-ranap.la -hnb_test_SOURCES = $(RUA_FILES) hnb-test.c test_common.c hnb-test-ranap.c hnb-test-rua.c -hnb_test_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-hnbap.la $(top_builddir)/src/rua/libosmo-asn1-rua.a $(top_builddir)/src/libosmo-ranap.la +hnb_test_SOURCES = hnb-test.c test_common.c hnb-test-ranap.c hnb-test-rua.c +hnb_test_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-hnbap.la $(top_builddir)/src/libosmo-rua.la $(top_builddir)/src/libosmo-ranap.la test_ranap_SOURCES = test-ranap.c test_common.c test_ranap_LDADD = $(COMMON_LIBS) $(top_builddir)/src/libosmo-ranap.la @@ -32,6 +30,9 @@ $(top_builddir)/src/libosmo-hnbap.la: $(MAKE) -C $(top_builddir)/src libosmo-hnbap.la +$(top_builddir)/src/libosmo-rua.la: + $(MAKE) -C $(top_builddir)/src libosmo-rua.la + $(top_builddir)/src/libosmo-ranap.la: $(MAKE) -C $(top_builddir)/src libosmo-ranap.la -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I8b800baacbfe3a3c424c51b418b5ac2e2848b3ba Gerrit-Change-Number: 25887 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 08:55:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 08:55:09 +0000 Subject: Change in osmo-bts[master]: lchan: introduce and use lchan_is_tch() helper In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25906 ) Change subject: lchan: introduce and use lchan_is_tch() helper ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icd832667cad1189e3e819c88bde837c4260aa252 Gerrit-Change-Number: 25906 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 08:55:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 08:55:14 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 08:55:14 +0000 Subject: Change in osmo-bts[master]: lchan: introduce and use lchan_is_tch() helper In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25906 ) Change subject: lchan: introduce and use lchan_is_tch() helper ...................................................................... lchan: introduce and use lchan_is_tch() helper Change-Id: Icd832667cad1189e3e819c88bde837c4260aa252 --- M include/osmo-bts/lchan.h M src/common/lchan.c M src/common/rsl.c 3 files changed, 5 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index a7e9004..57999b1 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -365,3 +365,6 @@ return false; } } + +#define lchan_is_tch(lchan) \ + ((lchan)->type == GSM_LCHAN_TCH_F || (lchan)->type == GSM_LCHAN_TCH_H) diff --git a/src/common/lchan.c b/src/common/lchan.c index c2b0144..29fd247 100644 --- a/src/common/lchan.c +++ b/src/common/lchan.c @@ -67,7 +67,7 @@ t200_ms_acch[DL_SAPI0] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; t200_ms_acch[DL_SAPI3] = bts->t200_ms[T200_SACCH_SDCCH] + fn_advance_ms; - if (lchan->rep_acch_cap.dl_facch_all && (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { + if (lchan->rep_acch_cap.dl_facch_all && lchan_is_tch(lchan)) { t200_ms_acch[DL_SAPI0] *= 2; t200_ms_acch[DL_SAPI3] *= 2; } diff --git a/src/common/rsl.c b/src/common/rsl.c index e8f9aa0..c100687 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3579,8 +3579,7 @@ rsl_msg_name(rh->msg_type)); /* REL_IND handling */ - if (rh->msg_type == RSL_MT_REL_IND && - (lchan->type == GSM_LCHAN_TCH_F || lchan->type == GSM_LCHAN_TCH_H)) { + if (rh->msg_type == RSL_MT_REL_IND && lchan_is_tch(lchan)) { LOGPLCHAN(lchan, DRSL, LOGL_INFO, "Scheduling %s to L3 in next associated TCH-RTS.ind\n", rsl_msg_name(rh->msg_type)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icd832667cad1189e3e819c88bde837c4260aa252 Gerrit-Change-Number: 25906 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 08:58:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 08:58:36 +0000 Subject: Change in osmo-iuh[master]: RFC: Add lib prefix to structs with duplicated names In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25888 ) Change subject: RFC: Add lib prefix to structs with duplicated names ...................................................................... Patch Set 3: Using asn1c -fcompound-names may help wth this. We are already prefixing stuff with ASN1C_PREFIX="FOOBAR_" (only missing for libosmo-hnbap, I have a patch WIP for that). -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I552fc028c7d08c880fdb844ece75816602c5bb67 Gerrit-Change-Number: 25888 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 25 Oct 2021 08:58:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:00:14 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:00:14 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20296 ) Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... Patch Set 15: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 15 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:00:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:00:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:00:46 +0000 Subject: Change in libosmocore[master]: logging: Avoid memcpy from stack to msgb in _file_output() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20305 ) Change subject: logging: Avoid memcpy from stack to msgb in _file_output() ...................................................................... Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 Gerrit-Change-Number: 20305 Gerrit-PatchSet: 12 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:00:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:04:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:04:29 +0000 Subject: Change in osmo-bts[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22641 ) Change subject: initial support for static userspace probes via systemtap ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 Gerrit-Change-Number: 22641 Gerrit-PatchSet: 7 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:04:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:05:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:05:10 +0000 Subject: Change in osmo-ci[master]: coverity: disable Doxygen when building projects In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25910 ) Change subject: coverity: disable Doxygen when building projects ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2fe2f80eb3ec00e9b6c0a3c0ee96e1a0da217b27 Gerrit-Change-Number: 25910 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:05:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:06:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:06:53 +0000 Subject: Change in osmo-ci[master]: Add osmo-hnodeb to ansible/jenkins/coverity setup In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/25875 to look at the new patch set (#3). Change subject: Add osmo-hnodeb to ansible/jenkins/coverity setup ...................................................................... Add osmo-hnodeb to ansible/jenkins/coverity setup Change-Id: Ie4b03aefeda13d216706bd648145689cf2ef93bb --- M ansible/roles/osmocom-workstation/tasks/git-repos.yml M coverity/build_Osmocom.sh M coverity/prepare_source_Osmcocom.sh M jobs/gerrit-lint.yml M jobs/gerrit-verifications.yml M jobs/master-builds.yml 6 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/75/25875/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie4b03aefeda13d216706bd648145689cf2ef93bb Gerrit-Change-Number: 25875 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:07:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:07:20 +0000 Subject: Change in osmo-ci[master]: Add osmo-hnodeb to ansible/jenkins/coverity setup In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25875 ) Change subject: Add osmo-hnodeb to ansible/jenkins/coverity setup ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie4b03aefeda13d216706bd648145689cf2ef93bb Gerrit-Change-Number: 25875 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:07:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:07:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:07:31 +0000 Subject: Change in osmo-ci[master]: Add osmo-hnodeb to ansible/jenkins/coverity setup In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25875 ) Change subject: Add osmo-hnodeb to ansible/jenkins/coverity setup ...................................................................... Add osmo-hnodeb to ansible/jenkins/coverity setup Change-Id: Ie4b03aefeda13d216706bd648145689cf2ef93bb --- M ansible/roles/osmocom-workstation/tasks/git-repos.yml M coverity/build_Osmocom.sh M coverity/prepare_source_Osmcocom.sh M jobs/gerrit-lint.yml M jobs/gerrit-verifications.yml M jobs/master-builds.yml 6 files changed, 8 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/ansible/roles/osmocom-workstation/tasks/git-repos.yml b/ansible/roles/osmocom-workstation/tasks/git-repos.yml index d829892..edef6dd 100644 --- a/ansible/roles/osmocom-workstation/tasks/git-repos.yml +++ b/ansible/roles/osmocom-workstation/tasks/git-repos.yml @@ -36,6 +36,7 @@ - osmo-gsm-manuals - osmo-gtp-kernel - osmo-hlr + - osmo-hnodeb - osmo-iuh - osmo-mgw - osmo-msc diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 3ab1313..f3a903b 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -94,6 +94,7 @@ --enable-iu build_default osmo-smlc build_default osmo-cbc +build_default osmo-hnodeb # GMR build_default libosmo-dsp diff --git a/coverity/prepare_source_Osmcocom.sh b/coverity/prepare_source_Osmcocom.sh index 7a86b7d..78661e1 100755 --- a/coverity/prepare_source_Osmcocom.sh +++ b/coverity/prepare_source_Osmcocom.sh @@ -32,6 +32,7 @@ osmo-smlc \ osmo-cbc \ simtrace2 \ + osmo-hnodeb \ ; do if [ -d $proj ]; then diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index 130b616..db00509 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -27,6 +27,7 @@ - openggsn - osmo-bsc - osmo-bts + - osmo-hnodeb - osmo-ci: # Run the lint script from the checked out branch diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 59e332c..77865b7 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -250,6 +250,7 @@ - osmo-el2tpd - osmo-smlc - osmo-gbproxy + - osmo-hnodeb - pysim: slave_axis: !!python/tuple [simtester] diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 56e2065..65b641b 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -107,7 +107,8 @@ master-osmo-bsc, master-osmo-iuh, master-osmo-msc, - master-osmo-sgsn + master-osmo-sgsn, + master-osmo-hnodeb - libosmocore: a1_name: arch @@ -350,6 +351,7 @@ - osmo-el2tpd - osmo-smlc - osmo-gbproxy + - osmo-hnodeb - rtl-sdr: email: laforge at gnumonks.org steve at steve-m.de -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ie4b03aefeda13d216706bd648145689cf2ef93bb Gerrit-Change-Number: 25875 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:10:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:10:37 +0000 Subject: Change in osmo-trx[master]: IPCDevice: check value returned from select() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25923 ) Change subject: IPCDevice: check value returned from select() ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-trx/+/25923/1/Transceiver52M/device/ipc/IPCDevice.cpp File Transceiver52M/device/ipc/IPCDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/25923/1/Transceiver52M/device/ipc/IPCDevice.cpp at 853 PS1, Line 853: LOGP(DDEV, LOGL_ERROR, "select() failed: %s\n", strerror(errno)); strerror is not thread safe. "man strerror". -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1c823317659547bb2391c57ac4d7931de1a383e3 Gerrit-Change-Number: 25923 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:10:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:11:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:11:07 +0000 Subject: Change in osmo-trx[master]: LMSDevice::open(): LMS_GetDeviceList() may return a negative number In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25928 ) Change subject: LMSDevice::open(): LMS_GetDeviceList() may return a negative number ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I855bd8ea6d9cb0f285f4dbbf3bcd09bff4e71044 Gerrit-Change-Number: 25928 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:11:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:12:02 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:12:02 +0000 Subject: Change in libusrp[master]: usrp_standard: fix out-of-bounds read in set_rx_freq() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/25925 ) Change subject: usrp_standard: fix out-of-bounds read in set_rx_freq() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/25925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I3e3ba31e5a68f92a330c5791ee72ad1ffab83da9 Gerrit-Change-Number: 25925 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:12:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:12:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:12:39 +0000 Subject: Change in osmo-cbc[master]: rest_api: fix api_cb_message_del(): unsigned compared against 0 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/25926 ) Change subject: rest_api: fix api_cb_message_del(): unsigned compared against 0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/25926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie0d710516bdafb8acc9e78d9de14bd3fe115021d Gerrit-Change-Number: 25926 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:12:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:13:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:13:52 +0000 Subject: Change in libusrp[master]: usrp_prims_common: fix use-after-free in get_proto_filename() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/25927 ) Change subject: usrp_prims_common: fix use-after-free in get_proto_filename() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/25927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ib0007e9aebd9e77c28531c1ec70c61f1723a2d0d Gerrit-Change-Number: 25927 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:13:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:14:25 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:14:25 +0000 Subject: Change in libusrp[master]: libusb_get_device_list() may return a negative number In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/25929 ) Change subject: libusb_get_device_list() may return a negative number ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/25929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ibf5f88d51c36ff9577f748c004562bd8ed2e96bf Gerrit-Change-Number: 25929 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:14:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:16:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:16:22 +0000 Subject: Change in osmo-msc[master]: smpp_smsc: use osmo_talloc_replace_string() in smpp_smsc_conf() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25930 ) Change subject: smpp_smsc: use osmo_talloc_replace_string() in smpp_smsc_conf() ...................................................................... Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/25930/1/src/libmsc/smpp_smsc.c File src/libmsc/smpp_smsc.c: https://gerrit.osmocom.org/c/osmo-msc/+/25930/1/src/libmsc/smpp_smsc.c at 990 PS1, Line 990: osmo_talloc_replace_string(&smsc->bind_addr, bind_addr); You are missing the ctx param here: osmo_talloc_replace_string(smsc, &smsc->bind_addr, bind_addr); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie3dc0d9673a0410a5908cba77fc352d581bac6f6 Gerrit-Change-Number: 25930 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:16:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:18:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:18:21 +0000 Subject: Change in osmo-cbc[master]: varaible for atoi() result shouild be signed integer In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/25931 ) Change subject: varaible for atoi() result shouild be signed integer ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-cbc/+/25931/1/src/rest_api.c File src/rest_api.c: https://gerrit.osmocom.org/c/osmo-cbc/+/25931/1/src/rest_api.c at 605 PS1, Line 605: int message_id; so iirc there's another patch from Vadim now in gerrit simply dropping the "message_id < 0" check from line 614. Please agree on which one to merge. Being an ID, doesn't look like negative is expected in message_id_str. But perhaps atoi() can return negative if there's an error? It may be a good place to use neel's recent APIs to read integers from string using libosmocore. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/25931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I650fce5bd64752823ee57d8b528d2b371fada857 Gerrit-Change-Number: 25931 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:18:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:18:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:18:31 +0000 Subject: Change in osmo-cbc[master]: varaible for atoi() result shouild be signed integer In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/25931 ) Change subject: varaible for atoi() result shouild be signed integer ...................................................................... Patch Set 1: See https://gerrit.osmocom.org/c/osmo-cbc/+/25926 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/25931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I650fce5bd64752823ee57d8b528d2b371fada857 Gerrit-Change-Number: 25931 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:18:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:18:40 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:18:40 +0000 Subject: Change in osmo-cbc[master]: rest_api: fix api_cb_message_del(): unsigned compared against 0 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/25926 ) Change subject: rest_api: fix api_cb_message_del(): unsigned compared against 0 ...................................................................... Patch Set 1: -Code-Review See https://gerrit.osmocom.org/c/osmo-cbc/+/25931 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/25926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie0d710516bdafb8acc9e78d9de14bd3fe115021d Gerrit-Change-Number: 25926 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:18:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:19:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:19:05 +0000 Subject: Change in simtrace2[master]: cardem-pcsc: Fix return of uninitialized variable In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25932 ) Change subject: cardem-pcsc: Fix return of uninitialized variable ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I97431f491f60e2a6537502ef88042907723b7de6 Gerrit-Change-Number: 25932 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:19:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:19:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:19:36 +0000 Subject: Change in osmo-msc[master]: smpp_mirror: Factor-out reset of SMPP read state In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25933 ) Change subject: smpp_mirror: Factor-out reset of SMPP read state ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib9f210316eaddae19cb74db92b922016864dd786 Gerrit-Change-Number: 25933 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:19:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:20:45 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 09:20:45 +0000 Subject: Change in osmo-msc[master]: smpp_mirror: Don't allocated msgb's for unrealistic amounts of memory In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25934 ) Change subject: smpp_mirror: Don't allocated msgb's for unrealistic amounts of memory ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-msc/+/25934/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/25934/1//COMMIT_MSG at 7 PS1, Line 7: smpp_mirror: Don't allocated msgb's for unrealistic amounts of memory allocate -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I561f75210811826de06ea1673eca1df24faaa210 Gerrit-Change-Number: 25934 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:20:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:23:10 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 09:23:10 +0000 Subject: Change in osmo-msc[master]: smpp_mirror: Factor-out reset of SMPP read state In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25933 ) Change subject: smpp_mirror: Factor-out reset of SMPP read state ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib9f210316eaddae19cb74db92b922016864dd786 Gerrit-Change-Number: 25933 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:23:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:24:03 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 09:24:03 +0000 Subject: Change in osmo-msc[master]: smpp_mirror: Don't allocated msgb's for unrealistic amounts of memory In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25934 ) Change subject: smpp_mirror: Don't allocated msgb's for unrealistic amounts of memory ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I561f75210811826de06ea1673eca1df24faaa210 Gerrit-Change-Number: 25934 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:24:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:24:56 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 09:24:56 +0000 Subject: Change in simtrace2[master]: cardem-pcsc: Fix return of uninitialized variable In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25932 ) Change subject: cardem-pcsc: Fix return of uninitialized variable ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I97431f491f60e2a6537502ef88042907723b7de6 Gerrit-Change-Number: 25932 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:24:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:27:00 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 09:27:00 +0000 Subject: Change in libusrp[master]: libusb_get_device_list() may return a negative number In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/25929 ) Change subject: libusb_get_device_list() may return a negative number ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/25929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ibf5f88d51c36ff9577f748c004562bd8ed2e96bf Gerrit-Change-Number: 25929 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:27:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:28:22 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 09:28:22 +0000 Subject: Change in libusrp[master]: usrp_prims_common: fix use-after-free in get_proto_filename() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/25927 ) Change subject: usrp_prims_common: fix use-after-free in get_proto_filename() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/25927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ib0007e9aebd9e77c28531c1ec70c61f1723a2d0d Gerrit-Change-Number: 25927 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:28:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:30:27 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 09:30:27 +0000 Subject: Change in osmo-ci[master]: coverity: disable Doxygen when building projects In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25910 ) Change subject: coverity: disable Doxygen when building projects ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2fe2f80eb3ec00e9b6c0a3c0ee96e1a0da217b27 Gerrit-Change-Number: 25910 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:30:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:31:37 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 09:31:37 +0000 Subject: Change in osmo-ci[master]: Build and test osmo-hnodeb nightly packages In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25876 ) Change subject: Build and test osmo-hnodeb nightly packages ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I53c2b357b0669f5101ceec7896c4ba30e69605c2 Gerrit-Change-Number: 25876 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 25 Oct 2021 09:31:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:32:45 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 09:32:45 +0000 Subject: Change in osmo-trx[master]: IPCDevice: check value returned from select() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25923 ) Change subject: IPCDevice: check value returned from select() ...................................................................... Patch Set 1: (1 comment) New patch set coming soon... https://gerrit.osmocom.org/c/osmo-trx/+/25923/1/Transceiver52M/device/ipc/IPCDevice.cpp File Transceiver52M/device/ipc/IPCDevice.cpp: https://gerrit.osmocom.org/c/osmo-trx/+/25923/1/Transceiver52M/device/ipc/IPCDevice.cpp at 853 PS1, Line 853: LOGP(DDEV, LOGL_ERROR, "select() failed: %s\n", strerror(errno)); > strerror is not thread safe. "man strerror". strerror() is already used in this file, so I simply copy-pasted without thinking about thread safety. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1c823317659547bb2391c57ac4d7931de1a383e3 Gerrit-Change-Number: 25923 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:32:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Mon Oct 25 09:46:18 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 25 Oct 2021 09:46:18 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <61767cfe3d1cc_24ca2af300e165f4653330@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 84s] #include [ 84s] int main (int argc, char ** argv) { [ 84s] sctp_connectx(0, NULL, 0, NULL); [ 84s] } [ 84s] Compiler stdout: [ 84s] [ 84s] Compiler stderr: [ 84s] [ 84s] Checking if "sctp_connectx() accepts 4 arguments" : compiles: YES [ 84s] Configuring freeDiameter-host.h using configuration [ 84s] Configuring version.h using configuration [ 84s] WARNING: Target "../dict_dcca_3gpp" has a path separator in its name. [ 84s] This is not supported, it can cause unexpected failures and will become [ 84s] a hard error in the future. [ 84s] [ 84s] ../subprojects/freeDiameter/extensions/dict_dcca_3gpp/meson.build:1:0: ERROR: Target "../dict_dcca_3gpp" has a path segment pointing to directory "subprojects/freeDiameter/extensions/dict_dcca_3gpp/..". This is an error. [ 84s] To define a target that builds in that directory you must define it [ 84s] in the meson.build file in that directory. [ 84s] [ 84s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 84s] make: *** [debian/rules:11: binary] Error 25 [ 84s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 84s] ### VM INTERACTION START ### [ 87s] [ 78.630891] sysrq: Power Off [ 87s] [ 78.634352] reboot: Power down [ 87s] ### VM INTERACTION END ### [ 87s] [ 87s] goat07 failed "build open5gs_2.3.6.202110250026.dsc" at Mon Oct 25 09:46:07 UTC 2021. [ 87s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 25 09:47:09 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 25 Oct 2021 09:47:09 +0000 Subject: Build failure of network:osmocom:latest/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <61767d382390e_24ca2af300e165f4653869@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/open5gs/Debian_Unstable/x86_64 Package network:osmocom:latest/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest open5gs Last lines of build log: [ 133s] #include [ 133s] int main (int argc, char ** argv) { [ 133s] sctp_connectx(0, NULL, 0, NULL); [ 133s] } [ 133s] Compiler stdout: [ 133s] [ 133s] Compiler stderr: [ 133s] [ 133s] Checking if "sctp_connectx() accepts 4 arguments" : compiles: YES [ 133s] Configuring freeDiameter-host.h using configuration [ 133s] Configuring version.h using configuration [ 133s] WARNING: Target "../dict_dcca_3gpp" has a path separator in its name. [ 133s] This is not supported, it can cause unexpected failures and will become [ 133s] a hard error in the future. [ 133s] [ 133s] ../subprojects/freeDiameter/extensions/dict_dcca_3gpp/meson.build:1:0: ERROR: Target "../dict_dcca_3gpp" has a path segment pointing to directory "subprojects/freeDiameter/extensions/dict_dcca_3gpp/..". This is an error. [ 133s] To define a target that builds in that directory you must define it [ 133s] in the meson.build file in that directory. [ 133s] [ 133s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 133s] make: *** [debian/rules:11: binary] Error 25 [ 133s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 133s] ### VM INTERACTION START ### [ 136s] [ 121.832321] sysrq: Power Off [ 136s] [ 121.834663] reboot: Power down [ 136s] ### VM INTERACTION END ### [ 136s] [ 136s] old-atreju2 failed "build open5gs_2.3.6.dsc" at Mon Oct 25 09:46:58 UTC 2021. [ 136s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:58:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 09:58:05 +0000 Subject: Change in simtrace2[master]: cardem-pcsc: Fix return of uninitialized variable In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25932 ) Change subject: cardem-pcsc: Fix return of uninitialized variable ...................................................................... cardem-pcsc: Fix return of uninitialized variable Fixes: CID#240740 Change-Id: I97431f491f60e2a6537502ef88042907723b7de6 --- M host/src/simtrace2-cardem-pcsc.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/host/src/simtrace2-cardem-pcsc.c b/host/src/simtrace2-cardem-pcsc.c index df191df..576de61 100644 --- a/host/src/simtrace2-cardem-pcsc.c +++ b/host/src/simtrace2-cardem-pcsc.c @@ -199,6 +199,7 @@ break; case SIMTRACE_MSGT_BD_CEMU_CONFIG: /* firmware confirms configuration change; ignore */ + rc = 0; break; default: printf("unknown simtrace msg type 0x%02x\n", sh->msg_type); -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25932 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I97431f491f60e2a6537502ef88042907723b7de6 Gerrit-Change-Number: 25932 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:58:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 09:58:55 +0000 Subject: Change in osmo-msc[master]: smpp_mirror: Don't allocate msgb's for unrealistic amounts of memory In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/25934 to look at the new patch set (#2). Change subject: smpp_mirror: Don't allocate msgb's for unrealistic amounts of memory ...................................................................... smpp_mirror: Don't allocate msgb's for unrealistic amounts of memory If the remote ESME would send us 0xffffffff as length field, don't try to allocte 4GB of memory, but bail out. Change-Id: I561f75210811826de06ea1673eca1df24faaa210 Fixes: CID#240738 --- M src/utils/smpp_mirror.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/34/25934/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I561f75210811826de06ea1673eca1df24faaa210 Gerrit-Change-Number: 25934 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:58:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 09:58:58 +0000 Subject: Change in osmo-msc[master]: smpp_mirror: Don't allocate msgb's for unrealistic amounts of memory In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25934 ) Change subject: smpp_mirror: Don't allocate msgb's for unrealistic amounts of memory ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I561f75210811826de06ea1673eca1df24faaa210 Gerrit-Change-Number: 25934 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 09:58:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:59:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 09:59:00 +0000 Subject: Change in osmo-msc[master]: smpp_mirror: Factor-out reset of SMPP read state In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25933 ) Change subject: smpp_mirror: Factor-out reset of SMPP read state ...................................................................... smpp_mirror: Factor-out reset of SMPP read state Change-Id: Ib9f210316eaddae19cb74db92b922016864dd786 --- M src/utils/smpp_mirror.c 1 file changed, 9 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/src/utils/smpp_mirror.c b/src/utils/smpp_mirror.c index 3053553..883c498 100644 --- a/src/utils/smpp_mirror.c +++ b/src/utils/smpp_mirror.c @@ -214,6 +214,14 @@ return rc; } +static void esme_read_state_reset(struct esme *esme) +{ + esme->read_msg = NULL; + esme->read_idx = 0; + esme->read_len = 0; + esme->read_state = READ_ST_IN_LEN; +} + /* FIXME: merge with smpp_smsc.c */ static int esme_read_cb(struct osmo_fd *ofd) { @@ -264,10 +272,7 @@ if (esme->read_idx >= esme->read_len) { rc = smpp_pdu_rx(esme, esme->read_msg); - esme->read_msg = NULL; - esme->read_idx = 0; - esme->read_len = 0; - esme->read_state = READ_ST_IN_LEN; + esme_read_state_reset(esme); } break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25933 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib9f210316eaddae19cb74db92b922016864dd786 Gerrit-Change-Number: 25933 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:59:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 09:59:01 +0000 Subject: Change in osmo-msc[master]: smpp_mirror: Don't allocate msgb's for unrealistic amounts of memory In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25934 ) Change subject: smpp_mirror: Don't allocate msgb's for unrealistic amounts of memory ...................................................................... smpp_mirror: Don't allocate msgb's for unrealistic amounts of memory If the remote ESME would send us 0xffffffff as length field, don't try to allocte 4GB of memory, but bail out. Change-Id: I561f75210811826de06ea1673eca1df24faaa210 Fixes: CID#240738 --- M src/utils/smpp_mirror.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/utils/smpp_mirror.c b/src/utils/smpp_mirror.c index 883c498..72d15e3 100644 --- a/src/utils/smpp_mirror.c +++ b/src/utils/smpp_mirror.c @@ -246,6 +246,10 @@ esme->read_idx += rc; if (esme->read_idx >= sizeof(uint32_t)) { esme->read_len = ntohl(len); + if (esme->read_len > 65535) { + /* unrealistic */ + goto dead_socket; + } msg = msgb_alloc(esme->read_len, "SMPP Rx"); if (!msg) return -ENOMEM; @@ -283,6 +287,7 @@ osmo_fd_unregister(&esme->wqueue.bfd); close(esme->wqueue.bfd.fd); esme->wqueue.bfd.fd = -1; + esme_read_state_reset(esme); exit(2342); return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I561f75210811826de06ea1673eca1df24faaa210 Gerrit-Change-Number: 25934 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:59:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 09:59:47 +0000 Subject: Change in osmo-iuh[master]: move-asn1-header-files.sh: Replace original asn file path in generate... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25903 ) Change subject: move-asn1-header-files.sh: Replace original asn file path in generated asn1 header files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I19537f136cbb654950172ee532027920d353a556 Gerrit-Change-Number: 25903 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 25 Oct 2021 09:59:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:59:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 09:59:53 +0000 Subject: Change in osmo-iuh[master]: move-asn1-header-files.sh: Replace original asn file path in generate... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25903 ) Change subject: move-asn1-header-files.sh: Replace original asn file path in generated asn1 header files ...................................................................... move-asn1-header-files.sh: Replace original asn file path in generated asn1 header files This makes builds reproducible and keep the existing relative path. This should have been done in a previous commit changing the paths being passed to asn1c to be absolute (top_srcdir). Fixes: f67803684f47077de3c9e06eb7dc007e0bc86b28 Change-Id: I19537f136cbb654950172ee532027920d353a556 --- M move-asn1-header-files.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/move-asn1-header-files.sh b/move-asn1-header-files.sh index b968323..ec94e24 100755 --- a/move-asn1-header-files.sh +++ b/move-asn1-header-files.sh @@ -22,6 +22,7 @@ shift echo "s,^#include \"$fname\"$,#include <$include_subdir/$fname>," + echo "s, \* \tfound in \"${base_dir}, * \tfound in \"../..," done } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I19537f136cbb654950172ee532027920d353a556 Gerrit-Change-Number: 25903 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 09:59:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 09:59:54 +0000 Subject: Change in osmo-iuh[master]: README.md: Document how to re-generate code from ASN1 files In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25904 ) Change subject: README.md: Document how to re-generate code from ASN1 files ...................................................................... README.md: Document how to re-generate code from ASN1 files Change-Id: Ie3e5b7fb88caf2a795fccdcf214f559f9683070c --- M README.md 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/README.md b/README.md index edbde9f..984ac85 100644 --- a/README.md +++ b/README.md @@ -99,5 +99,6 @@ you will need a modified asn1c which has the following features: * APER support (the patch from Eurecom, or its forward-ported version from the aper branch of git://git.osmocom.org/asn1c) -* support for prefixing the generated types (aper-prefix branch of +* Support for prefixing the generated types (aper-prefix branch of git://git.osmocom.org/asn1c) +* Then in osmo-iuh.git: make -C src/ regen -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25904 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ie3e5b7fb88caf2a795fccdcf214f559f9683070c Gerrit-Change-Number: 25904 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:00:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 10:00:07 +0000 Subject: Change in osmo-ci[master]: Build and test osmo-hnodeb nightly packages In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25876 ) Change subject: Build and test osmo-hnodeb nightly packages ...................................................................... Build and test osmo-hnodeb nightly packages Change-Id: I53c2b357b0669f5101ceec7896c4ba30e69605c2 --- M scripts/common.sh M scripts/osmocom-nightly-packages.sh M scripts/repo-install-test/run-inside-docker.sh 3 files changed, 3 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve diff --git a/scripts/common.sh b/scripts/common.sh index 8dd00a1..85725f6 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -28,6 +28,7 @@ osmo-trx osmocom-bb " +#TODO: Add above once we have releases: osmo-hnodeb, osmo-gbproxy OSMO_BRANCH_DOCKER_PLAYGROUND="${OSMO_BRANCH_DOCKER_PLAYGROUND:-master}" diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index d9fd996..2bdc4f0 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -265,6 +265,7 @@ build osmo-smlc build osmo-cbc build osmo-gbproxy + build osmo-hnodeb post } diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index e47b4ec..1ba94d9 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -31,6 +31,7 @@ # * osmo-pcap-server 0.2.0: VTY port in default config conflicts with osmo-bts (OS#5203) SERVICES_NIGHTLY=" osmo-pcap-server + osmo-hnodeb " distro_obsdir() { -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25876 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I53c2b357b0669f5101ceec7896c4ba30e69605c2 Gerrit-Change-Number: 25876 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:00:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 10:00:24 +0000 Subject: Change in osmo-ci[master]: coverity: disable Doxygen when building projects In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25910 ) Change subject: coverity: disable Doxygen when building projects ...................................................................... coverity: disable Doxygen when building projects Change-Id: I2fe2f80eb3ec00e9b6c0a3c0ee96e1a0da217b27 --- M coverity/build_Osmocom.sh 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index f3a903b..bfd440b 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -12,7 +12,11 @@ do_build() { autoreconf --install --force - ./configure --prefix="$prefix" --with-systemdsystemunitdir=no $* + ./configure \ + --prefix="$prefix" \ + --with-systemdsystemunitdir=no \ + --disable-doxygen \ + $* make $PARALLEL_MAKE make install -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2fe2f80eb3ec00e9b6c0a3c0ee96e1a0da217b27 Gerrit-Change-Number: 25910 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:01:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 10:01:25 +0000 Subject: Change in osmo-cbc[master]: rest_api: fix api_cb_message_del(): unsigned compared against 0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/25926 ) Change subject: rest_api: fix api_cb_message_del(): unsigned compared against 0 ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-cbc/+/25926/1/src/rest_api.c File src/rest_api.c: https://gerrit.osmocom.org/c/osmo-cbc/+/25926/1/src/rest_api.c at 614 PS1, Line 614: if ( I think it's better to use an 'int message_id' above. This way we we don't assing a singed int to an uint16_t. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/25926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie0d710516bdafb8acc9e78d9de14bd3fe115021d Gerrit-Change-Number: 25926 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 25 Oct 2021 10:01:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:02:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 10:02:22 +0000 Subject: Change in libusrp[master]: usrp_standard: fix out-of-bounds read in set_rx_freq() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/25925 ) Change subject: usrp_standard: fix out-of-bounds read in set_rx_freq() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/25925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I3e3ba31e5a68f92a330c5791ee72ad1ffab83da9 Gerrit-Change-Number: 25925 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 10:02:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:02:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 10:02:51 +0000 Subject: Change in libusrp[master]: usrp_prims_common: fix use-after-free in get_proto_filename() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libusrp/+/25927 ) Change subject: usrp_prims_common: fix use-after-free in get_proto_filename() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/25927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ib0007e9aebd9e77c28531c1ec70c61f1723a2d0d Gerrit-Change-Number: 25927 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 10:02:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:03:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 10:03:06 +0000 Subject: Change in libusrp[master]: usrp_standard: fix out-of-bounds read in set_rx_freq() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libusrp/+/25925 ) Change subject: usrp_standard: fix out-of-bounds read in set_rx_freq() ...................................................................... usrp_standard: fix out-of-bounds read in set_rx_freq() Change-Id: I3e3ba31e5a68f92a330c5791ee72ad1ffab83da9 Fixes: CID#240737 --- M host/lib/usrp_standard.cc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/host/lib/usrp_standard.cc b/host/lib/usrp_standard.cc index fe5afab..69145ab 100644 --- a/host/lib/usrp_standard.cc +++ b/host/lib/usrp_standard.cc @@ -649,7 +649,7 @@ bool usrp_standard_rx::set_rx_freq (int channel, double freq) { - if (channel < 0 || channel > MAX_CHAN) + if (channel < 0 || channel >= MAX_CHAN) return false; unsigned int v = -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/25925 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: I3e3ba31e5a68f92a330c5791ee72ad1ffab83da9 Gerrit-Change-Number: 25925 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:03:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 10:03:07 +0000 Subject: Change in libusrp[master]: usrp_prims_common: fix use-after-free in get_proto_filename() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libusrp/+/25927 ) Change subject: usrp_prims_common: fix use-after-free in get_proto_filename() ...................................................................... usrp_prims_common: fix use-after-free in get_proto_filename() Every time the get_proto_filename() is called, a new instance of std::string is allocated for the first argument. When the function returns, this instance gets deallocated. Therefore, the returned user_filename.c_str() points to free()d memory. Change-Id: Ib0007e9aebd9e77c28531c1ec70c61f1723a2d0d Fixes: CID#240724 --- M host/lib/usrp_prims_common.cc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/host/lib/usrp_prims_common.cc b/host/lib/usrp_prims_common.cc index 20a5565..ca9b447 100644 --- a/host/lib/usrp_prims_common.cc +++ b/host/lib/usrp_prims_common.cc @@ -85,7 +85,7 @@ } static const char * -get_proto_filename(const std::string user_filename, const char *env_var, const char *def) +get_proto_filename(const std::string &user_filename, const char *env_var, const char *def) { if (user_filename.length() != 0) return user_filename.c_str(); -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/25927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ib0007e9aebd9e77c28531c1ec70c61f1723a2d0d Gerrit-Change-Number: 25927 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:03:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 10:03:07 +0000 Subject: Change in libusrp[master]: libusb_get_device_list() may return a negative number In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libusrp/+/25929 ) Change subject: libusb_get_device_list() may return a negative number ...................................................................... libusb_get_device_list() may return a negative number Change-Id: Ibf5f88d51c36ff9577f748c004562bd8ed2e96bf Fixes: CID#240717 --- M host/lib/usrp_prims_libusb1.cc 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/host/lib/usrp_prims_libusb1.cc b/host/lib/usrp_prims_libusb1.cc index 5dfe416..3a348b9 100644 --- a/host/lib/usrp_prims_libusb1.cc +++ b/host/lib/usrp_prims_libusb1.cc @@ -183,8 +183,8 @@ // skipped if you know what you're doing. assert (ctx != NULL); - size_t cnt = libusb_get_device_list(ctx, &list); - size_t i = 0; + ssize_t cnt = libusb_get_device_list(ctx, &list); + ssize_t i = 0; if (cnt < 0) fprintf(stderr, "usrp: libusb_get_device_list failed: %s\n", -- To view, visit https://gerrit.osmocom.org/c/libusrp/+/25929 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libusrp Gerrit-Branch: master Gerrit-Change-Id: Ibf5f88d51c36ff9577f748c004562bd8ed2e96bf Gerrit-Change-Number: 25929 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:04:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 10:04:57 +0000 Subject: Change in simtrace2[master]: host: fix process_usb_msg(): rc may be uninitialized In-Reply-To: References: Message-ID: laforge has abandoned this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25924 ) Change subject: host: fix process_usb_msg(): rc may be uninitialized ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25924 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Idce87adabc9a1bb21f395755aa15b17d6edef6fb Gerrit-Change-Number: 25924 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:06:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 10:06:04 +0000 Subject: Change in osmo-bts[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 to look at the new patch set (#8). Change subject: initial support for static userspace probes via systemtap ...................................................................... initial support for static userspace probes via systemtap This adds a --enable-systemtap configure option, which will then add static tracepoints to the generated osmo-bts-* binary. At this point, only two sets of tracepoints are supported, and only in osmo-bts-trx: ul_data_{start,done} and dl_rts_{start,done}. The probes are intended to be used for analyzing the amount of time needed for processing of uplink bursts / generation of downlink bursts. Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 --- M configure.ac M src/common/Makefile.am A src/common/probes.d M src/osmo-bts-trx/Makefile.am A src/osmo-bts-trx/probes.d M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_if.c 7 files changed, 97 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/22641/8 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 Gerrit-Change-Number: 22641 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:06:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 10:06:07 +0000 Subject: Change in osmo-bts[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22641 ) Change subject: initial support for static userspace probes via systemtap ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 Gerrit-Change-Number: 22641 Gerrit-PatchSet: 8 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 10:06:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:06:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 10:06:09 +0000 Subject: Change in osmo-bts[master]: initial support for static userspace probes via systemtap In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/22641 ) Change subject: initial support for static userspace probes via systemtap ...................................................................... initial support for static userspace probes via systemtap This adds a --enable-systemtap configure option, which will then add static tracepoints to the generated osmo-bts-* binary. At this point, only two sets of tracepoints are supported, and only in osmo-bts-trx: ul_data_{start,done} and dl_rts_{start,done}. The probes are intended to be used for analyzing the amount of time needed for processing of uplink bursts / generation of downlink bursts. Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 --- M configure.ac M src/common/Makefile.am A src/common/probes.d M src/osmo-bts-trx/Makefile.am A src/osmo-bts-trx/probes.d M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_if.c 7 files changed, 97 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 4f2e889..91fe244 100644 --- a/configure.ac +++ b/configure.ac @@ -367,6 +367,38 @@ AC_MSG_RESULT([$enable_ext_tests]) AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes") +# +# SystemTap support +# +AC_MSG_CHECKING([whether to include systemtap tracing support]) +AC_ARG_ENABLE([systemtap], + [AS_HELP_STRING([--enable-systemtap], + [Enable inclusion of systemtap trace support])], + [ENABLE_SYSTEMTAP="${enableval}"], [ENABLE_SYSTEMTAP='no']) +AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$ENABLE_SYSTEMTAP = xyes]) +AC_MSG_RESULT(${ENABLE_SYSTEMTAP}) + +if test "x${ENABLE_SYSTEMTAP}" = xyes; then + # Additional configuration for --enable-systemtap is HERE + AC_CHECK_PROGS(DTRACE, dtrace) + if test -z "$DTRACE"; then + AC_MSG_ERROR([dtrace not found]) + fi + AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], + [SDT_H_FOUND='no'; + AC_MSG_ERROR([systemtap support needs sys/sdt.h header])]) + AC_DEFINE([HAVE_SYSTEMTAP], [1], [Define to 1 if using SystemTap probes.]) + AC_ARG_WITH([tapset-install-dir], + [AS_HELP_STRING([--with-tapset-install-dir], + [The absolute path where the tapset dir will be installed])], + [if test "x${withval}" = x; then + ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset" + else + ABS_TAPSET_DIR="${withval}" + fi], [ABS_TAPSET_DIR="\$(datadir)/systemtap/tapset"]) + AC_SUBST(ABS_TAPSET_DIR) +fi + # https://www.freedesktop.org/software/systemd/man/daemon.html AC_ARG_WITH([systemdsystemunitdir], [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],, diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 72438c6..5b69b5c 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOCODEC_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOCODEC_LIBS) @@ -44,6 +44,18 @@ nm_bb_transc_fsm.c \ nm_channel_fsm.c \ nm_radio_carrier_fsm.c \ + probes.d \ $(NULL) libl1sched_a_SOURCES = scheduler.c + +if ENABLE_SYSTEMTAP +probes.h: probes.d + $(DTRACE) -C -h -s $< -o $@ + +probes.lo: probes.d + $(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC env CFLAGS="$(CFLAGS)" $(DTRACE) -C -G -s $< -o $@ + +BUILT_SOURCES = probes.h probes.lo +libbts_la_LDADD = probes.lo +endif diff --git a/src/common/probes.d b/src/common/probes.d new file mode 100644 index 0000000..aaf9030 --- /dev/null +++ b/src/common/probes.d @@ -0,0 +1,2 @@ +provider osmo_bts { +}; diff --git a/src/osmo-bts-trx/Makefile.am b/src/osmo-bts-trx/Makefile.am index 54d1af9..afa5414 100644 --- a/src/osmo-bts-trx/Makefile.am +++ b/src/osmo-bts-trx/Makefile.am @@ -1,6 +1,7 @@ AM_CPPFLAGS = \ $(all_includes) \ -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ $(NULL) AM_CFLAGS = \ @@ -51,6 +52,7 @@ trx_provision_fsm.c \ trx_vty.c \ loops.c \ + probes.d \ $(NULL) osmo_bts_trx_LDADD = \ @@ -58,3 +60,14 @@ $(top_builddir)/src/common/libbts.a \ $(LDADD) \ $(NULL) + +if ENABLE_SYSTEMTAP +probes.h: probes.d + $(DTRACE) -C -h -s $< -o $@ + +probes.lo: probes.d + $(LIBTOOL) --mode=compile $(AM_V_lt) --tag=CC env CFLAGS="$(CFLAGS)" $(DTRACE) -C -G -s $< -o $@ + +BUILT_SOURCES = probes.h probes.lo +osmo_bts_trx_LDADD += probes.lo +endif diff --git a/src/osmo-bts-trx/probes.d b/src/osmo-bts-trx/probes.d new file mode 100644 index 0000000..2f905bd --- /dev/null +++ b/src/osmo-bts-trx/probes.d @@ -0,0 +1,7 @@ +provider osmo_bts_trx { + probe ul_data_start(int, int, int); /* trx_nr, ts_nr, fn */ + probe ul_data_done(int, int, int); /* trx_nr, ts_nr, fn */ + + probe dl_rts_start(int, int, int); /* trx_nr, ts_nr, fn */ + probe dl_rts_done(int, int, int); /* trx_nr, ts_nr, fn */ +}; diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index 6136b14..1159e59 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -50,6 +50,19 @@ #include "l1_if.h" #include "trx_if.h" +#include "btsconfig.h" + +#ifdef HAVE_SYSTEMTAP +/* include the generated probes header and put markers in code */ +#include "probes.h" +#define TRACE(probe) probe +#define TRACE_ENABLED(probe) probe ## _ENABLED() +#else +/* Wrap the probe to allow it to be removed when no systemtap available */ +#define TRACE(probe) +#define TRACE_ENABLED(probe) (0) +#endif /* HAVE_SYSTEMTAP */ + #define SCHED_FH_PARAMS_FMT "hsn=%u, maio=%u, ma_len=%u" #define SCHED_FH_PARAMS_VALS(ts) \ (ts)->hopping.hsn, (ts)->hopping.maio, (ts)->hopping.arfcn_num @@ -280,8 +293,10 @@ struct trx_dl_burst_req *br; /* ready-to-send */ + TRACE(OSMO_BTS_TRX_DL_RTS_START(trx->nr, tn, fn)); _sched_rts(l1ts, GSM_TDMA_FN_SUM(fn, plink->u.osmotrx.clock_advance + plink->u.osmotrx.rts_advance)); + TRACE(OSMO_BTS_TRX_DL_RTS_DONE(trx->nr, tn, fn)); /* pre-initialized buffer for the Downlink burst */ br = &pinst->u.osmotrx.br[tn]; diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c index 914d0e1..9232e64 100644 --- a/src/osmo-bts-trx/trx_if.c +++ b/src/osmo-bts-trx/trx_if.c @@ -51,6 +51,19 @@ #include "trx_if.h" #include "trx_provision_fsm.h" +#include "btsconfig.h" + +#ifdef HAVE_SYSTEMTAP +/* include the generated probes header and put markers in code */ +#include "probes.h" +#define TRACE(probe) probe +#define TRACE_ENABLED(probe) probe ## _ENABLED() +#else +/* Wrap the probe to allow it to be removed when no systemtap available */ +#define TRACE(probe) +#define TRACE_ENABLED(probe) (0) +#endif /* HAVE_SYSTEMTAP */ + /* * socket helper functions */ @@ -1083,7 +1096,9 @@ bi._num_pdus++; /* feed received burst into scheduler code */ + TRACE(OSMO_BTS_TRX_UL_DATA_START(l1h->phy_inst->trx->nr, bi.tn, bi.fn)); trx_sched_route_burst_ind(l1h->phy_inst->trx, &bi); + TRACE(OSMO_BTS_TRX_UL_DATA_DONE(l1h->phy_inst->trx->nr, bi.tn, bi.fn)); } while (bi.flags & TRX_BI_F_BATCH_IND); return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/22641 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibb4962253f1a195dc1a54405bac058ccb2545799 Gerrit-Change-Number: 22641 Gerrit-PatchSet: 9 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:06:15 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 10:06:15 +0000 Subject: Change in osmo-cbc[master]: rest_api: fix api_cb_message_del(): unsigned compared against 0 In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/25926 ) Change subject: rest_api: fix api_cb_message_del(): unsigned compared against 0 ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/25926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie0d710516bdafb8acc9e78d9de14bd3fe115021d Gerrit-Change-Number: 25926 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:07:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 10:07:44 +0000 Subject: Change in osmo-sip-connector[master]: MNCC v8: Implement Basic Support for Global Call Reference. In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 ) Change subject: MNCC v8: Implement Basic Support for Global Call Reference. ...................................................................... MNCC v8: Implement Basic Support for Global Call Reference. * Add GCR to mncc struct and therefore bump mncc version. * Pass the GCR as a SIP Header to SIP UA and retrieve any such header from incoming SIP calls, passing the GCR on to MNCC Related: #OS5164 Depends: osmo-msc I705c860e51637b4537cad65a330ecbaaca96dd5b Change-Id: Id40d7e0fed9356f801b3627c118150055e7232b1 --- M src/call.h M src/mncc.c M src/mncc_protocol.h M src/sip.c 4 files changed, 79 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/call.h b/src/call.h index d1732f9..8360711 100644 --- a/src/call.h +++ b/src/call.h @@ -31,6 +31,7 @@ const char *source; const char *dest; + struct osmo_gcr_parsed gcr; }; enum { diff --git a/src/mncc.c b/src/mncc.c index 9d75950..fc99400 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -543,6 +543,7 @@ leg->conn = conn; leg->state = MNCC_CC_INITIAL; leg->dir = MNCC_DIR_MO; + leg->base.call->gcr = data->gcr; memcpy(&leg->called, called, sizeof(leg->called)); memcpy(&leg->calling, &data->calling, sizeof(leg->calling)); memcpy(&leg->imsi, data->imsi, sizeof(leg->imsi)); @@ -898,6 +899,7 @@ mncc.fields |= MNCC_F_CALLING; mncc.calling.plan = GSM48_NPI_ISDN_E164; + mncc.gcr = call->gcr; if (call->source && call->source[0] == '+') { mncc.calling.type = GSM48_TON_INTERNATIONAL; diff --git a/src/mncc_protocol.h b/src/mncc_protocol.h index 5d35191..11969ee 100644 --- a/src/mncc_protocol.h +++ b/src/mncc_protocol.h @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -159,6 +160,7 @@ unsigned char lchan_type; unsigned char lchan_mode; + struct osmo_gcr_parsed gcr; /* A buffer to contain SDP ('\0' terminated) */ char sdp[1024]; @@ -170,7 +172,7 @@ unsigned char data[0]; }; -#define MNCC_SOCK_VERSION 7 +#define MNCC_SOCK_VERSION 8 struct gsm_mncc_hello { uint32_t msg_type; uint32_t version; diff --git a/src/sip.c b/src/sip.c index f0bc4c3..684ef74 100644 --- a/src/sip.c +++ b/src/sip.c @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -106,6 +107,34 @@ nua_ack(leg->nua_handle, TAG_END()); } +int _osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len) +{ + uint16_t parsed = 1; /* account for length byte right away */ + + if (len < 13) + return -EBADMSG; + + gcr->net_len = elem[0]; + if (gcr->net_len < 3 || gcr->net_len > 5) + return -EINVAL; + + memcpy(gcr->net, elem + parsed, gcr->net_len); + /* +1 for ignored Node ID length field */ + parsed += (gcr->net_len + 1); + + gcr->node = osmo_load16be(elem + parsed); + parsed += 2; + + if (elem[parsed] != 5) /* see Table B 2.1.9.2 */ + return -ENOENT; + + parsed++; + + memcpy(gcr->cr, elem + parsed, 5); + + return parsed + 5; +} + static void new_call(struct sip_agent *agent, nua_handle_t *nh, const sip_t *sip) { @@ -113,9 +142,20 @@ struct sip_call_leg *leg; const char *from = NULL, *to = NULL; char ip_addr[INET6_ADDRSTRLEN]; + uint8_t gcr_back[28] = { 0 }; + LOGP(DSIP, LOGL_INFO, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh); + sip_unknown_t *unknown_header = sip->sip_unknown; + while (unknown_header != NULL) { + if (!strcmp("X-Global-Call-Ref", unknown_header->un_name)) { + osmo_hexparse(unknown_header->un_value, gcr_back, sizeof(gcr_back)); + break; + } + unknown_header = unknown_header->un_next; + } + if (!sdp_screen_sdp(sip)) { LOGP(DSIP, LOGL_ERROR, "No supported codec.\n"); nua_respond(nh, SIP_406_NOT_ACCEPTABLE, TAG_END()); @@ -131,6 +171,8 @@ return; } + _osmo_dec_gcr(&call->gcr, gcr_back, sizeof(gcr_back)); + if (sip->sip_to) to = sip->sip_to->a_url->url_user; if (sip->sip_from) @@ -590,10 +632,38 @@ leg->state = SIP_CC_CONNECTED; } +/*! Encode Global Call Reference. */ +uint8_t _osmo_enc_gcr(uint8_t *buf, const struct osmo_gcr_parsed *g) +{ + uint8_t tmp[2]; + + if (!g) + return 0; + + if (g->net_len < 3 || g->net_len > 5) + return 0; + + buf = lv_put(buf, g->net_len, g->net); + osmo_store16be(g->node, &tmp); + buf = lv_put(buf, 2, tmp); + buf = lv_put(buf, 5, g->cr); + + /* Length: LV(Net) + LV(Node) + LV(CRef) - see 3GPP TS ?3.2.2.115 */ + return (g->net_len + 1) + (2 + 1) + (5 + 1); +} + static int send_invite(struct sip_agent *agent, struct sip_call_leg *leg, const char *calling_num, const char *called_num) { struct call_leg *other = leg->base.call->initial; + char gcr_hex[30]; + uint8_t data[15]; + + gcr_hex[0] = '\0'; + data[0] = '\0'; + uint8_t len = _osmo_enc_gcr(data, &leg->base.call->gcr); + if (len) + osmo_strlcpy(gcr_hex, osmo_hexdump_nospc(data, len*2+1), len*2+1); char *from = talloc_asprintf(leg, "sip:%s@%s:%d", calling_num, @@ -605,6 +675,8 @@ agent->app->sip.remote_port); char *sdp = sdp_create_file(leg, other, sdp_sendrecv); + char *x_gcr = talloc_asprintf(leg, "X-Global-Call-Ref: %s", gcr_hex); + leg->state = SIP_CC_INITIAL; leg->dir = SIP_DIR_MT; nua_invite(leg->nua_handle, @@ -612,6 +684,7 @@ SIPTAG_TO_STR(to), NUTAG_MEDIA_ENABLE(0), SIPTAG_CONTENT_TYPE_STR("application/sdp"), + SIPTAG_HEADER_STR(x_gcr), SIPTAG_PAYLOAD_STR(sdp), TAG_END()); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Id40d7e0fed9356f801b3627c118150055e7232b1 Gerrit-Change-Number: 25675 Gerrit-PatchSet: 4 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:07:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 10:07:48 +0000 Subject: Change in osmo-msc[master]: Add support for LCLS to the MSC In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/24236 ) Change subject: Add support for LCLS to the MSC ...................................................................... Add support for LCLS to the MSC This commit is largely based on work by Max Adds LCLS parameters for A-interface transactions This commit also adds a vty option to facilitate globally disabling LCLS for all calls on this MSC. Add a global call reference (GCR) to MNCC and therefore bump the MNCC version to version 8. (This commit has to be merged at the same time as the corresponing commit in the osmo-sip-connector for mncc-external use.) Depends: osmo-sip-connector Id40d7e0fed9356f801b3627c118150055e7232b1 Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b --- M include/osmocom/msc/debug.h M include/osmocom/msc/gsm_data.h M include/osmocom/msc/mncc.h M include/osmocom/msc/ran_msg.h M include/osmocom/msc/transaction.h M src/libmsc/gsm_04_08_cc.c M src/libmsc/msc_a.c M src/libmsc/msc_vty.c M src/libmsc/ran_msg_a.c M src/libmsc/transaction.c M src/osmo-msc/msc_main.c M tests/mncc/mncc_test.ok M tests/test_nodes.vty 13 files changed, 134 insertions(+), 12 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve keith: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/debug.h b/include/osmocom/msc/debug.h index 3347e20..0d08ceb 100644 --- a/include/osmocom/msc/debug.h +++ b/include/osmocom/msc/debug.h @@ -8,6 +8,7 @@ DCC, DMM, DRR, + DLCLS, DMNCC, DPAG, DMSC, diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 170d884..72e33a6 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -260,6 +260,10 @@ /* Whether to use call waiting on the network */ bool call_waiting; + + /* Whether to use lcls on the network */ + bool lcls_permitted; + char *sms_db_file_path; }; diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h index 1c8aff0..5002227 100644 --- a/include/osmocom/msc/mncc.h +++ b/include/osmocom/msc/mncc.h @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -160,7 +161,7 @@ unsigned char lchan_type; unsigned char lchan_mode; - + struct osmo_gcr_parsed gcr; /* A buffer to contain SDP ('\0' terminated) */ char sdp[1024]; }; @@ -171,7 +172,7 @@ unsigned char data[0]; }; -#define MNCC_SOCK_VERSION 7 +#define MNCC_SOCK_VERSION 8 struct gsm_mncc_hello { uint32_t msg_type; uint32_t version; diff --git a/include/osmocom/msc/ran_msg.h b/include/osmocom/msc/ran_msg.h index 1303ba3..fd2439f 100644 --- a/include/osmocom/msc/ran_msg.h +++ b/include/osmocom/msc/ran_msg.h @@ -88,6 +88,7 @@ uint8_t osmux_cid; bool call_id_present; uint32_t call_id; + struct osmo_lcls *lcls; }; struct ran_cipher_mode_command { diff --git a/include/osmocom/msc/transaction.h b/include/osmocom/msc/transaction.h index 928b137..14b89bb 100644 --- a/include/osmocom/msc/transaction.h +++ b/include/osmocom/msc/transaction.h @@ -100,6 +100,7 @@ struct osmo_timer_list timer_guard; struct gsm_mncc msg; /* stores setup/disconnect/release message */ bool mncc_initiated; /* Whether an MNCC Release is necessary on failure */ + struct osmo_lcls *lcls; } cc; struct { struct gsm411_smc_inst smc_inst; @@ -145,6 +146,8 @@ const struct vlr_subscr *vsub, uint8_t sm_rp_mr); +struct osmo_lcls *trans_lcls_compose(const struct gsm_trans *trans, bool use_lac); + struct gsm_trans *trans_alloc(struct gsm_network *net, struct vlr_subscr *vsub, enum trans_type type, uint8_t trans_id, diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index a8b4665..d6a2864 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -318,6 +318,16 @@ msc_a_get(msc_a, MSC_A_USE_CC); trans->msc_a = msc_a; trans->paging_request = NULL; + + /* Get the GCR from the MO call leg (if any). */ + if (!trans->cc.lcls) { + trans->cc.lcls = trans_lcls_compose(trans, true); + if (trans->cc.lcls) { + trans->cc.lcls->gcr = trans->cc.msg.gcr; + trans->cc.lcls->gcr_available = true; + } + } + osmo_fsm_inst_dispatch(msc_a->c.fi, MSC_A_EV_TRANSACTION_ACCEPTED, trans); /* send SETUP request to called party */ gsm48_cc_tx_setup(trans, &trans->cc.msg); @@ -502,6 +512,14 @@ memset(&setup, 0, sizeof(struct gsm_mncc)); setup.callref = trans->callref; + /* New Global Call Reference */ + if (!trans->cc.lcls) + trans->cc.lcls = trans_lcls_compose(trans, true); + + /* Pass the LCLS GCR on to the MT call leg via MNCC */ + if (trans->cc.lcls) + setup.gcr = trans->cc.lcls->gcr; + tlv_parse(&tp, &gsm48_att_tlvdef, gh->data, payload_len, 0, 0); /* emergency setup is identified by msg_type */ if (msg_type == GSM48_MT_CC_EMERG_SETUP) { diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index fa8e842..9b6b602 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -569,6 +569,7 @@ .osmux_cid = msc_a->cc.call_leg->rtp[RTP_TO_RAN]->local_osmux_cid, .call_id_present = true, .call_id = cc_trans->callref, + .lcls = cc_trans->cc.lcls, }, }; if (msc_a_ran_down(msc_a, MSC_ROLE_I, &msg)) { @@ -1506,6 +1507,13 @@ rc = msc_a_up_ho(msc_a, d, MSC_HO_EV_RX_FAILURE); break; + case RAN_MSG_LCLS_STATUS: + /* The BSS sends us LCLS_STATUS. We do nothing for now, but it is not an error. */ + LOG_MSC_A(msc_a, LOGL_DEBUG, "LCLS_STATUS (%s) received from MSC-I\n", + gsm0808_lcls_status_name(msg->lcls_status.status)); + rc = 0; + break; + default: LOG_MSC_A(msc_a, LOGL_ERROR, "Message from MSC-I not implemented: %s\n", ran_msg_type_name(msg->msg_type)); rc = -ENOTSUP; diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 2a4dbbb..e4e0937 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -499,6 +499,24 @@ return CMD_SUCCESS; } +DEFUN_ATTR(cfg_msc_lcls_disable, cfg_msc_lcls_disable_cmd, + "lcls-permitted", + "Globally allow LCLS (Local Call Local Switch) for all calls on this MSC.\n", + CMD_ATTR_IMMEDIATE) +{ + gsmnet->lcls_permitted = true; + return CMD_SUCCESS; +} + +DEFUN_ATTR(cfg_msc_no_lcls_disable, cfg_msc_no_lcls_disable_cmd, + "no lcls-permitted", + NO_STR "Globally disable LCLS (Local Call Local Switch) for all calls on this MSC.\n", + CMD_ATTR_IMMEDIATE) +{ + gsmnet->lcls_permitted = false; + return CMD_SUCCESS; +} + DEFUN(cfg_msc_cs7_instance_a, cfg_msc_cs7_instance_a_cmd, "cs7-instance-a <0-15>", @@ -764,6 +782,8 @@ gsmnet->ncss_guard_timeout, VTY_NEWLINE); vty_out(vty, " %sassign-tmsi%s", gsmnet->vlr->cfg.assign_tmsi? "" : "no ", VTY_NEWLINE); + if (gsmnet->lcls_permitted) + vty_out(vty, " lcls-permitted%s", VTY_NEWLINE); vty_out(vty, " cs7-instance-a %u%s", gsmnet->a.cs7_instance, VTY_NEWLINE); @@ -2083,6 +2103,8 @@ install_node(&msc_node, config_write_msc); install_element(MSC_NODE, &cfg_sms_database_cmd); install_element(MSC_NODE, &cfg_msc_assign_tmsi_cmd); + install_element(MSC_NODE, &cfg_msc_lcls_disable_cmd); + install_element(MSC_NODE, &cfg_msc_no_lcls_disable_cmd); install_element(MSC_NODE, &cfg_msc_mncc_internal_cmd); install_element(MSC_NODE, &cfg_msc_mncc_external_cmd); install_element(MSC_NODE, &cfg_msc_mncc_guard_timeout_cmd); diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c index 273f8dd..b50259d 100644 --- a/src/libmsc/ran_msg_a.c +++ b/src/libmsc/ran_msg_a.c @@ -1004,7 +1004,8 @@ if(ac->call_id_present == true) call_id = &ac->call_id; - msg = gsm0808_create_ass(ac->channel_type, NULL, use_rtp_addr, use_scl, call_id); + msg = gsm0808_create_ass2(ac->channel_type, NULL, use_rtp_addr, use_scl, call_id, + NULL, ac->lcls); if (ac->osmux_present) _gsm0808_assignment_extend_osmux(msg, ac->osmux_cid); return msg; diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 94712cc..2108ab4 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -110,6 +110,66 @@ return NULL; } +struct osmo_lcls *trans_lcls_compose(const struct gsm_trans *trans, bool use_lac) +{ + if (!trans->net->a.sri->sccp) + return NULL; + + struct osmo_ss7_instance *ss7 = osmo_sccp_get_ss7(trans->net->a.sri->sccp); + struct osmo_lcls *lcls; + uint8_t w = osmo_ss7_pc_width(&ss7->cfg.pc_fmt); + + if (!trans) { + LOGP(DCC, LOGL_ERROR, "LCLS: unable to fill parameters for unallocated transaction\n"); + return NULL; + } + + if (!trans->net->lcls_permitted) { + LOGP(DCC, LOGL_NOTICE, "LCLS disabled globally\n"); + return NULL; + } + + if (!trans->msc_a) { + LOGP(DCC, LOGL_ERROR, "LCLS: unable to fill parameters for transaction without connection\n"); + return NULL; + } + + if (trans->msc_a->c.ran->type != OSMO_RAT_GERAN_A) { + LOGP(DCC, LOGL_ERROR, "LCLS: only A interface is supported at the moment\n"); + return NULL; + } + + lcls = talloc_zero(trans, struct osmo_lcls); + if (!lcls) { + LOGP(DCC, LOGL_ERROR, "LCLS: failed to allocate osmo_lcls\n"); + return NULL; + } + + LOGP(DCC, LOGL_INFO, "LCLS: using %u bits (%u bytes) for node ID\n", w, w / 8); + + lcls->gcr.net_len = 3; + lcls->gcr.node = ss7->cfg.primary_pc; + + /* net id from Q.1902.3 3-5 bytes, this function gives 3 bytes exactly */ + osmo_plmn_to_bcd(lcls->gcr.net, &trans->net->plmn); + + osmo_store32be(trans->callref, lcls->gcr.cr); + osmo_store16be(use_lac ? trans->msc_a->via_cell.lai.lac : trans->msc_a->via_cell.cell_identity, lcls->gcr.cr + 3); + + LOGP(DCC, LOGL_INFO, "LCLS: allocated %s-based CR-ID %s\n", use_lac ? "LAC" : "CI", + osmo_hexdump(lcls->gcr.cr, 5)); + + lcls->config = GSM0808_LCLS_CFG_BOTH_WAY; + lcls->control = GSM0808_LCLS_CSC_CONNECT; + lcls->corr_needed = true; + lcls->gcr_available = true; + + LOGP(DCC, LOGL_DEBUG, "Filled %s\n", osmo_lcls_dump(lcls)); + LOGP(DCC, LOGL_DEBUG, "Filled %s\n", osmo_gcr_dump(lcls)); + + return lcls; +} + static const char *trans_vsub_use(enum trans_type type) { return get_value_string_or_null(trans_type_names, type) ? : "trans-type-unknown"; diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index a0f584d..cd91d54 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -258,6 +258,7 @@ mgcp_client_conf_init(&net->mgw.conf); net->call_waiting = true; + net->lcls_permitted = false; net->mgw.tdefs = g_mgw_tdefs; osmo_tdefs_reset(net->mgw.tdefs); diff --git a/tests/mncc/mncc_test.ok b/tests/mncc/mncc_test.ok index 9334706..7cb1201 100644 --- a/tests/mncc/mncc_test.ok +++ b/tests/mncc/mncc_test.ok @@ -1,15 +1,15 @@ test_sdp_termination() struct gsm_mncc: -empty SDP: len=1860 sdplen=1026 sdp="\0" rc=0 -empty SDP, shortest possible: len=835 sdplen=1 sdp="\0" rc=0 -empty SDP, zero len: len=834 sdplen=0 sdp=- rc=-22 -terminated SDP str: len=1860 sdplen=1026 sdp="Privacy is a desirable marketing option\0" rc=0 -terminated SDP str, shortest possible: len=874 sdplen=40 sdp="Privacy is a desirable marketing option\0" rc=0 -terminated SDP str, but len excludes nul: len=873 sdplen=39 sdp="Privacy is a desirable marketing option" rc=-22 -terminated SDP str, but len too short: len=857 sdplen=23 sdp="Privacy is a desirable " rc=-22 -len way too short: len=10 sdplen=-824 sdp=- rc=-22 -len zero: len=0 sdplen=-834 sdp=- rc=-22 +empty SDP: len=1872 sdplen=1024 sdp="\0" rc=0 +empty SDP, shortest possible: len=849 sdplen=1 sdp="\0" rc=0 +empty SDP, zero len: len=848 sdplen=0 sdp=- rc=-22 +terminated SDP str: len=1872 sdplen=1024 sdp="Privacy is a desirable marketing option\0" rc=0 +terminated SDP str, shortest possible: len=888 sdplen=40 sdp="Privacy is a desirable marketing option\0" rc=0 +terminated SDP str, but len excludes nul: len=887 sdplen=39 sdp="Privacy is a desirable marketing option" rc=-22 +terminated SDP str, but len too short: len=871 sdplen=23 sdp="Privacy is a desirable " rc=-22 +len way too short: len=10 sdplen=-838 sdp=- rc=-22 +len zero: len=0 sdplen=-848 sdp=- rc=-22 struct gsm_mncc_rtp: empty SDP: len=1168 sdplen=1024 sdp="\0" rc=0 diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 268681a..315264f 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -48,6 +48,8 @@ ... sms-database PATH assign-tmsi + lcls-permitted + no lcls-permitted mncc internal mncc external MNCC_SOCKET_PATH mncc guard-timeout <0-255> -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24236 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I705c860e51637b4537cad65a330ecbaaca96dd5b Gerrit-Change-Number: 24236 Gerrit-PatchSet: 11 Gerrit-Owner: keith Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:13:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 10:13:04 +0000 Subject: Change in osmo-trx[master]: IPCDevice: check value returned from select() In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/25923 to look at the new patch set (#2). Change subject: IPCDevice: check value returned from select() ...................................................................... IPCDevice: check value returned from select() Change-Id: I1c823317659547bb2391c57ac4d7931de1a383e3 Fxies: CID#240744 --- M Transceiver52M/device/ipc/IPCDevice.cpp 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/23/25923/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1c823317659547bb2391c57ac4d7931de1a383e3 Gerrit-Change-Number: 25923 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:13:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 10:13:04 +0000 Subject: Change in osmo-trx[master]: LMSDevice: LMS_GetDeviceList() may return a negative number In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-trx/+/25928 to look at the new patch set (#2). Change subject: LMSDevice: LMS_GetDeviceList() may return a negative number ...................................................................... LMSDevice: LMS_GetDeviceList() may return a negative number Change-Id: I855bd8ea6d9cb0f285f4dbbf3bcd09bff4e71044 Fixes: CID#240718 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/28/25928/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I855bd8ea6d9cb0f285f4dbbf3bcd09bff4e71044 Gerrit-Change-Number: 25928 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:13:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 10:13:04 +0000 Subject: Change in osmo-trx[master]: trx_rate_ctr: use thread safe strerror() in device_sig_cb() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/25935 ) Change subject: trx_rate_ctr: use thread safe strerror() in device_sig_cb() ...................................................................... trx_rate_ctr: use thread safe strerror() in device_sig_cb() Change-Id: Ibd52af22bbe99652f402ada87410de167a124b73 --- M CommonLibs/trx_rate_ctr.cpp 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/35/25935/1 diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp index ba4fcc0..a7467c1 100644 --- a/CommonLibs/trx_rate_ctr.cpp +++ b/CommonLibs/trx_rate_ctr.cpp @@ -214,6 +214,7 @@ struct timespec next_sched = {.tv_sec = 0, .tv_nsec = 20*1000*1000}; /* no automatic re-trigger */ struct timespec intv_sched = {.tv_sec = 0, .tv_nsec = 0}; + char err_buf[256]; switch (signal) { case S_DEVICE_COUNTER_CHANGE: @@ -222,7 +223,8 @@ dev_rate_ctr_mutex.lock(); dev_ctrs_pending[dev_ctr->chan] = *dev_ctr; if (osmo_timerfd_schedule(&dev_rate_ctr_timerfd, &next_sched, &intv_sched) < 0) { - LOGC(DCTR, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno); + LOGC(DCTR, ERROR) << "Failed to schedule timerfd: " << errno + << " = "<< strerror_r(errno, err_buf, sizeof(err_buf)); } dev_rate_ctr_mutex.unlock(); break; @@ -232,7 +234,8 @@ trx_rate_ctr_mutex.lock(); trx_ctrs_pending[trx_ctr->chan] = *trx_ctr; if (osmo_timerfd_schedule(&trx_rate_ctr_timerfd, &next_sched, &intv_sched) < 0) { - LOGC(DCTR, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno); + LOGC(DCTR, ERROR) << "Failed to schedule timerfd: " << errno + << " = "<< strerror_r(errno, err_buf, sizeof(err_buf)); } trx_rate_ctr_mutex.unlock(); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibd52af22bbe99652f402ada87410de167a124b73 Gerrit-Change-Number: 25935 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:13:05 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 10:13:05 +0000 Subject: Change in osmo-trx[master]: IPCDevice: use thread safe strerror_r() instead of strerror() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/25936 ) Change subject: IPCDevice: use thread safe strerror_r() instead of strerror() ...................................................................... IPCDevice: use thread safe strerror_r() instead of strerror() Change-Id: Ia51ffa51ec7729572faca0282ae41c1e4968049f --- M Transceiver52M/device/ipc/IPCDevice.cpp 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/36/25936/1 diff --git a/Transceiver52M/device/ipc/IPCDevice.cpp b/Transceiver52M/device/ipc/IPCDevice.cpp index 5ed428e..c1c6449 100644 --- a/Transceiver52M/device/ipc/IPCDevice.cpp +++ b/Transceiver52M/device/ipc/IPCDevice.cpp @@ -100,12 +100,14 @@ int IPCDevice::ipc_shm_connect(const char *shm_name) { int fd; + char err_buf[256]; size_t shm_len; int rc; LOGP(DDEV, LOGL_NOTICE, "Opening shm path %s\n", shm_name); if ((fd = shm_open(shm_name, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR)) < 0) { - LOGP(DDEV, LOGL_ERROR, "shm_open %d: %s\n", errno, strerror(errno)); + LOGP(DDEV, LOGL_ERROR, "shm_open %d: %s\n", errno, + strerror_r(errno, err_buf, sizeof(err_buf))); rc = -errno; goto err_shm_open; } @@ -113,7 +115,8 @@ // Get size of the allocated memory struct stat shm_stat; if (fstat(fd, &shm_stat) < 0) { - LOGP(DDEV, LOGL_ERROR, "fstat %d: %s\n", errno, strerror(errno)); + LOGP(DDEV, LOGL_ERROR, "fstat %d: %s\n", errno, + strerror_r(errno, err_buf, sizeof(err_buf))); rc = -errno; goto err_mmap; } @@ -122,7 +125,8 @@ LOGP(DDEV, LOGL_NOTICE, "mmaping shared memory fd %d (size=%zu)\n", fd, shm_len); if ((shm = mmap(NULL, shm_len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) == MAP_FAILED) { - LOGP(DDEV, LOGL_ERROR, "mmap %d: %s\n", errno, strerror(errno)); + LOGP(DDEV, LOGL_ERROR, "mmap %d: %s\n", errno, + strerror_r(errno, err_buf, sizeof(err_buf))); rc = -errno; goto err_mmap; } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia51ffa51ec7729572faca0282ae41c1e4968049f Gerrit-Change-Number: 25936 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:15:59 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 10:15:59 +0000 Subject: Change in osmo-msc[master]: smpp_smsc: use osmo_talloc_replace_string() in smpp_smsc_conf() In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/25930 to look at the new patch set (#2). Change subject: smpp_smsc: use osmo_talloc_replace_string() in smpp_smsc_conf() ...................................................................... smpp_smsc: use osmo_talloc_replace_string() in smpp_smsc_conf() Change-Id: Ie3dc0d9673a0410a5908cba77fc352d581bac6f6 Fixes: CID#240711 --- M src/libmsc/smpp_smsc.c 1 file changed, 1 insertion(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/30/25930/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie3dc0d9673a0410a5908cba77fc352d581bac6f6 Gerrit-Change-Number: 25930 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:22:12 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 10:22:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 ) Change subject: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() ...................................................................... Patch Set 1: We need to move multi-trx support forward, because it blocks BS power control related test cases, and the overpower related test cases. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8df3db36f35190241735629a961f09d73bd0e5f5 Gerrit-Change-Number: 25907 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 25 Oct 2021 10:22:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:22:27 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 10:22:27 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20296 ) Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... Patch Set 15: Code-Review+1 (3 comments) LGTM, just some nitpicks https://gerrit.osmocom.org/c/libosmocore/+/20296/15/src/logging.c File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/20296/15/src/logging.c at 920 PS15, Line 920: fprintf(target->tgt_file.out, "%s", log); how about: fputs(log, target->tgt_file.out) https://gerrit.osmocom.org/c/libosmocore/+/20296/15/src/logging.c at 1084 PS15, Line 1084: /* close the write queue file descriptor */ With this comment, I would have expected close() here - but that's happening only later on. Maybe remove the comment here, and change "re-open" to "open" below? https://gerrit.osmocom.org/c/libosmocore/+/20296/15/src/logging.c at 1099 PS15, Line 1099: block write? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 15 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 10:22:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:24:57 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 10:24:57 +0000 Subject: Change in osmo-iuh[master]: move-asn1-header-files.sh: Replace original asn file path in generate... In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25903 ) Change subject: move-asn1-header-files.sh: Replace original asn file path in generated asn1 header files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I19537f136cbb654950172ee532027920d353a556 Gerrit-Change-Number: 25903 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 25 Oct 2021 10:24:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:31:49 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 10:31:49 +0000 Subject: Change in libosmocore[master]: logging: Avoid memcpy from stack to msgb in _file_output() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20305 ) Change subject: logging: Avoid memcpy from stack to msgb in _file_output() ...................................................................... Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 Gerrit-Change-Number: 20305 Gerrit-PatchSet: 12 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 10:31:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:36:59 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 10:36:59 +0000 Subject: Change in libosmocore[master]: logging: Attempt a synchronous, non-blocking write first (file, stderr) In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20317 ) Change subject: logging: Attempt a synchronous, non-blocking write first (file, stderr) ...................................................................... Patch Set 10: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I08469a7e4be9bc5bbd39140457bb582f4a0b1703 Gerrit-Change-Number: 20317 Gerrit-PatchSet: 10 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 10:36:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:55:40 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 10:55:40 +0000 Subject: Change in osmo-trx[master]: IPCDevice: check value returned from select() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25923 ) Change subject: IPCDevice: check value returned from select() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1c823317659547bb2391c57ac4d7931de1a383e3 Gerrit-Change-Number: 25923 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 10:55:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:56:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 10:56:37 +0000 Subject: Change in osmo-trx[master]: LMSDevice: LMS_GetDeviceList() may return a negative number In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25928 ) Change subject: LMSDevice: LMS_GetDeviceList() may return a negative number ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I855bd8ea6d9cb0f285f4dbbf3bcd09bff4e71044 Gerrit-Change-Number: 25928 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 10:56:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:57:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 10:57:13 +0000 Subject: Change in osmo-trx[master]: trx_rate_ctr: use thread safe strerror() in device_sig_cb() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25935 ) Change subject: trx_rate_ctr: use thread safe strerror() in device_sig_cb() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibd52af22bbe99652f402ada87410de167a124b73 Gerrit-Change-Number: 25935 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 10:57:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 10:57:48 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 10:57:48 +0000 Subject: Change in osmo-trx[master]: IPCDevice: use thread safe strerror_r() instead of strerror() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25936 ) Change subject: IPCDevice: use thread safe strerror_r() instead of strerror() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia51ffa51ec7729572faca0282ae41c1e4968049f Gerrit-Change-Number: 25936 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 10:57:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 11:21:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 11:21:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 ) Change subject: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8df3db36f35190241735629a961f09d73bd0e5f5 Gerrit-Change-Number: 25907 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 25 Oct 2021 11:21:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 11:31:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 11:31:50 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Use NUM_SDCCH_PER_BTS in dyn ts sdcch8 tests References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25937 ) Change subject: bsc: Use NUM_SDCCH_PER_BTS in dyn ts sdcch8 tests ...................................................................... bsc: Use NUM_SDCCH_PER_BTS in dyn ts sdcch8 tests Change-Id: I42bfa1a1e450d15cd4122e996d7936df88917891 --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/37/25937/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index a65871b..cebd634 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7202,7 +7202,7 @@ /* Fill TS0 SDCCH channels (NOTE: only 3 SDCCH/4 channels are available * on CCCH+SDCCH4+CBCH) */ var integer i; - for (i := 0; i < 3; i := i + 1) { + for (i := 0; i < NUM_SDCCH_PER_BTS; i := i + 1) { dt := f_est_dchan('23'O, i, '00010203040506'O); } @@ -7279,7 +7279,7 @@ /* Fill TS0 SDCCH channels (NOTE: only 3 SDCCH/4 channels are available * on CCCH+SDCCH4+CBCH) */ var OCT1 ra := '43'O; /* RA containing reason=originating speech call*/ - for (i := 0; i < 3; i := i + 1) { + for (i := 0; i < NUM_SDCCH_PER_BTS; i := i + 1) { dt := f_est_dchan(ra, i, '00010203040506'O); } @@ -7349,7 +7349,7 @@ /* Fill TS0 SDCCH channels (NOTE: only 3 SDCCH/4 channels are available * on CCCH+SDCCH4+CBCH) */ var integer i; - for (i := 0; i < 3; i := i + 1) { + for (i := 0; i < NUM_SDCCH_PER_BTS; i := i + 1) { dt := f_est_dchan('23'O, i, '00010203040506'O); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42bfa1a1e450d15cd4122e996d7936df88917891 Gerrit-Change-Number: 25937 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 12:26:09 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 12:26:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 ) Change subject: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used ...................................................................... bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used Related: OS#5278 Related: SYS#5309 Change-Id: Iee37eef2012ce2c2e2f0a0db4c26abb75a947d84 --- M bsc/BSC_Tests.ttcn 1 file changed, 79 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/25938/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cebd634..d3a66b7 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1672,6 +1672,36 @@ return dt; } +function f_est_dchan_dyn(OCT1 ra, GsmFrameNumber fn, octetstring l3) +runs on test_CT return DchanTuple { + var BSSAP_N_CONNECT_ind rx_c_ind; + var DchanTuple dt; + + /* Send CHAN RQD */ + var RSL_Message rx_rsl; + f_ipa_tx(0, ts_RSL_CHAN_RQD(ra, fn)); + + /* The dyn TS first deactivates PDCH */ + rx_rsl := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL), T3101_MAX); + dt.rsl_chan_nr := rx_rsl.ies[0].body.chan_nr; + f_ipa_tx(0, ts_RSL_RF_CHAN_REL_ACK(dt.rsl_chan_nr)); + + rx_rsl := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); + dt.rsl_chan_nr := rx_rsl.ies[0].body.chan_nr; + + /* Now activates the signalling channel */ + f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(dt.rsl_chan_nr, fn+10)); + rx_rsl := f_exp_ipa_rx(0, tr_RSL_IMM_ASSIGN(0)); + + f_ipa_tx(0, ts_RSL_EST_IND(dt.rsl_chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3)); + + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) -> value rx_c_ind; + dt.sccp_conn_id := rx_c_ind.connectionId; + BSSAP.send(ts_BSSAP_CONNECT_res(dt.sccp_conn_id)); + + return dt; +} + /* expect RF CAN REL from BTS, acknowledge it and clear the MSC side */ private function f_exp_chan_rel_and_clear(DchanTuple dt, integer bts_nr := 0) runs on test_CT { var RSL_Message rx_rsl; @@ -7241,6 +7271,54 @@ f_shutdown_helper(); } +/* Validate all 8 subslots of a dynamics TS configured as SDCCH8 are used */ +testcase TC_dyn_ts_sdcch8_all_subslots_used() runs on test_CT { + var ASP_RSL_Unitdata rsl_ud; + var integer i; + var integer chreq_total, chreq_nochan; + + f_init_vty(); + for (i := 1; i < 8; i := i + 1) { + if (i == 2) { + f_ts_set_chcomb(0, 0, i, "TCH/F_TCH/H_SDCCH8_PDCH"); + } else { + f_ts_set_chcomb(0, 0, i, "PDCH"); + } + } + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); + + f_init(1); + + /* The dyn TS want to activate PDCH mode, ACK that. */ + var RslChannelNr chan_nr; + chan_nr := valueof(t_RslChanNr_PDCH(2)); + f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?)); + f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2342)); + + f_sleep(1.0); + + /* Exhaust all dedicated SDCCH lchans. + /* GSM 44.018 Table 9.1.8.2: + * RA = '13'O -> Establishment cause = 0001xxxx (MS dual rate capable and asks for "SDCCH"). + */ + for (i := 0; i < NUM_SDCCH_PER_BTS; i := i+1) { + f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + } + + /* Three dyn TS as well as one static TCH/F and one TCH/H timeslot are available. + * The first dyn TS gets converted to SDCCH8 */ + f_est_dchan_dyn('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + /* Also occupy the seven other SDCCH of the dyn TS */ + for (i := 0; i < 7; i := i+1) { + f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + } + + /* clean up config */ + f_ts_reset_chcomb(0); + + f_shutdown_helper(); +} + /* Test Osmocom dyn TS SDCCH8 activation / deactivation: If activating dyn TS as SDCCH8 would end up in having no free TCH, then BSC should decide to activate it as TCH directly instead. SYS#5309. */ @@ -10517,6 +10595,7 @@ execute( TC_dyn_pdch_osmo_act_nack() ); if (mp_enable_dyn_sdcch8_test) { execute( TC_dyn_ts_sdcch8_act_deact() ); + execute( TC_dyn_ts_sdcch8_all_subslots_used() ); execute( TC_dyn_ts_sdcch8_tch_call_act_deact() ); execute( TC_dyn_ts_sdcch8_act_nack() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iee37eef2012ce2c2e2f0a0db4c26abb75a947d84 Gerrit-Change-Number: 25938 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 12:26:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 12:26:28 +0000 Subject: Change in osmo-bsc[master]: Set subslots_per_pchan[GSM_PCHAN_OSMO_DYN] = 8 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25939 ) Change subject: Set subslots_per_pchan[GSM_PCHAN_OSMO_DYN] = 8 ...................................................................... Set subslots_per_pchan[GSM_PCHAN_OSMO_DYN] = 8 Since a while ago, osmocom types dynamic TS supports being configured as SDCCH8, hence the maximum subslots is 8. This fixes issue where only up to 2 subslots where being used on those TS. Related: OS#5278 Related: SYS#5309 Fixes: 52b9912ef95838c0b60fc171984d3157a56fe488 Change-Id: I50e6530284ef49cfd77d1944d4a183c5df345820 --- M src/osmo-bsc/gsm_data.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/39/25939/1 diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 5d57072..b0e0a68 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -609,7 +609,7 @@ [GSM_PCHAN_CCCH_SDCCH4_CBCH] = 4, [GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = 8, /* Dyn TS: maximum allowed subslots */ - [GSM_PCHAN_OSMO_DYN] = 2, + [GSM_PCHAN_OSMO_DYN] = 8, [GSM_PCHAN_TCH_F_PDCH] = 1, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I50e6530284ef49cfd77d1944d4a183c5df345820 Gerrit-Change-Number: 25939 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 12:26:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 12:26:29 +0000 Subject: Change in osmo-bsc[master]: Properly handle dyn TS TCH with vamos after updating subslots_per_pchan References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25940 ) Change subject: Properly handle dyn TS TCH with vamos after updating subslots_per_pchan ...................................................................... Properly handle dyn TS TCH with vamos after updating subslots_per_pchan Related: OS#5278 Change-Id: If86af5fafe059d5e830c1f6d37034f7325d9a96c --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/40/25940/1 diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 76ac1af..499d982 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -201,6 +201,8 @@ { int i; struct gsm_lchan *lchan; + uint8_t max_lchans_possible_vamos; + ts->pchan_is = pchan_is; ts->max_primary_lchans = pchan_subslots(ts->pchan_is); LOG_TS(ts, LOGL_DEBUG, "pchan_is=%s max_primary_lchans=%d max_lchans_possible=%d\n", @@ -208,12 +210,13 @@ switch (ts->pchan_is) { case GSM_PCHAN_TCH_F: case GSM_PCHAN_TCH_H: + max_lchans_possible_vamos = pchan_subslots_vamos(ts->pchan_is); for (i = 0; i < ts->max_lchans_possible; i++) { lchan = &ts->lchan[i]; - if (i < ts->max_primary_lchans) - lchan->vamos.is_secondary = false; - else + if (i >= ts->max_primary_lchans && i < max_lchans_possible_vamos) lchan->vamos.is_secondary = true; + else + lchan->vamos.is_secondary = false; lchan_fsm_update_id(lchan); } break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If86af5fafe059d5e830c1f6d37034f7325d9a96c Gerrit-Change-Number: 25940 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Mon Oct 25 12:30:41 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 25 Oct 2021 12:30:41 +0000 Subject: Build failure of network:osmocom:latest/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <6176a3886833e_24ca2af300e165f467931f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/open5gs/Debian_Unstable/x86_64 Package network:osmocom:latest/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest open5gs Last lines of build log: [ 161s] #include [ 161s] int main (int argc, char ** argv) { [ 161s] sctp_connectx(0, NULL, 0, NULL); [ 161s] } [ 161s] Compiler stdout: [ 161s] [ 161s] Compiler stderr: [ 161s] [ 161s] Checking if "sctp_connectx() accepts 4 arguments" : compiles: YES [ 161s] Configuring freeDiameter-host.h using configuration [ 161s] Configuring version.h using configuration [ 161s] WARNING: Target "../dict_dcca_3gpp" has a path separator in its name. [ 161s] This is not supported, it can cause unexpected failures and will become [ 161s] a hard error in the future. [ 161s] [ 161s] ../subprojects/freeDiameter/extensions/dict_dcca_3gpp/meson.build:1:0: ERROR: Target "../dict_dcca_3gpp" has a path segment pointing to directory "subprojects/freeDiameter/extensions/dict_dcca_3gpp/..". This is an error. [ 161s] To define a target that builds in that directory you must define it [ 161s] in the meson.build file in that directory. [ 161s] [ 161s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 161s] make: *** [debian/rules:11: binary] Error 25 [ 161s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 161s] ### VM INTERACTION START ### [ 164s] [ 139.990568] sysrq: Power Off [ 164s] [ 139.995341] reboot: Power down [ 164s] ### VM INTERACTION END ### [ 164s] [ 164s] cloud128 failed "build open5gs_2.3.6.dsc" at Mon Oct 25 12:30:38 UTC 2021. [ 164s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Oct 25 12:34:18 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 12:34:18 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 ) Change subject: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8df3db36f35190241735629a961f09d73bd0e5f5 Gerrit-Change-Number: 25907 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 25 Oct 2021 12:34:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 12:39:25 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 12:39:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: make TRX number configurable for ConnHdlr In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21317 ) Change subject: BTS_Tests: make TRX number configurable for ConnHdlr ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifed3891658501e0a04ff89563d0a02f08211eed3 Gerrit-Change-Number: 21317 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 25 Oct 2021 12:39:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 12:45:34 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 12:45:34 +0000 Subject: Change in osmo-bsc[master]: Set subslots_per_pchan[GSM_PCHAN_OSMO_DYN] = 8 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25939 ) Change subject: Set subslots_per_pchan[GSM_PCHAN_OSMO_DYN] = 8 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I50e6530284ef49cfd77d1944d4a183c5df345820 Gerrit-Change-Number: 25939 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 25 Oct 2021 12:45:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 12:47:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 12:47:21 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Use NUM_SDCCH_PER_BTS in dyn ts sdcch8 tests In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25937 ) Change subject: bsc: Use NUM_SDCCH_PER_BTS in dyn ts sdcch8 tests ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42bfa1a1e450d15cd4122e996d7936df88917891 Gerrit-Change-Number: 25937 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 25 Oct 2021 12:47:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 14:03:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 14:03:14 +0000 Subject: Change in osmo-bsc[master]: Set subslots_per_pchan[GSM_PCHAN_OSMO_DYN] = 8 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25939 ) Change subject: Set subslots_per_pchan[GSM_PCHAN_OSMO_DYN] = 8 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I50e6530284ef49cfd77d1944d4a183c5df345820 Gerrit-Change-Number: 25939 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 25 Oct 2021 14:03:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 14:03:33 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 14:03:33 +0000 Subject: Change in osmo-bsc[master]: Properly handle dyn TS TCH with vamos after updating subslots_per_pchan In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25940 ) Change subject: Properly handle dyn TS TCH with vamos after updating subslots_per_pchan ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If86af5fafe059d5e830c1f6d37034f7325d9a96c Gerrit-Change-Number: 25940 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 25 Oct 2021 14:03:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 14:03:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 14:03:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Use NUM_SDCCH_PER_BTS in dyn ts sdcch8 tests In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25937 ) Change subject: bsc: Use NUM_SDCCH_PER_BTS in dyn ts sdcch8 tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42bfa1a1e450d15cd4122e996d7936df88917891 Gerrit-Change-Number: 25937 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 25 Oct 2021 14:03:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 14:04:16 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 14:04:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 ) Change subject: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iee37eef2012ce2c2e2f0a0db4c26abb75a947d84 Gerrit-Change-Number: 25938 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 25 Oct 2021 14:04:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 14:07:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 14:07:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Use NUM_SDCCH_PER_BTS in dyn ts sdcch8 tests In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25937 ) Change subject: bsc: Use NUM_SDCCH_PER_BTS in dyn ts sdcch8 tests ...................................................................... bsc: Use NUM_SDCCH_PER_BTS in dyn ts sdcch8 tests Change-Id: I42bfa1a1e450d15cd4122e996d7936df88917891 --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index a65871b..cebd634 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -7202,7 +7202,7 @@ /* Fill TS0 SDCCH channels (NOTE: only 3 SDCCH/4 channels are available * on CCCH+SDCCH4+CBCH) */ var integer i; - for (i := 0; i < 3; i := i + 1) { + for (i := 0; i < NUM_SDCCH_PER_BTS; i := i + 1) { dt := f_est_dchan('23'O, i, '00010203040506'O); } @@ -7279,7 +7279,7 @@ /* Fill TS0 SDCCH channels (NOTE: only 3 SDCCH/4 channels are available * on CCCH+SDCCH4+CBCH) */ var OCT1 ra := '43'O; /* RA containing reason=originating speech call*/ - for (i := 0; i < 3; i := i + 1) { + for (i := 0; i < NUM_SDCCH_PER_BTS; i := i + 1) { dt := f_est_dchan(ra, i, '00010203040506'O); } @@ -7349,7 +7349,7 @@ /* Fill TS0 SDCCH channels (NOTE: only 3 SDCCH/4 channels are available * on CCCH+SDCCH4+CBCH) */ var integer i; - for (i := 0; i < 3; i := i + 1) { + for (i := 0; i < NUM_SDCCH_PER_BTS; i := i + 1) { dt := f_est_dchan('23'O, i, '00010203040506'O); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I42bfa1a1e450d15cd4122e996d7936df88917891 Gerrit-Change-Number: 25937 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 14:07:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 14:07:53 +0000 Subject: Change in osmo-bsc[master]: Set subslots_per_pchan[GSM_PCHAN_OSMO_DYN] = 8 In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25939 ) Change subject: Set subslots_per_pchan[GSM_PCHAN_OSMO_DYN] = 8 ...................................................................... Set subslots_per_pchan[GSM_PCHAN_OSMO_DYN] = 8 Since a while ago, osmocom types dynamic TS supports being configured as SDCCH8, hence the maximum subslots is 8. This fixes issue where only up to 2 subslots where being used on those TS. Related: OS#5278 Related: SYS#5309 Fixes: 52b9912ef95838c0b60fc171984d3157a56fe488 Change-Id: I50e6530284ef49cfd77d1944d4a183c5df345820 --- M src/osmo-bsc/gsm_data.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 5d57072..b0e0a68 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -609,7 +609,7 @@ [GSM_PCHAN_CCCH_SDCCH4_CBCH] = 4, [GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = 8, /* Dyn TS: maximum allowed subslots */ - [GSM_PCHAN_OSMO_DYN] = 2, + [GSM_PCHAN_OSMO_DYN] = 8, [GSM_PCHAN_TCH_F_PDCH] = 1, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I50e6530284ef49cfd77d1944d4a183c5df345820 Gerrit-Change-Number: 25939 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 14:41:14 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 14:41:14 +0000 Subject: Change in osmo-bts[master]: [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25897 ) Change subject: [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I370c8f95fb64eceb60a9dc2eae1412f8a0df0f4e Gerrit-Change-Number: 25897 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 25 Oct 2021 14:41:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 14:44:28 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 14:44:28 +0000 Subject: Change in osmo-bts[master]: [overpower] lchan_dump_full_vty(): print overpower state In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25902 ) Change subject: [overpower] lchan_dump_full_vty(): print overpower state ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I052f1d68b27b2dc7203835b4a93d40c94b0c8d82 Gerrit-Change-Number: 25902 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 14:44:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 14:48:26 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Mon, 25 Oct 2021 14:48:26 +0000 Subject: Change in osmo-bts[master]: [overpower] scheduler: handle {sacch, facch}_enabled flags In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25898 ) Change subject: [overpower] scheduler: handle {sacch,facch}_enabled flags ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaaab675a20bbefece832d913963c8c5ae32ff80c Gerrit-Change-Number: 25898 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 14:48:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 14:51:08 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 14:51:08 +0000 Subject: Change in osmo-bts[master]: [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25897 ) Change subject: [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I370c8f95fb64eceb60a9dc2eae1412f8a0df0f4e Gerrit-Change-Number: 25897 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Mon, 25 Oct 2021 14:51:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 14:51:12 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 14:51:12 +0000 Subject: Change in osmo-bts[master]: [overpower] lchan_dump_full_vty(): print overpower state In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25902 ) Change subject: [overpower] lchan_dump_full_vty(): print overpower state ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I052f1d68b27b2dc7203835b4a93d40c94b0c8d82 Gerrit-Change-Number: 25902 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 14:51:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 14:51:17 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 14:51:17 +0000 Subject: Change in osmo-bts[master]: [overpower] scheduler: handle {sacch, facch}_enabled flags In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25898 ) Change subject: [overpower] scheduler: handle {sacch,facch}_enabled flags ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaaab675a20bbefece832d913963c8c5ae32ff80c Gerrit-Change-Number: 25898 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 14:51:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 14:51:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 14:51:21 +0000 Subject: Change in osmo-bts[master]: [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25897 ) Change subject: [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP ...................................................................... [overpower] rsl: store full content of RSL_IE_OSMO_TEMP_OVP_ACCH_CAP The new fields in 'struct abis_rsl_osmo_temp_ovp_acch_cap' allow: * selectively enabling SACCH and/or FACCH, * setting the RxQual (BER) threshold. Both features are implemented in the follow-up commits. Change-Id: I370c8f95fb64eceb60a9dc2eae1412f8a0df0f4e Depends: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M include/osmo-bts/lchan.h M src/common/rsl.c M src/common/scheduler.c 3 files changed, 13 insertions(+), 9 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index 57999b1..754dc7c 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -293,8 +293,8 @@ struct gsm_power_ctrl_params ms_dpc_params; struct gsm_power_ctrl_params bs_dpc_params; - /* Temporary Overpower for SACCH/FACCH */ - uint8_t bs_acch_overpower_db; + /* Temporary ACCH overpower capabilities */ + struct abis_rsl_osmo_temp_ovp_acch_cap top_acch_cap; struct msgb *pending_rel_ind_msg; diff --git a/src/common/rsl.c b/src/common/rsl.c index c100687..a952d25 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -1592,18 +1592,22 @@ static int parse_temporary_overpower_acch_capability(struct gsm_lchan *lchan, const struct tlv_parsed *tp) { - struct abis_rsl_osmo_temp_ovp_acch_cap *top; + memset(&lchan->top_acch_cap, 0, sizeof(lchan->top_acch_cap)); - lchan->bs_acch_overpower_db = 0; - - if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP, sizeof(*top))) + if (!TLVP_PRES_LEN(tp, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP, sizeof(lchan->top_acch_cap))) return 0; if (!osmo_bts_has_feature(lchan->ts->trx->bts->features, BTS_FEAT_ACCH_TEMP_OVP)) return -RSL_ERR_OPT_IE_ERROR; - top = (struct abis_rsl_osmo_temp_ovp_acch_cap *)TLVP_VAL(tp, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP); - lchan->bs_acch_overpower_db = top->overpower_db; + memcpy(&lchan->top_acch_cap, + TLVP_VAL(tp, RSL_IE_OSMO_TEMP_OVP_ACCH_CAP), + sizeof(lchan->top_acch_cap)); + + /* Simplify checking whether the overpower is enabled at all: allow + * testing just one parameter (overpower_db > 0) instead of all three. */ + if (!lchan->top_acch_cap.sacch_enable && !lchan->top_acch_cap.facch_enable) + lchan->top_acch_cap.overpower_db = 0; return 0; } diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 2a729e4..463a5b8 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -1299,7 +1299,7 @@ struct trx_dl_burst_req *br) { const struct trx_chan_desc *desc = &trx_chan_desc[br->chan]; - const uint8_t overpower_db = lchan->bs_acch_overpower_db; + const uint8_t overpower_db = lchan->top_acch_cap.overpower_db; /* Current BS power reduction value in dB */ br->att = lchan->bs_power_ctrl.current; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I370c8f95fb64eceb60a9dc2eae1412f8a0df0f4e Gerrit-Change-Number: 25897 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 14:51:22 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 14:51:22 +0000 Subject: Change in osmo-bts[master]: [overpower] lchan_dump_full_vty(): print overpower state In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25902 ) Change subject: [overpower] lchan_dump_full_vty(): print overpower state ...................................................................... [overpower] lchan_dump_full_vty(): print overpower state Change-Id: I052f1d68b27b2dc7203835b4a93d40c94b0c8d82 Depends: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M src/common/vty.c 1 file changed, 31 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/vty.c b/src/common/vty.c index 124f7ef..97bd658 100644 --- a/src/common/vty.c +++ b/src/common/vty.c @@ -1759,6 +1759,34 @@ indent -= 2; } +static void lchan_acch_top_state_dump(struct vty *vty, unsigned int indent, + const struct gsm_lchan *lchan) +{ + if (lchan->top_acch_cap.overpower_db == 0) + return; + + cfg_out(vty, "Temporary ACCH overpower:%s", VTY_NEWLINE); + indent += 2; + + cfg_out(vty, "Overpower value: %u dB%s", + lchan->top_acch_cap.overpower_db, VTY_NEWLINE); + + cfg_out(vty, "SACCH overpower: %sabled%s", + lchan->top_acch_cap.sacch_enable ? "en" : "dis", + VTY_NEWLINE); + cfg_out(vty, "FACCH overpower: %sabled%s", + lchan->top_acch_cap.facch_enable ? "en" : "dis", + VTY_NEWLINE); + + if (lchan->top_acch_cap.rxqual == 0) { + cfg_out(vty, "RxQual threshold: disabled " + "(overpower is always on)%s", VTY_NEWLINE); + } else { + cfg_out(vty, "RxQual threshold: %u%s", + lchan->top_acch_cap.rxqual, VTY_NEWLINE); + } +} + static void lchan_dump_full_vty(struct vty *vty, const struct gsm_lchan *lchan) { struct in_addr ia; @@ -1841,7 +1869,10 @@ /* BS/MS Power Control state and parameters */ lchan_bs_power_ctrl_state_dump(vty, 2, lchan); lchan_ms_power_ctrl_state_dump(vty, 2, lchan); + + /* ACCH repetition / overpower state */ lchan_acch_rep_state_dump(vty, 2, lchan); + lchan_acch_top_state_dump(vty, 2, lchan); } static void lchan_dump_short_vty(struct vty *vty, const struct gsm_lchan *lchan) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I052f1d68b27b2dc7203835b4a93d40c94b0c8d82 Gerrit-Change-Number: 25902 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 14:51:22 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 14:51:22 +0000 Subject: Change in osmo-bts[master]: [overpower] scheduler: handle {sacch, facch}_enabled flags In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25898 ) Change subject: [overpower] scheduler: handle {sacch,facch}_enabled flags ...................................................................... [overpower] scheduler: handle {sacch,facch}_enabled flags The new [bit-]fields in the RSL_IE_OSMO_TEMP_OVP_ACCH_CAP allow more fine-grained control over the overpower feature, which can be enabled: * for both SACCH and FACCH, * for SACCH only, or * for FACCH only. Change-Id: Iaaab675a20bbefece832d913963c8c5ae32ff80c Depends: Ia28293a12de0af71f55e701fb65c46e905dae217 Related: SYS#5319 --- M src/common/scheduler.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 463a5b8..a53de09 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -1299,17 +1299,17 @@ struct trx_dl_burst_req *br) { const struct trx_chan_desc *desc = &trx_chan_desc[br->chan]; - const uint8_t overpower_db = lchan->top_acch_cap.overpower_db; /* Current BS power reduction value in dB */ br->att = lchan->bs_power_ctrl.current; /* Temporary Overpower for SACCH/FACCH bursts */ - if (overpower_db == 0) + if (lchan->top_acch_cap.overpower_db == 0) return; - if (desc->link_id == LID_SACCH || br->flags & TRX_BR_F_FACCH) { - if (br->att > overpower_db) - br->att -= overpower_db; + if ((lchan->top_acch_cap.sacch_enable && desc->link_id == LID_SACCH) || + (lchan->top_acch_cap.facch_enable && br->flags & TRX_BR_F_FACCH)) { + if (br->att > lchan->top_acch_cap.overpower_db) + br->att -= lchan->top_acch_cap.overpower_db; else br->att = 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Iaaab675a20bbefece832d913963c8c5ae32ff80c Gerrit-Change-Number: 25898 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 15:09:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 15:09:49 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25941 ) Change subject: bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag ...................................................................... bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag With this change the error case is moved at the end of the function, which is more usual. At the same time, one goto tag can be removed, simplifying the function. Change-Id: Ifbd95ccbebf4d810b1fe0a162722e63fe69106b8 --- M src/osmo-bts-trx/sched_lchan_pdtch.c 1 file changed, 11 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/25941/1 diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c index 17523e1..4c63acb 100644 --- a/src/osmo-bts-trx/sched_lchan_pdtch.c +++ b/src/osmo-bts-trx/sched_lchan_pdtch.c @@ -161,20 +161,11 @@ /* get mac block from queue */ msg = _sched_dequeue_prim(l1ts, br); - if (msg) - goto got_msg; - - LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); - -no_msg: - /* free burst memory */ - if (*bursts_p) { - talloc_free(*bursts_p); - *bursts_p = NULL; + if (!msg) { + LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); + goto no_msg; } - return -ENODEV; -got_msg: /* BURST BYPASS */ /* allocate burst memory, if not already */ @@ -229,4 +220,12 @@ LOGL1SB(DL1P, LOGL_DEBUG, l1ts, br, "Transmitting burst=%u.\n", br->bid); return 0; + +no_msg: + /* free burst memory */ + if (*bursts_p) { + talloc_free(*bursts_p); + *bursts_p = NULL; + } + return -ENODEV; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifbd95ccbebf4d810b1fe0a162722e63fe69106b8 Gerrit-Change-Number: 25941 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 15:09:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 15:09:50 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25942 ) Change subject: bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly ...................................................................... bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly PCU idle blocks are identified by being 0 length, and hence msg->l2h being null. Don't try to encode those, but simply discard them silently. In case there's a missing block in C0, we want to log the event since the BTS is expected to send something on C0. Change-Id: I57e215fedeb415db4e67fdc56bf0f1410b5f7130 --- M src/osmo-bts-trx/sched_lchan_pdtch.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/42/25942/1 diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c index 4c63acb..e9e1e82 100644 --- a/src/osmo-bts-trx/sched_lchan_pdtch.c +++ b/src/osmo-bts-trx/sched_lchan_pdtch.c @@ -32,6 +32,7 @@ #include #include #include +#include #include @@ -161,8 +162,10 @@ /* get mac block from queue */ msg = _sched_dequeue_prim(l1ts, br); - if (!msg) { - LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); + if (!msg || !msg->l2h) { + const struct gsm_bts_trx *trx = l1ts->ts->trx; + if (!msg || trx == trx->bts->c0) + LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); goto no_msg; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I57e215fedeb415db4e67fdc56bf0f1410b5f7130 Gerrit-Change-Number: 25942 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 15:15:01 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 15:15:01 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25941 ) Change subject: bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25941/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/25941/1//COMMIT_MSG at 13 PS1, Line 13: Change-Id: Ifbd95ccbebf4d810b1fe0a162722e63fe69106b8 Related: SYS#5676 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifbd95ccbebf4d810b1fe0a162722e63fe69106b8 Gerrit-Change-Number: 25941 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 25 Oct 2021 15:15:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 15:15:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 15:15:51 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25942 ) Change subject: bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25942/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/25942/1//COMMIT_MSG at 15 PS1, Line 15: Change-Id: I57e215fedeb415db4e67fdc56bf0f1410b5f7130 Related: SYS#5676 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I57e215fedeb415db4e67fdc56bf0f1410b5f7130 Gerrit-Change-Number: 25942 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 25 Oct 2021 15:15:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 15:17:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 15:17:18 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25941 to look at the new patch set (#2). Change subject: bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag ...................................................................... bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag With this change the error case is moved at the end of the function, which is more usual. At the same time, one goto tag can be removed, simplifying the function. This is also a preparation for next patch improvinga bit the logic around same place. Related: SYS#5676 Related: SYS#4919 Change-Id: Ifbd95ccbebf4d810b1fe0a162722e63fe69106b8 --- M src/osmo-bts-trx/sched_lchan_pdtch.c 1 file changed, 11 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/41/25941/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifbd95ccbebf4d810b1fe0a162722e63fe69106b8 Gerrit-Change-Number: 25941 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 15:17:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 15:17:18 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly In-Reply-To: References: Message-ID: Hello osmith, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25942 to look at the new patch set (#2). Change subject: bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly ...................................................................... bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly PCU idle blocks are identified by being 0 length, and hence msg->l2h being null. Don't try to encode those, but simply discard them silently. In case there's a missing block in C0, we want to log the event since the BTS is expected to send something on C0. Related: SYS#5676 Related: SYS#4919 Fixes: 300e31ed135c674cd44526b7503d4664a45a9ec3 Change-Id: I57e215fedeb415db4e67fdc56bf0f1410b5f7130 --- M src/osmo-bts-trx/sched_lchan_pdtch.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/42/25942/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I57e215fedeb415db4e67fdc56bf0f1410b5f7130 Gerrit-Change-Number: 25942 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 15:17:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 15:17:56 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25942 ) Change subject: bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25942/1/src/osmo-bts-trx/sched_lchan_pdtch.c File src/osmo-bts-trx/sched_lchan_pdtch.c: https://gerrit.osmocom.org/c/osmo-bts/+/25942/1/src/osmo-bts-trx/sched_lchan_pdtch.c at 165 PS1, Line 165: || !msg->l2h Are you sure there would be no NULL pointer dereference if msg is NULL? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I57e215fedeb415db4e67fdc56bf0f1410b5f7130 Gerrit-Change-Number: 25942 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 25 Oct 2021 15:17:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 15:19:18 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 15:19:18 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25941 ) Change subject: bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifbd95ccbebf4d810b1fe0a162722e63fe69106b8 Gerrit-Change-Number: 25941 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 25 Oct 2021 15:19:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 15:25:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 15:25:33 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25942 ) Change subject: bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25942/1/src/osmo-bts-trx/sched_lchan_pdtch.c File src/osmo-bts-trx/sched_lchan_pdtch.c: https://gerrit.osmocom.org/c/osmo-bts/+/25942/1/src/osmo-bts-trx/sched_lchan_pdtch.c at 165 PS1, Line 165: || !msg->l2h > Are you sure there would be no NULL pointer dereference if msg is NULL? "if !msg" is first, hence if it holds true it enters directly the if clause and "!msg->l2h" is not executed. So yes, that' fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I57e215fedeb415db4e67fdc56bf0f1410b5f7130 Gerrit-Change-Number: 25942 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 25 Oct 2021 15:25:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Mon Oct 25 15:46:57 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 25 Oct 2021 15:46:57 +0000 Subject: Build failure of network:osmocom:nightly/libusrp in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <6176d17edf8bf_24ca2af300e165f47779c1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libusrp/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/libusrp failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly libusrp Last lines of build log: getbinaries: missing packages: libpolkit0 (worker was obs-arm-11:29) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 25 15:50:22 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 25 Oct 2021 15:50:22 +0000 Subject: Build failure of network:osmocom:latest/libosmocore in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <6176d24bc47e3_24ca2af300e165f47833ea@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmocore/openSUSE_Factory_ARM/armv7l Package network:osmocom:latest/libosmocore failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:latest libosmocore Last lines of build log: getbinaries: missing packages: libpolkit0 (worker was obs-arm-10:10) -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Oct 25 15:56:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 15:56:47 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25941 ) Change subject: bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifbd95ccbebf4d810b1fe0a162722e63fe69106b8 Gerrit-Change-Number: 25941 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 25 Oct 2021 15:56:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 15:57:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 15:57:21 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25942 ) Change subject: bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I57e215fedeb415db4e67fdc56bf0f1410b5f7130 Gerrit-Change-Number: 25942 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Mon, 25 Oct 2021 15:57:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 15:57:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 15:57:24 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25941 ) Change subject: bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag ...................................................................... bts-trx: sched_lchan_pdtch: Refactor tx_pdtch_fn to get rid of goto tag With this change the error case is moved at the end of the function, which is more usual. At the same time, one goto tag can be removed, simplifying the function. This is also a preparation for next patch improvinga bit the logic around same place. Related: SYS#5676 Related: SYS#4919 Change-Id: Ifbd95ccbebf4d810b1fe0a162722e63fe69106b8 --- M src/osmo-bts-trx/sched_lchan_pdtch.c 1 file changed, 11 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c index 17523e1..4c63acb 100644 --- a/src/osmo-bts-trx/sched_lchan_pdtch.c +++ b/src/osmo-bts-trx/sched_lchan_pdtch.c @@ -161,20 +161,11 @@ /* get mac block from queue */ msg = _sched_dequeue_prim(l1ts, br); - if (msg) - goto got_msg; - - LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); - -no_msg: - /* free burst memory */ - if (*bursts_p) { - talloc_free(*bursts_p); - *bursts_p = NULL; + if (!msg) { + LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); + goto no_msg; } - return -ENODEV; -got_msg: /* BURST BYPASS */ /* allocate burst memory, if not already */ @@ -229,4 +220,12 @@ LOGL1SB(DL1P, LOGL_DEBUG, l1ts, br, "Transmitting burst=%u.\n", br->bid); return 0; + +no_msg: + /* free burst memory */ + if (*bursts_p) { + talloc_free(*bursts_p); + *bursts_p = NULL; + } + return -ENODEV; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25941 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifbd95ccbebf4d810b1fe0a162722e63fe69106b8 Gerrit-Change-Number: 25941 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 15:57:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Mon, 25 Oct 2021 15:57:24 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25942 ) Change subject: bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly ...................................................................... bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly PCU idle blocks are identified by being 0 length, and hence msg->l2h being null. Don't try to encode those, but simply discard them silently. In case there's a missing block in C0, we want to log the event since the BTS is expected to send something on C0. Related: SYS#5676 Related: SYS#4919 Fixes: 300e31ed135c674cd44526b7503d4664a45a9ec3 Change-Id: I57e215fedeb415db4e67fdc56bf0f1410b5f7130 --- M src/osmo-bts-trx/sched_lchan_pdtch.c 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c index 4c63acb..e9e1e82 100644 --- a/src/osmo-bts-trx/sched_lchan_pdtch.c +++ b/src/osmo-bts-trx/sched_lchan_pdtch.c @@ -32,6 +32,7 @@ #include #include #include +#include #include @@ -161,8 +162,10 @@ /* get mac block from queue */ msg = _sched_dequeue_prim(l1ts, br); - if (!msg) { - LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); + if (!msg || !msg->l2h) { + const struct gsm_bts_trx *trx = l1ts->ts->trx; + if (!msg || trx == trx->bts->c0) + LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); goto no_msg; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25942 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I57e215fedeb415db4e67fdc56bf0f1410b5f7130 Gerrit-Change-Number: 25942 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 16:32:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 16:32:57 +0000 Subject: Change in osmo-bts[master]: Revert "bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly" References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25943 ) Change subject: Revert "bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly" ...................................................................... Revert "bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly" This reverts commit 8a85b71167c4580ddf9e6c59ea602475fd462b3a. This is actually the wrong fix. Proper fix comes as a follow-up patch, since the root cause happens earlier in upper layers. No msg with l2h=NULL should reach this point of code ever. Change-Id: Ie23d94924f824bd7e89437ccf73b260f542477c6 --- M src/osmo-bts-trx/sched_lchan_pdtch.c 1 file changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/43/25943/1 diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c index e9e1e82..4c63acb 100644 --- a/src/osmo-bts-trx/sched_lchan_pdtch.c +++ b/src/osmo-bts-trx/sched_lchan_pdtch.c @@ -32,7 +32,6 @@ #include #include #include -#include #include @@ -162,10 +161,8 @@ /* get mac block from queue */ msg = _sched_dequeue_prim(l1ts, br); - if (!msg || !msg->l2h) { - const struct gsm_bts_trx *trx = l1ts->ts->trx; - if (!msg || trx == trx->bts->c0) - LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); + if (!msg) { + LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); goto no_msg; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie23d94924f824bd7e89437ccf73b260f542477c6 Gerrit-Change-Number: 25943 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 16:32:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 16:32:57 +0000 Subject: Change in osmo-bts[master]: scheduler: Fix check against empty PDCH blocks References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25944 ) Change subject: scheduler: Fix check against empty PDCH blocks ...................................................................... scheduler: Fix check against empty PDCH blocks msgb_l2len() will return nonzero values if msg->l2h is NULL. Let's check against msg->l2h being NULL instead. Related: SYS#5676 Related: SYS#4919 Fixes: 300e31ed135c674cd44526b7503d4664a45a9ec3 Change-Id: I18b61fcaa858a53887191a18d560c2e929478c64 --- M src/common/scheduler.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/44/25944/1 diff --git a/src/common/scheduler.c b/src/common/scheduler.c index a53de09..c068ea0 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -869,7 +869,7 @@ OSMO_ASSERT(l1sap->oph.msg); /* ignore empty frame */ - if (!msgb_l2len(l1sap->oph.msg)) { + if (!l1sap->oph.msg->l2h) { msgb_free(l1sap->oph.msg); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I18b61fcaa858a53887191a18d560c2e929478c64 Gerrit-Change-Number: 25944 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 16:32:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 16:32:58 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched: tx_pdtch_fn: Drop log line clogging logs References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25945 ) Change subject: bts-trx: sched: tx_pdtch_fn: Drop log line clogging logs ...................................................................... bts-trx: sched: tx_pdtch_fn: Drop log line clogging logs The burst is properly pre-filled to _sched_dummy_burst in bts_sched_init_buffers(), so we are fine doing nothing on C0. Related: SYS#5676 Related: SYS#4919 Fixes: 300e31ed135c674cd44526b7503d4664a45a9ec3 Change-Id: Ia7045724a1a3206f5890c0b12843711ad2360ed8 --- M src/osmo-bts-trx/sched_lchan_pdtch.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/45/25945/1 diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c index 4c63acb..66be116 100644 --- a/src/osmo-bts-trx/sched_lchan_pdtch.c +++ b/src/osmo-bts-trx/sched_lchan_pdtch.c @@ -162,7 +162,11 @@ /* get mac block from queue */ msg = _sched_dequeue_prim(l1ts, br); if (!msg) { - LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); + /* It's totally fine to get no block here, since PCU may submit + * empty blocks when there's no MS listening. The scheduler will + * take care of filling C0 with dummy bursts to keep expected + * power transmit levels + */ goto no_msg; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia7045724a1a3206f5890c0b12843711ad2360ed8 Gerrit-Change-Number: 25945 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 16:41:08 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 16:41:08 +0000 Subject: Change in osmo-bts[master]: scheduler: Fix check against empty PDCH blocks In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25944 ) Change subject: scheduler: Fix check against empty PDCH blocks ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I18b61fcaa858a53887191a18d560c2e929478c64 Gerrit-Change-Number: 25944 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 25 Oct 2021 16:41:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 16:43:47 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 16:43:47 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched: tx_pdtch_fn: Drop log line clogging logs In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25945 ) Change subject: bts-trx: sched: tx_pdtch_fn: Drop log line clogging logs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia7045724a1a3206f5890c0b12843711ad2360ed8 Gerrit-Change-Number: 25945 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 25 Oct 2021 16:43:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Mon Oct 25 16:44:22 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 25 Oct 2021 16:44:22 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <6176def5e459e_24ca2af300e165f4860373@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 132s] #include [ 132s] int main (int argc, char ** argv) { [ 132s] sctp_connectx(0, NULL, 0, NULL); [ 132s] } [ 132s] Compiler stdout: [ 132s] [ 132s] Compiler stderr: [ 132s] [ 132s] Checking if "sctp_connectx() accepts 4 arguments" : compiles: YES [ 132s] Configuring freeDiameter-host.h using configuration [ 132s] Configuring version.h using configuration [ 132s] WARNING: Target "../dict_dcca_3gpp" has a path separator in its name. [ 132s] This is not supported, it can cause unexpected failures and will become [ 132s] a hard error in the future. [ 132s] [ 132s] ../subprojects/freeDiameter/extensions/dict_dcca_3gpp/meson.build:1:0: ERROR: Target "../dict_dcca_3gpp" has a path segment pointing to directory "subprojects/freeDiameter/extensions/dict_dcca_3gpp/..". This is an error. [ 132s] To define a target that builds in that directory you must define it [ 132s] in the meson.build file in that directory. [ 132s] [ 132s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 132s] make: *** [debian/rules:11: binary] Error 25 [ 132s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 132s] ### VM INTERACTION START ### [ 135s] [ 120.819474] sysrq: Power Off [ 135s] [ 120.822245] reboot: Power down [ 135s] ### VM INTERACTION END ### [ 135s] [ 135s] sheep87 failed "build open5gs_2.3.6.202110250026.dsc" at Mon Oct 25 16:44:13 UTC 2021. [ 135s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Mon Oct 25 16:48:39 2021 From: noreply at opensuse.org (OBS Notification) Date: Mon, 25 Oct 2021 16:48:39 +0000 Subject: Build failure of network:osmocom:latest/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <6176e004df57f_24ca2af300e165f4865096@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/open5gs/Debian_Unstable/x86_64 Package network:osmocom:latest/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest open5gs Last lines of build log: [ 380s] #include [ 380s] int main (int argc, char ** argv) { [ 380s] sctp_connectx(0, NULL, 0, NULL); [ 380s] } [ 380s] Compiler stdout: [ 380s] [ 380s] Compiler stderr: [ 380s] [ 380s] Checking if "sctp_connectx() accepts 4 arguments" : compiles: YES [ 380s] Configuring freeDiameter-host.h using configuration [ 380s] Configuring version.h using configuration [ 380s] WARNING: Target "../dict_dcca_3gpp" has a path separator in its name. [ 380s] This is not supported, it can cause unexpected failures and will become [ 380s] a hard error in the future. [ 380s] [ 380s] ../subprojects/freeDiameter/extensions/dict_dcca_3gpp/meson.build:1:0: ERROR: Target "../dict_dcca_3gpp" has a path segment pointing to directory "subprojects/freeDiameter/extensions/dict_dcca_3gpp/..". This is an error. [ 380s] To define a target that builds in that directory you must define it [ 380s] in the meson.build file in that directory. [ 380s] [ 380s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 380s] make: *** [debian/rules:11: binary] Error 25 [ 380s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 380s] ### VM INTERACTION START ### [ 383s] [ 316.036397] sysrq: Power Off [ 383s] [ 316.083347] reboot: Power down [ 383s] ### VM INTERACTION END ### [ 383s] [ 383s] lamb60 failed "build open5gs_2.3.6.dsc" at Mon Oct 25 16:48:30 UTC 2021. [ 383s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Mon Oct 25 17:19:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 17:19:31 +0000 Subject: Change in osmo-bsc[master]: Properly handle dyn TS TCH with vamos after updating subslots_per_pchan In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25940 to look at the new patch set (#2). Change subject: Properly handle dyn TS TCH with vamos after updating subslots_per_pchan ...................................................................... Properly handle dyn TS TCH with vamos after updating subslots_per_pchan In the case of ts->pchan_from_config=GSM_PCHAN_OSMO_DYN, ts->max_primary_lchans will be 8 due to SDCCH8 support, and we don't want to set lchan->vamos.is_secondary=true for lchans at the end of the array. Related: OS#5278 Change-Id: If86af5fafe059d5e830c1f6d37034f7325d9a96c --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/40/25940/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If86af5fafe059d5e830c1f6d37034f7325d9a96c Gerrit-Change-Number: 25940 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 17:19:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 17:19:32 +0000 Subject: Change in osmo-bsc[master]: timeslot_fsm: Add assert to make sure we never go out of bounds in ts... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25946 ) Change subject: timeslot_fsm: Add assert to make sure we never go out of bounds in ts->lchan array ...................................................................... timeslot_fsm: Add assert to make sure we never go out of bounds in ts->lchan array Related: OS#5278 Change-Id: I23a5349838e0c540fbb54cad10f2af42268d7729 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/46/25946/1 diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 76ac1af..93fc380 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -243,6 +243,7 @@ ts->max_lchans_possible = max_lchans + max_lchans_vamos; ts->max_primary_lchans = 0; + OSMO_ASSERT(ts->max_lchans_possible <= TS_MAX_LCHAN); for (i = 0; i < ts->max_lchans_possible; i++) { /* If we receive more than one Channel OPSTART ACK, don't fail on the second init. */ if (ts->lchan[i].fi) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I23a5349838e0c540fbb54cad10f2af42268d7729 Gerrit-Change-Number: 25946 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 17:19:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 17:19:33 +0000 Subject: Change in osmo-bsc[master]: Set subslots_per_pchan_vamos[GSM_PCHAN_OSMO_DYN] = 0 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25947 ) Change subject: Set subslots_per_pchan_vamos[GSM_PCHAN_OSMO_DYN] = 0 ...................................................................... Set subslots_per_pchan_vamos[GSM_PCHAN_OSMO_DYN] = 0 VAMOS secondary lchans are to be used specifically when the osmocom dyn TS is set to pchan_is=TCH_{F,H}. Setting secondary subslots for OSMO_DYN TS is not needed since it's only used to initialize the TS, and OSMO DYN already initializes 8 subslots (subslots_per_pchan[GSM_PCHAN_OSMO_DYN]=8). Otherwise, ts_setup_lchans() will try to initialize 8+2 lchans on the TS, which is more than needed and will access out of bounds in the array. Related: OS#5278 Change-Id: I8727d5b446179c0ebcd8738507efe5a50afaf1e2 --- M src/osmo-bsc/gsm_data.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/47/25947/1 diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index b0e0a68..0134e34 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -633,7 +633,7 @@ [GSM_PCHAN_SDCCH8_SACCH8C] = 0, [GSM_PCHAN_CCCH_SDCCH4_CBCH] = 0, [GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = 0, - [GSM_PCHAN_OSMO_DYN] = 2, + [GSM_PCHAN_OSMO_DYN] = 0, [GSM_PCHAN_TCH_F_PDCH] = 2, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8727d5b446179c0ebcd8738507efe5a50afaf1e2 Gerrit-Change-Number: 25947 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 17:23:24 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 17:23:24 +0000 Subject: Change in osmo-bsc[master]: Properly handle dyn TS TCH with vamos after updating subslots_per_pchan In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25940 to look at the new patch set (#3). Change subject: Properly handle dyn TS TCH with vamos after updating subslots_per_pchan ...................................................................... Properly handle dyn TS TCH with vamos after updating subslots_per_pchan In the case of ts->pchan_from_config=GSM_PCHAN_OSMO_DYN, ts->max_primary_lchans will be 8 due to SDCCH8 support, and we don't want to set lchan->vamos.is_secondary=true for lchans at the end of the array. Related: OS#5278 Change-Id: If86af5fafe059d5e830c1f6d37034f7325d9a96c --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/40/25940/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If86af5fafe059d5e830c1f6d37034f7325d9a96c Gerrit-Change-Number: 25940 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 17:59:31 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 17:59:31 +0000 Subject: Change in osmo-bts[master]: l1sap: fix handling of lchan->pending_rel_ind_msg References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25948 ) Change subject: l1sap: fix handling of lchan->pending_rel_ind_msg ...................................................................... l1sap: fix handling of lchan->pending_rel_ind_msg After merging the patch [1] fixing handling of the RLL RELease INDication message in lapdm_rll_tx_cb(), ttcn3-bts-test shows several regressions: pass->fail: BTS_Tests.TC_rll_rel_ind_DCCH_0 pass->fail: BTS_Tests.TC_rll_rel_ind_DCCH_3 pass->fail: BTS_Tests.TC_rll_rel_ind_ACCH_0 pass->fail: BTS_Tests.TC_rll_rel_ind_ACCH_3 pass->fail: BTS_Tests_LAPDm.TC_sabm_dm [1] I823c9101bcca72d5792e16379b02d3602ffc2726 991020c049c63768e147d49bd2918c2d2e0f6dcb The problem is actually *not* in patch [1], but in the older one [2] which we attempted to fix. While a logical channel is in signalling mode, the lower layers do not produce PRIM_TCH_RTS, and thus the l1sap_tch_rts_ind() is not being called. Unlike l1sap_tch_rts_ind(), the l1sap_ph_rts_ind() is being called regardless of the channel mode (signalling vs speech), so let's move handling of lchan->pending_rel_ind_msg there. Change-Id: I2c380f9045624f0a0a8f988bb207bc73d8354857 Fixes: [2] Ie4f70c75f0137b4bd72d579b3a32575bac2fca3 --- M src/common/l1sap.c 1 file changed, 7 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/25948/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index c89b2c3..ae91677 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1139,6 +1139,13 @@ rsl_chan_nr_str(chan_nr)); return 0; } + if (lchan->pending_rel_ind_msg) { + LOGPGT(DRSL, LOGL_INFO, &g_time, + "%s Forward RLL RELease INDication to the BSC\n", + gsm_lchan_name(lchan)); + abis_bts_rsl_sendmsg(lchan->pending_rel_ind_msg); + lchan->pending_rel_ind_msg = NULL; + } if (L1SAP_IS_LINK_SACCH(link_id)) { p = msgb_put(msg, GSM_MACBLOCK_LEN); /* L1-header, if not set/modified by layer 1 */ @@ -1318,16 +1325,6 @@ resp_l1sap = msgb_l1sap_prim(resp_msg); } - /* check for pending REL_IND */ - if (lchan->pending_rel_ind_msg) { - LOGPGT(DRSL, LOGL_INFO, &g_time, "%s Forward REL_IND to L3\n", gsm_lchan_name(lchan)); - /* Forward it to L3 */ - rc = abis_bts_rsl_sendmsg(lchan->pending_rel_ind_msg); - lchan->pending_rel_ind_msg = NULL; - if (rc < 0) - return rc; - } - memset(resp_l1sap, 0, sizeof(*resp_l1sap)); osmo_prim_init(&resp_l1sap->oph, SAP_GSM_PH, PRIM_TCH, PRIM_OP_REQUEST, resp_msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2c380f9045624f0a0a8f988bb207bc73d8354857 Gerrit-Change-Number: 25948 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 18:10:03 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 18:10:03 +0000 Subject: Change in osmo-bts[master]: l1sap: fix handling of lchan->pending_rel_ind_msg In-Reply-To: References: Message-ID: Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25948 to look at the new patch set (#2). Change subject: l1sap: fix handling of lchan->pending_rel_ind_msg ...................................................................... l1sap: fix handling of lchan->pending_rel_ind_msg After merging the patch [1] fixing handling of the RLL RELease INDication message in lapdm_rll_tx_cb(), ttcn3-bts-test shows several regressions: pass->fail: BTS_Tests.TC_rll_rel_ind_DCCH_0 pass->fail: BTS_Tests.TC_rll_rel_ind_DCCH_3 pass->fail: BTS_Tests.TC_rll_rel_ind_ACCH_0 pass->fail: BTS_Tests.TC_rll_rel_ind_ACCH_3 pass->fail: BTS_Tests_LAPDm.TC_sabm_dm [1] I823c9101bcca72d5792e16379b02d3602ffc2726 991020c049c63768e147d49bd2918c2d2e0f6dcb The problem is actually *not* in patch [1], but in the older one [2] which we attempted to fix. While a logical channel is in signalling mode, the lower layers do not produce PRIM_TCH_RTS, and thus the l1sap_tch_rts_ind() is not being called. Unlike l1sap_tch_rts_ind(), the l1sap_ph_rts_ind() is being called regardless of the channel mode (signalling vs speech), so let's move handling of lchan->pending_rel_ind_msg there. Change-Id: I2c380f9045624f0a0a8f988bb207bc73d8354857 Fixes: [2] Ie4f70c75f0137b4bd72d579b3a32575bac2fca3 --- M src/common/l1sap.c 1 file changed, 7 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/25948/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2c380f9045624f0a0a8f988bb207bc73d8354857 Gerrit-Change-Number: 25948 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 18:12:45 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Mon, 25 Oct 2021 18:12:45 +0000 Subject: Change in osmo-bts[master]: l1sap: fix handling of lchan->pending_rel_ind_msg In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25948 ) Change subject: l1sap: fix handling of lchan->pending_rel_ind_msg ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2c380f9045624f0a0a8f988bb207bc73d8354857 Gerrit-Change-Number: 25948 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 25 Oct 2021 18:12:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 21:09:11 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 21:09:11 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: set don't-fragment flag on all TRXD packets In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23814 ) Change subject: osmo-bts-trx: set don't-fragment flag on all TRXD packets ...................................................................... Patch Set 5: > Patch Set 5: Code-Review-2 > > why that? I thought the point was to _allow_ IP fragmentation in large TRXD PDUs? You're doing the exact opposite here? I don't remember all the details of our previous conversation regarding the IP fragmentation, sorry. My understanding at the time of writing this patch was that we don't want the fragmentation because of the associated performance loss. It seems I understood you wrong. I did some tests with the current master (no explicit IP_MTU_DISCOVER setting), and as far as I can see, the IP fragmentation is employed by default if a TRXD PDU exceeds the MTU. So AFAIU, we want to make sure that it can be employed regardless of the system's default policy by setting IP_MTU_DISCOVER explicitly, right? If so, shall I use IP_PMTUDISC_DONT or IP_PMTUDISC_WANT? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I25415b76b69ccf43f83ddfb0e7dd1e330fb23aa7 Gerrit-Change-Number: 23814 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Mon, 25 Oct 2021 21:09:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 21:33:12 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 21:33:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix DTE in TC_lost_sdcch_during_assignment() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25949 ) Change subject: BSC_Tests: fix DTE in TC_lost_sdcch_during_assignment() ...................................................................... BSC_Tests: fix DTE in TC_lost_sdcch_during_assignment() This test case fails in ttcn3-bsc-test-sccplite due to: BSC_Tests.ttcn:10212 Dynamic test case error: Using the value of an optional field containing omit. Change-Id: I235027c2b53b8f2ae975e25eb7c38b1959668d6f --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/25949/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cebd634..e6d0f23 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -10202,11 +10202,9 @@ * Activ Ack (SYS#5627). */ private function f_TC_lost_sdcch_during_assignment(charstring id) runs on MSC_ConnHdlr { var PDU_BSSAP ass_cmd := f_gen_ass_req(); - if (mp_bssap_cfg[0].transport == BSSAP_TRANSPORT_AoIP) { - ass_cmd.pdu.bssmap.assignmentRequest.codecList := g_pars.ass_codec_list; - } - ass_cmd.pdu.bssmap.assignmentRequest.channelType := - f_BSSMAP_chtype_from_codec(g_pars.ass_codec_list.codecElements[0]); + + ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType); + ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); var BSSMAP_FIELD_CodecType codecType; codecType := valueof(ass_cmd.pdu.bssmap.assignmentRequest.codecList.codecElements[0].codecType); @@ -10280,7 +10278,6 @@ f_init(1, true); f_sleep(1.0); - pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR})); vc_conn := f_start_handler(refers(f_TC_lost_sdcch_during_assignment), pars); vc_conn.done; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I235027c2b53b8f2ae975e25eb7c38b1959668d6f Gerrit-Change-Number: 25949 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 21:36:36 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 21:36:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix DTE in TC_lost_sdcch_during_assignment() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25949 to look at the new patch set (#2). Change subject: BSC_Tests: fix DTE in TC_lost_sdcch_during_assignment() ...................................................................... BSC_Tests: fix DTE in TC_lost_sdcch_during_assignment() This test case fails in ttcn3-bsc-test-sccplite due to: BSC_Tests.ttcn:10212 Dynamic test case error: Using the value of an optional field containing omit. Change-Id: I235027c2b53b8f2ae975e25eb7c38b1959668d6f Related: SYS#5627 --- M bsc/BSC_Tests.ttcn 1 file changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/49/25949/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I235027c2b53b8f2ae975e25eb7c38b1959668d6f Gerrit-Change-Number: 25949 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: neels Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Mon Oct 25 21:45:47 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Mon, 25 Oct 2021 21:45:47 +0000 Subject: Change in osmo-msc[master]: libmsc: struct smsc: drop 'const' qualifier from bind_addr References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/25950 ) Change subject: libmsc: struct smsc: drop 'const' qualifier from bind_addr ...................................................................... libmsc: struct smsc: drop 'const' qualifier from bind_addr This pointer holds an address of a string allocated on heap. Change-Id: I50145b57494aaccd4793f7b0ed2f65a6641db929 Related: CID#240711 --- M src/libmsc/smpp_smsc.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/50/25950/1 diff --git a/src/libmsc/smpp_smsc.h b/src/libmsc/smpp_smsc.h index b26d011..4c0d701 100644 --- a/src/libmsc/smpp_smsc.h +++ b/src/libmsc/smpp_smsc.h @@ -110,7 +110,7 @@ struct llist_head esme_list; struct llist_head acl_list; struct llist_head route_list; - const char *bind_addr; + char *bind_addr; uint16_t listen_port; char system_id[SMPP_SYS_ID_LEN+1]; int accept_all; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I50145b57494aaccd4793f7b0ed2f65a6641db929 Gerrit-Change-Number: 25950 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Tue Oct 26 00:36:22 2021 From: noreply at opensuse.org (OBS Notification) Date: Tue, 26 Oct 2021 00:36:22 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <61774d967873e_24ca2af300e165f41313958@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 197s] - /usr/include/osmocom/sabp/SABP_RepetitionNumber0.h [ 197s] - /usr/include/osmocom/sabp/SABP_RepetitionNumber1.h [ 197s] - /usr/include/osmocom/sabp/SABP_Reset-Complete.h [ 197s] - /usr/include/osmocom/sabp/SABP_Reset-Failure.h [ 197s] - /usr/include/osmocom/sabp/SABP_Reset.h [ 197s] - /usr/include/osmocom/sabp/SABP_Restart.h [ 197s] - /usr/include/osmocom/sabp/SABP_SABP-PDU.h [ 197s] - /usr/include/osmocom/sabp/SABP_Serial-Number.h [ 197s] - /usr/include/osmocom/sabp/SABP_Service-Area-Identifier.h [ 197s] - /usr/include/osmocom/sabp/SABP_Service-Areas-List.h [ 197s] - /usr/include/osmocom/sabp/SABP_SuccessfulOutcome.h [ 197s] - /usr/include/osmocom/sabp/SABP_TriggeringMessage.h [ 197s] - /usr/include/osmocom/sabp/SABP_TypeOfError.h [ 197s] - /usr/include/osmocom/sabp/SABP_UnsuccessfulOutcome.h [ 197s] - /usr/include/osmocom/sabp/SABP_Warning-Type.h [ 197s] - /usr/include/osmocom/sabp/SABP_WarningSecurityInfo.h [ 197s] - /usr/include/osmocom/sabp/SABP_Write-Replace-Complete.h [ 197s] - /usr/include/osmocom/sabp/SABP_Write-Replace-Failure.h [ 197s] - /usr/include/osmocom/sabp/SABP_Write-Replace.h [ 197s] - /usr/include/osmocom/sabp/sabp_common.h [ 197s] - /usr/include/osmocom/sabp/sabp_ies_defs.h [ 197s] [ 197s] ### VM INTERACTION START ### [ 200s] [ 191.500196][ T419] sysrq: Power Off [ 200s] [ 191.509393][ T16] reboot: Power down [ 200s] ### VM INTERACTION END ### [ 200s] [ 200s] lamb61 failed "build osmo-iuh.spec" at Tue Oct 26 00:36:11 UTC 2021. [ 200s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Tue Oct 26 00:37:13 2021 From: noreply at opensuse.org (OBS Notification) Date: Tue, 26 Oct 2021 00:37:13 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <61774dd5f695_24ca2af300e165f41315345@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 327s] #include [ 327s] int main (int argc, char ** argv) { [ 327s] sctp_connectx(0, NULL, 0, NULL); [ 327s] } [ 327s] Compiler stdout: [ 327s] [ 327s] Compiler stderr: [ 327s] [ 327s] Checking if "sctp_connectx() accepts 4 arguments" : compiles: YES [ 327s] Configuring freeDiameter-host.h using configuration [ 327s] Configuring version.h using configuration [ 327s] WARNING: Target "../dict_dcca_3gpp" has a path separator in its name. [ 327s] This is not supported, it can cause unexpected failures and will become [ 327s] a hard error in the future. [ 327s] [ 327s] ../subprojects/freeDiameter/extensions/dict_dcca_3gpp/meson.build:1:0: ERROR: Target "../dict_dcca_3gpp" has a path segment pointing to directory "subprojects/freeDiameter/extensions/dict_dcca_3gpp/..". This is an error. [ 327s] To define a target that builds in that directory you must define it [ 327s] in the meson.build file in that directory. [ 327s] [ 327s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 327s] make: *** [debian/rules:11: binary] Error 25 [ 327s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 327s] ### VM INTERACTION START ### [ 329s] [ 276.760955] sysrq: Power Off [ 330s] [ 276.868531] reboot: Power down [ 330s] ### VM INTERACTION END ### [ 330s] [ 330s] lamb60 failed "build open5gs_2.3.6.202110260026.dsc" at Tue Oct 26 00:37:09 UTC 2021. [ 330s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Tue Oct 26 00:41:47 2021 From: noreply at opensuse.org (OBS Notification) Date: Tue, 26 Oct 2021 00:41:47 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <61774edf8117f_24ca2af300e165f41317468@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 229s] - /usr/include/osmocom/sabp/SABP_RepetitionNumber0.h [ 229s] - /usr/include/osmocom/sabp/SABP_RepetitionNumber1.h [ 229s] - /usr/include/osmocom/sabp/SABP_Reset-Complete.h [ 229s] - /usr/include/osmocom/sabp/SABP_Reset-Failure.h [ 229s] - /usr/include/osmocom/sabp/SABP_Reset.h [ 229s] - /usr/include/osmocom/sabp/SABP_Restart.h [ 229s] - /usr/include/osmocom/sabp/SABP_SABP-PDU.h [ 229s] - /usr/include/osmocom/sabp/SABP_Serial-Number.h [ 229s] - /usr/include/osmocom/sabp/SABP_Service-Area-Identifier.h [ 229s] - /usr/include/osmocom/sabp/SABP_Service-Areas-List.h [ 229s] - /usr/include/osmocom/sabp/SABP_SuccessfulOutcome.h [ 229s] - /usr/include/osmocom/sabp/SABP_TriggeringMessage.h [ 229s] - /usr/include/osmocom/sabp/SABP_TypeOfError.h [ 229s] - /usr/include/osmocom/sabp/SABP_UnsuccessfulOutcome.h [ 229s] - /usr/include/osmocom/sabp/SABP_Warning-Type.h [ 229s] - /usr/include/osmocom/sabp/SABP_WarningSecurityInfo.h [ 229s] - /usr/include/osmocom/sabp/SABP_Write-Replace-Complete.h [ 229s] - /usr/include/osmocom/sabp/SABP_Write-Replace-Failure.h [ 229s] - /usr/include/osmocom/sabp/SABP_Write-Replace.h [ 229s] - /usr/include/osmocom/sabp/sabp_common.h [ 229s] - /usr/include/osmocom/sabp/sabp_ies_defs.h [ 229s] [ 229s] ### VM INTERACTION START ### [ 232s] [ 223.521885][ T422] sysrq: Power Off [ 232s] [ 223.533675][ T16] reboot: Power down [ 232s] ### VM INTERACTION END ### [ 232s] [ 232s] lamb25 failed "build osmo-iuh.spec" at Tue Oct 26 00:41:39 UTC 2021. [ 232s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Tue Oct 26 00:47:30 2021 From: noreply at opensuse.org (OBS Notification) Date: Tue, 26 Oct 2021 00:47:30 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Factory_ARM/armv7l In-Reply-To: References: Message-ID: <61775029ca5f7_24ca2af300e165f413204cb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Factory_ARM/armv7l Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Factory_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 195s] - /usr/include/osmocom/sabp/SABP_RepetitionNumber0.h [ 195s] - /usr/include/osmocom/sabp/SABP_RepetitionNumber1.h [ 195s] - /usr/include/osmocom/sabp/SABP_Reset-Complete.h [ 195s] - /usr/include/osmocom/sabp/SABP_Reset-Failure.h [ 195s] - /usr/include/osmocom/sabp/SABP_Reset.h [ 195s] - /usr/include/osmocom/sabp/SABP_Restart.h [ 195s] - /usr/include/osmocom/sabp/SABP_SABP-PDU.h [ 195s] - /usr/include/osmocom/sabp/SABP_Serial-Number.h [ 195s] - /usr/include/osmocom/sabp/SABP_Service-Area-Identifier.h [ 195s] - /usr/include/osmocom/sabp/SABP_Service-Areas-List.h [ 195s] - /usr/include/osmocom/sabp/SABP_SuccessfulOutcome.h [ 195s] - /usr/include/osmocom/sabp/SABP_TriggeringMessage.h [ 195s] - /usr/include/osmocom/sabp/SABP_TypeOfError.h [ 195s] - /usr/include/osmocom/sabp/SABP_UnsuccessfulOutcome.h [ 195s] - /usr/include/osmocom/sabp/SABP_Warning-Type.h [ 195s] - /usr/include/osmocom/sabp/SABP_WarningSecurityInfo.h [ 195s] - /usr/include/osmocom/sabp/SABP_Write-Replace-Complete.h [ 195s] - /usr/include/osmocom/sabp/SABP_Write-Replace-Failure.h [ 195s] - /usr/include/osmocom/sabp/SABP_Write-Replace.h [ 195s] - /usr/include/osmocom/sabp/sabp_common.h [ 195s] - /usr/include/osmocom/sabp/sabp_ies_defs.h [ 195s] [ 195s] ### VM INTERACTION START ### [ 198s] [ 173.295316][ T384] sysrq: Power Off [ 198s] [ 173.295897][ T283] reboot: Power down [ 198s] ### VM INTERACTION END ### [ 198s] [ 198s] obs-arm-10 failed "build osmo-iuh.spec" at Tue Oct 26 00:47:23 UTC 2021. [ 198s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Tue Oct 26 01:49:13 2021 From: noreply at opensuse.org (OBS Notification) Date: Tue, 26 Oct 2021 01:49:13 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Factory_ARM/aarch64 In-Reply-To: References: Message-ID: <61775eb01c9f6_24ca2af300e165f41349723@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Factory_ARM/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 1965s] - /usr/include/osmocom/ranap/RANAP_UeRadioCapabilityMatchResponse.h [ 1965s] - /usr/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h [ 1965s] - /usr/include/osmocom/ranap/RANAP_UnsuccessfulOutcome.h [ 1965s] - /usr/include/osmocom/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h [ 1965s] - /usr/include/osmocom/ranap/RANAP_UplinkInformationExchangeFailure.h [ 1965s] - /usr/include/osmocom/ranap/RANAP_UplinkInformationExchangeRequest.h [ 1965s] - /usr/include/osmocom/ranap/RANAP_UplinkInformationExchangeResponse.h [ 1965s] - /usr/include/osmocom/ranap/RANAP_UserPlaneInformation.h [ 1965s] - /usr/include/osmocom/ranap/RANAP_UserPlaneMode.h [ 1965s] - /usr/include/osmocom/ranap/RANAP_VelocityEstimate.h [ 1965s] - /usr/include/osmocom/ranap/RANAP_VerticalAccuracyCode.h [ 1965s] - /usr/include/osmocom/ranap/RANAP_VerticalSpeedDirection.h [ 1965s] - /usr/include/osmocom/ranap/RANAP_VerticalVelocity.h [ 1965s] - /usr/include/osmocom/ranap/RANAP_VoiceSupportMatchIndicator.h [ 1965s] - /usr/include/osmocom/ranap/iu_client.h [ 1965s] - /usr/include/osmocom/ranap/iu_helpers.h [ 1965s] - /usr/include/osmocom/ranap/ranap_common.h [ 1965s] - /usr/include/osmocom/ranap/ranap_common_cn.h [ 1965s] - /usr/include/osmocom/ranap/ranap_ies_defs.h [ 1965s] - /usr/include/osmocom/ranap/ranap_msg_factory.h [ 1965s] - /usr/include/osmocom/rua/RUA_Ansi-41-IDNNS.h [ 1965s] - /usr/include/osmocom/rua/RUA_CN-DomainIndicator.h [ 1965s] - /usr/include/osmocom/rua/RUA_CSGMembershipStatus.h [ 1967s] - /usr/include/osmo[ 1935.455428][ T381] sysrq: Power Off [ 1967s] [ 1935.481828][ T15] reboot: Power down [ 1968s] ### VM INTERACTION END ### [ 1968s] [ 1968s] obs-arm-2 failed "build osmo-iuh.spec" at Tue Oct 26 01:49:07 UTC 2021. [ 1968s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Tue Oct 26 02:51:30 2021 From: noreply at opensuse.org (OBS Notification) Date: Tue, 26 Oct 2021 02:51:30 +0000 Subject: Build failure of network:osmocom:nightly/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <61776d3cb194e_24ca2af300e165f41369446@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_Unstable/x86_64 Package network:osmocom:nightly/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 116s] #include [ 116s] int main (int argc, char ** argv) { [ 116s] sctp_connectx(0, NULL, 0, NULL); [ 116s] } [ 116s] Compiler stdout: [ 116s] [ 116s] Compiler stderr: [ 116s] [ 116s] Checking if "sctp_connectx() accepts 4 arguments" : compiles: YES [ 116s] Configuring freeDiameter-host.h using configuration [ 116s] Configuring version.h using configuration [ 116s] WARNING: Target "../dict_dcca_3gpp" has a path separator in its name. [ 116s] This is not supported, it can cause unexpected failures and will become [ 116s] a hard error in the future. [ 116s] [ 116s] ../subprojects/freeDiameter/extensions/dict_dcca_3gpp/meson.build:1:0: ERROR: Target "../dict_dcca_3gpp" has a path segment pointing to directory "subprojects/freeDiameter/extensions/dict_dcca_3gpp/..". This is an error. [ 116s] To define a target that builds in that directory you must define it [ 116s] in the meson.build file in that directory. [ 116s] [ 116s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 116s] make: *** [debian/rules:11: binary] Error 25 [ 116s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 116s] ### VM INTERACTION START ### [ 119s] [ 106.714909] sysrq: Power Off [ 119s] [ 106.717709] reboot: Power down [ 119s] ### VM INTERACTION END ### [ 119s] [ 119s] hci-cnode2-m0 failed "build open5gs_2.3.6.202110260026.dsc" at Tue Oct 26 02:51:26 UTC 2021. [ 119s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Tue Oct 26 02:52:23 2021 From: noreply at opensuse.org (OBS Notification) Date: Tue, 26 Oct 2021 02:52:23 +0000 Subject: Build failure of network:osmocom:latest/open5gs in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <61776d798c1d8_24ca2af300e165f41369829@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/open5gs/Debian_Unstable/x86_64 Package network:osmocom:latest/open5gs failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest open5gs Last lines of build log: [ 172s] #include [ 172s] int main (int argc, char ** argv) { [ 172s] sctp_connectx(0, NULL, 0, NULL); [ 172s] } [ 172s] Compiler stdout: [ 172s] [ 172s] Compiler stderr: [ 172s] [ 172s] Checking if "sctp_connectx() accepts 4 arguments" : compiles: YES [ 172s] Configuring freeDiameter-host.h using configuration [ 172s] Configuring version.h using configuration [ 172s] WARNING: Target "../dict_dcca_3gpp" has a path separator in its name. [ 172s] This is not supported, it can cause unexpected failures and will become [ 172s] a hard error in the future. [ 172s] [ 172s] ../subprojects/freeDiameter/extensions/dict_dcca_3gpp/meson.build:1:0: ERROR: Target "../dict_dcca_3gpp" has a path segment pointing to directory "subprojects/freeDiameter/extensions/dict_dcca_3gpp/..". This is an error. [ 172s] To define a target that builds in that directory you must define it [ 172s] in the meson.build file in that directory. [ 172s] [ 172s] dh_auto_configure: error: cd obj-x86_64-linux-gnu && LC_ALL=C.UTF-8 meson .. --wrap-mode=nodownload --buildtype=plain --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=lib/x86_64-linux-gnu --libexecdir=lib/x86_64-linux-gnu returned exit code 1 [ 172s] make: *** [debian/rules:11: binary] Error 25 [ 172s] dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2 [ 172s] ### VM INTERACTION START ### [ 175s] [ 158.693578] sysrq: Power Off [ 175s] [ 158.700752] reboot: Power down [ 175s] ### VM INTERACTION END ### [ 175s] [ 175s] lamb59 failed "build open5gs_2.3.6.dsc" at Tue Oct 26 02:52:20 UTC 2021. [ 175s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Oct 26 06:18:51 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 06:18:51 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: fix missing checkout osmo-hnodeb References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25951 ) Change subject: OBS: nightly: fix missing checkout osmo-hnodeb ...................................................................... OBS: nightly: fix missing checkout osmo-hnodeb Fixes: 2ab3f7 ("Build and test osmo-hnodeb nightly packages") Related: https://jenkins.osmocom.org/jenkins/job/Osmocom_OBS_nightly/1044 Change-Id: I327adaa8f60c1f90aa150e9d4fba5a10f271c96b --- M scripts/osmocom-nightly-packages.sh 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/51/25951/1 diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 2bdc4f0..4d21cd7 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -225,6 +225,7 @@ checkout osmo-smlc checkout osmo-cbc checkout osmo-gbproxy + checkout osmo-hnodeb cd "$REPO" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I327adaa8f60c1f90aa150e9d4fba5a10f271c96b Gerrit-Change-Number: 25951 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Tue Oct 26 06:58:53 2021 From: noreply at opensuse.org (OBS Notification) Date: Tue, 26 Oct 2021 06:58:53 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <6177a73b8a395_24ca2af300e165f4144713e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 111s] intention of the Shared Library Policy is to allow parallel installation of [ 111s] multiple versions of the same shared library, hard dependencies likely make [ 111s] that impossible. Please remove this dependency and instead move it to the [ 111s] runtime uses of your library. [ 111s] [ 111s] osmo-iuh.x86_64: W: suse-missing-rclink osmo-hnbgw [ 111s] The package contains an init script or systemd service file but lacks the [ 111s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 111s] [ 111s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 111s] libosmo-rua0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 111s] This package contains a library and provides no %post scriptlet containing a [ 111s] call to ldconfig. [ 111s] [ 111s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 111s] libosmo-rua0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 111s] This package contains a library and provides no %postun scriptlet containing a [ 111s] call to ldconfig. [ 111s] [ 111s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 111s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 111s] [ 111s] ### VM INTERACTION START ### [ 115s] [ 109.048965] sysrq: Power Off [ 115s] [ 109.051485] reboot: Power down [ 115s] ### VM INTERACTION END ### [ 115s] [ 115s] goat15 failed "build osmo-iuh.spec" at Tue Oct 26 06:58:38 UTC 2021. [ 115s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Tue Oct 26 07:00:52 2021 From: noreply at opensuse.org (OBS Notification) Date: Tue, 26 Oct 2021 07:00:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <6177a7b38c50c_24ca2af300e165f4144777c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 199s] - /usr/include/osmocom/sabp/SABP_RepetitionNumber0.h [ 199s] - /usr/include/osmocom/sabp/SABP_RepetitionNumber1.h [ 199s] - /usr/include/osmocom/sabp/SABP_Reset-Complete.h [ 199s] - /usr/include/osmocom/sabp/SABP_Reset-Failure.h [ 199s] - /usr/include/osmocom/sabp/SABP_Reset.h [ 199s] - /usr/include/osmocom/sabp/SABP_Restart.h [ 199s] - /usr/include/osmocom/sabp/SABP_SABP-PDU.h [ 199s] - /usr/include/osmocom/sabp/SABP_Serial-Number.h [ 199s] - /usr/include/osmocom/sabp/SABP_Service-Area-Identifier.h [ 199s] - /usr/include/osmocom/sabp/SABP_Service-Areas-List.h [ 199s] - /usr/include/osmocom/sabp/SABP_SuccessfulOutcome.h [ 199s] - /usr/include/osmocom/sabp/SABP_TriggeringMessage.h [ 199s] - /usr/include/osmocom/sabp/SABP_TypeOfError.h [ 199s] - /usr/include/osmocom/sabp/SABP_UnsuccessfulOutcome.h [ 199s] - /usr/include/osmocom/sabp/SABP_Warning-Type.h [ 199s] - /usr/include/osmocom/sabp/SABP_WarningSecurityInfo.h [ 199s] - /usr/include/osmocom/sabp/SABP_Write-Replace-Complete.h [ 199s] - /usr/include/osmocom/sabp/SABP_Write-Replace-Failure.h [ 199s] - /usr/include/osmocom/sabp/SABP_Write-Replace.h [ 199s] - /usr/include/osmocom/sabp/sabp_common.h [ 199s] - /usr/include/osmocom/sabp/sabp_ies_defs.h [ 199s] [ 199s] ### VM INTERACTION START ### [ 202s] [ 193.214393] sysrq: SysRq : Power Off [ 202s] [ 193.219473] reboot: Power down [ 202s] ### VM INTERACTION END ### [ 202s] [ 202s] lamb13 failed "build osmo-iuh.spec" at Tue Oct 26 07:00:39 UTC 2021. [ 202s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Tue Oct 26 07:02:17 2021 From: noreply at opensuse.org (OBS Notification) Date: Tue, 26 Oct 2021 07:02:17 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <6177a80cc6a78_24ca2af300e165f414482bc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 224s] - /usr/include/osmocom/ranap/RANAP_TraceReference.h [ 224s] - /usr/include/osmocom/ranap/RANAP_TraceType.h [ 224s] - /usr/include/osmocom/ranap/RANAP_TrafficClass.h [ 224s] - /usr/include/osmocom/ranap/RANAP_TrafficHandlingPriority.h [ 224s] - /usr/include/osmocom/ranap/RANAP_TransferDelay.h [ 224s] - /usr/include/osmocom/ranap/RANAP_TransportLayerAddress.h [ 224s] - /usr/include/osmocom/ranap/RANAP_TransportLayerInformation.h [ 224s] - /usr/include/osmocom/ranap/RANAP_TriggerID.h [ 224s] - /usr/include/osmocom/ranap/RANAP_TriggeringMessage.h [ 224s] - /usr/include/osmocom/ranap/RANAP_TunnelInformation.h [ 224s] - /usr/include/osmocom/ranap/RANAP_TypeOfError.h [ 224s] - /usr/include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h [ 224s] - /usr/include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.h [ 224s] - /usr/include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRateUplink.h [ 224s] - /usr/include/osmocom/ranap/RANAP_UE-History-Information.h [ 224s] - /usr/include/osmocom/ranap/RANAP_UE-ID.h [ 224s] - /usr/include/osmocom/ranap/RANAP_UESBI-Iu.h [ 224s] - /usr/include/osmocom/ranap/RANAP_UESBI-IuA.h [ 224s] - /usr/include/osmocom/ranap/RANAP_UESBI-IuB.h [ 224s] - /usr/include/osmocom/ranap/RANAP_UESpecificInformationIndication.h [ 224s] - /usr/include/osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h [ 224s] - /usr/include/osmocom/ranap/RANAP_UL-N-PDU-SequenceNumber.h [ 224s] - /usr/include/osmocom/ranap/RANAP_UP-ModeVersions.h [ 226s] - /usr/include/osmocom/r[ 213.739657] sysrq: SysRq : Power Off [ 226s] [ 213.741926] reboot: Power down [ 226s] ### VM INTERACTION END ### [ 226s] [ 226s] obs-arm-7 failed "build osmo-iuh.spec" at Tue Oct 26 07:02:02 UTC 2021. [ 226s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Oct 26 07:22:44 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 07:22:44 +0000 Subject: Change in osmo-iuh[master]: contrib/osmo-iuh.spec.in: fix header packaging References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25952 ) Change subject: contrib/osmo-iuh.spec.in: fix header packaging ...................................................................... contrib/osmo-iuh.spec.in: fix header packaging Fix the conflict from having %{_includedir}/* in multiple packages by replacing it with the correct subdir path. Fix for: found conflict of libosmo-hnbap-devel-0.7.0.11.b110.202110260026-1.1.armv7hl with libosmo-ranap-devel-0.7.0.11.b110.202110260026-1.1.armv7hl: - /usr/include/osmocom/hnbap/Access-stratum-release-indicator.h - /usr/include/osmocom/hnbap/AccessResult.h - /usr/include/osmocom/hnbap/AdditionalNeighbourInfoList.h ... I've verified that it builds again in my own OBS namespace. Related: SYS#5516 Fixes: 35f2bd ("Provide libosmo-hnbap as a public shared library") Fixes: dba8b0 ("Provide libosmo-rua as a public shared library") Change-Id: Ia401caf01fa9ea351f811d7c22a04ccff556d6bc --- M contrib/osmo-iuh.spec.in 1 file changed, 13 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/52/25952/1 diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in index 2ef38a3..b4f14f2 100644 --- a/contrib/osmo-iuh.spec.in +++ b/contrib/osmo-iuh.spec.in @@ -2,6 +2,7 @@ # spec file for package osmo-iuh # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 sysmocom - s.f.m.c GmbH # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -154,7 +155,9 @@ %{_libdir}/libosmo-hnbap.so.0* %files -n libosmo-hnbap-devel -%{_includedir}/* +%dir %{_includedir}/osmocom/ +%dir %{_includedir}/osmocom/hnbap/ +%{_includedir}/osmocom/hnbap/* %{_libdir}/libosmo-hnbap.so %{_libdir}/pkgconfig/libosmo-hnbap.pc @@ -162,7 +165,9 @@ %{_libdir}/libosmo-ranap.so.3* %files -n libosmo-ranap-devel -%{_includedir}/* +%dir %{_includedir}/osmocom/ +%dir %{_includedir}/osmocom/ranap/ +%{_includedir}/osmocom/ranap/* %{_libdir}/libosmo-ranap.so %{_libdir}/pkgconfig/libosmo-ranap.pc @@ -170,7 +175,9 @@ %{_libdir}/libosmo-rua.so.0* %files -n libosmo-rua-devel -%{_includedir}/* +%dir %{_includedir}/osmocom/ +%dir %{_includedir}/osmocom/rua/ +%{_includedir}/osmocom/rua/* %{_libdir}/libosmo-rua.so %{_libdir}/pkgconfig/libosmo-rua.pc @@ -178,6 +185,9 @@ %{_libdir}/libosmo-sabp.so.0* %files -n libosmo-sabp-devel +%dir %{_includedir}/osmocom/ +%dir %{_includedir}/osmocom/sabp/ +%{_includedir}/osmocom/sabp/* %{_libdir}/libosmo-sabp.so %{_libdir}/pkgconfig/libosmo-sabp.pc -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia401caf01fa9ea351f811d7c22a04ccff556d6bc Gerrit-Change-Number: 25952 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 07:26:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 07:26:04 +0000 Subject: Change in osmo-msc[master]: libmsc: fix NULL pointer dereference in trans_lcls_compose() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/25953 ) Change subject: libmsc: fix NULL pointer dereference in trans_lcls_compose() ...................................................................... libmsc: fix NULL pointer dereference in trans_lcls_compose() Change-Id: I96342de4cb3e0bc3d3cac7538d4517aa211e8a38 Fixes: CID#240768 --- M src/libmsc/transaction.c 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/53/25953/1 diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 2108ab4..25c0e3c 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -112,6 +112,11 @@ struct osmo_lcls *trans_lcls_compose(const struct gsm_trans *trans, bool use_lac) { + if (!trans) { + LOGP(DCC, LOGL_ERROR, "LCLS: unable to fill parameters for unallocated transaction\n"); + return NULL; + } + if (!trans->net->a.sri->sccp) return NULL; @@ -119,11 +124,6 @@ struct osmo_lcls *lcls; uint8_t w = osmo_ss7_pc_width(&ss7->cfg.pc_fmt); - if (!trans) { - LOGP(DCC, LOGL_ERROR, "LCLS: unable to fill parameters for unallocated transaction\n"); - return NULL; - } - if (!trans->net->lcls_permitted) { LOGP(DCC, LOGL_NOTICE, "LCLS disabled globally\n"); return NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I96342de4cb3e0bc3d3cac7538d4517aa211e8a38 Gerrit-Change-Number: 25953 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Tue Oct 26 07:33:10 2021 From: noreply at opensuse.org (OBS Notification) Date: Tue, 26 Oct 2021 07:33:10 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1_ARM/armv7l In-Reply-To: References: Message-ID: <6177af5316d62_24ca2af300e165f414597df@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1_ARM/armv7l Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 586s] - /usr/include/osmocom/rua/RUA_RANAP-Message.h [ 586s] - /usr/include/osmocom/rua/RUA_RUA-PDU.h [ 586s] - /usr/include/osmocom/rua/RUA_RoutingParameter.h [ 586s] - /usr/include/osmocom/rua/RUA_SuccessfulOutcome.h [ 586s] - /usr/include/osmocom/rua/RUA_TriggeringMessage.h [ 586s] - /usr/include/osmocom/rua/RUA_TypeOfError.h [ 586s] - /usr/include/osmocom/rua/RUA_UnsuccessfulOutcome.h [ 586s] - /usr/include/osmocom/rua/rua_common.h [ 586s] - /usr/include/osmocom/rua/rua_ies_defs.h [ 586s] - /usr/include/osmocom/rua/rua_msg_factory.h [ 586s] - /usr/include/osmocom/sabp/SABP_Available-Bandwidth.h [ 586s] - /usr/include/osmocom/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.h [ 586s] - /usr/include/osmocom/sabp/SABP_Broadcast-Message-Content.h [ 586s] - /usr/include/osmocom/sabp/SABP_Category.h [ 586s] - /usr/include/osmocom/sabp/SABP_Cause.h [ 586s] - /usr/include/osmocom/sabp/SABP_Criticality-Diagnostics.h [ 586s] - /usr/include/osmocom/sabp/SABP_Criticality.h [ 586s] - /usr/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h [ 586s] - /usr/include/osmocom/sabp/SABP_Data-Coding-Scheme.h [ 586s] - /usr/include/osmocom/sabp/SABP_Error-Indication.h [ 586s] - /usr/include/osmocom/sabp/SABP_Failure-List-Item.h [ 586s] - /usr/include/osmocom/sabp/SABP_Failure-List.h [ 586s] - /usr/include/osmocom/sabp/SABP_Failure.h [ 588s] - /usr/include/osmocom/sabp/SABP_IE-Ext[ 574.313767] sysrq: SysRq : Power Off [ 588s] [ 574.365543] reboot: Power down [ 588s] ### VM INTERACTION END ### [ 588s] [ 588s] armbuild21 failed "build osmo-iuh.spec" at Tue Oct 26 07:32:55 UTC 2021. [ 588s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Oct 26 07:35:13 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 07:35:13 +0000 Subject: Change in osmo-iuh[master]: contrib/osmo-iuh.spec.in: fix header packaging In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25952 ) Change subject: contrib/osmo-iuh.spec.in: fix header packaging ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia401caf01fa9ea351f811d7c22a04ccff556d6bc Gerrit-Change-Number: 25952 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 07:35:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 07:35:38 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 07:35:38 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: fix missing checkout osmo-hnodeb In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25951 ) Change subject: OBS: nightly: fix missing checkout osmo-hnodeb ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I327adaa8f60c1f90aa150e9d4fba5a10f271c96b Gerrit-Change-Number: 25951 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 07:35:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 09:55:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 09:55:27 +0000 Subject: Change in osmo-iuh[master]: contrib/osmo-iuh.spec.in: fix header packaging In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25952 ) Change subject: contrib/osmo-iuh.spec.in: fix header packaging ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia401caf01fa9ea351f811d7c22a04ccff556d6bc Gerrit-Change-Number: 25952 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 09:55:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 09:56:13 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 09:56:13 +0000 Subject: Change in osmo-iuh[master]: contrib/osmo-iuh.spec.in: fix header packaging In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25952 ) Change subject: contrib/osmo-iuh.spec.in: fix header packaging ...................................................................... contrib/osmo-iuh.spec.in: fix header packaging Fix the conflict from having %{_includedir}/* in multiple packages by replacing it with the correct subdir path. Fix for: found conflict of libosmo-hnbap-devel-0.7.0.11.b110.202110260026-1.1.armv7hl with libosmo-ranap-devel-0.7.0.11.b110.202110260026-1.1.armv7hl: - /usr/include/osmocom/hnbap/Access-stratum-release-indicator.h - /usr/include/osmocom/hnbap/AccessResult.h - /usr/include/osmocom/hnbap/AdditionalNeighbourInfoList.h ... I've verified that it builds again in my own OBS namespace. Related: SYS#5516 Fixes: 35f2bd ("Provide libosmo-hnbap as a public shared library") Fixes: dba8b0 ("Provide libosmo-rua as a public shared library") Change-Id: Ia401caf01fa9ea351f811d7c22a04ccff556d6bc --- M contrib/osmo-iuh.spec.in 1 file changed, 13 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/contrib/osmo-iuh.spec.in b/contrib/osmo-iuh.spec.in index 2ef38a3..b4f14f2 100644 --- a/contrib/osmo-iuh.spec.in +++ b/contrib/osmo-iuh.spec.in @@ -2,6 +2,7 @@ # spec file for package osmo-iuh # # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 sysmocom - s.f.m.c GmbH # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -154,7 +155,9 @@ %{_libdir}/libosmo-hnbap.so.0* %files -n libosmo-hnbap-devel -%{_includedir}/* +%dir %{_includedir}/osmocom/ +%dir %{_includedir}/osmocom/hnbap/ +%{_includedir}/osmocom/hnbap/* %{_libdir}/libosmo-hnbap.so %{_libdir}/pkgconfig/libosmo-hnbap.pc @@ -162,7 +165,9 @@ %{_libdir}/libosmo-ranap.so.3* %files -n libosmo-ranap-devel -%{_includedir}/* +%dir %{_includedir}/osmocom/ +%dir %{_includedir}/osmocom/ranap/ +%{_includedir}/osmocom/ranap/* %{_libdir}/libosmo-ranap.so %{_libdir}/pkgconfig/libosmo-ranap.pc @@ -170,7 +175,9 @@ %{_libdir}/libosmo-rua.so.0* %files -n libosmo-rua-devel -%{_includedir}/* +%dir %{_includedir}/osmocom/ +%dir %{_includedir}/osmocom/rua/ +%{_includedir}/osmocom/rua/* %{_libdir}/libosmo-rua.so %{_libdir}/pkgconfig/libosmo-rua.pc @@ -178,6 +185,9 @@ %{_libdir}/libosmo-sabp.so.0* %files -n libosmo-sabp-devel +%dir %{_includedir}/osmocom/ +%dir %{_includedir}/osmocom/sabp/ +%{_includedir}/osmocom/sabp/* %{_libdir}/libosmo-sabp.so %{_libdir}/pkgconfig/libosmo-sabp.pc -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ia401caf01fa9ea351f811d7c22a04ccff556d6bc Gerrit-Change-Number: 25952 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 09:58:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 09:58:23 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: fix DTE in TC_lost_sdcch_during_assignment() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25949 ) Change subject: BSC_Tests: fix DTE in TC_lost_sdcch_during_assignment() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25949 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I235027c2b53b8f2ae975e25eb7c38b1959668d6f Gerrit-Change-Number: 25949 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Assignee: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: neels Gerrit-Comment-Date: Tue, 26 Oct 2021 09:58:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 10:00:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 10:00:06 +0000 Subject: Change in osmo-msc[master]: libmsc: struct smsc: drop 'const' qualifier from bind_addr In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25950 ) Change subject: libmsc: struct smsc: drop 'const' qualifier from bind_addr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I50145b57494aaccd4793f7b0ed2f65a6641db929 Gerrit-Change-Number: 25950 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 10:00:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 10:00:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 10:00:27 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: fix missing checkout osmo-hnodeb In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25951 ) Change subject: OBS: nightly: fix missing checkout osmo-hnodeb ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I327adaa8f60c1f90aa150e9d4fba5a10f271c96b Gerrit-Change-Number: 25951 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 10:00:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 10:00:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 10:00:29 +0000 Subject: Change in osmo-ci[master]: OBS: nightly: fix missing checkout osmo-hnodeb In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25951 ) Change subject: OBS: nightly: fix missing checkout osmo-hnodeb ...................................................................... OBS: nightly: fix missing checkout osmo-hnodeb Fixes: 2ab3f7 ("Build and test osmo-hnodeb nightly packages") Related: https://jenkins.osmocom.org/jenkins/job/Osmocom_OBS_nightly/1044 Change-Id: I327adaa8f60c1f90aa150e9d4fba5a10f271c96b --- M scripts/osmocom-nightly-packages.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh index 2bdc4f0..4d21cd7 100755 --- a/scripts/osmocom-nightly-packages.sh +++ b/scripts/osmocom-nightly-packages.sh @@ -225,6 +225,7 @@ checkout osmo-smlc checkout osmo-cbc checkout osmo-gbproxy + checkout osmo-hnodeb cd "$REPO" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I327adaa8f60c1f90aa150e9d4fba5a10f271c96b Gerrit-Change-Number: 25951 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 10:00:52 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 10:00:52 +0000 Subject: Change in osmo-bsc[master]: timeslot_fsm: Add assert to make sure we never go out of bounds in ts... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25946 ) Change subject: timeslot_fsm: Add assert to make sure we never go out of bounds in ts->lchan array ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I23a5349838e0c540fbb54cad10f2af42268d7729 Gerrit-Change-Number: 25946 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 10:00:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 10:01:13 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 10:01:13 +0000 Subject: Change in osmo-bsc[master]: Set subslots_per_pchan_vamos[GSM_PCHAN_OSMO_DYN] = 0 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25947 ) Change subject: Set subslots_per_pchan_vamos[GSM_PCHAN_OSMO_DYN] = 0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8727d5b446179c0ebcd8738507efe5a50afaf1e2 Gerrit-Change-Number: 25947 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 10:01:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 10:01:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 10:01:34 +0000 Subject: Change in osmo-msc[master]: libmsc: fix NULL pointer dereference in trans_lcls_compose() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25953 ) Change subject: libmsc: fix NULL pointer dereference in trans_lcls_compose() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I96342de4cb3e0bc3d3cac7538d4517aa211e8a38 Gerrit-Change-Number: 25953 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 10:01:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 10:37:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 10:37:03 +0000 Subject: Change in osmo-bsc[master]: timeslot_fsm: Add assert to make sure we never go out of bounds in ts... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25946 ) Change subject: timeslot_fsm: Add assert to make sure we never go out of bounds in ts->lchan array ...................................................................... Patch Set 1: This patchset should be merged today in order to avoid crash of osmo-bsc. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I23a5349838e0c540fbb54cad10f2af42268d7729 Gerrit-Change-Number: 25946 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 10:37:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Tue Oct 26 11:31:09 2021 From: noreply at opensuse.org (OBS Notification) Date: Tue, 26 Oct 2021 11:31:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Tumbleweed/i586 In-Reply-To: References: Message-ID: <6177e7036cbce_24ca2af300e165f41544184@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Tumbleweed/i586 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Tumbleweed/i586 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 169s] - /usr/include/osmocom/sabp/SABP_RepetitionNumber0.h [ 169s] - /usr/include/osmocom/sabp/SABP_RepetitionNumber1.h [ 169s] - /usr/include/osmocom/sabp/SABP_Reset-Complete.h [ 169s] - /usr/include/osmocom/sabp/SABP_Reset-Failure.h [ 169s] - /usr/include/osmocom/sabp/SABP_Reset.h [ 169s] - /usr/include/osmocom/sabp/SABP_Restart.h [ 169s] - /usr/include/osmocom/sabp/SABP_SABP-PDU.h [ 169s] - /usr/include/osmocom/sabp/SABP_Serial-Number.h [ 169s] - /usr/include/osmocom/sabp/SABP_Service-Area-Identifier.h [ 169s] - /usr/include/osmocom/sabp/SABP_Service-Areas-List.h [ 169s] - /usr/include/osmocom/sabp/SABP_SuccessfulOutcome.h [ 169s] - /usr/include/osmocom/sabp/SABP_TriggeringMessage.h [ 169s] - /usr/include/osmocom/sabp/SABP_TypeOfError.h [ 169s] - /usr/include/osmocom/sabp/SABP_UnsuccessfulOutcome.h [ 169s] - /usr/include/osmocom/sabp/SABP_Warning-Type.h [ 169s] - /usr/include/osmocom/sabp/SABP_WarningSecurityInfo.h [ 169s] - /usr/include/osmocom/sabp/SABP_Write-Replace-Complete.h [ 169s] - /usr/include/osmocom/sabp/SABP_Write-Replace-Failure.h [ 169s] - /usr/include/osmocom/sabp/SABP_Write-Replace.h [ 169s] - /usr/include/osmocom/sabp/sabp_common.h [ 169s] - /usr/include/osmocom/sabp/sabp_ies_defs.h [ 169s] [ 169s] ### VM INTERACTION START ### [ 171s] [ 164.874850][ T430] sysrq: Power Off [ 171s] [ 164.907537][ T7] reboot: Power down [ 171s] ### VM INTERACTION END ### [ 172s] [ 172s] goat09 failed "build osmo-iuh.spec" at Tue Oct 26 11:30:57 UTC 2021. [ 172s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Oct 26 12:22:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 12:22:07 +0000 Subject: Change in osmo-iuh[master]: hnbgw_rua.c: Use proper type struct References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25954 ) Change subject: hnbgw_rua.c: Use proper type struct ...................................................................... hnbgw_rua.c: Use proper type struct Change-Id: I9e21b504e4fac072d8481d0a699bc58d1b94a12d --- M src/hnbgw_rua.c 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/54/25954/1 diff --git a/src/hnbgw_rua.c b/src/hnbgw_rua.c index 5224bf1..33ba12b 100644 --- a/src/hnbgw_rua.c +++ b/src/hnbgw_rua.c @@ -39,7 +39,7 @@ #include #include -static const char *cn_domain_indicator_to_str(CN_DomainIndicator_t cN_DomainIndicator) +static const char *cn_domain_indicator_to_str(RUA_CN_DomainIndicator_t cN_DomainIndicator) { switch (cN_DomainIndicator) { case RUA_CN_DomainIndicator_cs_domain: @@ -174,7 +174,7 @@ /* forward a RUA message to the SCCP User API to SCCP */ static int rua_to_scu(struct hnb_context *hnb, - CN_DomainIndicator_t cN_DomainIndicator, + RUA_CN_DomainIndicator_t cN_DomainIndicator, enum osmo_scu_prim_type type, uint32_t context_id, uint32_t cause, const uint8_t *data, unsigned int len) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I9e21b504e4fac072d8481d0a699bc58d1b94a12d Gerrit-Change-Number: 25954 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 12:22:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 12:22:08 +0000 Subject: Change in osmo-iuh[master]: hnbgw_cn.c: Use proper type struct References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25955 ) Change subject: hnbgw_cn.c: Use proper type struct ...................................................................... hnbgw_cn.c: Use proper type struct Change-Id: Icc8b90866a8edce9d10c87f4ced7137edf1c46f0 --- M src/hnbgw_cn.c 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/55/25955/1 diff --git a/src/hnbgw_cn.c b/src/hnbgw_cn.c index 0623561..7b3cb09 100644 --- a/src/hnbgw_cn.c +++ b/src/hnbgw_cn.c @@ -34,7 +34,6 @@ #include #include #include -#include /*********************************************************************** * Outbound RANAP RESET to CN @@ -52,7 +51,7 @@ }; LOGP(DRANAP, LOGL_NOTICE, "Tx RESET to %s %s\n", - domain == CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", + domain == RANAP_CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", osmo_sccp_inst_addr_name(gw->sccp.cnlink->sccp, remote_addr)); msg = ranap_new_msg_reset(domain, &cause); @@ -69,7 +68,7 @@ struct msgb *msg; LOGP(DRANAP, LOGL_NOTICE, "Tx RESET ACK to %s %s\n", - domain == CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", + domain == RANAP_CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", osmo_sccp_inst_addr_name(gw->sccp.cnlink->sccp, remote_addr)); msg = ranap_new_msg_reset_ack(domain, NULL); @@ -119,7 +118,7 @@ const struct osmo_scu_unitdata_param *unitdata, RANAP_InitiatingMessage_t *imsg) { - CN_DomainIndicator_t domain; + RANAP_CN_DomainIndicator_t domain; RANAP_ResetIEs_t ies; int rc; @@ -128,14 +127,14 @@ ranap_free_reseties(&ies); LOGP(DRANAP, LOGL_NOTICE, "Rx RESET from %s %s, returning ACK\n", - domain == CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", + domain == RANAP_CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", osmo_sccp_inst_addr_name(cnlink->sccp, &unitdata->calling_addr)); /* FIXME: actually reset connections, if any */ if (transmit_reset_ack(cnlink->gw, domain, &unitdata->calling_addr)) LOGP(DRANAP, LOGL_ERROR, "Error: cannot send RESET ACK to %s %s\n", - domain == CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", + domain == RANAP_CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", osmo_sccp_inst_addr_name(cnlink->sccp, &unitdata->calling_addr)); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Icc8b90866a8edce9d10c87f4ced7137edf1c46f0 Gerrit-Change-Number: 25955 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 12:32:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 12:32:50 +0000 Subject: Change in osmo-iuh[master]: hnb-test: Fix rc var may be used uninitialized References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25956 ) Change subject: hnb-test: Fix rc var may be used uninitialized ...................................................................... hnb-test: Fix rc var may be used uninitialized Warning observed compiling with gcc 11.1.0. Change-Id: I6ca53dd57572338f15971633441da895843a164d --- M src/tests/hnb-test.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/56/25956/1 diff --git a/src/tests/hnb-test.c b/src/tests/hnb-test.c index b612814..344bac5 100644 --- a/src/tests/hnb-test.c +++ b/src/tests/hnb-test.c @@ -496,6 +496,7 @@ rc = hnb_test_rx_ue_register_acc(hnb, &pdu->choice.successfulOutcome.value); break; default: + rc = -ENOSPC; break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6ca53dd57572338f15971633441da895843a164d Gerrit-Change-Number: 25956 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 12:43:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 12:43:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Add TC_process_rx_xudt, verifying reception of SCCP XUDT References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25957 ) Change subject: sccp: Add TC_process_rx_xudt, verifying reception of SCCP XUDT ...................................................................... sccp: Add TC_process_rx_xudt, verifying reception of SCCP XUDT Test if a XUDT SCCP message is processed by libosmo-sigtran. We assume any XUDT is received (and echoed back) just like normal UDT. Related: OS#5281, SYS#5674 Change-Id: Idbf6db7a684e51858129618b2fcffcbe55b1b70f --- M library/SCCP_Templates.ttcn M sccp/SCCP_Tests_RAW.ttcn 2 files changed, 73 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/25957/1 diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn index 5167e4b..74f1a20 100644 --- a/library/SCCP_Templates.ttcn +++ b/library/SCCP_Templates.ttcn @@ -171,6 +171,53 @@ } } +template (value) PDU_SCCP ts_SCCP_XUDT(SCCP_PAR_Address calling, SCCP_PAR_Address called, + template (value) octetstring data, + template (value) BIT4 msg_hdl := '0000'B, + template (value) integer hop_ctr := 16) := { + extudata := { + messageType := xudt, + protClass := {'0000'B, msg_hdl}, + hopCounter := hop_ctr, + pointer1 := 0, /* overwritten */ + pointer2 := 0, /* overwritten */ + pointer3 := 0, /* overwritten */ + pointer4 := 0, /* overwritten */ + calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), + callingPAddress := ConvertASPAddressToEncodedAddress_itu(calling), + data := { + paramLength := 0, + data := data + }, + optionalPart := omit, + eop := omit + } +} + +template PDU_SCCP tr_SCCP_XUDT(template (present) SCCP_PAR_Address calling, template (present) SCCP_PAR_Address called, + template octetstring data := ?, + template BIT4 msg_hdl := '0000'B, + template integer hop_ctr := ?) := { + extudata := { + messageType := xudt, + protClass := {'0000'B, msg_hdl}, + hopCounter := hop_ctr, + pointer1 := ?, + pointer2 := ?, + pointer3 := ?, + pointer4 := ?, + calledPAddress := tr_Addr(called), + callingPAddress := tr_Addr(calling), + data := { + paramLength := ?, + data := data + }, + optionalPart := { segmentation:= omit, importance := * } ifpresent, + eop := { paramName:= con_SCCP_eop } ifpresent + } +} + + template PDU_SCCP tr_SCCP_IT(template (present) OCT3 source_lref := ?, template (present) OCT3 dest_lref := ?) := { inacttest := { diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 1ac82a2..5013ddf 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -310,6 +310,31 @@ } } +private function f_tx_xudt_exp(SCCP_PAR_Address calling, SCCP_PAR_Address called, octetstring data) runs on SCCP_Test_RAW_CT { + var template PDU_SCCP exp_rx; + f_send_sccp(ts_SCCP_XUDT(calling, called, data)); + exp_rx := (tr_SCCP_UDT(called, calling, data), tr_SCCP_XUDT(called, calling, data)); + f_exp_sccp(exp_rx); +} + +/* Test if the IUT SCCP code processes an XUDT [treat it like UDT] and answers back. */ +testcase TC_process_rx_xudt() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + var octetstring data := f_rnd_octstring(f_rnd_int(100)); + + f_init_raw(mp_sccp_cfg[0]); + f_sleep(1.0); + + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, mp_sccp_cfg[0].peer_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + + /* Make sure an XUDT is echoed back just like an UDT */ + f_tx_xudt_exp(calling, called, data); + setverdict(pass); +} + function f_scmg_xceive(SCCP_PAR_Address calling, SCCP_PAR_Address called, template (value) PDU_SCMG_message tx, template (omit) PDU_SCMG_message rx_exp, @@ -429,6 +454,7 @@ execute( TC_udt_without_cr_cc() ); execute( TC_tiar_timeout() ); execute( TC_it_avoids_tiar() ); + execute( TC_process_rx_xudt() ); execute( TC_scmg_sst_ssn1() ); execute( TC_scmg_sst_ssn_valid() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idbf6db7a684e51858129618b2fcffcbe55b1b70f Gerrit-Change-Number: 25957 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 12:47:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 12:47:37 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25958 ) Change subject: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN ...................................................................... src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 --- M src/hnbap/Makefile.am M src/ranap/Makefile.am M src/rua/Makefile.am M src/sabp/Makefile.am 4 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/58/25958/1 diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am index c4a8c29..9532103 100644 --- a/src/hnbap/Makefile.am +++ b/src/hnbap/Makefile.am @@ -248,3 +248,5 @@ -rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.* # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/hnbap $(ASN_MODULE_INC) +# Finally copy *.c from tmpdir to srcdir: + cp *.c $(top_srcdir)/src/hnbap diff --git a/src/ranap/Makefile.am b/src/ranap/Makefile.am index 0bb36a0..4c9d208 100644 --- a/src/ranap/Makefile.am +++ b/src/ranap/Makefile.am @@ -1188,3 +1188,5 @@ sed -i 's/Member/MemberN/' RANAP_RABDataVolumeReport.[ch] # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/ranap $(ASN_MODULE_INC) +# Finally copy *.c from tmpdir to srcdir: + cp *.c $(top_srcdir)/src/ranap/ diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am index 7e1d18e..8951979 100644 --- a/src/rua/Makefile.am +++ b/src/rua/Makefile.am @@ -86,3 +86,5 @@ @rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.* # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/rua $(ASN_MODULE_INC) +# Finally copy *.c from tmpdir to srcdir: + cp *.c $(top_srcdir)/src/rua/ diff --git a/src/sabp/Makefile.am b/src/sabp/Makefile.am index a30674c..99875f8 100644 --- a/src/sabp/Makefile.am +++ b/src/sabp/Makefile.am @@ -145,4 +145,5 @@ sed -i '/#include "SABP_Serial-Number.h"/a #include ' SABP_Old-Serial-Number.h SABP_New-Serial-Number.h # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/sabp $(ASN_MODULE_INC) - +# Finally copy *.c from tmpdir to srcdir: + cp *.c $(top_srcdir)/src/sabp/ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 Gerrit-Change-Number: 25958 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 12:47:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 12:47:37 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25959 ) Change subject: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code ...................................................................... src/*/Makefile.am: Use asn1c -R to avoid generating runtime code Change-Id: I5666a6dc1ec9e56fe133642fb0054e913265c081 --- M src/hnbap/Makefile.am M src/ranap/Makefile.am M src/rua/Makefile.am M src/sabp/Makefile.am 4 files changed, 5 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/59/25959/1 diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am index 9532103..a748db6 100644 --- a/src/hnbap/Makefile.am +++ b/src/hnbap/Makefile.am @@ -243,9 +243,7 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - asn1c -gen-PER -fnative-types $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn -# remove the local copy of the runtime code - -rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.* + asn1c -R -gen-PER -fnative-types $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/hnbap $(ASN_MODULE_INC) # Finally copy *.c from tmpdir to srcdir: diff --git a/src/ranap/Makefile.am b/src/ranap/Makefile.am index 4c9d208..da1f1f6 100644 --- a/src/ranap/Makefile.am +++ b/src/ranap/Makefile.am @@ -1169,10 +1169,8 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - ASN1C_PREFIX="RANAP_" asn1c -gen-PER $(top_srcdir)/asn1/ranap/RANAP-CommonDataTypes.asn $(top_srcdir)/asn1/ranap/RANAP-Constants.asn $(top_srcdir)/asn1/ranap/RANAP-IEs.asn $(top_srcdir)/asn1/ranap/RANAP-PDU.asn - @rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* NULL.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.* -# some fixups in erroneous code that asn1c generates - sed -i '6i#include ' RANAP_ChosenEncryptionAlgorithm.h RANAP_ChosenIntegrityProtectionAlgorithm.h RANAP_IMSI.h RANAP_PLMNidentity.h RANAP_RAB-ReleaseFailedList.c RANAP_RAB-ReleaseList.c RANAP_RAB-SetupOrModifyList.c RANAP_ResetResourceList.c RANAP_ResetResourceAckList.c + ASN1C_PREFIX="RANAP_" asn1c -R -gen-PER $(top_srcdir)/asn1/ranap/RANAP-CommonDataTypes.asn $(top_srcdir)/asn1/ranap/RANAP-Constants.asn $(top_srcdir)/asn1/ranap/RANAP-IEs.asn $(top_srcdir)/asn1/ranap/RANAP-PDU.asn + sed -i '7i#include ' RANAP_ChosenEncryptionAlgorithm.h RANAP_ChosenIntegrityProtectionAlgorithm.h RANAP_IMSI.h RANAP_PLMNidentity.h RANAP_RAB-ReleaseFailedList.c RANAP_RAB-ReleaseList.c RANAP_RAB-SetupOrModifyList.c RANAP_ResetResourceList.c RANAP_ResetResourceAckList.c sed -i 's/Member/MemberA/' RANAP_LA-LIST.[ch] sed -i 's/Member/MemberB/' RANAP_RABParametersList.[ch] sed -i 's/Member/MemberC/' RANAP_AuthorisedPLMNs.[ch] diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am index 8951979..59c6ba8 100644 --- a/src/rua/Makefile.am +++ b/src/rua/Makefile.am @@ -81,9 +81,7 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - ASN1C_PREFIX="RUA_" asn1c -gen-PER $(top_srcdir)/asn1/rua/RUA-CommonDataTypes.asn $(top_srcdir)/asn1/rua/RUA-Constants.asn $(top_srcdir)/asn1/rua/RUA-IEs.asn $(top_srcdir)/asn1/rua/RUA-PDU.asn -# remove the local copy of the runtime code - @rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.* + ASN1C_PREFIX="RUA_" asn1c -R -gen-PER $(top_srcdir)/asn1/rua/RUA-CommonDataTypes.asn $(top_srcdir)/asn1/rua/RUA-Constants.asn $(top_srcdir)/asn1/rua/RUA-IEs.asn $(top_srcdir)/asn1/rua/RUA-PDU.asn # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/rua $(ASN_MODULE_INC) # Finally copy *.c from tmpdir to srcdir: diff --git a/src/sabp/Makefile.am b/src/sabp/Makefile.am index 99875f8..edda32f 100644 --- a/src/sabp/Makefile.am +++ b/src/sabp/Makefile.am @@ -135,9 +135,7 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - ASN1C_PREFIX="SABP_" asn1c -gen-PER $(top_srcdir)/asn1/sabp/SABP-CommonDataTypes.asn $(top_srcdir)/asn1/sabp/SABP-Constants.asn $(top_srcdir)/asn1/sabp/SABP-IEs.asn $(top_srcdir)/asn1/sabp/SABP-PDU.asn -# remove the local copy of the runtime code - @rm ANY.* INTEGER.* NativeEnumerated.* NativeInteger.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.* + ASN1C_PREFIX="SABP_" asn1c -R -gen-PER $(top_srcdir)/asn1/sabp/SABP-CommonDataTypes.asn $(top_srcdir)/asn1/sabp/SABP-Constants.asn $(top_srcdir)/asn1/sabp/SABP-IEs.asn $(top_srcdir)/asn1/sabp/SABP-PDU.asn # change include style to `#include ' sed -i 's/Member/MemberA/' SABP_MessageStructure.[ch] sed -i 's/Member/MemberB/' SABP_Criticality-Diagnostics.[ch] -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I5666a6dc1ec9e56fe133642fb0054e913265c081 Gerrit-Change-Number: 25959 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 12:47:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 12:47:37 +0000 Subject: Change in osmo-iuh[master]: Update generated .c/.h after using asn1c -R param References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25960 ) Change subject: Update generated .c/.h after using asn1c -R param ...................................................................... Update generated .c/.h after using asn1c -R param Change-Id: Ib7a03973d43828f47ff59b561d9ddce43186f8af --- M include/osmocom/hnbap/Access-stratum-release-indicator.h M include/osmocom/hnbap/AccessResult.h M include/osmocom/hnbap/AdditionalNeighbourInfoList.h M include/osmocom/hnbap/AltitudeAndDirection.h M include/osmocom/hnbap/BackoffTimer.h M include/osmocom/hnbap/BindingID.h M include/osmocom/hnbap/CELL-FACHMobilitySupport.h M include/osmocom/hnbap/CGI.h M include/osmocom/hnbap/CI.h M include/osmocom/hnbap/CN-DomainIndicator.h M include/osmocom/hnbap/CSG-Capability.h M include/osmocom/hnbap/CSG-ID.h M include/osmocom/hnbap/CSGMembershipStatus.h M include/osmocom/hnbap/CSGMembershipUpdate.h M include/osmocom/hnbap/Cause.h M include/osmocom/hnbap/CauseMisc.h M include/osmocom/hnbap/CauseProtocol.h M include/osmocom/hnbap/CauseRadioNetwork.h M include/osmocom/hnbap/CauseTransport.h M include/osmocom/hnbap/CellIdentity.h M include/osmocom/hnbap/ConfigurationInformation.h M include/osmocom/hnbap/Context-ID.h M include/osmocom/hnbap/Criticality.h M include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h M include/osmocom/hnbap/CriticalityDiagnostics.h M include/osmocom/hnbap/ESN.h M include/osmocom/hnbap/ErrorIndication.h M include/osmocom/hnbap/GTP-TEI.h M include/osmocom/hnbap/GeographicalCoordinates.h M include/osmocom/hnbap/GeographicalLocation.h M include/osmocom/hnbap/HNB-Cell-Access-Mode.h M include/osmocom/hnbap/HNB-Cell-Identifier.h M include/osmocom/hnbap/HNB-GWResponse.h M include/osmocom/hnbap/HNB-Identity-Info.h M include/osmocom/hnbap/HNB-Identity.h M include/osmocom/hnbap/HNB-Location-Information.h M include/osmocom/hnbap/HNB-RNL-Identity.h M include/osmocom/hnbap/HNBAP-PDU.h M include/osmocom/hnbap/HNBCapacity.h M include/osmocom/hnbap/HNBConfigInfo.h M include/osmocom/hnbap/HNBConfigTransferRequest.h M include/osmocom/hnbap/HNBConfigTransferResponse.h M include/osmocom/hnbap/HNBConfigurationInformationMissing.h M include/osmocom/hnbap/HNBConfigurationInformationProvided.h M include/osmocom/hnbap/HNBDe-Register.h M include/osmocom/hnbap/HNBRegisterAccept.h M include/osmocom/hnbap/HNBRegisterReject.h M include/osmocom/hnbap/HNBRegisterRequest.h M include/osmocom/hnbap/IE-Extensions.h M include/osmocom/hnbap/IE.h M include/osmocom/hnbap/IMEI.h M include/osmocom/hnbap/IMSI.h M include/osmocom/hnbap/IMSIDS41.h M include/osmocom/hnbap/IMSIESN.h M include/osmocom/hnbap/IP-Address.h M include/osmocom/hnbap/InitiatingMessage.h M include/osmocom/hnbap/Ipv4Address.h M include/osmocom/hnbap/Ipv6Address.h M include/osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h M include/osmocom/hnbap/LAC.h M include/osmocom/hnbap/LAI.h M include/osmocom/hnbap/MacroCellID.h M include/osmocom/hnbap/MacroCoverageInformation.h M include/osmocom/hnbap/MuxPortNumber.h M include/osmocom/hnbap/NeighbourCellIdentityList.h M include/osmocom/hnbap/NeighbourIdentity.h M include/osmocom/hnbap/NeighbourInfoList.h M include/osmocom/hnbap/NeighbourInfoRequestItem.h M include/osmocom/hnbap/NeighbourInfoRequestList.h M include/osmocom/hnbap/PLMNidentity.h M include/osmocom/hnbap/PSC.h M include/osmocom/hnbap/PTMSI.h M include/osmocom/hnbap/PTMSIRAI.h M include/osmocom/hnbap/Presence.h M include/osmocom/hnbap/PrivateIE-ID.h M include/osmocom/hnbap/PrivateMessage.h M include/osmocom/hnbap/ProcedureCode.h M include/osmocom/hnbap/ProtocolIE-ID.h M include/osmocom/hnbap/RAB-ID.h M include/osmocom/hnbap/RABList.h M include/osmocom/hnbap/RABListItem.h M include/osmocom/hnbap/RAC.h M include/osmocom/hnbap/RAI.h M include/osmocom/hnbap/RNC-ID.h M include/osmocom/hnbap/Registration-Cause.h M include/osmocom/hnbap/RelocationComplete.h M include/osmocom/hnbap/S-RNTIPrefix.h M include/osmocom/hnbap/SAC.h M include/osmocom/hnbap/SuccessfulOutcome.h M include/osmocom/hnbap/TMSIDS41.h M include/osmocom/hnbap/TMSILAI.h M include/osmocom/hnbap/TNLUpdateFailure.h M include/osmocom/hnbap/TNLUpdateRequest.h M include/osmocom/hnbap/TNLUpdateResponse.h M include/osmocom/hnbap/TransportInfo.h M include/osmocom/hnbap/TransportLayerAddress.h M include/osmocom/hnbap/TriggeringMessage.h M include/osmocom/hnbap/Tunnel-Information.h M include/osmocom/hnbap/TypeOfError.h M include/osmocom/hnbap/U-RNTI.h M include/osmocom/hnbap/U-RNTIQueryRequest.h M include/osmocom/hnbap/U-RNTIQueryResponse.h M include/osmocom/hnbap/UDP-Port-Number.h M include/osmocom/hnbap/UE-Capabilities.h M include/osmocom/hnbap/UE-Identity.h M include/osmocom/hnbap/UEDe-Register.h M include/osmocom/hnbap/UERegisterAccept.h M include/osmocom/hnbap/UERegisterReject.h M include/osmocom/hnbap/UERegisterRequest.h M include/osmocom/hnbap/URAIdentity.h M include/osmocom/hnbap/URAIdentityList.h M include/osmocom/hnbap/UTRANCellID.h M include/osmocom/hnbap/UnknownU-RNTIIndication.h M include/osmocom/hnbap/UnsuccessfulOutcome.h M include/osmocom/hnbap/Update-cause.h M include/osmocom/ranap/RANAP_APN.h M include/osmocom/ranap/RANAP_AccuracyFulfilmentIndicator.h M include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameters.h M include/osmocom/ranap/RANAP_AlternativeRABConfigurationRequest.h M include/osmocom/ranap/RANAP_AreaIdentity.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameters.h M include/osmocom/ranap/RANAP_AuthorisedPLMNs.h M include/osmocom/ranap/RANAP_AuthorisedSNAs.h M include/osmocom/ranap/RANAP_BindingID.h M include/osmocom/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.h M include/osmocom/ranap/RANAP_CGI.h M include/osmocom/ranap/RANAP_CI.h M include/osmocom/ranap/RANAP_CN-DeactivateTrace.h M include/osmocom/ranap/RANAP_CN-DomainIndicator.h M include/osmocom/ranap/RANAP_CN-ID.h M include/osmocom/ranap/RANAP_CN-InvokeTrace.h M include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h M include/osmocom/ranap/RANAP_CSFB-Information.h M include/osmocom/ranap/RANAP_CSG-Id-List.h M include/osmocom/ranap/RANAP_CSG-Id.h M include/osmocom/ranap/RANAP_CSG-Membership-Status.h M include/osmocom/ranap/RANAP_Cause.h M include/osmocom/ranap/RANAP_CauseMisc.h M include/osmocom/ranap/RANAP_CauseNAS.h M include/osmocom/ranap/RANAP_CauseNon-Standard.h M include/osmocom/ranap/RANAP_CauseProtocol.h M include/osmocom/ranap/RANAP_CauseRadioNetwork.h M include/osmocom/ranap/RANAP_CauseRadioNetworkExtension.h M include/osmocom/ranap/RANAP_CauseTransmissionNetwork.h M include/osmocom/ranap/RANAP_Cell-Access-Mode.h M include/osmocom/ranap/RANAP_Cell-Capacity-Class-Value.h M include/osmocom/ranap/RANAP_Cell-Id.h M include/osmocom/ranap/RANAP_CellBased.h M include/osmocom/ranap/RANAP_CellIdList.h M include/osmocom/ranap/RANAP_CellLoadInformation.h M include/osmocom/ranap/RANAP_CellLoadInformationGroup.h M include/osmocom/ranap/RANAP_CellType.h M include/osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h M include/osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h M include/osmocom/ranap/RANAP_ClassmarkInformation2.h M include/osmocom/ranap/RANAP_ClassmarkInformation3.h M include/osmocom/ranap/RANAP_ClientType.h M include/osmocom/ranap/RANAP_CommonID.h M include/osmocom/ranap/RANAP_Correlation-ID.h M include/osmocom/ranap/RANAP_Criticality.h M include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h M include/osmocom/ranap/RANAP_CriticalityDiagnostics.h M include/osmocom/ranap/RANAP_D-RNTI.h M include/osmocom/ranap/RANAP_DCH-ID.h M include/osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_DL-N-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_DRX-CycleLengthCoefficient.h M include/osmocom/ranap/RANAP_DSCH-ID.h M include/osmocom/ranap/RANAP_DataPDUType.h M include/osmocom/ranap/RANAP_DataVolumeList.h M include/osmocom/ranap/RANAP_DataVolumeReference.h M include/osmocom/ranap/RANAP_DataVolumeReport.h M include/osmocom/ranap/RANAP_DataVolumeReportList.h M include/osmocom/ranap/RANAP_DataVolumeReportRequest.h M include/osmocom/ranap/RANAP_DataVolumeReportingIndication.h M include/osmocom/ranap/RANAP_DeliveryOfErroneousSDU.h M include/osmocom/ranap/RANAP_DeliveryOrder.h M include/osmocom/ranap/RANAP_DeltaRAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_DirectInformationTransfer.h M include/osmocom/ranap/RANAP_DirectReportingIndicator.h M include/osmocom/ranap/RANAP_DirectTransfer-IE-ContainerList.h M include/osmocom/ranap/RANAP_DirectTransfer.h M include/osmocom/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h M include/osmocom/ranap/RANAP_E-DCH-MAC-d-Flow-ID.h M include/osmocom/ranap/RANAP_E-UTRAN-Service-Handover.h M include/osmocom/ranap/RANAP_EARFCN-Extended.h M include/osmocom/ranap/RANAP_ENB-ID.h M include/osmocom/ranap/RANAP_EUTRANFrequencies.h M include/osmocom/ranap/RANAP_EncryptionAlgorithm.h M include/osmocom/ranap/RANAP_EncryptionInformation.h M include/osmocom/ranap/RANAP_EncryptionKey.h M include/osmocom/ranap/RANAP_End-Of-CSFB.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteConfirm.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteFailure.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteRequest.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteResponse.h M include/osmocom/ranap/RANAP_EquipmentsToBeTraced.h M include/osmocom/ranap/RANAP_ErrorIndication.h M include/osmocom/ranap/RANAP_Event.h M include/osmocom/ranap/RANAP_Event1F-Parameters.h M include/osmocom/ranap/RANAP_Event1I-Parameters.h M include/osmocom/ranap/RANAP_ExtendedGuaranteedBitrate.h M include/osmocom/ranap/RANAP_ExtendedMaxBitrate.h M include/osmocom/ranap/RANAP_ExtendedRNC-ID.h M include/osmocom/ranap/RANAP_ForwardSRNS-Context.h M include/osmocom/ranap/RANAP_ForwardingIndication.h M include/osmocom/ranap/RANAP_FrameSequenceNumber.h M include/osmocom/ranap/RANAP_FrequenceLayerConvergenceFlag.h M include/osmocom/ranap/RANAP_GA-AltitudeAndDirection.h M include/osmocom/ranap/RANAP_GA-EllipsoidArc.h M include/osmocom/ranap/RANAP_GA-Point.h M include/osmocom/ranap/RANAP_GA-PointWithAltitude.h M include/osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h M include/osmocom/ranap/RANAP_GA-PointWithUnCertainty.h M include/osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h M include/osmocom/ranap/RANAP_GA-Polygon.h M include/osmocom/ranap/RANAP_GA-UncertaintyEllipse.h M include/osmocom/ranap/RANAP_GANSS-PositioningDataSet.h M include/osmocom/ranap/RANAP_GANSS-PositioningMethodAndUsage.h M include/osmocom/ranap/RANAP_GERAN-BSC-Container.h M include/osmocom/ranap/RANAP_GERAN-Cell-ID.h M include/osmocom/ranap/RANAP_GERAN-Classmark.h M include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h M include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h M include/osmocom/ranap/RANAP_GTP-TEI.h M include/osmocom/ranap/RANAP_GeographicalArea.h M include/osmocom/ranap/RANAP_GeographicalCoordinates.h M include/osmocom/ranap/RANAP_GlobalCN-ID.h M include/osmocom/ranap/RANAP_GlobalRNC-ID.h M include/osmocom/ranap/RANAP_GuaranteedBitrate.h M include/osmocom/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.h M include/osmocom/ranap/RANAP_HigherBitratesThan16MbpsFlag.h M include/osmocom/ranap/RANAP_HorizontalSpeedAndBearing.h M include/osmocom/ranap/RANAP_HorizontalVelocity.h M include/osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h M include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h M include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h M include/osmocom/ranap/RANAP_IE-Extensions.h M include/osmocom/ranap/RANAP_IE.h M include/osmocom/ranap/RANAP_IMEI.h M include/osmocom/ranap/RANAP_IMEIGroup.h M include/osmocom/ranap/RANAP_IMEIList.h M include/osmocom/ranap/RANAP_IMEISV.h M include/osmocom/ranap/RANAP_IMEISVGroup.h M include/osmocom/ranap/RANAP_IMEISVList.h M include/osmocom/ranap/RANAP_IMSI.h M include/osmocom/ranap/RANAP_IPMulticastAddress.h M include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h M include/osmocom/ranap/RANAP_IRATmeasurementParameters.h M include/osmocom/ranap/RANAP_ImmediateMDT.h M include/osmocom/ranap/RANAP_IncludeVelocity.h M include/osmocom/ranap/RANAP_InformationExchangeID.h M include/osmocom/ranap/RANAP_InformationExchangeType.h M include/osmocom/ranap/RANAP_InformationRequestType.h M include/osmocom/ranap/RANAP_InformationRequested.h M include/osmocom/ranap/RANAP_InformationTransferConfirmation.h M include/osmocom/ranap/RANAP_InformationTransferFailure.h M include/osmocom/ranap/RANAP_InformationTransferID.h M include/osmocom/ranap/RANAP_InformationTransferIndication.h M include/osmocom/ranap/RANAP_InformationTransferType.h M include/osmocom/ranap/RANAP_InitialUE-Message.h M include/osmocom/ranap/RANAP_InitiatingMessage.h M include/osmocom/ranap/RANAP_IntegrityProtectionAlgorithm.h M include/osmocom/ranap/RANAP_IntegrityProtectionInformation.h M include/osmocom/ranap/RANAP_IntegrityProtectionKey.h M include/osmocom/ranap/RANAP_InterSystemInformation-TransparentContainer.h M include/osmocom/ranap/RANAP_InterSystemInformationTransferType.h M include/osmocom/ranap/RANAP_InterfacesToTraceItem.h M include/osmocom/ranap/RANAP_Iu-ReleaseCommand.h M include/osmocom/ranap/RANAP_Iu-ReleaseComplete.h M include/osmocom/ranap/RANAP_Iu-ReleaseRequest.h M include/osmocom/ranap/RANAP_IuSigConId-IE-ContainerList.h M include/osmocom/ranap/RANAP_IuSignallingConnectionIdentifier.h M include/osmocom/ranap/RANAP_IuTransportAssociation.h M include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h M include/osmocom/ranap/RANAP_KeyStatus.h M include/osmocom/ranap/RANAP_L3-Information.h M include/osmocom/ranap/RANAP_LA-LIST.h M include/osmocom/ranap/RANAP_LABased.h M include/osmocom/ranap/RANAP_LAC.h M include/osmocom/ranap/RANAP_LAI-List.h M include/osmocom/ranap/RANAP_LAI.h M include/osmocom/ranap/RANAP_LAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_LHN-ID.h M include/osmocom/ranap/RANAP_LastKnownServiceArea.h M include/osmocom/ranap/RANAP_LastVisitedUTRANCell-Item.h M include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h M include/osmocom/ranap/RANAP_Links-to-log.h M include/osmocom/ranap/RANAP_ListOF-SNAs.h M include/osmocom/ranap/RANAP_ListOfInterfacesToTrace.h M include/osmocom/ranap/RANAP_LoadValue.h M include/osmocom/ranap/RANAP_LocationRelatedDataFailure.h M include/osmocom/ranap/RANAP_LocationRelatedDataRequest.h M include/osmocom/ranap/RANAP_LocationRelatedDataRequestType.h M include/osmocom/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.h M include/osmocom/ranap/RANAP_LocationRelatedDataResponse.h M include/osmocom/ranap/RANAP_LocationReport.h M include/osmocom/ranap/RANAP_LocationReportingControl.h M include/osmocom/ranap/RANAP_LocationReportingTransferInformation.h M include/osmocom/ranap/RANAP_LoggedMDT.h M include/osmocom/ranap/RANAP_LoggingDuration.h M include/osmocom/ranap/RANAP_LoggingInterval.h M include/osmocom/ranap/RANAP_M1Report.h M include/osmocom/ranap/RANAP_M2Report.h M include/osmocom/ranap/RANAP_M4-Collection-Parameters.h M include/osmocom/ranap/RANAP_M4-Period.h M include/osmocom/ranap/RANAP_M4-Threshold.h M include/osmocom/ranap/RANAP_M4Report.h M include/osmocom/ranap/RANAP_M5-Period.h M include/osmocom/ranap/RANAP_M5Report.h M include/osmocom/ranap/RANAP_M6-Period.h M include/osmocom/ranap/RANAP_M6Report.h M include/osmocom/ranap/RANAP_M7-Period.h M include/osmocom/ranap/RANAP_M7Report.h M include/osmocom/ranap/RANAP_MBMS-PTP-RAB-ID.h M include/osmocom/ranap/RANAP_MBMSBearerServiceType.h M include/osmocom/ranap/RANAP_MBMSCNDe-Registration.h M include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationRequest.h M include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationResponse.h M include/osmocom/ranap/RANAP_MBMSCountingInformation.h M include/osmocom/ranap/RANAP_MBMSHCIndicator.h M include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h M include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h M include/osmocom/ranap/RANAP_MBMSLinkingInformation.h M include/osmocom/ranap/RANAP_MBMSRABEstablishmentIndication.h M include/osmocom/ranap/RANAP_MBMSRABRelease.h M include/osmocom/ranap/RANAP_MBMSRABReleaseFailure.h M include/osmocom/ranap/RANAP_MBMSRABReleaseRequest.h M include/osmocom/ranap/RANAP_MBMSRegistrationFailure.h M include/osmocom/ranap/RANAP_MBMSRegistrationRequest.h M include/osmocom/ranap/RANAP_MBMSRegistrationRequestType.h M include/osmocom/ranap/RANAP_MBMSRegistrationResponse.h M include/osmocom/ranap/RANAP_MBMSServiceArea.h M include/osmocom/ranap/RANAP_MBMSSessionDuration.h M include/osmocom/ranap/RANAP_MBMSSessionIdentity.h M include/osmocom/ranap/RANAP_MBMSSessionRepetitionNumber.h M include/osmocom/ranap/RANAP_MBMSSessionStart.h M include/osmocom/ranap/RANAP_MBMSSessionStartFailure.h M include/osmocom/ranap/RANAP_MBMSSessionStartResponse.h M include/osmocom/ranap/RANAP_MBMSSessionStop.h M include/osmocom/ranap/RANAP_MBMSSessionStopResponse.h M include/osmocom/ranap/RANAP_MBMSSessionUpdate.h M include/osmocom/ranap/RANAP_MBMSSessionUpdateFailure.h M include/osmocom/ranap/RANAP_MBMSSessionUpdateResponse.h M include/osmocom/ranap/RANAP_MBMSSynchronisationInformation.h M include/osmocom/ranap/RANAP_MBMSUELinkingRequest.h M include/osmocom/ranap/RANAP_MBMSUELinkingResponse.h M include/osmocom/ranap/RANAP_MDT-Activation.h M include/osmocom/ranap/RANAP_MDT-Configuration.h M include/osmocom/ranap/RANAP_MDT-PLMN-List.h M include/osmocom/ranap/RANAP_MDT-Report-Parameters.h M include/osmocom/ranap/RANAP_MDTAreaScope.h M include/osmocom/ranap/RANAP_MDTMode.h M include/osmocom/ranap/RANAP_MSISDN.h M include/osmocom/ranap/RANAP_Management-Based-MDT-Allowed.h M include/osmocom/ranap/RANAP_MaxBitrate.h M include/osmocom/ranap/RANAP_MaxSDU-Size.h M include/osmocom/ranap/RANAP_MeasBand.h M include/osmocom/ranap/RANAP_MeasurementQuantity.h M include/osmocom/ranap/RANAP_MeasurementsToActivate.h M include/osmocom/ranap/RANAP_MessageStructure.h M include/osmocom/ranap/RANAP_NAS-PDU.h M include/osmocom/ranap/RANAP_NAS-SequenceNumber.h M include/osmocom/ranap/RANAP_NAS-SynchronisationIndicator.h M include/osmocom/ranap/RANAP_NRTLoadInformationValue.h M include/osmocom/ranap/RANAP_NewBSS-To-OldBSS-Information.h M include/osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_NonSearchingIndication.h M include/osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_NumberOfIuInstances.h M include/osmocom/ranap/RANAP_NumberOfSteps.h M include/osmocom/ranap/RANAP_OMC-ID.h M include/osmocom/ranap/RANAP_Offload-RAB-Parameters-APN.h M include/osmocom/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.h M include/osmocom/ranap/RANAP_Offload-RAB-Parameters.h M include/osmocom/ranap/RANAP_OldBSS-ToNewBSS-Information.h M include/osmocom/ranap/RANAP_Out-Of-UTRAN.h M include/osmocom/ranap/RANAP_Outcome.h M include/osmocom/ranap/RANAP_Overload.h M include/osmocom/ranap/RANAP_P-TMSI.h M include/osmocom/ranap/RANAP_PDP-Type-extension.h M include/osmocom/ranap/RANAP_PDP-Type.h M include/osmocom/ranap/RANAP_PDP-TypeInformation-extension.h M include/osmocom/ranap/RANAP_PDP-TypeInformation.h M include/osmocom/ranap/RANAP_PDUType14FrameSequenceNumber.h M include/osmocom/ranap/RANAP_PLMNidentity.h M include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h M include/osmocom/ranap/RANAP_Paging.h M include/osmocom/ranap/RANAP_PagingAreaID.h M include/osmocom/ranap/RANAP_PagingCause.h M include/osmocom/ranap/RANAP_PeriodicLocationInfo.h M include/osmocom/ranap/RANAP_PeriodicReportingIndicator.h M include/osmocom/ranap/RANAP_PermanentNAS-UE-ID.h M include/osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h M include/osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h M include/osmocom/ranap/RANAP_Port-Number.h M include/osmocom/ranap/RANAP_PositionData.h M include/osmocom/ranap/RANAP_PositionDataSpecificToGERANIuMode.h M include/osmocom/ranap/RANAP_PositioningDataDiscriminator.h M include/osmocom/ranap/RANAP_PositioningDataSet.h M include/osmocom/ranap/RANAP_PositioningMethodAndUsage.h M include/osmocom/ranap/RANAP_PositioningPriority.h M include/osmocom/ranap/RANAP_Pre-emptionCapability.h M include/osmocom/ranap/RANAP_Pre-emptionVulnerability.h M include/osmocom/ranap/RANAP_Presence.h M include/osmocom/ranap/RANAP_Priority-Class-Indicator.h M include/osmocom/ranap/RANAP_PriorityLevel.h M include/osmocom/ranap/RANAP_PrivateIE-ID.h M include/osmocom/ranap/RANAP_PrivateMessage.h M include/osmocom/ranap/RANAP_ProcedureCode.h M include/osmocom/ranap/RANAP_ProtocolError-IE-ContainerList.h M include/osmocom/ranap/RANAP_ProtocolExtensionContainer.h M include/osmocom/ranap/RANAP_ProtocolExtensionField.h M include/osmocom/ranap/RANAP_ProtocolExtensionID.h M include/osmocom/ranap/RANAP_ProtocolIE-Container.h M include/osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h M include/osmocom/ranap/RANAP_ProtocolIE-FieldPair.h M include/osmocom/ranap/RANAP_ProtocolIE-ID.h M include/osmocom/ranap/RANAP_ProvidedData.h M include/osmocom/ranap/RANAP_QueuingAllowed.h M include/osmocom/ranap/RANAP_RAB-AssignmentRequest.h M include/osmocom/ranap/RANAP_RAB-AssignmentResponse.h M include/osmocom/ranap/RANAP_RAB-AsymmetryIndicator.h M include/osmocom/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h M include/osmocom/ranap/RANAP_RAB-ContextItem.h M include/osmocom/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h M include/osmocom/ranap/RANAP_RAB-ContextList.h M include/osmocom/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h M include/osmocom/ranap/RANAP_RAB-DataForwardingItem.h M include/osmocom/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h M include/osmocom/ranap/RANAP_RAB-DataForwardingList.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportList.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestItem.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestList.h M include/osmocom/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-FailedItem.h M include/osmocom/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-FailedList.h M include/osmocom/ranap/RANAP_RAB-ID.h M include/osmocom/ranap/RANAP_RAB-IE-ContainerList.h M include/osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h M include/osmocom/ranap/RANAP_RAB-ModifyItem.h M include/osmocom/ranap/RANAP_RAB-ModifyList.h M include/osmocom/ranap/RANAP_RAB-ModifyRequest.h M include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameters.h M include/osmocom/ranap/RANAP_RAB-QueuedItem.h M include/osmocom/ranap/RANAP_RAB-QueuedList.h M include/osmocom/ranap/RANAP_RAB-ReleaseFailedList.h M include/osmocom/ranap/RANAP_RAB-ReleaseItem.h M include/osmocom/ranap/RANAP_RAB-ReleaseList.h M include/osmocom/ranap/RANAP_RAB-ReleaseRequest.h M include/osmocom/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h M include/osmocom/ranap/RANAP_RAB-ReleasedItem.h M include/osmocom/ranap/RANAP_RAB-ReleasedList-IuRelComp.h M include/osmocom/ranap/RANAP_RAB-ReleasedList.h M include/osmocom/ranap/RANAP_RAB-RelocationReleaseItem.h M include/osmocom/ranap/RANAP_RAB-RelocationReleaseList.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReq.h M include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReqAck.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-SetupList-RelocReq.h M include/osmocom/ranap/RANAP_RAB-SetupList-RelocReqAck.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifiedList.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemFirst.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemSecond.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifyList.h M include/osmocom/ranap/RANAP_RAB-SubflowCombinationBitRate.h M include/osmocom/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-TrCH-Mapping.h M include/osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h M include/osmocom/ranap/RANAP_RABDataVolumeReport.h M include/osmocom/ranap/RANAP_RABParametersList.h M include/osmocom/ranap/RANAP_RABased.h M include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferItem.h M include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferList.h M include/osmocom/ranap/RANAP_RABs-failed-to-reportItem.h M include/osmocom/ranap/RANAP_RABs-failed-to-reportList.h M include/osmocom/ranap/RANAP_RAC.h M include/osmocom/ranap/RANAP_RAI-List.h M include/osmocom/ranap/RANAP_RAI.h M include/osmocom/ranap/RANAP_RAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h M include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h M include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h M include/osmocom/ranap/RANAP_RANAP-PDU.h M include/osmocom/ranap/RANAP_RANAP-RelocationInformation.h M include/osmocom/ranap/RANAP_RAT-Type.h M include/osmocom/ranap/RANAP_RAofIdleModeUEs.h M include/osmocom/ranap/RANAP_RIM-Transfer.h M include/osmocom/ranap/RANAP_RIMInformation.h M include/osmocom/ranap/RANAP_RIMRoutingAddress.h M include/osmocom/ranap/RANAP_RNC-ID.h M include/osmocom/ranap/RANAP_RNCTraceInformation.h M include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h M include/osmocom/ranap/RANAP_RRC-Container.h M include/osmocom/ranap/RANAP_RSRQ-Extension.h M include/osmocom/ranap/RANAP_RSRQ-Type.h M include/osmocom/ranap/RANAP_RSRVCC-HO-Indication.h M include/osmocom/ranap/RANAP_RSRVCC-Information.h M include/osmocom/ranap/RANAP_RSRVCC-Operation-Possible.h M include/osmocom/ranap/RANAP_RTLoadValue.h M include/osmocom/ranap/RANAP_RateControlAllowed.h M include/osmocom/ranap/RANAP_RedirectAttemptFlag.h M include/osmocom/ranap/RANAP_RedirectionCompleted.h M include/osmocom/ranap/RANAP_RedirectionIndication.h M include/osmocom/ranap/RANAP_RejectCauseValue.h M include/osmocom/ranap/RANAP_RelocationCancel.h M include/osmocom/ranap/RANAP_RelocationCancelAcknowledge.h M include/osmocom/ranap/RANAP_RelocationCommand.h M include/osmocom/ranap/RANAP_RelocationComplete.h M include/osmocom/ranap/RANAP_RelocationDetect.h M include/osmocom/ranap/RANAP_RelocationFailure.h M include/osmocom/ranap/RANAP_RelocationPreparationFailure.h M include/osmocom/ranap/RANAP_RelocationRequest.h M include/osmocom/ranap/RANAP_RelocationRequestAcknowledge.h M include/osmocom/ranap/RANAP_RelocationRequired.h M include/osmocom/ranap/RANAP_RelocationRequirement.h M include/osmocom/ranap/RANAP_RelocationType.h M include/osmocom/ranap/RANAP_RepetitionNumber0.h M include/osmocom/ranap/RANAP_RepetitionNumber1.h M include/osmocom/ranap/RANAP_ReportAmount.h M include/osmocom/ranap/RANAP_ReportArea.h M include/osmocom/ranap/RANAP_ReportChangeOfSAI.h M include/osmocom/ranap/RANAP_ReportInterval.h M include/osmocom/ranap/RANAP_RequestType.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h M include/osmocom/ranap/RANAP_RequestedGANSSAssistanceData.h M include/osmocom/ranap/RANAP_RequestedGPSAssistanceData.h M include/osmocom/ranap/RANAP_RequestedLocationRelatedDataType.h M include/osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h M include/osmocom/ranap/RANAP_RequestedMulticastServiceList.h M include/osmocom/ranap/RANAP_Reset.h M include/osmocom/ranap/RANAP_ResetAcknowledge.h M include/osmocom/ranap/RANAP_ResetResource.h M include/osmocom/ranap/RANAP_ResetResourceAckItem.h M include/osmocom/ranap/RANAP_ResetResourceAckList.h M include/osmocom/ranap/RANAP_ResetResourceAcknowledge.h M include/osmocom/ranap/RANAP_ResetResourceItem.h M include/osmocom/ranap/RANAP_ResetResourceList.h M include/osmocom/ranap/RANAP_ResidualBitErrorRatio.h M include/osmocom/ranap/RANAP_ResponseTime.h M include/osmocom/ranap/RANAP_SAC.h M include/osmocom/ranap/RANAP_SAI.h M include/osmocom/ranap/RANAP_SAPI.h M include/osmocom/ranap/RANAP_SDU-ErrorRatio.h M include/osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h M include/osmocom/ranap/RANAP_SDU-FormatInformationParameters.h M include/osmocom/ranap/RANAP_SDU-ParameterItem.h M include/osmocom/ranap/RANAP_SDU-Parameters.h M include/osmocom/ranap/RANAP_SNA-Access-Information.h M include/osmocom/ranap/RANAP_SNAC.h M include/osmocom/ranap/RANAP_SRB-ID.h M include/osmocom/ranap/RANAP_SRB-TrCH-Mapping.h M include/osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h M include/osmocom/ranap/RANAP_SRNS-ContextRequest.h M include/osmocom/ranap/RANAP_SRNS-ContextResponse.h M include/osmocom/ranap/RANAP_SRNS-DataForwardCommand.h M include/osmocom/ranap/RANAP_SRVCC-CSKeysRequest.h M include/osmocom/ranap/RANAP_SRVCC-CSKeysResponse.h M include/osmocom/ranap/RANAP_SRVCC-HO-Indication.h M include/osmocom/ranap/RANAP_SRVCC-Information.h M include/osmocom/ranap/RANAP_SRVCC-Operation-Possible.h M include/osmocom/ranap/RANAP_SecurityModeCommand.h M include/osmocom/ranap/RANAP_SecurityModeComplete.h M include/osmocom/ranap/RANAP_SecurityModeReject.h M include/osmocom/ranap/RANAP_Service-Handover.h M include/osmocom/ranap/RANAP_Session-Re-establishment-Indicator.h M include/osmocom/ranap/RANAP_SessionUpdateID.h M include/osmocom/ranap/RANAP_Shared-Network-Information.h M include/osmocom/ranap/RANAP_SignallingIndication.h M include/osmocom/ranap/RANAP_Source-ToTarget-TransparentContainer.h M include/osmocom/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.h M include/osmocom/ranap/RANAP_SourceCellID.h M include/osmocom/ranap/RANAP_SourceID.h M include/osmocom/ranap/RANAP_SourceRNC-ID.h M include/osmocom/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h M include/osmocom/ranap/RANAP_SourceStatisticsDescriptor.h M include/osmocom/ranap/RANAP_SourceUTRANCellID.h M include/osmocom/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.h M include/osmocom/ranap/RANAP_SubflowSDU-Size.h M include/osmocom/ranap/RANAP_SubscriberProfileIDforRFP.h M include/osmocom/ranap/RANAP_SuccessfulOutcome.h M include/osmocom/ranap/RANAP_SupportedBitrate.h M include/osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h M include/osmocom/ranap/RANAP_TAC.h M include/osmocom/ranap/RANAP_TAI.h M include/osmocom/ranap/RANAP_TBCD-STRING.h M include/osmocom/ranap/RANAP_TMGI.h M include/osmocom/ranap/RANAP_TMSI.h M include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h M include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h M include/osmocom/ranap/RANAP_Target-ToSource-TransparentContainer.h M include/osmocom/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.h M include/osmocom/ranap/RANAP_TargetCellId.h M include/osmocom/ranap/RANAP_TargetENB-ID.h M include/osmocom/ranap/RANAP_TargetID.h M include/osmocom/ranap/RANAP_TargetRNC-ID.h M include/osmocom/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h M include/osmocom/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.h M include/osmocom/ranap/RANAP_TemporaryUE-ID.h M include/osmocom/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.h M include/osmocom/ranap/RANAP_Time-UE-StayedInCell.h M include/osmocom/ranap/RANAP_TimeToMBMSDataTransfer.h M include/osmocom/ranap/RANAP_TimingDifferenceULDL.h M include/osmocom/ranap/RANAP_TrCH-ID-List.h M include/osmocom/ranap/RANAP_TrCH-ID.h M include/osmocom/ranap/RANAP_TraceDepth.h M include/osmocom/ranap/RANAP_TraceInformation.h M include/osmocom/ranap/RANAP_TracePropagationParameters.h M include/osmocom/ranap/RANAP_TraceRecordingSessionInformation.h M include/osmocom/ranap/RANAP_TraceRecordingSessionReference.h M include/osmocom/ranap/RANAP_TraceReference.h M include/osmocom/ranap/RANAP_TraceType.h M include/osmocom/ranap/RANAP_TrafficClass.h M include/osmocom/ranap/RANAP_TrafficHandlingPriority.h M include/osmocom/ranap/RANAP_TransferDelay.h M include/osmocom/ranap/RANAP_TransportLayerAddress.h M include/osmocom/ranap/RANAP_TransportLayerInformation.h M include/osmocom/ranap/RANAP_TriggerID.h M include/osmocom/ranap/RANAP_TriggeringMessage.h M include/osmocom/ranap/RANAP_TunnelInformation.h M include/osmocom/ranap/RANAP_TypeOfError.h M include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h M include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.h M include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRateUplink.h M include/osmocom/ranap/RANAP_UE-History-Information.h M include/osmocom/ranap/RANAP_UE-ID.h M include/osmocom/ranap/RANAP_UESBI-Iu.h M include/osmocom/ranap/RANAP_UESBI-IuA.h M include/osmocom/ranap/RANAP_UESBI-IuB.h M include/osmocom/ranap/RANAP_UESpecificInformationIndication.h M include/osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_UL-N-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_UP-ModeVersions.h M include/osmocom/ranap/RANAP_UPInformation.h M include/osmocom/ranap/RANAP_UPInitialisationFrame.h M include/osmocom/ranap/RANAP_USCH-ID.h M include/osmocom/ranap/RANAP_UTRAN-CellID.h M include/osmocom/ranap/RANAP_UeRadioCapabilityMatchRequest.h M include/osmocom/ranap/RANAP_UeRadioCapabilityMatchResponse.h M include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h M include/osmocom/ranap/RANAP_UnsuccessfulOutcome.h M include/osmocom/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h M include/osmocom/ranap/RANAP_UplinkInformationExchangeFailure.h M include/osmocom/ranap/RANAP_UplinkInformationExchangeRequest.h M include/osmocom/ranap/RANAP_UplinkInformationExchangeResponse.h M include/osmocom/ranap/RANAP_UserPlaneInformation.h M include/osmocom/ranap/RANAP_UserPlaneMode.h M include/osmocom/ranap/RANAP_VelocityEstimate.h M include/osmocom/ranap/RANAP_VerticalAccuracyCode.h M include/osmocom/ranap/RANAP_VerticalSpeedDirection.h M include/osmocom/ranap/RANAP_VerticalVelocity.h M include/osmocom/ranap/RANAP_VoiceSupportMatchIndicator.h M include/osmocom/rua/RUA_Ansi-41-IDNNS.h M include/osmocom/rua/RUA_CN-DomainIndicator.h M include/osmocom/rua/RUA_CSGMembershipStatus.h M include/osmocom/rua/RUA_Cause.h M include/osmocom/rua/RUA_CauseMisc.h M include/osmocom/rua/RUA_CauseProtocol.h M include/osmocom/rua/RUA_CauseRadioNetwork.h M include/osmocom/rua/RUA_CauseTransport.h M include/osmocom/rua/RUA_Connect.h M include/osmocom/rua/RUA_ConnectionlessTransfer.h M include/osmocom/rua/RUA_Context-ID.h M include/osmocom/rua/RUA_Criticality.h M include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h M include/osmocom/rua/RUA_CriticalityDiagnostics.h M include/osmocom/rua/RUA_DirectTransfer.h M include/osmocom/rua/RUA_Disconnect.h M include/osmocom/rua/RUA_ErrorIndication.h M include/osmocom/rua/RUA_Establishment-Cause.h M include/osmocom/rua/RUA_Gsm-map-IDNNS.h M include/osmocom/rua/RUA_IE-Extensions.h M include/osmocom/rua/RUA_IE.h M include/osmocom/rua/RUA_InitiatingMessage.h M include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h M include/osmocom/rua/RUA_Presence.h M include/osmocom/rua/RUA_PrivateIE-ID.h M include/osmocom/rua/RUA_PrivateMessage.h M include/osmocom/rua/RUA_ProcedureCode.h M include/osmocom/rua/RUA_ProtocolIE-ID.h M include/osmocom/rua/RUA_RANAP-Message.h M include/osmocom/rua/RUA_RUA-PDU.h M include/osmocom/rua/RUA_RoutingParameter.h M include/osmocom/rua/RUA_SuccessfulOutcome.h M include/osmocom/rua/RUA_TriggeringMessage.h M include/osmocom/rua/RUA_TypeOfError.h M include/osmocom/rua/RUA_UnsuccessfulOutcome.h M include/osmocom/sabp/SABP_Available-Bandwidth.h M include/osmocom/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.h M include/osmocom/sabp/SABP_Broadcast-Message-Content.h M include/osmocom/sabp/SABP_Category.h M include/osmocom/sabp/SABP_Cause.h M include/osmocom/sabp/SABP_Criticality-Diagnostics.h M include/osmocom/sabp/SABP_Criticality.h M include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h M include/osmocom/sabp/SABP_Data-Coding-Scheme.h M include/osmocom/sabp/SABP_Error-Indication.h M include/osmocom/sabp/SABP_Failure-List-Item.h M include/osmocom/sabp/SABP_Failure-List.h M include/osmocom/sabp/SABP_Failure.h M include/osmocom/sabp/SABP_IE-Extensions.h M include/osmocom/sabp/SABP_IE.h M include/osmocom/sabp/SABP_InitiatingMessage.h M include/osmocom/sabp/SABP_Kill-Complete.h M include/osmocom/sabp/SABP_Kill-Failure.h M include/osmocom/sabp/SABP_Kill.h M include/osmocom/sabp/SABP_Load-Query-Complete.h M include/osmocom/sabp/SABP_Load-Query-Failure.h M include/osmocom/sabp/SABP_Load-Query.h M include/osmocom/sabp/SABP_Message-Identifier.h M include/osmocom/sabp/SABP_Message-Status-Query-Complete.h M include/osmocom/sabp/SABP_Message-Status-Query-Failure.h M include/osmocom/sabp/SABP_Message-Status-Query.h M include/osmocom/sabp/SABP_MessageStructure.h M include/osmocom/sabp/SABP_New-Serial-Number.h M include/osmocom/sabp/SABP_Number-Of-Broadcasts-Completed-Info.h M include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.h M include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List.h M include/osmocom/sabp/SABP_Number-of-Broadcasts-Requested.h M include/osmocom/sabp/SABP_Old-Serial-Number.h M include/osmocom/sabp/SABP_Paging-ETWS-Indicator.h M include/osmocom/sabp/SABP_Presence.h M include/osmocom/sabp/SABP_ProcedureCode.h M include/osmocom/sabp/SABP_ProtocolExtensionID.h M include/osmocom/sabp/SABP_ProtocolIE-ID.h M include/osmocom/sabp/SABP_Radio-Resource-Loading-List-Item.h M include/osmocom/sabp/SABP_Radio-Resource-Loading-List.h M include/osmocom/sabp/SABP_Recovery-Indication.h M include/osmocom/sabp/SABP_Repetition-Period.h M include/osmocom/sabp/SABP_RepetitionNumber0.h M include/osmocom/sabp/SABP_RepetitionNumber1.h M include/osmocom/sabp/SABP_Reset-Complete.h M include/osmocom/sabp/SABP_Reset-Failure.h M include/osmocom/sabp/SABP_Reset.h M include/osmocom/sabp/SABP_Restart.h M include/osmocom/sabp/SABP_SABP-PDU.h M include/osmocom/sabp/SABP_Serial-Number.h M include/osmocom/sabp/SABP_Service-Area-Identifier.h M include/osmocom/sabp/SABP_Service-Areas-List.h M include/osmocom/sabp/SABP_SuccessfulOutcome.h M include/osmocom/sabp/SABP_TriggeringMessage.h M include/osmocom/sabp/SABP_TypeOfError.h M include/osmocom/sabp/SABP_UnsuccessfulOutcome.h M include/osmocom/sabp/SABP_Warning-Type.h M include/osmocom/sabp/SABP_WarningSecurityInfo.h M include/osmocom/sabp/SABP_Write-Replace-Complete.h M include/osmocom/sabp/SABP_Write-Replace-Failure.h M include/osmocom/sabp/SABP_Write-Replace.h M src/hnbap/Access-stratum-release-indicator.c M src/hnbap/AccessResult.c M src/hnbap/AdditionalNeighbourInfoList.c M src/hnbap/AltitudeAndDirection.c M src/hnbap/BackoffTimer.c M src/hnbap/BindingID.c M src/hnbap/CELL-FACHMobilitySupport.c M src/hnbap/CGI.c M src/hnbap/CI.c M src/hnbap/CN-DomainIndicator.c M src/hnbap/CSG-Capability.c M src/hnbap/CSG-ID.c M src/hnbap/CSGMembershipStatus.c M src/hnbap/CSGMembershipUpdate.c M src/hnbap/Cause.c M src/hnbap/CauseMisc.c M src/hnbap/CauseProtocol.c M src/hnbap/CauseRadioNetwork.c M src/hnbap/CauseTransport.c M src/hnbap/CellIdentity.c M src/hnbap/ConfigurationInformation.c M src/hnbap/Context-ID.c M src/hnbap/Criticality.c M src/hnbap/CriticalityDiagnostics-IE-List.c M src/hnbap/CriticalityDiagnostics.c M src/hnbap/ESN.c M src/hnbap/ErrorIndication.c M src/hnbap/GTP-TEI.c M src/hnbap/GeographicalCoordinates.c M src/hnbap/GeographicalLocation.c M src/hnbap/HNB-Cell-Access-Mode.c M src/hnbap/HNB-Cell-Identifier.c M src/hnbap/HNB-GWResponse.c M src/hnbap/HNB-Identity-Info.c M src/hnbap/HNB-Identity.c M src/hnbap/HNB-Location-Information.c M src/hnbap/HNB-RNL-Identity.c M src/hnbap/HNBAP-PDU.c M src/hnbap/HNBCapacity.c M src/hnbap/HNBConfigInfo.c M src/hnbap/HNBConfigTransferRequest.c M src/hnbap/HNBConfigTransferResponse.c M src/hnbap/HNBConfigurationInformationMissing.c M src/hnbap/HNBConfigurationInformationProvided.c M src/hnbap/HNBDe-Register.c M src/hnbap/HNBRegisterAccept.c M src/hnbap/HNBRegisterReject.c M src/hnbap/HNBRegisterRequest.c M src/hnbap/IE-Extensions.c M src/hnbap/IE.c M src/hnbap/IMEI.c M src/hnbap/IMSI.c M src/hnbap/IMSIDS41.c M src/hnbap/IMSIESN.c M src/hnbap/IP-Address.c M src/hnbap/InitiatingMessage.c M src/hnbap/Ipv4Address.c M src/hnbap/Ipv6Address.c M src/hnbap/Iurh-Signalling-TNL-AddressList.c M src/hnbap/LAC.c M src/hnbap/LAI.c M src/hnbap/MacroCellID.c M src/hnbap/MacroCoverageInformation.c M src/hnbap/MuxPortNumber.c M src/hnbap/NeighbourCellIdentityList.c M src/hnbap/NeighbourIdentity.c M src/hnbap/NeighbourInfoList.c M src/hnbap/NeighbourInfoRequestItem.c M src/hnbap/NeighbourInfoRequestList.c M src/hnbap/PLMNidentity.c M src/hnbap/PSC.c M src/hnbap/PTMSI.c M src/hnbap/PTMSIRAI.c M src/hnbap/Presence.c M src/hnbap/PrivateIE-ID.c M src/hnbap/PrivateMessage.c M src/hnbap/ProcedureCode.c M src/hnbap/ProtocolIE-ID.c M src/hnbap/RAB-ID.c M src/hnbap/RABList.c M src/hnbap/RABListItem.c M src/hnbap/RAC.c M src/hnbap/RAI.c M src/hnbap/RNC-ID.c M src/hnbap/Registration-Cause.c M src/hnbap/RelocationComplete.c M src/hnbap/S-RNTIPrefix.c M src/hnbap/SAC.c M src/hnbap/SuccessfulOutcome.c M src/hnbap/TMSIDS41.c M src/hnbap/TMSILAI.c M src/hnbap/TNLUpdateFailure.c M src/hnbap/TNLUpdateRequest.c M src/hnbap/TNLUpdateResponse.c M src/hnbap/TransportInfo.c M src/hnbap/TransportLayerAddress.c M src/hnbap/TriggeringMessage.c M src/hnbap/Tunnel-Information.c M src/hnbap/TypeOfError.c M src/hnbap/U-RNTI.c M src/hnbap/U-RNTIQueryRequest.c M src/hnbap/U-RNTIQueryResponse.c M src/hnbap/UDP-Port-Number.c M src/hnbap/UE-Capabilities.c M src/hnbap/UE-Identity.c M src/hnbap/UEDe-Register.c M src/hnbap/UERegisterAccept.c M src/hnbap/UERegisterReject.c M src/hnbap/UERegisterRequest.c M src/hnbap/URAIdentity.c M src/hnbap/URAIdentityList.c M src/hnbap/UTRANCellID.c M src/hnbap/UnknownU-RNTIIndication.c M src/hnbap/UnsuccessfulOutcome.c M src/hnbap/Update-cause.c M src/ranap/RANAP_APN.c M src/ranap/RANAP_AccuracyFulfilmentIndicator.c M src/ranap/RANAP_AllocationOrRetentionPriority.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.c M src/ranap/RANAP_Alt-RAB-Parameters.c M src/ranap/RANAP_AlternativeRABConfigurationRequest.c M src/ranap/RANAP_AreaIdentity.c M src/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameters.c M src/ranap/RANAP_AuthorisedPLMNs.c M src/ranap/RANAP_AuthorisedSNAs.c M src/ranap/RANAP_BindingID.c M src/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.c M src/ranap/RANAP_CGI.c M src/ranap/RANAP_CI.c M src/ranap/RANAP_CN-DeactivateTrace.c M src/ranap/RANAP_CN-DomainIndicator.c M src/ranap/RANAP_CN-ID.c M src/ranap/RANAP_CN-InvokeTrace.c M src/ranap/RANAP_CNMBMSLinkingInformation.c M src/ranap/RANAP_CSFB-Information.c M src/ranap/RANAP_CSG-Id-List.c M src/ranap/RANAP_CSG-Id.c M src/ranap/RANAP_CSG-Membership-Status.c M src/ranap/RANAP_Cause.c M src/ranap/RANAP_CauseMisc.c M src/ranap/RANAP_CauseNAS.c M src/ranap/RANAP_CauseNon-Standard.c M src/ranap/RANAP_CauseProtocol.c M src/ranap/RANAP_CauseRadioNetwork.c M src/ranap/RANAP_CauseRadioNetworkExtension.c M src/ranap/RANAP_CauseTransmissionNetwork.c M src/ranap/RANAP_Cell-Access-Mode.c M src/ranap/RANAP_Cell-Capacity-Class-Value.c M src/ranap/RANAP_Cell-Id.c M src/ranap/RANAP_CellBased.c M src/ranap/RANAP_CellIdList.c M src/ranap/RANAP_CellLoadInformation.c M src/ranap/RANAP_CellLoadInformationGroup.c M src/ranap/RANAP_CellType.c M src/ranap/RANAP_ChosenEncryptionAlgorithm.c M src/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.c M src/ranap/RANAP_ClassmarkInformation2.c M src/ranap/RANAP_ClassmarkInformation3.c M src/ranap/RANAP_ClientType.c M src/ranap/RANAP_CommonID.c M src/ranap/RANAP_Correlation-ID.c M src/ranap/RANAP_Criticality.c M src/ranap/RANAP_CriticalityDiagnostics-IE-List.c M src/ranap/RANAP_CriticalityDiagnostics.c M src/ranap/RANAP_D-RNTI.c M src/ranap/RANAP_DCH-ID.c M src/ranap/RANAP_DL-GTP-PDU-SequenceNumber.c M src/ranap/RANAP_DL-N-PDU-SequenceNumber.c M src/ranap/RANAP_DRX-CycleLengthCoefficient.c M src/ranap/RANAP_DSCH-ID.c M src/ranap/RANAP_DataPDUType.c M src/ranap/RANAP_DataVolumeList.c M src/ranap/RANAP_DataVolumeReference.c M src/ranap/RANAP_DataVolumeReport.c M src/ranap/RANAP_DataVolumeReportList.c M src/ranap/RANAP_DataVolumeReportRequest.c M src/ranap/RANAP_DataVolumeReportingIndication.c M src/ranap/RANAP_DeliveryOfErroneousSDU.c M src/ranap/RANAP_DeliveryOrder.c M src/ranap/RANAP_DeltaRAListofIdleModeUEs.c M src/ranap/RANAP_DirectInformationTransfer.c M src/ranap/RANAP_DirectReportingIndicator.c M src/ranap/RANAP_DirectTransfer-IE-ContainerList.c M src/ranap/RANAP_DirectTransfer.c M src/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.c M src/ranap/RANAP_E-DCH-MAC-d-Flow-ID.c M src/ranap/RANAP_E-UTRAN-Service-Handover.c M src/ranap/RANAP_EARFCN-Extended.c M src/ranap/RANAP_ENB-ID.c M src/ranap/RANAP_EUTRANFrequencies.c M src/ranap/RANAP_EncryptionAlgorithm.c M src/ranap/RANAP_EncryptionInformation.c M src/ranap/RANAP_EncryptionKey.c M src/ranap/RANAP_End-Of-CSFB.c M src/ranap/RANAP_EnhancedRelocationCompleteConfirm.c M src/ranap/RANAP_EnhancedRelocationCompleteFailure.c M src/ranap/RANAP_EnhancedRelocationCompleteRequest.c M src/ranap/RANAP_EnhancedRelocationCompleteResponse.c M src/ranap/RANAP_EquipmentsToBeTraced.c M src/ranap/RANAP_ErrorIndication.c M src/ranap/RANAP_Event.c M src/ranap/RANAP_Event1F-Parameters.c M src/ranap/RANAP_Event1I-Parameters.c M src/ranap/RANAP_ExtendedGuaranteedBitrate.c M src/ranap/RANAP_ExtendedMaxBitrate.c M src/ranap/RANAP_ExtendedRNC-ID.c M src/ranap/RANAP_ForwardSRNS-Context.c M src/ranap/RANAP_ForwardingIndication.c M src/ranap/RANAP_FrameSequenceNumber.c M src/ranap/RANAP_FrequenceLayerConvergenceFlag.c M src/ranap/RANAP_GA-AltitudeAndDirection.c M src/ranap/RANAP_GA-EllipsoidArc.c M src/ranap/RANAP_GA-Point.c M src/ranap/RANAP_GA-PointWithAltitude.c M src/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.c M src/ranap/RANAP_GA-PointWithUnCertainty.c M src/ranap/RANAP_GA-PointWithUnCertaintyEllipse.c M src/ranap/RANAP_GA-Polygon.c M src/ranap/RANAP_GA-UncertaintyEllipse.c M src/ranap/RANAP_GANSS-PositioningDataSet.c M src/ranap/RANAP_GANSS-PositioningMethodAndUsage.c M src/ranap/RANAP_GERAN-BSC-Container.c M src/ranap/RANAP_GERAN-Cell-ID.c M src/ranap/RANAP_GERAN-Classmark.c M src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.c M src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.c M src/ranap/RANAP_GTP-TEI.c M src/ranap/RANAP_GeographicalArea.c M src/ranap/RANAP_GeographicalCoordinates.c M src/ranap/RANAP_GlobalCN-ID.c M src/ranap/RANAP_GlobalRNC-ID.c M src/ranap/RANAP_GuaranteedBitrate.c M src/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.c M src/ranap/RANAP_HigherBitratesThan16MbpsFlag.c M src/ranap/RANAP_HorizontalSpeedAndBearing.c M src/ranap/RANAP_HorizontalVelocity.c M src/ranap/RANAP_HorizontalVelocityWithUncertainty.c M src/ranap/RANAP_HorizontalWithVerticalVelocity.c M src/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.c M src/ranap/RANAP_IE-Extensions.c M src/ranap/RANAP_IE.c M src/ranap/RANAP_IMEI.c M src/ranap/RANAP_IMEIGroup.c M src/ranap/RANAP_IMEIList.c M src/ranap/RANAP_IMEISV.c M src/ranap/RANAP_IMEISVGroup.c M src/ranap/RANAP_IMEISVList.c M src/ranap/RANAP_IMSI.c M src/ranap/RANAP_IPMulticastAddress.c M src/ranap/RANAP_IRAT-Measurement-Configuration.c M src/ranap/RANAP_IRATmeasurementParameters.c M src/ranap/RANAP_ImmediateMDT.c M src/ranap/RANAP_IncludeVelocity.c M src/ranap/RANAP_InformationExchangeID.c M src/ranap/RANAP_InformationExchangeType.c M src/ranap/RANAP_InformationRequestType.c M src/ranap/RANAP_InformationRequested.c M src/ranap/RANAP_InformationTransferConfirmation.c M src/ranap/RANAP_InformationTransferFailure.c M src/ranap/RANAP_InformationTransferID.c M src/ranap/RANAP_InformationTransferIndication.c M src/ranap/RANAP_InformationTransferType.c M src/ranap/RANAP_InitialUE-Message.c M src/ranap/RANAP_InitiatingMessage.c M src/ranap/RANAP_IntegrityProtectionAlgorithm.c M src/ranap/RANAP_IntegrityProtectionInformation.c M src/ranap/RANAP_IntegrityProtectionKey.c M src/ranap/RANAP_InterSystemInformation-TransparentContainer.c M src/ranap/RANAP_InterSystemInformationTransferType.c M src/ranap/RANAP_InterfacesToTraceItem.c M src/ranap/RANAP_Iu-ReleaseCommand.c M src/ranap/RANAP_Iu-ReleaseComplete.c M src/ranap/RANAP_Iu-ReleaseRequest.c M src/ranap/RANAP_IuSigConId-IE-ContainerList.c M src/ranap/RANAP_IuSignallingConnectionIdentifier.c M src/ranap/RANAP_IuTransportAssociation.c M src/ranap/RANAP_JoinedMBMSBearerService-IEs.c M src/ranap/RANAP_KeyStatus.c M src/ranap/RANAP_L3-Information.c M src/ranap/RANAP_LA-LIST.c M src/ranap/RANAP_LABased.c M src/ranap/RANAP_LAC.c M src/ranap/RANAP_LAI-List.c M src/ranap/RANAP_LAI.c M src/ranap/RANAP_LAListofIdleModeUEs.c M src/ranap/RANAP_LHN-ID.c M src/ranap/RANAP_LastKnownServiceArea.c M src/ranap/RANAP_LastVisitedUTRANCell-Item.c M src/ranap/RANAP_LeftMBMSBearerService-IEs.c M src/ranap/RANAP_Links-to-log.c M src/ranap/RANAP_ListOF-SNAs.c M src/ranap/RANAP_ListOfInterfacesToTrace.c M src/ranap/RANAP_LoadValue.c M src/ranap/RANAP_LocationRelatedDataFailure.c M src/ranap/RANAP_LocationRelatedDataRequest.c M src/ranap/RANAP_LocationRelatedDataRequestType.c M src/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.c M src/ranap/RANAP_LocationRelatedDataResponse.c M src/ranap/RANAP_LocationReport.c M src/ranap/RANAP_LocationReportingControl.c M src/ranap/RANAP_LocationReportingTransferInformation.c M src/ranap/RANAP_LoggedMDT.c M src/ranap/RANAP_LoggingDuration.c M src/ranap/RANAP_LoggingInterval.c M src/ranap/RANAP_M1Report.c M src/ranap/RANAP_M2Report.c M src/ranap/RANAP_M4-Collection-Parameters.c M src/ranap/RANAP_M4-Period.c M src/ranap/RANAP_M4-Threshold.c M src/ranap/RANAP_M4Report.c M src/ranap/RANAP_M5-Period.c M src/ranap/RANAP_M5Report.c M src/ranap/RANAP_M6-Period.c M src/ranap/RANAP_M6Report.c M src/ranap/RANAP_M7-Period.c M src/ranap/RANAP_M7Report.c M src/ranap/RANAP_MBMS-PTP-RAB-ID.c M src/ranap/RANAP_MBMSBearerServiceType.c M src/ranap/RANAP_MBMSCNDe-Registration.c M src/ranap/RANAP_MBMSCNDe-RegistrationRequest.c M src/ranap/RANAP_MBMSCNDe-RegistrationResponse.c M src/ranap/RANAP_MBMSCountingInformation.c M src/ranap/RANAP_MBMSHCIndicator.c M src/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.c M src/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.c M src/ranap/RANAP_MBMSLinkingInformation.c M src/ranap/RANAP_MBMSRABEstablishmentIndication.c M src/ranap/RANAP_MBMSRABRelease.c M src/ranap/RANAP_MBMSRABReleaseFailure.c M src/ranap/RANAP_MBMSRABReleaseRequest.c M src/ranap/RANAP_MBMSRegistrationFailure.c M src/ranap/RANAP_MBMSRegistrationRequest.c M src/ranap/RANAP_MBMSRegistrationRequestType.c M src/ranap/RANAP_MBMSRegistrationResponse.c M src/ranap/RANAP_MBMSServiceArea.c M src/ranap/RANAP_MBMSSessionDuration.c M src/ranap/RANAP_MBMSSessionIdentity.c M src/ranap/RANAP_MBMSSessionRepetitionNumber.c M src/ranap/RANAP_MBMSSessionStart.c M src/ranap/RANAP_MBMSSessionStartFailure.c M src/ranap/RANAP_MBMSSessionStartResponse.c M src/ranap/RANAP_MBMSSessionStop.c M src/ranap/RANAP_MBMSSessionStopResponse.c M src/ranap/RANAP_MBMSSessionUpdate.c M src/ranap/RANAP_MBMSSessionUpdateFailure.c M src/ranap/RANAP_MBMSSessionUpdateResponse.c M src/ranap/RANAP_MBMSSynchronisationInformation.c M src/ranap/RANAP_MBMSUELinkingRequest.c M src/ranap/RANAP_MBMSUELinkingResponse.c M src/ranap/RANAP_MDT-Activation.c M src/ranap/RANAP_MDT-Configuration.c M src/ranap/RANAP_MDT-PLMN-List.c M src/ranap/RANAP_MDT-Report-Parameters.c M src/ranap/RANAP_MDTAreaScope.c M src/ranap/RANAP_MDTMode.c M src/ranap/RANAP_MSISDN.c M src/ranap/RANAP_Management-Based-MDT-Allowed.c M src/ranap/RANAP_MaxBitrate.c M src/ranap/RANAP_MaxSDU-Size.c M src/ranap/RANAP_MeasBand.c M src/ranap/RANAP_MeasurementQuantity.c M src/ranap/RANAP_MeasurementsToActivate.c M src/ranap/RANAP_MessageStructure.c M src/ranap/RANAP_NAS-PDU.c M src/ranap/RANAP_NAS-SequenceNumber.c M src/ranap/RANAP_NAS-SynchronisationIndicator.c M src/ranap/RANAP_NRTLoadInformationValue.c M src/ranap/RANAP_NewBSS-To-OldBSS-Information.c M src/ranap/RANAP_NewRAListofIdleModeUEs.c M src/ranap/RANAP_NonSearchingIndication.c M src/ranap/RANAP_NotEmptyRAListofIdleModeUEs.c M src/ranap/RANAP_NumberOfIuInstances.c M src/ranap/RANAP_NumberOfSteps.c M src/ranap/RANAP_OMC-ID.c M src/ranap/RANAP_Offload-RAB-Parameters-APN.c M src/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.c M src/ranap/RANAP_Offload-RAB-Parameters.c M src/ranap/RANAP_OldBSS-ToNewBSS-Information.c M src/ranap/RANAP_Out-Of-UTRAN.c M src/ranap/RANAP_Outcome.c M src/ranap/RANAP_Overload.c M src/ranap/RANAP_P-TMSI.c M src/ranap/RANAP_PDP-Type-extension.c M src/ranap/RANAP_PDP-Type.c M src/ranap/RANAP_PDP-TypeInformation-extension.c M src/ranap/RANAP_PDP-TypeInformation.c M src/ranap/RANAP_PDUType14FrameSequenceNumber.c M src/ranap/RANAP_PLMNidentity.c M src/ranap/RANAP_PLMNs-in-shared-network.c M src/ranap/RANAP_Paging.c M src/ranap/RANAP_PagingAreaID.c M src/ranap/RANAP_PagingCause.c M src/ranap/RANAP_PeriodicLocationInfo.c M src/ranap/RANAP_PeriodicReportingIndicator.c M src/ranap/RANAP_PermanentNAS-UE-ID.c M src/ranap/RANAP_PermittedEncryptionAlgorithms.c M src/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.c M src/ranap/RANAP_Port-Number.c M src/ranap/RANAP_PositionData.c M src/ranap/RANAP_PositionDataSpecificToGERANIuMode.c M src/ranap/RANAP_PositioningDataDiscriminator.c M src/ranap/RANAP_PositioningDataSet.c M src/ranap/RANAP_PositioningMethodAndUsage.c M src/ranap/RANAP_PositioningPriority.c M src/ranap/RANAP_Pre-emptionCapability.c M src/ranap/RANAP_Pre-emptionVulnerability.c M src/ranap/RANAP_Presence.c M src/ranap/RANAP_Priority-Class-Indicator.c M src/ranap/RANAP_PriorityLevel.c M src/ranap/RANAP_PrivateIE-ID.c M src/ranap/RANAP_PrivateMessage.c M src/ranap/RANAP_ProcedureCode.c M src/ranap/RANAP_ProtocolError-IE-ContainerList.c M src/ranap/RANAP_ProtocolExtensionContainer.c M src/ranap/RANAP_ProtocolExtensionField.c M src/ranap/RANAP_ProtocolExtensionID.c M src/ranap/RANAP_ProtocolIE-Container.c M src/ranap/RANAP_ProtocolIE-ContainerPair.c M src/ranap/RANAP_ProtocolIE-FieldPair.c M src/ranap/RANAP_ProtocolIE-ID.c M src/ranap/RANAP_ProvidedData.c M src/ranap/RANAP_QueuingAllowed.c M src/ranap/RANAP_RAB-AssignmentRequest.c M src/ranap/RANAP_RAB-AssignmentResponse.c M src/ranap/RANAP_RAB-AsymmetryIndicator.c M src/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.c M src/ranap/RANAP_RAB-ContextItem.c M src/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.c M src/ranap/RANAP_RAB-ContextList.c M src/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.c M src/ranap/RANAP_RAB-DataForwardingItem.c M src/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.c M src/ranap/RANAP_RAB-DataForwardingList.c M src/ranap/RANAP_RAB-DataVolumeReportItem.c M src/ranap/RANAP_RAB-DataVolumeReportList.c M src/ranap/RANAP_RAB-DataVolumeReportRequestItem.c M src/ranap/RANAP_RAB-DataVolumeReportRequestList.c M src/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-FailedItem.c M src/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-FailedList.c M src/ranap/RANAP_RAB-ID.c M src/ranap/RANAP_RAB-IE-ContainerList.c M src/ranap/RANAP_RAB-IE-ContainerPairList.c M src/ranap/RANAP_RAB-ModifyItem.c M src/ranap/RANAP_RAB-ModifyList.c M src/ranap/RANAP_RAB-ModifyRequest.c M src/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_RAB-Parameters.c M src/ranap/RANAP_RAB-QueuedItem.c M src/ranap/RANAP_RAB-QueuedList.c M src/ranap/RANAP_RAB-ReleaseFailedList.c M src/ranap/RANAP_RAB-ReleaseItem.c M src/ranap/RANAP_RAB-ReleaseList.c M src/ranap/RANAP_RAB-ReleaseRequest.c M src/ranap/RANAP_RAB-ReleasedItem-IuRelComp.c M src/ranap/RANAP_RAB-ReleasedItem.c M src/ranap/RANAP_RAB-ReleasedList-IuRelComp.c M src/ranap/RANAP_RAB-ReleasedList.c M src/ranap/RANAP_RAB-RelocationReleaseItem.c M src/ranap/RANAP_RAB-RelocationReleaseList.c M src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.c M src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.c M src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-SetupItem-RelocReq.c M src/ranap/RANAP_RAB-SetupItem-RelocReqAck.c M src/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.c M src/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.c M src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-SetupList-RelocReq.c M src/ranap/RANAP_RAB-SetupList-RelocReqAck.c M src/ranap/RANAP_RAB-SetupOrModifiedItem.c M src/ranap/RANAP_RAB-SetupOrModifiedList.c M src/ranap/RANAP_RAB-SetupOrModifyItemFirst.c M src/ranap/RANAP_RAB-SetupOrModifyItemSecond.c M src/ranap/RANAP_RAB-SetupOrModifyList.c M src/ranap/RANAP_RAB-SubflowCombinationBitRate.c M src/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-TrCH-Mapping.c M src/ranap/RANAP_RAB-TrCH-MappingItem.c M src/ranap/RANAP_RABDataVolumeReport.c M src/ranap/RANAP_RABParametersList.c M src/ranap/RANAP_RABased.c M src/ranap/RANAP_RABs-ContextFailedtoTransferItem.c M src/ranap/RANAP_RABs-ContextFailedtoTransferList.c M src/ranap/RANAP_RABs-failed-to-reportItem.c M src/ranap/RANAP_RABs-failed-to-reportList.c M src/ranap/RANAP_RAC.c M src/ranap/RANAP_RAI-List.c M src/ranap/RANAP_RAI.c M src/ranap/RANAP_RAListofIdleModeUEs.c M src/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.c M src/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.c M src/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.c M src/ranap/RANAP_RANAP-PDU.c M src/ranap/RANAP_RANAP-RelocationInformation.c M src/ranap/RANAP_RAT-Type.c M src/ranap/RANAP_RAofIdleModeUEs.c M src/ranap/RANAP_RIM-Transfer.c M src/ranap/RANAP_RIMInformation.c M src/ranap/RANAP_RIMRoutingAddress.c M src/ranap/RANAP_RNC-ID.c M src/ranap/RANAP_RNCTraceInformation.c M src/ranap/RANAP_RNSAPRelocationParameters.c M src/ranap/RANAP_RRC-Container.c M src/ranap/RANAP_RSRQ-Extension.c M src/ranap/RANAP_RSRQ-Type.c M src/ranap/RANAP_RSRVCC-HO-Indication.c M src/ranap/RANAP_RSRVCC-Information.c M src/ranap/RANAP_RSRVCC-Operation-Possible.c M src/ranap/RANAP_RTLoadValue.c M src/ranap/RANAP_RateControlAllowed.c M src/ranap/RANAP_RedirectAttemptFlag.c M src/ranap/RANAP_RedirectionCompleted.c M src/ranap/RANAP_RedirectionIndication.c M src/ranap/RANAP_RejectCauseValue.c M src/ranap/RANAP_RelocationCancel.c M src/ranap/RANAP_RelocationCancelAcknowledge.c M src/ranap/RANAP_RelocationCommand.c M src/ranap/RANAP_RelocationComplete.c M src/ranap/RANAP_RelocationDetect.c M src/ranap/RANAP_RelocationFailure.c M src/ranap/RANAP_RelocationPreparationFailure.c M src/ranap/RANAP_RelocationRequest.c M src/ranap/RANAP_RelocationRequestAcknowledge.c M src/ranap/RANAP_RelocationRequired.c M src/ranap/RANAP_RelocationRequirement.c M src/ranap/RANAP_RelocationType.c M src/ranap/RANAP_RepetitionNumber0.c M src/ranap/RANAP_RepetitionNumber1.c M src/ranap/RANAP_ReportAmount.c M src/ranap/RANAP_ReportArea.c M src/ranap/RANAP_ReportChangeOfSAI.c M src/ranap/RANAP_ReportInterval.c M src/ranap/RANAP_RequestType.c M src/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-Values.c M src/ranap/RANAP_RequestedGANSSAssistanceData.c M src/ranap/RANAP_RequestedGPSAssistanceData.c M src/ranap/RANAP_RequestedLocationRelatedDataType.c M src/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.c M src/ranap/RANAP_RequestedMulticastServiceList.c M src/ranap/RANAP_Reset.c M src/ranap/RANAP_ResetAcknowledge.c M src/ranap/RANAP_ResetResource.c M src/ranap/RANAP_ResetResourceAckItem.c M src/ranap/RANAP_ResetResourceAckList.c M src/ranap/RANAP_ResetResourceAcknowledge.c M src/ranap/RANAP_ResetResourceItem.c M src/ranap/RANAP_ResetResourceList.c M src/ranap/RANAP_ResidualBitErrorRatio.c M src/ranap/RANAP_ResponseTime.c M src/ranap/RANAP_SAC.c M src/ranap/RANAP_SAI.c M src/ranap/RANAP_SAPI.c M src/ranap/RANAP_SDU-ErrorRatio.c M src/ranap/RANAP_SDU-FormatInformationParameterItem.c M src/ranap/RANAP_SDU-FormatInformationParameters.c M src/ranap/RANAP_SDU-ParameterItem.c M src/ranap/RANAP_SDU-Parameters.c M src/ranap/RANAP_SNA-Access-Information.c M src/ranap/RANAP_SNAC.c M src/ranap/RANAP_SRB-ID.c M src/ranap/RANAP_SRB-TrCH-Mapping.c M src/ranap/RANAP_SRB-TrCH-MappingItem.c M src/ranap/RANAP_SRNS-ContextRequest.c M src/ranap/RANAP_SRNS-ContextResponse.c M src/ranap/RANAP_SRNS-DataForwardCommand.c M src/ranap/RANAP_SRVCC-CSKeysRequest.c M src/ranap/RANAP_SRVCC-CSKeysResponse.c M src/ranap/RANAP_SRVCC-HO-Indication.c M src/ranap/RANAP_SRVCC-Information.c M src/ranap/RANAP_SRVCC-Operation-Possible.c M src/ranap/RANAP_SecurityModeCommand.c M src/ranap/RANAP_SecurityModeComplete.c M src/ranap/RANAP_SecurityModeReject.c M src/ranap/RANAP_Service-Handover.c M src/ranap/RANAP_Session-Re-establishment-Indicator.c M src/ranap/RANAP_SessionUpdateID.c M src/ranap/RANAP_Shared-Network-Information.c M src/ranap/RANAP_SignallingIndication.c M src/ranap/RANAP_Source-ToTarget-TransparentContainer.c M src/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.c M src/ranap/RANAP_SourceCellID.c M src/ranap/RANAP_SourceID.c M src/ranap/RANAP_SourceRNC-ID.c M src/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.c M src/ranap/RANAP_SourceStatisticsDescriptor.c M src/ranap/RANAP_SourceUTRANCellID.c M src/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.c M src/ranap/RANAP_SubflowSDU-Size.c M src/ranap/RANAP_SubscriberProfileIDforRFP.c M src/ranap/RANAP_SuccessfulOutcome.c M src/ranap/RANAP_SupportedBitrate.c M src/ranap/RANAP_SupportedRAB-ParameterBitrateList.c M src/ranap/RANAP_TAC.c M src/ranap/RANAP_TAI.c M src/ranap/RANAP_TBCD-STRING.c M src/ranap/RANAP_TMGI.c M src/ranap/RANAP_TMSI.c M src/ranap/RANAP_TNLInformationEnhRelInfoReq.c M src/ranap/RANAP_TNLInformationEnhRelInfoRes.c M src/ranap/RANAP_Target-ToSource-TransparentContainer.c M src/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.c M src/ranap/RANAP_TargetCellId.c M src/ranap/RANAP_TargetENB-ID.c M src/ranap/RANAP_TargetID.c M src/ranap/RANAP_TargetRNC-ID.c M src/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.c M src/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.c M src/ranap/RANAP_TemporaryUE-ID.c M src/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.c M src/ranap/RANAP_Time-UE-StayedInCell.c M src/ranap/RANAP_TimeToMBMSDataTransfer.c M src/ranap/RANAP_TimingDifferenceULDL.c M src/ranap/RANAP_TrCH-ID-List.c M src/ranap/RANAP_TrCH-ID.c M src/ranap/RANAP_TraceDepth.c M src/ranap/RANAP_TraceInformation.c M src/ranap/RANAP_TracePropagationParameters.c M src/ranap/RANAP_TraceRecordingSessionInformation.c M src/ranap/RANAP_TraceRecordingSessionReference.c M src/ranap/RANAP_TraceReference.c M src/ranap/RANAP_TraceType.c M src/ranap/RANAP_TrafficClass.c M src/ranap/RANAP_TrafficHandlingPriority.c M src/ranap/RANAP_TransferDelay.c M src/ranap/RANAP_TransportLayerAddress.c M src/ranap/RANAP_TransportLayerInformation.c M src/ranap/RANAP_TriggerID.c M src/ranap/RANAP_TriggeringMessage.c M src/ranap/RANAP_TunnelInformation.c M src/ranap/RANAP_TypeOfError.c M src/ranap/RANAP_UE-AggregateMaximumBitRate.c M src/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.c M src/ranap/RANAP_UE-AggregateMaximumBitRateUplink.c M src/ranap/RANAP_UE-History-Information.c M src/ranap/RANAP_UE-ID.c M src/ranap/RANAP_UESBI-Iu.c M src/ranap/RANAP_UESBI-IuA.c M src/ranap/RANAP_UESBI-IuB.c M src/ranap/RANAP_UESpecificInformationIndication.c M src/ranap/RANAP_UL-GTP-PDU-SequenceNumber.c M src/ranap/RANAP_UL-N-PDU-SequenceNumber.c M src/ranap/RANAP_UP-ModeVersions.c M src/ranap/RANAP_UPInformation.c M src/ranap/RANAP_UPInitialisationFrame.c M src/ranap/RANAP_USCH-ID.c M src/ranap/RANAP_UTRAN-CellID.c M src/ranap/RANAP_UeRadioCapabilityMatchRequest.c M src/ranap/RANAP_UeRadioCapabilityMatchResponse.c M src/ranap/RANAP_UnsuccessfulLinking-IEs.c M src/ranap/RANAP_UnsuccessfulOutcome.c M src/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.c M src/ranap/RANAP_UplinkInformationExchangeFailure.c M src/ranap/RANAP_UplinkInformationExchangeRequest.c M src/ranap/RANAP_UplinkInformationExchangeResponse.c M src/ranap/RANAP_UserPlaneInformation.c M src/ranap/RANAP_UserPlaneMode.c M src/ranap/RANAP_VelocityEstimate.c M src/ranap/RANAP_VerticalAccuracyCode.c M src/ranap/RANAP_VerticalSpeedDirection.c M src/ranap/RANAP_VerticalVelocity.c M src/ranap/RANAP_VoiceSupportMatchIndicator.c M src/rua/RUA_Ansi-41-IDNNS.c M src/rua/RUA_CN-DomainIndicator.c M src/rua/RUA_CSGMembershipStatus.c M src/rua/RUA_Cause.c M src/rua/RUA_CauseMisc.c M src/rua/RUA_CauseProtocol.c M src/rua/RUA_CauseRadioNetwork.c M src/rua/RUA_CauseTransport.c M src/rua/RUA_Connect.c M src/rua/RUA_ConnectionlessTransfer.c M src/rua/RUA_Context-ID.c M src/rua/RUA_Criticality.c M src/rua/RUA_CriticalityDiagnostics-IE-List.c M src/rua/RUA_CriticalityDiagnostics.c M src/rua/RUA_DirectTransfer.c M src/rua/RUA_Disconnect.c M src/rua/RUA_ErrorIndication.c M src/rua/RUA_Establishment-Cause.c M src/rua/RUA_Gsm-map-IDNNS.c M src/rua/RUA_IE-Extensions.c M src/rua/RUA_IE.c M src/rua/RUA_InitiatingMessage.c M src/rua/RUA_IntraDomainNasNodeSelector.c M src/rua/RUA_Presence.c M src/rua/RUA_PrivateIE-ID.c M src/rua/RUA_PrivateMessage.c M src/rua/RUA_ProcedureCode.c M src/rua/RUA_ProtocolIE-ID.c M src/rua/RUA_RANAP-Message.c M src/rua/RUA_RUA-PDU.c M src/rua/RUA_RoutingParameter.c M src/rua/RUA_SuccessfulOutcome.c M src/rua/RUA_TriggeringMessage.c M src/rua/RUA_TypeOfError.c M src/rua/RUA_UnsuccessfulOutcome.c M src/sabp/SABP_Available-Bandwidth.c M src/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.c M src/sabp/SABP_Broadcast-Message-Content.c M src/sabp/SABP_Category.c M src/sabp/SABP_Cause.c M src/sabp/SABP_Criticality-Diagnostics.c M src/sabp/SABP_Criticality.c M src/sabp/SABP_CriticalityDiagnostics-IE-List.c M src/sabp/SABP_Data-Coding-Scheme.c M src/sabp/SABP_Error-Indication.c M src/sabp/SABP_Failure-List-Item.c M src/sabp/SABP_Failure-List.c M src/sabp/SABP_Failure.c M src/sabp/SABP_IE-Extensions.c M src/sabp/SABP_IE.c M src/sabp/SABP_InitiatingMessage.c M src/sabp/SABP_Kill-Complete.c M src/sabp/SABP_Kill-Failure.c M src/sabp/SABP_Kill.c M src/sabp/SABP_Load-Query-Complete.c M src/sabp/SABP_Load-Query-Failure.c M src/sabp/SABP_Load-Query.c M src/sabp/SABP_Message-Identifier.c M src/sabp/SABP_Message-Status-Query-Complete.c M src/sabp/SABP_Message-Status-Query-Failure.c M src/sabp/SABP_Message-Status-Query.c M src/sabp/SABP_MessageStructure.c M src/sabp/SABP_New-Serial-Number.c M src/sabp/SABP_Number-Of-Broadcasts-Completed-Info.c M src/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.c M src/sabp/SABP_Number-of-Broadcasts-Completed-List.c M src/sabp/SABP_Number-of-Broadcasts-Requested.c M src/sabp/SABP_Old-Serial-Number.c M src/sabp/SABP_Paging-ETWS-Indicator.c M src/sabp/SABP_Presence.c M src/sabp/SABP_ProcedureCode.c M src/sabp/SABP_ProtocolExtensionID.c M src/sabp/SABP_ProtocolIE-ID.c M src/sabp/SABP_Radio-Resource-Loading-List-Item.c M src/sabp/SABP_Radio-Resource-Loading-List.c M src/sabp/SABP_Recovery-Indication.c M src/sabp/SABP_Repetition-Period.c M src/sabp/SABP_RepetitionNumber0.c M src/sabp/SABP_RepetitionNumber1.c M src/sabp/SABP_Reset-Complete.c M src/sabp/SABP_Reset-Failure.c M src/sabp/SABP_Reset.c M src/sabp/SABP_Restart.c M src/sabp/SABP_SABP-PDU.c M src/sabp/SABP_Serial-Number.c M src/sabp/SABP_Service-Area-Identifier.c M src/sabp/SABP_Service-Areas-List.c M src/sabp/SABP_SuccessfulOutcome.c M src/sabp/SABP_TriggeringMessage.c M src/sabp/SABP_TypeOfError.c M src/sabp/SABP_UnsuccessfulOutcome.c M src/sabp/SABP_Warning-Type.c M src/sabp/SABP_WarningSecurityInfo.c M src/sabp/SABP_Write-Replace-Complete.c M src/sabp/SABP_Write-Replace-Failure.c M src/sabp/SABP_Write-Replace.c 1,580 files changed, 1,580 insertions(+), 230 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/60/25960/1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ib7a03973d43828f47ff59b561d9ddce43186f8af Gerrit-Change-Number: 25960 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 12:47:39 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 12:47:39 +0000 Subject: Change in osmo-iuh[master]: WIP: hnbap: Use specific prefix for HNBAP generated code References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25961 ) Change subject: WIP: hnbap: Use specific prefix for HNBAP generated code ...................................................................... WIP: hnbap: Use specific prefix for HNBAP generated code Other libraries already use ASN1C_PREFIX except the HNBAP one. Let's use it here to avoid collisions. All new include/osmocom/hnbap/HNBAP_*.h and src/hnbap/HNBAP_*.c are generated using the updated src/hnbap/Makefile.am. Files such as src/*.c, test/* and include/osmocom/hnbap/hnbap_common.h are modified manually to update structs/enums to new prefix. Related: SYS#5516 Change-Id: I6c062f631527ae42811bfec134933671c05ecba6 --- D include/osmocom/hnbap/Access-stratum-release-indicator.h D include/osmocom/hnbap/AccessResult.h D include/osmocom/hnbap/AdditionalNeighbourInfoList.h D include/osmocom/hnbap/BackoffTimer.h D include/osmocom/hnbap/BindingID.h D include/osmocom/hnbap/CELL-FACHMobilitySupport.h D include/osmocom/hnbap/CGI.h D include/osmocom/hnbap/CI.h D include/osmocom/hnbap/CN-DomainIndicator.h D include/osmocom/hnbap/CSG-Capability.h D include/osmocom/hnbap/CSG-ID.h D include/osmocom/hnbap/CSGMembershipStatus.h D include/osmocom/hnbap/Cause.h D include/osmocom/hnbap/CauseMisc.h D include/osmocom/hnbap/CauseProtocol.h D include/osmocom/hnbap/CauseRadioNetwork.h D include/osmocom/hnbap/CauseTransport.h D include/osmocom/hnbap/CellIdentity.h D include/osmocom/hnbap/ConfigurationInformation.h D include/osmocom/hnbap/Context-ID.h D include/osmocom/hnbap/Criticality.h D include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h D include/osmocom/hnbap/CriticalityDiagnostics.h D include/osmocom/hnbap/ESN.h D include/osmocom/hnbap/GTP-TEI.h D include/osmocom/hnbap/GeographicalLocation.h D include/osmocom/hnbap/HNB-Cell-Access-Mode.h D include/osmocom/hnbap/HNB-Cell-Identifier.h D include/osmocom/hnbap/HNB-GWResponse.h D include/osmocom/hnbap/HNB-Identity-Info.h D include/osmocom/hnbap/HNB-Identity.h D include/osmocom/hnbap/HNB-Location-Information.h D include/osmocom/hnbap/HNB-RNL-Identity.h D include/osmocom/hnbap/HNBAP-PDU.h A include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h A include/osmocom/hnbap/HNBAP_AccessResult.h A include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h R include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h A include/osmocom/hnbap/HNBAP_BackoffTimer.h A include/osmocom/hnbap/HNBAP_BindingID.h A include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h A include/osmocom/hnbap/HNBAP_CGI.h A include/osmocom/hnbap/HNBAP_CI.h A include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h A include/osmocom/hnbap/HNBAP_CSG-Capability.h A include/osmocom/hnbap/HNBAP_CSG-ID.h A include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h R include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h A include/osmocom/hnbap/HNBAP_Cause.h A include/osmocom/hnbap/HNBAP_CauseMisc.h A include/osmocom/hnbap/HNBAP_CauseProtocol.h A include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h A include/osmocom/hnbap/HNBAP_CauseTransport.h A include/osmocom/hnbap/HNBAP_CellIdentity.h A include/osmocom/hnbap/HNBAP_ConfigurationInformation.h A include/osmocom/hnbap/HNBAP_Context-ID.h A include/osmocom/hnbap/HNBAP_Criticality.h A include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h A include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h A include/osmocom/hnbap/HNBAP_ESN.h R include/osmocom/hnbap/HNBAP_ErrorIndication.h A include/osmocom/hnbap/HNBAP_GTP-TEI.h R include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h A include/osmocom/hnbap/HNBAP_GeographicalLocation.h A include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h A include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h A include/osmocom/hnbap/HNBAP_HNB-GWResponse.h A include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h A include/osmocom/hnbap/HNBAP_HNB-Identity.h A include/osmocom/hnbap/HNBAP_HNB-Location-Information.h A include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h A include/osmocom/hnbap/HNBAP_HNBAP-PDU.h A include/osmocom/hnbap/HNBAP_HNBCapacity.h A include/osmocom/hnbap/HNBAP_HNBConfigInfo.h R include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h R include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h A include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h A include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h R include/osmocom/hnbap/HNBAP_HNBDe-Register.h R include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h R include/osmocom/hnbap/HNBAP_HNBRegisterReject.h R include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h C include/osmocom/hnbap/HNBAP_IE-Extensions.h R include/osmocom/hnbap/HNBAP_IE.h A include/osmocom/hnbap/HNBAP_IMEI.h A include/osmocom/hnbap/HNBAP_IMSI.h A include/osmocom/hnbap/HNBAP_IMSIDS41.h A include/osmocom/hnbap/HNBAP_IMSIESN.h R include/osmocom/hnbap/HNBAP_IP-Address.h A include/osmocom/hnbap/HNBAP_InitiatingMessage.h A include/osmocom/hnbap/HNBAP_Ipv4Address.h A include/osmocom/hnbap/HNBAP_Ipv6Address.h A include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h A include/osmocom/hnbap/HNBAP_LAC.h C include/osmocom/hnbap/HNBAP_LAI.h A include/osmocom/hnbap/HNBAP_MacroCellID.h A include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h A include/osmocom/hnbap/HNBAP_MuxPortNumber.h A include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h A include/osmocom/hnbap/HNBAP_NeighbourIdentity.h A include/osmocom/hnbap/HNBAP_NeighbourInfoList.h A include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h A include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h A include/osmocom/hnbap/HNBAP_PLMNidentity.h A include/osmocom/hnbap/HNBAP_PSC.h A include/osmocom/hnbap/HNBAP_PTMSI.h C include/osmocom/hnbap/HNBAP_PTMSIRAI.h A include/osmocom/hnbap/HNBAP_Presence.h A include/osmocom/hnbap/HNBAP_PrivateIE-ID.h R include/osmocom/hnbap/HNBAP_PrivateMessage.h A include/osmocom/hnbap/HNBAP_ProcedureCode.h A include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h A include/osmocom/hnbap/HNBAP_RAB-ID.h R include/osmocom/hnbap/HNBAP_RABList.h A include/osmocom/hnbap/HNBAP_RABListItem.h A include/osmocom/hnbap/HNBAP_RAC.h R include/osmocom/hnbap/HNBAP_RAI.h A include/osmocom/hnbap/HNBAP_RNC-ID.h A include/osmocom/hnbap/HNBAP_Registration-Cause.h R include/osmocom/hnbap/HNBAP_RelocationComplete.h A include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h A include/osmocom/hnbap/HNBAP_SAC.h A include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h A include/osmocom/hnbap/HNBAP_TMSIDS41.h R include/osmocom/hnbap/HNBAP_TMSILAI.h R include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h R include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h R include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h R include/osmocom/hnbap/HNBAP_TransportInfo.h A include/osmocom/hnbap/HNBAP_TransportLayerAddress.h A include/osmocom/hnbap/HNBAP_TriggeringMessage.h A include/osmocom/hnbap/HNBAP_Tunnel-Information.h A include/osmocom/hnbap/HNBAP_TypeOfError.h A include/osmocom/hnbap/HNBAP_U-RNTI.h R include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h R include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h A include/osmocom/hnbap/HNBAP_UDP-Port-Number.h A include/osmocom/hnbap/HNBAP_UE-Capabilities.h A include/osmocom/hnbap/HNBAP_UE-Identity.h R include/osmocom/hnbap/HNBAP_UEDe-Register.h R include/osmocom/hnbap/HNBAP_UERegisterAccept.h R include/osmocom/hnbap/HNBAP_UERegisterReject.h R include/osmocom/hnbap/HNBAP_UERegisterRequest.h A include/osmocom/hnbap/HNBAP_URAIdentity.h A include/osmocom/hnbap/HNBAP_URAIdentityList.h A include/osmocom/hnbap/HNBAP_UTRANCellID.h A include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h A include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h A include/osmocom/hnbap/HNBAP_Update-cause.h D include/osmocom/hnbap/HNBCapacity.h D include/osmocom/hnbap/HNBConfigInfo.h D include/osmocom/hnbap/HNBConfigurationInformationMissing.h D include/osmocom/hnbap/HNBConfigurationInformationProvided.h D include/osmocom/hnbap/IE-Extensions.h D include/osmocom/hnbap/IMEI.h D include/osmocom/hnbap/IMSI.h D include/osmocom/hnbap/IMSIDS41.h D include/osmocom/hnbap/IMSIESN.h D include/osmocom/hnbap/InitiatingMessage.h D include/osmocom/hnbap/Ipv4Address.h D include/osmocom/hnbap/Ipv6Address.h D include/osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h D include/osmocom/hnbap/LAC.h D include/osmocom/hnbap/MacroCellID.h D include/osmocom/hnbap/MacroCoverageInformation.h M include/osmocom/hnbap/Makefile.am D include/osmocom/hnbap/MuxPortNumber.h D include/osmocom/hnbap/NeighbourCellIdentityList.h D include/osmocom/hnbap/NeighbourIdentity.h D include/osmocom/hnbap/NeighbourInfoList.h D include/osmocom/hnbap/NeighbourInfoRequestItem.h D include/osmocom/hnbap/NeighbourInfoRequestList.h D include/osmocom/hnbap/PLMNidentity.h D include/osmocom/hnbap/PSC.h D include/osmocom/hnbap/PTMSI.h D include/osmocom/hnbap/PTMSIRAI.h D include/osmocom/hnbap/Presence.h D include/osmocom/hnbap/PrivateIE-ID.h D include/osmocom/hnbap/ProcedureCode.h D include/osmocom/hnbap/ProtocolIE-ID.h D include/osmocom/hnbap/RAB-ID.h D include/osmocom/hnbap/RABList.h D include/osmocom/hnbap/RABListItem.h D include/osmocom/hnbap/RAC.h D include/osmocom/hnbap/RAI.h D include/osmocom/hnbap/RNC-ID.h D include/osmocom/hnbap/Registration-Cause.h D include/osmocom/hnbap/S-RNTIPrefix.h D include/osmocom/hnbap/SAC.h D include/osmocom/hnbap/SuccessfulOutcome.h D include/osmocom/hnbap/TMSIDS41.h D include/osmocom/hnbap/TransportLayerAddress.h D include/osmocom/hnbap/TriggeringMessage.h D include/osmocom/hnbap/Tunnel-Information.h D include/osmocom/hnbap/TypeOfError.h D include/osmocom/hnbap/U-RNTI.h D include/osmocom/hnbap/UDP-Port-Number.h D include/osmocom/hnbap/UE-Capabilities.h D include/osmocom/hnbap/UE-Identity.h D include/osmocom/hnbap/URAIdentity.h D include/osmocom/hnbap/UTRANCellID.h D include/osmocom/hnbap/UnknownU-RNTIIndication.h D include/osmocom/hnbap/UnsuccessfulOutcome.h D include/osmocom/hnbap/Update-cause.h M include/osmocom/hnbap/hnbap_common.h M src/Makefile.am D src/hnbap/Access-stratum-release-indicator.c D src/hnbap/AccessResult.c D src/hnbap/AdditionalNeighbourInfoList.c D src/hnbap/BindingID.c D src/hnbap/CELL-FACHMobilitySupport.c D src/hnbap/CGI.c D src/hnbap/CN-DomainIndicator.c D src/hnbap/CSG-Capability.c D src/hnbap/CSG-ID.c D src/hnbap/CSGMembershipStatus.c D src/hnbap/CauseMisc.c D src/hnbap/CauseProtocol.c D src/hnbap/CauseTransport.c D src/hnbap/ConfigurationInformation.c D src/hnbap/Criticality.c D src/hnbap/CriticalityDiagnostics.c D src/hnbap/ESN.c D src/hnbap/GeographicalLocation.c D src/hnbap/HNB-Cell-Access-Mode.c D src/hnbap/HNB-Cell-Identifier.c D src/hnbap/HNB-GWResponse.c D src/hnbap/HNB-Identity.c D src/hnbap/HNB-Location-Information.c D src/hnbap/HNB-RNL-Identity.c A src/hnbap/HNBAP_Access-stratum-release-indicator.c A src/hnbap/HNBAP_AccessResult.c A src/hnbap/HNBAP_AdditionalNeighbourInfoList.c R src/hnbap/HNBAP_AltitudeAndDirection.c R src/hnbap/HNBAP_BackoffTimer.c R src/hnbap/HNBAP_BindingID.c A src/hnbap/HNBAP_CELL-FACHMobilitySupport.c A src/hnbap/HNBAP_CGI.c R src/hnbap/HNBAP_CI.c A src/hnbap/HNBAP_CN-DomainIndicator.c A src/hnbap/HNBAP_CSG-Capability.c R src/hnbap/HNBAP_CSG-ID.c A src/hnbap/HNBAP_CSGMembershipStatus.c R src/hnbap/HNBAP_CSGMembershipUpdate.c R src/hnbap/HNBAP_Cause.c A src/hnbap/HNBAP_CauseMisc.c A src/hnbap/HNBAP_CauseProtocol.c R src/hnbap/HNBAP_CauseRadioNetwork.c A src/hnbap/HNBAP_CauseTransport.c R src/hnbap/HNBAP_CellIdentity.c A src/hnbap/HNBAP_ConfigurationInformation.c R src/hnbap/HNBAP_Context-ID.c A src/hnbap/HNBAP_Criticality.c R src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c A src/hnbap/HNBAP_CriticalityDiagnostics.c R src/hnbap/HNBAP_ESN.c R src/hnbap/HNBAP_ErrorIndication.c R src/hnbap/HNBAP_GTP-TEI.c R src/hnbap/HNBAP_GeographicalCoordinates.c A src/hnbap/HNBAP_GeographicalLocation.c A src/hnbap/HNBAP_HNB-Cell-Access-Mode.c A src/hnbap/HNBAP_HNB-Cell-Identifier.c A src/hnbap/HNBAP_HNB-GWResponse.c A src/hnbap/HNBAP_HNB-Identity-Info.c A src/hnbap/HNBAP_HNB-Identity.c A src/hnbap/HNBAP_HNB-Location-Information.c A src/hnbap/HNBAP_HNB-RNL-Identity.c R src/hnbap/HNBAP_HNBAP-PDU.c R src/hnbap/HNBAP_HNBCapacity.c A src/hnbap/HNBAP_HNBConfigInfo.c R src/hnbap/HNBAP_HNBConfigTransferRequest.c R src/hnbap/HNBAP_HNBConfigTransferResponse.c A src/hnbap/HNBAP_HNBConfigurationInformationMissing.c A src/hnbap/HNBAP_HNBConfigurationInformationProvided.c R src/hnbap/HNBAP_HNBDe-Register.c R src/hnbap/HNBAP_HNBRegisterAccept.c R src/hnbap/HNBAP_HNBRegisterReject.c R src/hnbap/HNBAP_HNBRegisterRequest.c A src/hnbap/HNBAP_IE-Extensions.c R src/hnbap/HNBAP_IE.c R src/hnbap/HNBAP_IMEI.c R src/hnbap/HNBAP_IMSI.c R src/hnbap/HNBAP_IMSIDS41.c A src/hnbap/HNBAP_IMSIESN.c R src/hnbap/HNBAP_IP-Address.c A src/hnbap/HNBAP_InitiatingMessage.c C src/hnbap/HNBAP_Ipv4Address.c R src/hnbap/HNBAP_Ipv6Address.c A src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c C src/hnbap/HNBAP_LAC.c A src/hnbap/HNBAP_LAI.c A src/hnbap/HNBAP_MacroCellID.c A src/hnbap/HNBAP_MacroCoverageInformation.c A src/hnbap/HNBAP_MuxPortNumber.c A src/hnbap/HNBAP_NeighbourCellIdentityList.c A src/hnbap/HNBAP_NeighbourIdentity.c A src/hnbap/HNBAP_NeighbourInfoList.c A src/hnbap/HNBAP_NeighbourInfoRequestItem.c A src/hnbap/HNBAP_NeighbourInfoRequestList.c R src/hnbap/HNBAP_PLMNidentity.c R src/hnbap/HNBAP_PSC.c C src/hnbap/HNBAP_PTMSI.c A src/hnbap/HNBAP_PTMSIRAI.c A src/hnbap/HNBAP_Presence.c R src/hnbap/HNBAP_PrivateIE-ID.c R src/hnbap/HNBAP_PrivateMessage.c A src/hnbap/HNBAP_ProcedureCode.c A src/hnbap/HNBAP_ProtocolIE-ID.c R src/hnbap/HNBAP_RAB-ID.c A src/hnbap/HNBAP_RABList.c A src/hnbap/HNBAP_RABListItem.c R src/hnbap/HNBAP_RAC.c A src/hnbap/HNBAP_RAI.c R src/hnbap/HNBAP_RNC-ID.c A src/hnbap/HNBAP_Registration-Cause.c R src/hnbap/HNBAP_RelocationComplete.c C src/hnbap/HNBAP_S-RNTIPrefix.c R src/hnbap/HNBAP_SAC.c A src/hnbap/HNBAP_SuccessfulOutcome.c R src/hnbap/HNBAP_TMSIDS41.c R src/hnbap/HNBAP_TMSILAI.c R src/hnbap/HNBAP_TNLUpdateFailure.c R src/hnbap/HNBAP_TNLUpdateRequest.c R src/hnbap/HNBAP_TNLUpdateResponse.c R src/hnbap/HNBAP_TransportInfo.c A src/hnbap/HNBAP_TransportLayerAddress.c A src/hnbap/HNBAP_TriggeringMessage.c A src/hnbap/HNBAP_Tunnel-Information.c A src/hnbap/HNBAP_TypeOfError.c C src/hnbap/HNBAP_U-RNTI.c R src/hnbap/HNBAP_U-RNTIQueryRequest.c R src/hnbap/HNBAP_U-RNTIQueryResponse.c A src/hnbap/HNBAP_UDP-Port-Number.c A src/hnbap/HNBAP_UE-Capabilities.c R src/hnbap/HNBAP_UE-Identity.c R src/hnbap/HNBAP_UEDe-Register.c R src/hnbap/HNBAP_UERegisterAccept.c R src/hnbap/HNBAP_UERegisterReject.c R src/hnbap/HNBAP_UERegisterRequest.c C src/hnbap/HNBAP_URAIdentity.c A src/hnbap/HNBAP_URAIdentityList.c A src/hnbap/HNBAP_UTRANCellID.c A src/hnbap/HNBAP_UnknownU-RNTIIndication.c A src/hnbap/HNBAP_UnsuccessfulOutcome.c A src/hnbap/HNBAP_Update-cause.c D src/hnbap/HNBConfigInfo.c D src/hnbap/HNBConfigurationInformationMissing.c D src/hnbap/HNBConfigurationInformationProvided.c D src/hnbap/IE-Extensions.c D src/hnbap/IMSIESN.c D src/hnbap/InitiatingMessage.c D src/hnbap/Ipv4Address.c D src/hnbap/Ipv6Address.c D src/hnbap/Iurh-Signalling-TNL-AddressList.c D src/hnbap/LAC.c D src/hnbap/LAI.c D src/hnbap/MacroCellID.c D src/hnbap/MacroCoverageInformation.c M src/hnbap/Makefile.am D src/hnbap/MuxPortNumber.c D src/hnbap/NeighbourCellIdentityList.c D src/hnbap/NeighbourIdentity.c D src/hnbap/NeighbourInfoList.c D src/hnbap/NeighbourInfoRequestItem.c D src/hnbap/NeighbourInfoRequestList.c D src/hnbap/PTMSIRAI.c D src/hnbap/Presence.c D src/hnbap/ProcedureCode.c D src/hnbap/ProtocolIE-ID.c D src/hnbap/RABList.c D src/hnbap/RABListItem.c D src/hnbap/RAI.c D src/hnbap/RNC-ID.c D src/hnbap/Registration-Cause.c D src/hnbap/SuccessfulOutcome.c D src/hnbap/TransportLayerAddress.c D src/hnbap/TriggeringMessage.c D src/hnbap/Tunnel-Information.c D src/hnbap/TypeOfError.c D src/hnbap/U-RNTI.c D src/hnbap/UE-Capabilities.c D src/hnbap/URAIdentityList.c D src/hnbap/UTRANCellID.c D src/hnbap/UnknownU-RNTIIndication.c D src/hnbap/UnsuccessfulOutcome.c D src/hnbap/Update-cause.c M src/hnbap_common.c M src/hnbgw_hnbap.c M src/hnbgw_rua.c M src/tests/hnb-test.c M src/tests/test-hnbap.c 391 files changed, 13,507 insertions(+), 14,888 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/61/25961/1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6c062f631527ae42811bfec134933671c05ecba6 Gerrit-Change-Number: 25961 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 12:47:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 12:47:47 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use specific prefix for HNBAP generated code In-Reply-To: References: Message-ID: pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-iuh/+/25961 ) Change subject: hnbap: Use specific prefix for HNBAP generated code ...................................................................... hnbap: Use specific prefix for HNBAP generated code Other libraries already use ASN1C_PREFIX except the HNBAP one. Let's use it here to avoid collisions. All new include/osmocom/hnbap/HNBAP_*.h and src/hnbap/HNBAP_*.c are generated using the updated src/hnbap/Makefile.am. Files such as src/*.c, test/* and include/osmocom/hnbap/hnbap_common.h are modified manually to update structs/enums to new prefix. Related: SYS#5516 Change-Id: I6c062f631527ae42811bfec134933671c05ecba6 --- D include/osmocom/hnbap/Access-stratum-release-indicator.h D include/osmocom/hnbap/AccessResult.h D include/osmocom/hnbap/AdditionalNeighbourInfoList.h D include/osmocom/hnbap/BackoffTimer.h D include/osmocom/hnbap/BindingID.h D include/osmocom/hnbap/CELL-FACHMobilitySupport.h D include/osmocom/hnbap/CGI.h D include/osmocom/hnbap/CI.h D include/osmocom/hnbap/CN-DomainIndicator.h D include/osmocom/hnbap/CSG-Capability.h D include/osmocom/hnbap/CSG-ID.h D include/osmocom/hnbap/CSGMembershipStatus.h D include/osmocom/hnbap/Cause.h D include/osmocom/hnbap/CauseMisc.h D include/osmocom/hnbap/CauseProtocol.h D include/osmocom/hnbap/CauseRadioNetwork.h D include/osmocom/hnbap/CauseTransport.h D include/osmocom/hnbap/CellIdentity.h D include/osmocom/hnbap/ConfigurationInformation.h D include/osmocom/hnbap/Context-ID.h D include/osmocom/hnbap/Criticality.h D include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h D include/osmocom/hnbap/CriticalityDiagnostics.h D include/osmocom/hnbap/ESN.h D include/osmocom/hnbap/GTP-TEI.h D include/osmocom/hnbap/GeographicalLocation.h D include/osmocom/hnbap/HNB-Cell-Access-Mode.h D include/osmocom/hnbap/HNB-Cell-Identifier.h D include/osmocom/hnbap/HNB-GWResponse.h D include/osmocom/hnbap/HNB-Identity-Info.h D include/osmocom/hnbap/HNB-Identity.h D include/osmocom/hnbap/HNB-Location-Information.h D include/osmocom/hnbap/HNB-RNL-Identity.h D include/osmocom/hnbap/HNBAP-PDU.h A include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h A include/osmocom/hnbap/HNBAP_AccessResult.h A include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h R include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h A include/osmocom/hnbap/HNBAP_BackoffTimer.h A include/osmocom/hnbap/HNBAP_BindingID.h A include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h A include/osmocom/hnbap/HNBAP_CGI.h A include/osmocom/hnbap/HNBAP_CI.h A include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h A include/osmocom/hnbap/HNBAP_CSG-Capability.h A include/osmocom/hnbap/HNBAP_CSG-ID.h A include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h R include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h A include/osmocom/hnbap/HNBAP_Cause.h A include/osmocom/hnbap/HNBAP_CauseMisc.h A include/osmocom/hnbap/HNBAP_CauseProtocol.h A include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h A include/osmocom/hnbap/HNBAP_CauseTransport.h A include/osmocom/hnbap/HNBAP_CellIdentity.h A include/osmocom/hnbap/HNBAP_ConfigurationInformation.h A include/osmocom/hnbap/HNBAP_Context-ID.h A include/osmocom/hnbap/HNBAP_Criticality.h A include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h A include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h A include/osmocom/hnbap/HNBAP_ESN.h R include/osmocom/hnbap/HNBAP_ErrorIndication.h A include/osmocom/hnbap/HNBAP_GTP-TEI.h R include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h A include/osmocom/hnbap/HNBAP_GeographicalLocation.h A include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h A include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h A include/osmocom/hnbap/HNBAP_HNB-GWResponse.h A include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h A include/osmocom/hnbap/HNBAP_HNB-Identity.h A include/osmocom/hnbap/HNBAP_HNB-Location-Information.h A include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h A include/osmocom/hnbap/HNBAP_HNBAP-PDU.h A include/osmocom/hnbap/HNBAP_HNBCapacity.h A include/osmocom/hnbap/HNBAP_HNBConfigInfo.h R include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h R include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h A include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h A include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h R include/osmocom/hnbap/HNBAP_HNBDe-Register.h R include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h R include/osmocom/hnbap/HNBAP_HNBRegisterReject.h R include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h C include/osmocom/hnbap/HNBAP_IE-Extensions.h R include/osmocom/hnbap/HNBAP_IE.h A include/osmocom/hnbap/HNBAP_IMEI.h A include/osmocom/hnbap/HNBAP_IMSI.h A include/osmocom/hnbap/HNBAP_IMSIDS41.h A include/osmocom/hnbap/HNBAP_IMSIESN.h R include/osmocom/hnbap/HNBAP_IP-Address.h A include/osmocom/hnbap/HNBAP_InitiatingMessage.h A include/osmocom/hnbap/HNBAP_Ipv4Address.h A include/osmocom/hnbap/HNBAP_Ipv6Address.h A include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h A include/osmocom/hnbap/HNBAP_LAC.h C include/osmocom/hnbap/HNBAP_LAI.h A include/osmocom/hnbap/HNBAP_MacroCellID.h A include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h A include/osmocom/hnbap/HNBAP_MuxPortNumber.h A include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h A include/osmocom/hnbap/HNBAP_NeighbourIdentity.h A include/osmocom/hnbap/HNBAP_NeighbourInfoList.h A include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h A include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h A include/osmocom/hnbap/HNBAP_PLMNidentity.h A include/osmocom/hnbap/HNBAP_PSC.h A include/osmocom/hnbap/HNBAP_PTMSI.h C include/osmocom/hnbap/HNBAP_PTMSIRAI.h A include/osmocom/hnbap/HNBAP_Presence.h A include/osmocom/hnbap/HNBAP_PrivateIE-ID.h R include/osmocom/hnbap/HNBAP_PrivateMessage.h A include/osmocom/hnbap/HNBAP_ProcedureCode.h A include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h A include/osmocom/hnbap/HNBAP_RAB-ID.h R include/osmocom/hnbap/HNBAP_RABList.h A include/osmocom/hnbap/HNBAP_RABListItem.h A include/osmocom/hnbap/HNBAP_RAC.h R include/osmocom/hnbap/HNBAP_RAI.h A include/osmocom/hnbap/HNBAP_RNC-ID.h A include/osmocom/hnbap/HNBAP_Registration-Cause.h R include/osmocom/hnbap/HNBAP_RelocationComplete.h A include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h A include/osmocom/hnbap/HNBAP_SAC.h A include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h A include/osmocom/hnbap/HNBAP_TMSIDS41.h R include/osmocom/hnbap/HNBAP_TMSILAI.h R include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h R include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h R include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h R include/osmocom/hnbap/HNBAP_TransportInfo.h A include/osmocom/hnbap/HNBAP_TransportLayerAddress.h A include/osmocom/hnbap/HNBAP_TriggeringMessage.h A include/osmocom/hnbap/HNBAP_Tunnel-Information.h A include/osmocom/hnbap/HNBAP_TypeOfError.h A include/osmocom/hnbap/HNBAP_U-RNTI.h R include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h R include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h A include/osmocom/hnbap/HNBAP_UDP-Port-Number.h A include/osmocom/hnbap/HNBAP_UE-Capabilities.h A include/osmocom/hnbap/HNBAP_UE-Identity.h R include/osmocom/hnbap/HNBAP_UEDe-Register.h R include/osmocom/hnbap/HNBAP_UERegisterAccept.h R include/osmocom/hnbap/HNBAP_UERegisterReject.h R include/osmocom/hnbap/HNBAP_UERegisterRequest.h A include/osmocom/hnbap/HNBAP_URAIdentity.h A include/osmocom/hnbap/HNBAP_URAIdentityList.h A include/osmocom/hnbap/HNBAP_UTRANCellID.h A include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h A include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h A include/osmocom/hnbap/HNBAP_Update-cause.h D include/osmocom/hnbap/HNBCapacity.h D include/osmocom/hnbap/HNBConfigInfo.h D include/osmocom/hnbap/HNBConfigurationInformationMissing.h D include/osmocom/hnbap/HNBConfigurationInformationProvided.h D include/osmocom/hnbap/IE-Extensions.h D include/osmocom/hnbap/IMEI.h D include/osmocom/hnbap/IMSI.h D include/osmocom/hnbap/IMSIDS41.h D include/osmocom/hnbap/IMSIESN.h D include/osmocom/hnbap/InitiatingMessage.h D include/osmocom/hnbap/Ipv4Address.h D include/osmocom/hnbap/Ipv6Address.h D include/osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h D include/osmocom/hnbap/LAC.h D include/osmocom/hnbap/MacroCellID.h D include/osmocom/hnbap/MacroCoverageInformation.h M include/osmocom/hnbap/Makefile.am D include/osmocom/hnbap/MuxPortNumber.h D include/osmocom/hnbap/NeighbourCellIdentityList.h D include/osmocom/hnbap/NeighbourIdentity.h D include/osmocom/hnbap/NeighbourInfoList.h D include/osmocom/hnbap/NeighbourInfoRequestItem.h D include/osmocom/hnbap/NeighbourInfoRequestList.h D include/osmocom/hnbap/PLMNidentity.h D include/osmocom/hnbap/PSC.h D include/osmocom/hnbap/PTMSI.h D include/osmocom/hnbap/PTMSIRAI.h D include/osmocom/hnbap/Presence.h D include/osmocom/hnbap/PrivateIE-ID.h D include/osmocom/hnbap/ProcedureCode.h D include/osmocom/hnbap/ProtocolIE-ID.h D include/osmocom/hnbap/RAB-ID.h D include/osmocom/hnbap/RABList.h D include/osmocom/hnbap/RABListItem.h D include/osmocom/hnbap/RAC.h D include/osmocom/hnbap/RAI.h D include/osmocom/hnbap/RNC-ID.h D include/osmocom/hnbap/Registration-Cause.h D include/osmocom/hnbap/S-RNTIPrefix.h D include/osmocom/hnbap/SAC.h D include/osmocom/hnbap/SuccessfulOutcome.h D include/osmocom/hnbap/TMSIDS41.h D include/osmocom/hnbap/TransportLayerAddress.h D include/osmocom/hnbap/TriggeringMessage.h D include/osmocom/hnbap/Tunnel-Information.h D include/osmocom/hnbap/TypeOfError.h D include/osmocom/hnbap/U-RNTI.h D include/osmocom/hnbap/UDP-Port-Number.h D include/osmocom/hnbap/UE-Capabilities.h D include/osmocom/hnbap/UE-Identity.h D include/osmocom/hnbap/URAIdentity.h D include/osmocom/hnbap/UTRANCellID.h D include/osmocom/hnbap/UnknownU-RNTIIndication.h D include/osmocom/hnbap/UnsuccessfulOutcome.h D include/osmocom/hnbap/Update-cause.h M include/osmocom/hnbap/hnbap_common.h M src/Makefile.am D src/hnbap/Access-stratum-release-indicator.c D src/hnbap/AccessResult.c D src/hnbap/AdditionalNeighbourInfoList.c D src/hnbap/BindingID.c D src/hnbap/CELL-FACHMobilitySupport.c D src/hnbap/CGI.c D src/hnbap/CN-DomainIndicator.c D src/hnbap/CSG-Capability.c D src/hnbap/CSG-ID.c D src/hnbap/CSGMembershipStatus.c D src/hnbap/CauseMisc.c D src/hnbap/CauseProtocol.c D src/hnbap/CauseTransport.c D src/hnbap/ConfigurationInformation.c D src/hnbap/Criticality.c D src/hnbap/CriticalityDiagnostics.c D src/hnbap/ESN.c D src/hnbap/GeographicalLocation.c D src/hnbap/HNB-Cell-Access-Mode.c D src/hnbap/HNB-Cell-Identifier.c D src/hnbap/HNB-GWResponse.c D src/hnbap/HNB-Identity.c D src/hnbap/HNB-Location-Information.c D src/hnbap/HNB-RNL-Identity.c A src/hnbap/HNBAP_Access-stratum-release-indicator.c A src/hnbap/HNBAP_AccessResult.c A src/hnbap/HNBAP_AdditionalNeighbourInfoList.c R src/hnbap/HNBAP_AltitudeAndDirection.c R src/hnbap/HNBAP_BackoffTimer.c R src/hnbap/HNBAP_BindingID.c A src/hnbap/HNBAP_CELL-FACHMobilitySupport.c A src/hnbap/HNBAP_CGI.c R src/hnbap/HNBAP_CI.c A src/hnbap/HNBAP_CN-DomainIndicator.c A src/hnbap/HNBAP_CSG-Capability.c R src/hnbap/HNBAP_CSG-ID.c A src/hnbap/HNBAP_CSGMembershipStatus.c R src/hnbap/HNBAP_CSGMembershipUpdate.c R src/hnbap/HNBAP_Cause.c A src/hnbap/HNBAP_CauseMisc.c A src/hnbap/HNBAP_CauseProtocol.c R src/hnbap/HNBAP_CauseRadioNetwork.c A src/hnbap/HNBAP_CauseTransport.c R src/hnbap/HNBAP_CellIdentity.c A src/hnbap/HNBAP_ConfigurationInformation.c R src/hnbap/HNBAP_Context-ID.c A src/hnbap/HNBAP_Criticality.c R src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c A src/hnbap/HNBAP_CriticalityDiagnostics.c R src/hnbap/HNBAP_ESN.c R src/hnbap/HNBAP_ErrorIndication.c R src/hnbap/HNBAP_GTP-TEI.c R src/hnbap/HNBAP_GeographicalCoordinates.c A src/hnbap/HNBAP_GeographicalLocation.c A src/hnbap/HNBAP_HNB-Cell-Access-Mode.c A src/hnbap/HNBAP_HNB-Cell-Identifier.c A src/hnbap/HNBAP_HNB-GWResponse.c A src/hnbap/HNBAP_HNB-Identity-Info.c A src/hnbap/HNBAP_HNB-Identity.c A src/hnbap/HNBAP_HNB-Location-Information.c A src/hnbap/HNBAP_HNB-RNL-Identity.c R src/hnbap/HNBAP_HNBAP-PDU.c R src/hnbap/HNBAP_HNBCapacity.c A src/hnbap/HNBAP_HNBConfigInfo.c R src/hnbap/HNBAP_HNBConfigTransferRequest.c R src/hnbap/HNBAP_HNBConfigTransferResponse.c A src/hnbap/HNBAP_HNBConfigurationInformationMissing.c A src/hnbap/HNBAP_HNBConfigurationInformationProvided.c R src/hnbap/HNBAP_HNBDe-Register.c R src/hnbap/HNBAP_HNBRegisterAccept.c R src/hnbap/HNBAP_HNBRegisterReject.c R src/hnbap/HNBAP_HNBRegisterRequest.c A src/hnbap/HNBAP_IE-Extensions.c R src/hnbap/HNBAP_IE.c R src/hnbap/HNBAP_IMEI.c R src/hnbap/HNBAP_IMSI.c R src/hnbap/HNBAP_IMSIDS41.c A src/hnbap/HNBAP_IMSIESN.c R src/hnbap/HNBAP_IP-Address.c A src/hnbap/HNBAP_InitiatingMessage.c C src/hnbap/HNBAP_Ipv4Address.c R src/hnbap/HNBAP_Ipv6Address.c A src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c C src/hnbap/HNBAP_LAC.c A src/hnbap/HNBAP_LAI.c A src/hnbap/HNBAP_MacroCellID.c A src/hnbap/HNBAP_MacroCoverageInformation.c A src/hnbap/HNBAP_MuxPortNumber.c A src/hnbap/HNBAP_NeighbourCellIdentityList.c A src/hnbap/HNBAP_NeighbourIdentity.c A src/hnbap/HNBAP_NeighbourInfoList.c A src/hnbap/HNBAP_NeighbourInfoRequestItem.c A src/hnbap/HNBAP_NeighbourInfoRequestList.c R src/hnbap/HNBAP_PLMNidentity.c R src/hnbap/HNBAP_PSC.c C src/hnbap/HNBAP_PTMSI.c A src/hnbap/HNBAP_PTMSIRAI.c A src/hnbap/HNBAP_Presence.c R src/hnbap/HNBAP_PrivateIE-ID.c R src/hnbap/HNBAP_PrivateMessage.c A src/hnbap/HNBAP_ProcedureCode.c A src/hnbap/HNBAP_ProtocolIE-ID.c R src/hnbap/HNBAP_RAB-ID.c A src/hnbap/HNBAP_RABList.c A src/hnbap/HNBAP_RABListItem.c R src/hnbap/HNBAP_RAC.c A src/hnbap/HNBAP_RAI.c R src/hnbap/HNBAP_RNC-ID.c A src/hnbap/HNBAP_Registration-Cause.c R src/hnbap/HNBAP_RelocationComplete.c C src/hnbap/HNBAP_S-RNTIPrefix.c R src/hnbap/HNBAP_SAC.c A src/hnbap/HNBAP_SuccessfulOutcome.c R src/hnbap/HNBAP_TMSIDS41.c R src/hnbap/HNBAP_TMSILAI.c R src/hnbap/HNBAP_TNLUpdateFailure.c R src/hnbap/HNBAP_TNLUpdateRequest.c R src/hnbap/HNBAP_TNLUpdateResponse.c R src/hnbap/HNBAP_TransportInfo.c A src/hnbap/HNBAP_TransportLayerAddress.c A src/hnbap/HNBAP_TriggeringMessage.c A src/hnbap/HNBAP_Tunnel-Information.c A src/hnbap/HNBAP_TypeOfError.c C src/hnbap/HNBAP_U-RNTI.c R src/hnbap/HNBAP_U-RNTIQueryRequest.c R src/hnbap/HNBAP_U-RNTIQueryResponse.c A src/hnbap/HNBAP_UDP-Port-Number.c A src/hnbap/HNBAP_UE-Capabilities.c R src/hnbap/HNBAP_UE-Identity.c R src/hnbap/HNBAP_UEDe-Register.c R src/hnbap/HNBAP_UERegisterAccept.c R src/hnbap/HNBAP_UERegisterReject.c R src/hnbap/HNBAP_UERegisterRequest.c C src/hnbap/HNBAP_URAIdentity.c A src/hnbap/HNBAP_URAIdentityList.c A src/hnbap/HNBAP_UTRANCellID.c A src/hnbap/HNBAP_UnknownU-RNTIIndication.c A src/hnbap/HNBAP_UnsuccessfulOutcome.c A src/hnbap/HNBAP_Update-cause.c D src/hnbap/HNBConfigInfo.c D src/hnbap/HNBConfigurationInformationMissing.c D src/hnbap/HNBConfigurationInformationProvided.c D src/hnbap/IE-Extensions.c D src/hnbap/IMSIESN.c D src/hnbap/InitiatingMessage.c D src/hnbap/Ipv4Address.c D src/hnbap/Ipv6Address.c D src/hnbap/Iurh-Signalling-TNL-AddressList.c D src/hnbap/LAC.c D src/hnbap/LAI.c D src/hnbap/MacroCellID.c D src/hnbap/MacroCoverageInformation.c M src/hnbap/Makefile.am D src/hnbap/MuxPortNumber.c D src/hnbap/NeighbourCellIdentityList.c D src/hnbap/NeighbourIdentity.c D src/hnbap/NeighbourInfoList.c D src/hnbap/NeighbourInfoRequestItem.c D src/hnbap/NeighbourInfoRequestList.c D src/hnbap/PTMSIRAI.c D src/hnbap/Presence.c D src/hnbap/ProcedureCode.c D src/hnbap/ProtocolIE-ID.c D src/hnbap/RABList.c D src/hnbap/RABListItem.c D src/hnbap/RAI.c D src/hnbap/RNC-ID.c D src/hnbap/Registration-Cause.c D src/hnbap/SuccessfulOutcome.c D src/hnbap/TransportLayerAddress.c D src/hnbap/TriggeringMessage.c D src/hnbap/Tunnel-Information.c D src/hnbap/TypeOfError.c D src/hnbap/U-RNTI.c D src/hnbap/UE-Capabilities.c D src/hnbap/URAIdentityList.c D src/hnbap/UTRANCellID.c D src/hnbap/UnknownU-RNTIIndication.c D src/hnbap/UnsuccessfulOutcome.c D src/hnbap/Update-cause.c M src/hnbap_common.c M src/hnbgw_hnbap.c M src/hnbgw_rua.c M src/tests/hnb-test.c M src/tests/test-hnbap.c 391 files changed, 13,507 insertions(+), 14,888 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/61/25961/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6c062f631527ae42811bfec134933671c05ecba6 Gerrit-Change-Number: 25961 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 13:29:35 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 13:29:35 +0000 Subject: Change in osmo-bts[master]: Revert "bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly" In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25943 ) Change subject: Revert "bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie23d94924f824bd7e89437ccf73b260f542477c6 Gerrit-Change-Number: 25943 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 13:29:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 13:29:53 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 13:29:53 +0000 Subject: Change in osmo-bts[master]: scheduler: Fix check against empty PDCH blocks In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25944 ) Change subject: scheduler: Fix check against empty PDCH blocks ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I18b61fcaa858a53887191a18d560c2e929478c64 Gerrit-Change-Number: 25944 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 13:29:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 13:30:20 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 13:30:20 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched: tx_pdtch_fn: Drop log line clogging logs In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25945 ) Change subject: bts-trx: sched: tx_pdtch_fn: Drop log line clogging logs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia7045724a1a3206f5890c0b12843711ad2360ed8 Gerrit-Change-Number: 25945 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 13:30:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 13:33:54 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 13:33:54 +0000 Subject: Change in osmo-bsc[master]: Set subslots_per_pchan_vamos[GSM_PCHAN_OSMO_DYN] = 0 In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25947 ) Change subject: Set subslots_per_pchan_vamos[GSM_PCHAN_OSMO_DYN] = 0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8727d5b446179c0ebcd8738507efe5a50afaf1e2 Gerrit-Change-Number: 25947 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 13:33:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 13:34:32 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 13:34:32 +0000 Subject: Change in osmo-bsc[master]: timeslot_fsm: Add assert to make sure we never go out of bounds in ts... In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25946 ) Change subject: timeslot_fsm: Add assert to make sure we never go out of bounds in ts->lchan array ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I23a5349838e0c540fbb54cad10f2af42268d7729 Gerrit-Change-Number: 25946 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 13:34:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 13:39:46 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 13:39:46 +0000 Subject: Change in osmo-bsc[master]: Properly handle dyn TS TCH with vamos after updating subslots_per_pchan In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25940 ) Change subject: Properly handle dyn TS TCH with vamos after updating subslots_per_pchan ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25940 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: If86af5fafe059d5e830c1f6d37034f7325d9a96c Gerrit-Change-Number: 25940 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 13:39:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 13:49:55 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 13:49:55 +0000 Subject: Change in osmo-bsc[master]: timeslot_fsm: Add assert to make sure we never go out of bounds in ts... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25946 ) Change subject: timeslot_fsm: Add assert to make sure we never go out of bounds in ts->lchan array ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I23a5349838e0c540fbb54cad10f2af42268d7729 Gerrit-Change-Number: 25946 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 13:49:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 13:49:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 13:49:58 +0000 Subject: Change in osmo-bsc[master]: Set subslots_per_pchan_vamos[GSM_PCHAN_OSMO_DYN] = 0 In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25947 ) Change subject: Set subslots_per_pchan_vamos[GSM_PCHAN_OSMO_DYN] = 0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8727d5b446179c0ebcd8738507efe5a50afaf1e2 Gerrit-Change-Number: 25947 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 13:49:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 13:50:06 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 13:50:06 +0000 Subject: Change in osmo-bsc[master]: timeslot_fsm: Add assert to make sure we never go out of bounds in ts... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25946 ) Change subject: timeslot_fsm: Add assert to make sure we never go out of bounds in ts->lchan array ...................................................................... timeslot_fsm: Add assert to make sure we never go out of bounds in ts->lchan array Related: OS#5278 Change-Id: I23a5349838e0c540fbb54cad10f2af42268d7729 --- M src/osmo-bsc/timeslot_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index 76ac1af..93fc380 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -243,6 +243,7 @@ ts->max_lchans_possible = max_lchans + max_lchans_vamos; ts->max_primary_lchans = 0; + OSMO_ASSERT(ts->max_lchans_possible <= TS_MAX_LCHAN); for (i = 0; i < ts->max_lchans_possible; i++) { /* If we receive more than one Channel OPSTART ACK, don't fail on the second init. */ if (ts->lchan[i].fi) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I23a5349838e0c540fbb54cad10f2af42268d7729 Gerrit-Change-Number: 25946 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 13:50:07 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 13:50:07 +0000 Subject: Change in osmo-bsc[master]: Set subslots_per_pchan_vamos[GSM_PCHAN_OSMO_DYN] = 0 In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25947 ) Change subject: Set subslots_per_pchan_vamos[GSM_PCHAN_OSMO_DYN] = 0 ...................................................................... Set subslots_per_pchan_vamos[GSM_PCHAN_OSMO_DYN] = 0 VAMOS secondary lchans are to be used specifically when the osmocom dyn TS is set to pchan_is=TCH_{F,H}. Setting secondary subslots for OSMO_DYN TS is not needed since it's only used to initialize the TS, and OSMO DYN already initializes 8 subslots (subslots_per_pchan[GSM_PCHAN_OSMO_DYN]=8). Otherwise, ts_setup_lchans() will try to initialize 8+2 lchans on the TS, which is more than needed and will access out of bounds in the array. Related: OS#5278 Change-Id: I8727d5b446179c0ebcd8738507efe5a50afaf1e2 --- M src/osmo-bsc/gsm_data.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index b0e0a68..0134e34 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -633,7 +633,7 @@ [GSM_PCHAN_SDCCH8_SACCH8C] = 0, [GSM_PCHAN_CCCH_SDCCH4_CBCH] = 0, [GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = 0, - [GSM_PCHAN_OSMO_DYN] = 2, + [GSM_PCHAN_OSMO_DYN] = 0, [GSM_PCHAN_TCH_F_PDCH] = 2, }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25947 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8727d5b446179c0ebcd8738507efe5a50afaf1e2 Gerrit-Change-Number: 25947 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 13:57:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 13:57:59 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 to look at the new patch set (#2). Change subject: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN ...................................................................... src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 --- M src/hnbap/Makefile.am M src/ranap/Makefile.am M src/rua/Makefile.am M src/sabp/Makefile.am 4 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/58/25958/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 Gerrit-Change-Number: 25958 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Tue Oct 26 13:59:00 2021 From: noreply at opensuse.org (OBS Notification) Date: Tue, 26 Oct 2021 13:59:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Tumbleweed/x86_64 In-Reply-To: References: Message-ID: <617809ae2f89e_24ca2af300e165f41610327@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Tumbleweed/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Tumbleweed/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 128s] - /usr/include/osmocom/sabp/SABP_RepetitionNumber0.h [ 128s] - /usr/include/osmocom/sabp/SABP_RepetitionNumber1.h [ 128s] - /usr/include/osmocom/sabp/SABP_Reset-Complete.h [ 128s] - /usr/include/osmocom/sabp/SABP_Reset-Failure.h [ 128s] - /usr/include/osmocom/sabp/SABP_Reset.h [ 128s] - /usr/include/osmocom/sabp/SABP_Restart.h [ 128s] - /usr/include/osmocom/sabp/SABP_SABP-PDU.h [ 128s] - /usr/include/osmocom/sabp/SABP_Serial-Number.h [ 128s] - /usr/include/osmocom/sabp/SABP_Service-Area-Identifier.h [ 128s] - /usr/include/osmocom/sabp/SABP_Service-Areas-List.h [ 128s] - /usr/include/osmocom/sabp/SABP_SuccessfulOutcome.h [ 128s] - /usr/include/osmocom/sabp/SABP_TriggeringMessage.h [ 128s] - /usr/include/osmocom/sabp/SABP_TypeOfError.h [ 128s] - /usr/include/osmocom/sabp/SABP_UnsuccessfulOutcome.h [ 128s] - /usr/include/osmocom/sabp/SABP_Warning-Type.h [ 128s] - /usr/include/osmocom/sabp/SABP_WarningSecurityInfo.h [ 128s] - /usr/include/osmocom/sabp/SABP_Write-Replace-Complete.h [ 128s] - /usr/include/osmocom/sabp/SABP_Write-Replace-Failure.h [ 128s] - /usr/include/osmocom/sabp/SABP_Write-Replace.h [ 128s] - /usr/include/osmocom/sabp/sabp_common.h [ 128s] - /usr/include/osmocom/sabp/sabp_ies_defs.h [ 128s] [ 128s] ### VM INTERACTION START ### [ 131s] [ 124.575217][ T401] sysrq: Power Off [ 131s] [ 124.578533][ T7] reboot: Power down [ 131s] ### VM INTERACTION END ### [ 131s] [ 131s] sheep86 failed "build osmo-iuh.spec" at Tue Oct 26 13:58:57 UTC 2021. [ 131s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:10:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 14:10:17 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add minimalistic support for XUDT / XUDTS References: Message-ID: laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 ) Change subject: sccp: Add minimalistic support for XUDT / XUDTS ...................................................................... sccp: Add minimalistic support for XUDT / XUDTS XUDT and XUDTS can be used in two situations: a) because the sender wants to use segemntation b) because the sender wants to include a hop counter In this patch, we implement support for case "b" only. Change-Id: Ic5b9486f1aeb4bb90cfe702a7ce996f5d82ded2c Related: OS#5281, SYS#5674 --- M include/osmocom/sccp/sccp_types.h M src/sccp2sua.c 2 files changed, 110 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/62/25962/1 diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h index 616a7ee..4ad7edf 100644 --- a/include/osmocom/sccp/sccp_types.h +++ b/include/osmocom/sccp/sccp_types.h @@ -446,6 +446,9 @@ data #endif + /* optional */ + uint8_t optional_start; + #if OPTIONAL segmentation importance @@ -475,6 +478,9 @@ data #endif + /* optional */ + uint8_t optional_start; + #if OPTIONAL segmentation importancd diff --git a/src/sccp2sua.c b/src/sccp2sua.c index c937231..87bf491 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -1200,9 +1200,16 @@ } +static int sua_to_sccp_xudt(struct msgb *msg, struct xua_msg *xua); + static int sua_to_sccp_udt(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_unitdata *udt; + + /* Use XUDT if we have a hop counter on the SUA side */ + if (xua_msg_find_tag(xua, SUA_IEI_S7_HOP_CTR)) + return sua_to_sccp_xudt(msg, xua); + udt = (struct sccp_data_unitdata *) msgb_put(msg, sizeof(*udt)); /* Fixed Part */ @@ -1216,6 +1223,46 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ +static struct xua_msg *sccp_to_xua_xudt(struct msgb *msg, struct xua_msg *xua) +{ + struct sccp_data_ext_unitdata *xudt = (struct sccp_data_ext_unitdata *)msg->l2h; + + /* Fixed Part */ + xua_msg_add_u32(xua, SUA_IEI_PROTO_CLASS, xudt->proto_class); + xua_msg_add_u32(xua, SUA_IEI_S7_HOP_CTR, xudt->hop_counter); + /* Variable Part */ + if (!sccp_ptr_part_consistent(msg, &xudt->variable_called)) + return NULL; + sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, msg, &xudt->variable_called); + if (!sccp_ptr_part_consistent(msg, &xudt->variable_calling)) + return NULL; + sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, msg, &xudt->variable_calling); + if (!sccp_ptr_part_consistent(msg, &xudt->variable_data)) + return NULL; + sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, msg, &xudt->variable_data); + /* Optional Part */ + return sccp_to_xua_opt(msg, &xudt->optional_start, xua); + +} + +static int sua_to_sccp_xudt(struct msgb *msg, struct xua_msg *xua) +{ + struct sccp_data_ext_unitdata *xudt; + xudt = (struct sccp_data_ext_unitdata *) msgb_put(msg, sizeof(*xudt)); + + /* Fixed Part */ + xudt->type = SCCP_MSG_TYPE_XUDT; + xudt->proto_class = xua_msg_get_u32(xua, SUA_IEI_PROTO_CLASS); + xudt->hop_counter = xua_msg_get_u32(xua, SUA_IEI_S7_HOP_CTR); + /* Variable Part */ + sccp_add_var_addr(msg, &xudt->variable_called, xua, SUA_IEI_DEST_ADDR); + sccp_add_var_addr(msg, &xudt->variable_calling, xua, SUA_IEI_SRC_ADDR); + sccp_add_variable_part(msg, &xudt->variable_data, xua, SUA_IEI_DATA); + /* Optional Part */ + return xua_ies_to_sccp_opts(msg, &xudt->optional_start, xudt->type, xua); +} + +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_udts(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_unitdata_service *udts; @@ -1237,9 +1284,16 @@ } +static int sua_to_sccp_xudts(struct msgb *msg, struct xua_msg *xua); + static int sua_to_sccp_udts(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_unitdata_service *udts; + + /* Use XUDTS if we have a hop counter */ + if (xua_msg_find_tag(xua, SUA_IEI_S7_HOP_CTR)) + return sua_to_sccp_xudts(msg, xua); + udts = (struct sccp_data_unitdata_service *) msgb_put(msg, sizeof(*udts)); /* Fixed Part */ @@ -1253,6 +1307,46 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ +static struct xua_msg *sccp_to_xua_xudts(struct msgb *msg, struct xua_msg *xua) +{ + struct sccp_data_ext_unitdata_service *xudts; + xudts =(struct sccp_data_ext_unitdata_service *)msg->l2h; + + /* Fixed Part */ + xua_msg_add_u32(xua, SUA_IEI_CAUSE, SUA_CAUSE_T_RETURN | xudts->return_cause); + xua_msg_add_u32(xua, SUA_IEI_S7_HOP_CTR, xudts->hop_counter); + /* Variable Part */ + if (!sccp_ptr_part_consistent(msg, &xudts->variable_called)) + return NULL; + sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, msg, &xudts->variable_called); + if (!sccp_ptr_part_consistent(msg, &xudts->variable_calling)) + return NULL; + sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, msg, &xudts->variable_calling); + if (!sccp_ptr_part_consistent(msg, &xudts->variable_data)) + return NULL; + sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, msg, &xudts->variable_data); + /* Optional Part */ + return sccp_to_xua_opt(msg, &xudts->optional_start, xua); +} + +static int sua_to_sccp_xudts(struct msgb *msg, struct xua_msg *xua) +{ + struct sccp_data_ext_unitdata_service *xudts; + xudts = (struct sccp_data_ext_unitdata_service *) msgb_put(msg, sizeof(*xudts)); + + /* Fixed Part */ + xudts->type = SCCP_MSG_TYPE_XUDTS; + xudts->return_cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE) & 0xff; + xudts->hop_counter = xua_msg_get_u32(xua, SUA_IEI_S7_HOP_CTR); + /* Variable Part */ + sccp_add_var_addr(msg, &xudts->variable_called, xua, SUA_IEI_DEST_ADDR); + sccp_add_var_addr(msg, &xudts->variable_calling, xua, SUA_IEI_SRC_ADDR); + sccp_add_variable_part(msg, &xudts->variable_data, xua, SUA_IEI_DATA); + /* Optional Part */ + return xua_ies_to_sccp_opts(msg, &xudts->optional_start, xudts->type, xua); +} + +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_it(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_it *it = (struct sccp_data_it *)msg->l2h; @@ -1376,6 +1470,16 @@ if (!sccp_to_xua_err(msg, xua)) goto malformed; return xua; + case SCCP_MSG_TYPE_XUDT: + xua->hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT); + if (!sccp_to_xua_xudt(msg, xua)) + goto malformed; + return xua; + case SCCP_MSG_TYPE_XUDTS: + xua->hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDR); + if (!sccp_to_xua_xudts(msg, xua)) + goto malformed; + return xua; /* Unsupported Message Types */ case SCCP_MSG_TYPE_DT2: case SCCP_MSG_TYPE_AK: @@ -1383,8 +1487,6 @@ case SCCP_MSG_TYPE_EA: case SCCP_MSG_TYPE_RSR: case SCCP_MSG_TYPE_RSC: - case SCCP_MSG_TYPE_XUDT: - case SCCP_MSG_TYPE_XUDTS: case SCCP_MSG_TYPE_LUDT: case SCCP_MSG_TYPE_LUDTS: LOGP(DLSUA, LOGL_ERROR, "Unsupported SCCP message %s\n", -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic5b9486f1aeb4bb90cfe702a7ce996f5d82ded2c Gerrit-Change-Number: 25962 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:14:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:14:20 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 to look at the new patch set (#3). Change subject: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN ...................................................................... src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 --- M src/hnbap/Makefile.am M src/ranap/Makefile.am M src/rua/Makefile.am M src/sabp/Makefile.am 4 files changed, 8 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/58/25958/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 Gerrit-Change-Number: 25958 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:23:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 14:23:00 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add minimalistic support for XUDT / XUDTS In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 to look at the new patch set (#2). Change subject: sccp: Add minimalistic support for XUDT / XUDTS ...................................................................... sccp: Add minimalistic support for XUDT / XUDTS XUDT and XUDTS can be used in two situations: a) because the sender wants to use segemntation b) because the sender wants to include a hop counter In this patch, we implement support for case "b" only. Change-Id: Ic5b9486f1aeb4bb90cfe702a7ce996f5d82ded2c Related: OS#5281, SYS#5674 --- M include/osmocom/sccp/sccp_types.h M src/sccp2sua.c 2 files changed, 110 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/62/25962/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic5b9486f1aeb4bb90cfe702a7ce996f5d82ded2c Gerrit-Change-Number: 25962 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:23:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 14:23:43 +0000 Subject: Change in osmo-iuh[master]: hnbgw_rua.c: Use proper type struct In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25954 ) Change subject: hnbgw_rua.c: Use proper type struct ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I9e21b504e4fac072d8481d0a699bc58d1b94a12d Gerrit-Change-Number: 25954 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 26 Oct 2021 14:23:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:23:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 14:23:56 +0000 Subject: Change in osmo-iuh[master]: hnbgw_cn.c: Use proper type struct In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25955 ) Change subject: hnbgw_cn.c: Use proper type struct ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Icc8b90866a8edce9d10c87f4ced7137edf1c46f0 Gerrit-Change-Number: 25955 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 26 Oct 2021 14:23:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:24:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 14:24:04 +0000 Subject: Change in osmo-iuh[master]: hnb-test: Fix rc var may be used uninitialized In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25956 ) Change subject: hnb-test: Fix rc var may be used uninitialized ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6ca53dd57572338f15971633441da895843a164d Gerrit-Change-Number: 25956 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 26 Oct 2021 14:24:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:24:08 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 14:24:08 +0000 Subject: Change in osmo-iuh[master]: hnbgw_rua.c: Use proper type struct In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25954 ) Change subject: hnbgw_rua.c: Use proper type struct ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I9e21b504e4fac072d8481d0a699bc58d1b94a12d Gerrit-Change-Number: 25954 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 26 Oct 2021 14:24:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:24:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 14:24:10 +0000 Subject: Change in osmo-iuh[master]: hnbgw_cn.c: Use proper type struct In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25955 ) Change subject: hnbgw_cn.c: Use proper type struct ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Icc8b90866a8edce9d10c87f4ced7137edf1c46f0 Gerrit-Change-Number: 25955 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 26 Oct 2021 14:24:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:24:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 14:24:23 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25958 ) Change subject: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 Gerrit-Change-Number: 25958 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 26 Oct 2021 14:24:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:24:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 14:24:53 +0000 Subject: Change in osmo-iuh[master]: Update generated .c/.h after using asn1c -R param In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25960 ) Change subject: Update generated .c/.h after using asn1c -R param ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ib7a03973d43828f47ff59b561d9ddce43186f8af Gerrit-Change-Number: 25960 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 26 Oct 2021 14:24:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:25:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:25:08 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add minimalistic support for XUDT / XUDTS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 ) Change subject: sccp: Add minimalistic support for XUDT / XUDTS ...................................................................... Patch Set 2: (4 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/25962/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmo-sccp/+/25962/1//COMMIT_MSG at 11 PS1, Line 11: a) because the sender wants to use segemntation segmentation https://gerrit.osmocom.org/c/libosmo-sccp/+/25962/1/include/osmocom/sccp/sccp_types.h File include/osmocom/sccp/sccp_types.h: https://gerrit.osmocom.org/c/libosmo-sccp/+/25962/1/include/osmocom/sccp/sccp_types.h at 482 PS1, Line 482: uint8_t optional_start; should this be inside OPTIONAL define block below? https://gerrit.osmocom.org/c/libosmo-sccp/+/25962/1/src/sccp2sua.c File src/sccp2sua.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/25962/1/src/sccp2sua.c at 1203 PS1, Line 1203: static int sua_to_sccp_xudt(struct msgb *msg, struct xua_msg *xua); Why simply not putting the entire function here? https://gerrit.osmocom.org/c/libosmo-sccp/+/25962/1/src/sccp2sua.c at 1287 PS1, Line 1287: static int sua_to_sccp_xudts(struct msgb *msg, struct xua_msg *xua); Same here -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic5b9486f1aeb4bb90cfe702a7ce996f5d82ded2c Gerrit-Change-Number: 25962 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 14:25:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:25:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 14:25:35 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use specific prefix for HNBAP generated code In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25961 ) Change subject: hnbap: Use specific prefix for HNBAP generated code ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6c062f631527ae42811bfec134933671c05ecba6 Gerrit-Change-Number: 25961 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 26 Oct 2021 14:25:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:26:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:26:33 +0000 Subject: Change in osmo-iuh[master]: hnbgw_rua.c: Use proper type struct In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25954 ) Change subject: hnbgw_rua.c: Use proper type struct ...................................................................... hnbgw_rua.c: Use proper type struct Change-Id: I9e21b504e4fac072d8481d0a699bc58d1b94a12d --- M src/hnbgw_rua.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/hnbgw_rua.c b/src/hnbgw_rua.c index 5224bf1..33ba12b 100644 --- a/src/hnbgw_rua.c +++ b/src/hnbgw_rua.c @@ -39,7 +39,7 @@ #include #include -static const char *cn_domain_indicator_to_str(CN_DomainIndicator_t cN_DomainIndicator) +static const char *cn_domain_indicator_to_str(RUA_CN_DomainIndicator_t cN_DomainIndicator) { switch (cN_DomainIndicator) { case RUA_CN_DomainIndicator_cs_domain: @@ -174,7 +174,7 @@ /* forward a RUA message to the SCCP User API to SCCP */ static int rua_to_scu(struct hnb_context *hnb, - CN_DomainIndicator_t cN_DomainIndicator, + RUA_CN_DomainIndicator_t cN_DomainIndicator, enum osmo_scu_prim_type type, uint32_t context_id, uint32_t cause, const uint8_t *data, unsigned int len) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I9e21b504e4fac072d8481d0a699bc58d1b94a12d Gerrit-Change-Number: 25954 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:26:33 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:26:33 +0000 Subject: Change in osmo-iuh[master]: hnbgw_cn.c: Use proper type struct In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25955 ) Change subject: hnbgw_cn.c: Use proper type struct ...................................................................... hnbgw_cn.c: Use proper type struct Change-Id: Icc8b90866a8edce9d10c87f4ced7137edf1c46f0 --- M src/hnbgw_cn.c 1 file changed, 5 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/hnbgw_cn.c b/src/hnbgw_cn.c index 0623561..7b3cb09 100644 --- a/src/hnbgw_cn.c +++ b/src/hnbgw_cn.c @@ -34,7 +34,6 @@ #include #include #include -#include /*********************************************************************** * Outbound RANAP RESET to CN @@ -52,7 +51,7 @@ }; LOGP(DRANAP, LOGL_NOTICE, "Tx RESET to %s %s\n", - domain == CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", + domain == RANAP_CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", osmo_sccp_inst_addr_name(gw->sccp.cnlink->sccp, remote_addr)); msg = ranap_new_msg_reset(domain, &cause); @@ -69,7 +68,7 @@ struct msgb *msg; LOGP(DRANAP, LOGL_NOTICE, "Tx RESET ACK to %s %s\n", - domain == CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", + domain == RANAP_CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", osmo_sccp_inst_addr_name(gw->sccp.cnlink->sccp, remote_addr)); msg = ranap_new_msg_reset_ack(domain, NULL); @@ -119,7 +118,7 @@ const struct osmo_scu_unitdata_param *unitdata, RANAP_InitiatingMessage_t *imsg) { - CN_DomainIndicator_t domain; + RANAP_CN_DomainIndicator_t domain; RANAP_ResetIEs_t ies; int rc; @@ -128,14 +127,14 @@ ranap_free_reseties(&ies); LOGP(DRANAP, LOGL_NOTICE, "Rx RESET from %s %s, returning ACK\n", - domain == CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", + domain == RANAP_CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", osmo_sccp_inst_addr_name(cnlink->sccp, &unitdata->calling_addr)); /* FIXME: actually reset connections, if any */ if (transmit_reset_ack(cnlink->gw, domain, &unitdata->calling_addr)) LOGP(DRANAP, LOGL_ERROR, "Error: cannot send RESET ACK to %s %s\n", - domain == CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", + domain == RANAP_CN_DomainIndicator_cs_domain ? "IuCS" : "IuPS", osmo_sccp_inst_addr_name(cnlink->sccp, &unitdata->calling_addr)); return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Icc8b90866a8edce9d10c87f4ced7137edf1c46f0 Gerrit-Change-Number: 25955 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:26:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:26:34 +0000 Subject: Change in osmo-iuh[master]: hnb-test: Fix rc var may be used uninitialized In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25956 ) Change subject: hnb-test: Fix rc var may be used uninitialized ...................................................................... hnb-test: Fix rc var may be used uninitialized Warning observed compiling with gcc 11.1.0. Change-Id: I6ca53dd57572338f15971633441da895843a164d --- M src/tests/hnb-test.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/tests/hnb-test.c b/src/tests/hnb-test.c index b612814..344bac5 100644 --- a/src/tests/hnb-test.c +++ b/src/tests/hnb-test.c @@ -496,6 +496,7 @@ rc = hnb_test_rx_ue_register_acc(hnb, &pdu->choice.successfulOutcome.value); break; default: + rc = -ENOSPC; break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6ca53dd57572338f15971633441da895843a164d Gerrit-Change-Number: 25956 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:26:38 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 14:26:38 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25958 ) Change subject: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-iuh/+/25958/3/src/hnbap/Makefile.am File src/hnbap/Makefile.am: https://gerrit.osmocom.org/c/osmo-iuh/+/25958/3/src/hnbap/Makefile.am at 252 PS3, Line 252: test "$(realpath $(CURDIR))" = "$(realpath $(top_srcdir)/src/hnbap)" || cp *.c $(top_srcdir)/src/hnbap/ I suggest this to make it more readable: if [ "." != "$(srcdir)" ]; then \ cp *.c "$(srcdir)"; \ fi -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 Gerrit-Change-Number: 25958 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 14:26:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:27:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:27:31 +0000 Subject: Change in osmo-iuh[master]: Update generated .c/.h after using asn1c -R param In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25960 ) Change subject: Update generated .c/.h after using asn1c -R param ...................................................................... Patch Set 2: Verified+1 linter doesn't apply here. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ib7a03973d43828f47ff59b561d9ddce43186f8af Gerrit-Change-Number: 25960 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 14:27:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:27:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:27:32 +0000 Subject: Change in osmo-iuh[master]: Update generated .c/.h after using asn1c -R param In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25960 ) Change subject: Update generated .c/.h after using asn1c -R param ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ib7a03973d43828f47ff59b561d9ddce43186f8af Gerrit-Change-Number: 25960 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:28:34 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:28:34 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25959 ) Change subject: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code ...................................................................... Patch Set 2: Verified+1 This one fails because jenkins.sh checkes whether the generated C files need updating. I'm doing that in the follow-up commit to Make it easier to spot the logical hcange from the big list of files which get a comment line updated. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I5666a6dc1ec9e56fe133642fb0054e913265c081 Gerrit-Change-Number: 25959 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 14:28:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:28:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:28:36 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25959 ) Change subject: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I5666a6dc1ec9e56fe133642fb0054e913265c081 Gerrit-Change-Number: 25959 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:29:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:29:00 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use specific prefix for HNBAP generated code In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25961 ) Change subject: hnbap: Use specific prefix for HNBAP generated code ...................................................................... Patch Set 3: Verified+1 linter doesn't apply here. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6c062f631527ae42811bfec134933671c05ecba6 Gerrit-Change-Number: 25961 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 14:29:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:29:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:29:01 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use specific prefix for HNBAP generated code In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25961 ) Change subject: hnbap: Use specific prefix for HNBAP generated code ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6c062f631527ae42811bfec134933671c05ecba6 Gerrit-Change-Number: 25961 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:29:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 14:29:15 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add minimalistic support for XUDT / XUDTS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 ) Change subject: sccp: Add minimalistic support for XUDT / XUDTS ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/c/libosmo-sccp/+/25962/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/libosmo-sccp/+/25962/1//COMMIT_MSG at 11 PS1, Line 11: a) because the sender wants to use segemntation > segmentation Done https://gerrit.osmocom.org/c/libosmo-sccp/+/25962/1/include/osmocom/sccp/sccp_types.h File include/osmocom/sccp/sccp_types.h: https://gerrit.osmocom.org/c/libosmo-sccp/+/25962/1/include/osmocom/sccp/sccp_types.h at 482 PS1, Line 482: uint8_t optional_start; > should this be inside OPTIONAL define block below? I did it exactly like it is in the existing message definitions for other messages that have optional parts to ensure consistency in the file. The "OPTIONAL" blocks are actually some strange form of comments, as it would never compile if OPTIONAL would be true. https://gerrit.osmocom.org/c/libosmo-sccp/+/25962/1/src/sccp2sua.c File src/sccp2sua.c: https://gerrit.osmocom.org/c/libosmo-sccp/+/25962/1/src/sccp2sua.c at 1203 PS1, Line 1203: static int sua_to_sccp_xudt(struct msgb *msg, struct xua_msg *xua); > Why simply not putting the entire function here? to ensure the systematic ordering of functions in the file, grouping code by logical functionality rather than by linking dependency. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic5b9486f1aeb4bb90cfe702a7ce996f5d82ded2c Gerrit-Change-Number: 25962 Gerrit-PatchSet: 2 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 14:29:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:29:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 14:29:28 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add minimalistic support for XUDT / XUDTS In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 to look at the new patch set (#3). Change subject: sccp: Add minimalistic support for XUDT / XUDTS ...................................................................... sccp: Add minimalistic support for XUDT / XUDTS XUDT and XUDTS can be used in two situations: a) because the sender wants to use segmentation b) because the sender wants to include a hop counter In this patch, we implement support for case "b" only. Change-Id: Ic5b9486f1aeb4bb90cfe702a7ce996f5d82ded2c Related: OS#5281, SYS#5674 --- M include/osmocom/sccp/sccp_types.h M src/sccp2sua.c 2 files changed, 110 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/62/25962/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic5b9486f1aeb4bb90cfe702a7ce996f5d82ded2c Gerrit-Change-Number: 25962 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:30:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:30:56 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add minimalistic support for XUDT / XUDTS In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 ) Change subject: sccp: Add minimalistic support for XUDT / XUDTS ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/libosmo-sccp/+/25962/1/include/osmocom/sccp/sccp_types.h File include/osmocom/sccp/sccp_types.h: https://gerrit.osmocom.org/c/libosmo-sccp/+/25962/1/include/osmocom/sccp/sccp_types.h at 482 PS1, Line 482: uint8_t optional_start; > I did it exactly like it is in the existing message definitions for other messages that have optiona [?] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic5b9486f1aeb4bb90cfe702a7ce996f5d82ded2c Gerrit-Change-Number: 25962 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 14:30:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:33:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:33:04 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Add TC_process_rx_xudt, verifying reception of SCCP XUDT In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25957 ) Change subject: sccp: Add TC_process_rx_xudt, verifying reception of SCCP XUDT ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idbf6db7a684e51858129618b2fcffcbe55b1b70f Gerrit-Change-Number: 25957 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 14:33:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:37:12 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 14:37:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 ) Change subject: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938/1/bsc/BSC_Tests.ttcn at 1675 PS1, Line 1675: function f_est_dchan_dyn(OCT1 ra, GsmFrameNumber fn, octetstring l3) A comment here would be useful to understand the difference from f_est_dchan(). https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938/1/bsc/BSC_Tests.ttcn at 7300 PS1, Line 7300: SDCCH Might be good to clarify that it's SDCCH/4+CBCH. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938/1/bsc/BSC_Tests.ttcn at 7308 PS1, Line 7308: Three dyn TS as well as one static TCH/F and one TCH/H timeslot are available Hmm, but above you re-configure all timeslots to PDCH... This looks confusing. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iee37eef2012ce2c2e2f0a0db4c26abb75a947d84 Gerrit-Change-Number: 25938 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 14:37:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:38:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:38:53 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 to look at the new patch set (#4). Change subject: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN ...................................................................... src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 --- M src/hnbap/Makefile.am M src/ranap/Makefile.am M src/rua/Makefile.am M src/sabp/Makefile.am 4 files changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/58/25958/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 Gerrit-Change-Number: 25958 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:39:11 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 14:39:11 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25958 ) Change subject: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-iuh/+/25958/3/src/hnbap/Makefile.am File src/hnbap/Makefile.am: https://gerrit.osmocom.org/c/osmo-iuh/+/25958/3/src/hnbap/Makefile.am at 252 PS3, Line 252: test "$(realpath $(CURDIR))" = "$(realpath $(top_srcdir)/src/hnbap)" || cp *.c $(top_srcdir)/src/hnbap/ > I suggest this to make it more readable: [?] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 Gerrit-Change-Number: 25958 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-CC: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 14:39:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:41:23 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 14:41:23 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25958 ) Change subject: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-iuh/+/25958/4/src/sabp/Makefile.am File src/sabp/Makefile.am: https://gerrit.osmocom.org/c/osmo-iuh/+/25958/4/src/sabp/Makefile.am at 149 PS4, Line 149: if test "$(realpath $(CURDIR))" != "$(realpath $(top_srcdir)/src/sabp)"; then \ Inconsistent spacing, please shift it right by one tab like in other Makefiles. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 Gerrit-Change-Number: 25958 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-CC: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 14:41:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:42:02 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:42:02 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 to look at the new patch set (#5). Change subject: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN ...................................................................... src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 --- M src/hnbap/Makefile.am M src/ranap/Makefile.am M src/rua/Makefile.am M src/sabp/Makefile.am 4 files changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/58/25958/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 Gerrit-Change-Number: 25958 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-CC: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:43:09 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 14:43:09 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25959 ) Change subject: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I5666a6dc1ec9e56fe133642fb0054e913265c081 Gerrit-Change-Number: 25959 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 14:43:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:43:14 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:43:14 +0000 Subject: Change in osmo-bts[master]: Revert "bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly" In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25943 ) Change subject: Revert "bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie23d94924f824bd7e89437ccf73b260f542477c6 Gerrit-Change-Number: 25943 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 14:43:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:43:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:43:18 +0000 Subject: Change in osmo-bts[master]: scheduler: Fix check against empty PDCH blocks In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25944 ) Change subject: scheduler: Fix check against empty PDCH blocks ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I18b61fcaa858a53887191a18d560c2e929478c64 Gerrit-Change-Number: 25944 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 14:43:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:43:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:43:21 +0000 Subject: Change in osmo-bts[master]: Revert "bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly" In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25943 ) Change subject: Revert "bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly" ...................................................................... Revert "bts-trx: sched: tx_pdtch_fn: Handle PCU idle blocks properly" This reverts commit 8a85b71167c4580ddf9e6c59ea602475fd462b3a. This is actually the wrong fix. Proper fix comes as a follow-up patch, since the root cause happens earlier in upper layers. No msg with l2h=NULL should reach this point of code ever. Change-Id: Ie23d94924f824bd7e89437ccf73b260f542477c6 --- M src/osmo-bts-trx/sched_lchan_pdtch.c 1 file changed, 2 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c index e9e1e82..4c63acb 100644 --- a/src/osmo-bts-trx/sched_lchan_pdtch.c +++ b/src/osmo-bts-trx/sched_lchan_pdtch.c @@ -32,7 +32,6 @@ #include #include #include -#include #include @@ -162,10 +161,8 @@ /* get mac block from queue */ msg = _sched_dequeue_prim(l1ts, br); - if (!msg || !msg->l2h) { - const struct gsm_bts_trx *trx = l1ts->ts->trx; - if (!msg || trx == trx->bts->c0) - LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); + if (!msg) { + LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); goto no_msg; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25943 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie23d94924f824bd7e89437ccf73b260f542477c6 Gerrit-Change-Number: 25943 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:43:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:43:22 +0000 Subject: Change in osmo-bts[master]: scheduler: Fix check against empty PDCH blocks In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25944 ) Change subject: scheduler: Fix check against empty PDCH blocks ...................................................................... scheduler: Fix check against empty PDCH blocks msgb_l2len() will return nonzero values if msg->l2h is NULL. Let's check against msg->l2h being NULL instead. Related: SYS#5676 Related: SYS#4919 Fixes: 300e31ed135c674cd44526b7503d4664a45a9ec3 Change-Id: I18b61fcaa858a53887191a18d560c2e929478c64 --- M src/common/scheduler.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/scheduler.c b/src/common/scheduler.c index a53de09..c068ea0 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -869,7 +869,7 @@ OSMO_ASSERT(l1sap->oph.msg); /* ignore empty frame */ - if (!msgb_l2len(l1sap->oph.msg)) { + if (!l1sap->oph.msg->l2h) { msgb_free(l1sap->oph.msg); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25944 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I18b61fcaa858a53887191a18d560c2e929478c64 Gerrit-Change-Number: 25944 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:43:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:43:22 +0000 Subject: Change in osmo-bts[master]: bts-trx: sched: tx_pdtch_fn: Drop log line clogging logs In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25945 ) Change subject: bts-trx: sched: tx_pdtch_fn: Drop log line clogging logs ...................................................................... bts-trx: sched: tx_pdtch_fn: Drop log line clogging logs The burst is properly pre-filled to _sched_dummy_burst in bts_sched_init_buffers(), so we are fine doing nothing on C0. Related: SYS#5676 Related: SYS#4919 Fixes: 300e31ed135c674cd44526b7503d4664a45a9ec3 Change-Id: Ia7045724a1a3206f5890c0b12843711ad2360ed8 --- M src/osmo-bts-trx/sched_lchan_pdtch.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-trx/sched_lchan_pdtch.c b/src/osmo-bts-trx/sched_lchan_pdtch.c index 4c63acb..66be116 100644 --- a/src/osmo-bts-trx/sched_lchan_pdtch.c +++ b/src/osmo-bts-trx/sched_lchan_pdtch.c @@ -162,7 +162,11 @@ /* get mac block from queue */ msg = _sched_dequeue_prim(l1ts, br); if (!msg) { - LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "No prim for transmit.\n"); + /* It's totally fine to get no block here, since PCU may submit + * empty blocks when there's no MS listening. The scheduler will + * take care of filling C0 with dummy bursts to keep expected + * power transmit levels + */ goto no_msg; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia7045724a1a3206f5890c0b12843711ad2360ed8 Gerrit-Change-Number: 25945 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:46:01 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 14:46:01 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25958 ) Change subject: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-iuh/+/25958/5/src/hnbap/Makefile.am File src/hnbap/Makefile.am: https://gerrit.osmocom.org/c/osmo-iuh/+/25958/5/src/hnbap/Makefile.am at 252 PS5, Line 252: $(top_srcdir)/src/hnbap Why not simply: if [ "." != "$(srcdir)" ]; then No need to put the path relative to top_srcdir there, and no need to use realpath. Same below with "$(top_srcdir)/src/hnbap/" vs "$(srcdir)" -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 Gerrit-Change-Number: 25958 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-CC: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 14:46:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:49:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:49:08 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25958 ) Change subject: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-iuh/+/25958/5/src/hnbap/Makefile.am File src/hnbap/Makefile.am: https://gerrit.osmocom.org/c/osmo-iuh/+/25958/5/src/hnbap/Makefile.am at 252 PS5, Line 252: $(top_srcdir)/src/hnbap > Why not simply: [?] I don't want to run into weird/unexpected case where srcdir resolves to something different like "./" or the like. I really find it more understandable this way. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 Gerrit-Change-Number: 25958 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-CC: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 14:49:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:54:47 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 14:54:47 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25958 ) Change subject: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN ...................................................................... Patch Set 5: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-iuh/+/25958/5/src/hnbap/Makefile.am File src/hnbap/Makefile.am: https://gerrit.osmocom.org/c/osmo-iuh/+/25958/5/src/hnbap/Makefile.am at 252 PS5, Line 252: $(top_srcdir)/src/hnbap > I don't want to run into weird/unexpected case where srcdir resolves to something different like ". [?] okay. I prefer the other one, but not worth blocking the patch over this IMHO. Giving +1. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 Gerrit-Change-Number: 25958 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 26 Oct 2021 14:54:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:55:55 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 14:55:55 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25958 ) Change subject: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 Gerrit-Change-Number: 25958 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 14:55:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:56:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:56:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, neels, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 to look at the new patch set (#2). Change subject: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used ...................................................................... bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used Related: OS#5278 Related: SYS#5309 Change-Id: Iee37eef2012ce2c2e2f0a0db4c26abb75a947d84 --- M bsc/BSC_Tests.ttcn 1 file changed, 82 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/25938/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iee37eef2012ce2c2e2f0a0db4c26abb75a947d84 Gerrit-Change-Number: 25938 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:56:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:56:52 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25958 ) Change subject: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 Gerrit-Change-Number: 25958 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 14:56:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:57:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:57:01 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25959 ) Change subject: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I5666a6dc1ec9e56fe133642fb0054e913265c081 Gerrit-Change-Number: 25959 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:57:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:57:05 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25959 ) Change subject: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I5666a6dc1ec9e56fe133642fb0054e913265c081 Gerrit-Change-Number: 25959 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 14:57:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:57:14 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:57:14 +0000 Subject: Change in osmo-iuh[master]: Update generated .c/.h after using asn1c -R param In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25960 ) Change subject: Update generated .c/.h after using asn1c -R param ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ib7a03973d43828f47ff59b561d9ddce43186f8af Gerrit-Change-Number: 25960 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:57:18 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:57:18 +0000 Subject: Change in osmo-iuh[master]: Update generated .c/.h after using asn1c -R param In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25960 ) Change subject: Update generated .c/.h after using asn1c -R param ...................................................................... Patch Set 3: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ib7a03973d43828f47ff59b561d9ddce43186f8af Gerrit-Change-Number: 25960 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 14:57:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:57:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:57:26 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use specific prefix for HNBAP generated code In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25961 ) Change subject: hnbap: Use specific prefix for HNBAP generated code ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6c062f631527ae42811bfec134933671c05ecba6 Gerrit-Change-Number: 25961 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 14:57:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 14:57:29 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use specific prefix for HNBAP generated code In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25961 ) Change subject: hnbap: Use specific prefix for HNBAP generated code ...................................................................... Patch Set 4: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6c062f631527ae42811bfec134933671c05ecba6 Gerrit-Change-Number: 25961 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 14:57:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 15:15:54 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 15:15:54 +0000 Subject: Change in osmo-cbc[master]: varaible for atoi() result shouild be signed integer In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/25931 ) Change subject: varaible for atoi() result shouild be signed integer ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-cbc/+/25931/1/src/rest_api.c File src/rest_api.c: https://gerrit.osmocom.org/c/osmo-cbc/+/25931/1/src/rest_api.c at 605 PS1, Line 605: int message_id; > so iirc there's another patch from Vadim now in gerrit simply dropping the "message_id < 0" check from line 614. Please agree on which one to merge. Unfortunately, we both attempted to fix the same issue. I abandoned my patch. > perhaps atoi() can return negative if there's an error? No, atoi() does not detect errors at all. > It may be a good place to use neel's recent APIs to read integers from string using libosmocore. I don't see the need for this complication... -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/25931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I650fce5bd64752823ee57d8b528d2b371fada857 Gerrit-Change-Number: 25931 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 15:15:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 15:16:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 15:16:32 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20296 ) Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... Patch Set 15: (3 comments) https://gerrit.osmocom.org/c/libosmocore/+/20296/15/src/logging.c File src/logging.c: https://gerrit.osmocom.org/c/libosmocore/+/20296/15/src/logging.c at 920 PS15, Line 920: fprintf(target->tgt_file.out, "%s", log); > how about: [?] Done https://gerrit.osmocom.org/c/libosmocore/+/20296/15/src/logging.c at 1084 PS15, Line 1084: /* close the write queue file descriptor */ > With this comment, I would have expected close() here - but that's happening only later on. [?] Done https://gerrit.osmocom.org/c/libosmocore/+/20296/15/src/logging.c at 1099 PS15, Line 1099: block > write? Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 15 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 15:16:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 15:16:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 15:16:56 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: Hello osmith, Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/20296 to look at the new patch set (#16). Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... logging: Change stderr + file target to use non-blocking write So far, we used blocking, buffered fwrite() to write to stderr and file targets. This causes problems if there are [slow] consumers causing delays, such as gnome-terminal (when the program is started interactively) or systemd/journald (where we observe 64..128ms blocks on stderr). This patch introduces stderr/file based logging via write_queue and osmo_select_main(), i.e. switch from glibc-buffered, blocking to internally buffered, non-blocking writes. * when osmo_stderr_target is created via application.c, we create it in blocking stream mode for backwards compatibility, particularly for [smaller] programs that don't use osmo_select_main() * when the VTY code encounters 'log stderr' or 'log file FILENAME', we switch that respective target to non-blocking write-queue mode, as this means the application is in fact using osmo_select_main() * The config file can now state 'log stderr blocking-io' or 'log file FILENAME blocking-io' to explicitly enforce using blocking stream based I/O * The application can at any time use API functions to switch either way Closes: OS#4311 Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da --- M include/osmocom/core/logging.h M src/logging.c M src/vty/logging_vty.c M tests/logging/logging_vty_test.c 4 files changed, 313 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/20296/16 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 16 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 15:17:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 15:17:40 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add minimalistic support for XUDT / XUDTS In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 ) Change subject: sccp: Add minimalistic support for XUDT / XUDTS ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic5b9486f1aeb4bb90cfe702a7ce996f5d82ded2c Gerrit-Change-Number: 25962 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 15:17:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 15:17:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 15:17:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Add TC_process_rx_xudt, verifying reception of SCCP XUDT In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25957 ) Change subject: sccp: Add TC_process_rx_xudt, verifying reception of SCCP XUDT ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idbf6db7a684e51858129618b2fcffcbe55b1b70f Gerrit-Change-Number: 25957 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 15:17:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 15:18:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 15:18:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: sccp: Add TC_process_rx_xudt, verifying reception of SCCP XUDT In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25957 ) Change subject: sccp: Add TC_process_rx_xudt, verifying reception of SCCP XUDT ...................................................................... sccp: Add TC_process_rx_xudt, verifying reception of SCCP XUDT Test if a XUDT SCCP message is processed by libosmo-sigtran. We assume any XUDT is received (and echoed back) just like normal UDT. Related: OS#5281, SYS#5674 Change-Id: Idbf6db7a684e51858129618b2fcffcbe55b1b70f --- M library/SCCP_Templates.ttcn M sccp/SCCP_Tests_RAW.ttcn 2 files changed, 73 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/SCCP_Templates.ttcn b/library/SCCP_Templates.ttcn index 5167e4b..74f1a20 100644 --- a/library/SCCP_Templates.ttcn +++ b/library/SCCP_Templates.ttcn @@ -171,6 +171,53 @@ } } +template (value) PDU_SCCP ts_SCCP_XUDT(SCCP_PAR_Address calling, SCCP_PAR_Address called, + template (value) octetstring data, + template (value) BIT4 msg_hdl := '0000'B, + template (value) integer hop_ctr := 16) := { + extudata := { + messageType := xudt, + protClass := {'0000'B, msg_hdl}, + hopCounter := hop_ctr, + pointer1 := 0, /* overwritten */ + pointer2 := 0, /* overwritten */ + pointer3 := 0, /* overwritten */ + pointer4 := 0, /* overwritten */ + calledPAddress := ConvertASPAddressToEncodedAddress_itu(called), + callingPAddress := ConvertASPAddressToEncodedAddress_itu(calling), + data := { + paramLength := 0, + data := data + }, + optionalPart := omit, + eop := omit + } +} + +template PDU_SCCP tr_SCCP_XUDT(template (present) SCCP_PAR_Address calling, template (present) SCCP_PAR_Address called, + template octetstring data := ?, + template BIT4 msg_hdl := '0000'B, + template integer hop_ctr := ?) := { + extudata := { + messageType := xudt, + protClass := {'0000'B, msg_hdl}, + hopCounter := hop_ctr, + pointer1 := ?, + pointer2 := ?, + pointer3 := ?, + pointer4 := ?, + calledPAddress := tr_Addr(called), + callingPAddress := tr_Addr(calling), + data := { + paramLength := ?, + data := data + }, + optionalPart := { segmentation:= omit, importance := * } ifpresent, + eop := { paramName:= con_SCCP_eop } ifpresent + } +} + + template PDU_SCCP tr_SCCP_IT(template (present) OCT3 source_lref := ?, template (present) OCT3 dest_lref := ?) := { inacttest := { diff --git a/sccp/SCCP_Tests_RAW.ttcn b/sccp/SCCP_Tests_RAW.ttcn index 1ac82a2..5013ddf 100644 --- a/sccp/SCCP_Tests_RAW.ttcn +++ b/sccp/SCCP_Tests_RAW.ttcn @@ -310,6 +310,31 @@ } } +private function f_tx_xudt_exp(SCCP_PAR_Address calling, SCCP_PAR_Address called, octetstring data) runs on SCCP_Test_RAW_CT { + var template PDU_SCCP exp_rx; + f_send_sccp(ts_SCCP_XUDT(calling, called, data)); + exp_rx := (tr_SCCP_UDT(called, calling, data), tr_SCCP_XUDT(called, calling, data)); + f_exp_sccp(exp_rx); +} + +/* Test if the IUT SCCP code processes an XUDT [treat it like UDT] and answers back. */ +testcase TC_process_rx_xudt() runs on SCCP_Test_RAW_CT { + var SCCP_PAR_Address calling, called; + var octetstring data := f_rnd_octstring(f_rnd_int(100)); + + f_init_raw(mp_sccp_cfg[0]); + f_sleep(1.0); + + called := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].peer_pc, mp_sccp_cfg[0].peer_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + calling := valueof(ts_SccpAddr_PC_SSN(mp_sccp_cfg[0].own_pc, mp_sccp_cfg[0].own_ssn, + mp_sccp_cfg[0].sio, mp_sccp_cfg[0].sccp_service_type)); + + /* Make sure an XUDT is echoed back just like an UDT */ + f_tx_xudt_exp(calling, called, data); + setverdict(pass); +} + function f_scmg_xceive(SCCP_PAR_Address calling, SCCP_PAR_Address called, template (value) PDU_SCMG_message tx, template (omit) PDU_SCMG_message rx_exp, @@ -429,6 +454,7 @@ execute( TC_udt_without_cr_cc() ); execute( TC_tiar_timeout() ); execute( TC_it_avoids_tiar() ); + execute( TC_process_rx_xudt() ); execute( TC_scmg_sst_ssn1() ); execute( TC_scmg_sst_ssn_valid() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25957 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Idbf6db7a684e51858129618b2fcffcbe55b1b70f Gerrit-Change-Number: 25957 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 15:23:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 15:23:34 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: set don't-fragment flag on all TRXD packets In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23814 ) Change subject: osmo-bts-trx: set don't-fragment flag on all TRXD packets ...................................................................... Patch Set 5: > Patch Set 5: > > > Patch Set 5: Code-Review-2 > > > > why that? I thought the point was to _allow_ IP fragmentation in large TRXD PDUs? You're doing the exact opposite here? > > I don't remember all the details of our previous conversation regarding the IP fragmentation, sorry. My understanding at the time of writing this patch was that we don't want the fragmentation because of the associated performance loss. It seems I understood you wrong. a) the protocol is mostly spoken over looback, where MTU is 64k b) on other interfaces, yes, we should ideally stay belwo usual MTUs such as e.g. 1500 bytes In any case, this patch doesn't solve anything. You cannot fix this potential problem with a socket option. You need to make sure in the application code, that you don't aggregate more TRXD message to exceed the "reasonable minimum MTU". If you enable the DF bit, you are actively breaking existing situations that are working for the user (with fragmentation overhead). > I did some tests with the current master (no explicit IP_MTU_DISCOVER setting), and as far as I can see, the IP fragmentation is employed by default if a TRXD PDU exceeds the MTU. So AFAIU, we want to make sure that it can be employed regardless of the system's default policy by setting IP_MTU_DISCOVER explicitly, right? If so, shall I use IP_PMTUDISC_DONT or IP_PMTUDISC_WANT? fragmentation is always enabled by default, AFAICT. So nothing needs to be done to enable it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I25415b76b69ccf43f83ddfb0e7dd1e330fb23aa7 Gerrit-Change-Number: 23814 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 26 Oct 2021 15:23:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 15:25:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Tue, 26 Oct 2021 15:25:25 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: set don't-fragment flag on all TRXD packets In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23814 ) Change subject: osmo-bts-trx: set don't-fragment flag on all TRXD packets ...................................................................... Patch Set 5: > If you enable the DF bit, you are actively breaking existing situations that are working for the user (with fragmentation overhead). or to be more precise: If you want to enable DF, then you have to implement [in your application] some path-mtu-discovery to dynamically at runtime detect the MTU and then scale your UDP payload sizes to stay below it. In the absence of this, one could possibly introduce a VTY parameter. In the end, as stated above, over loopback it doesn't matter. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I25415b76b69ccf43f83ddfb0e7dd1e330fb23aa7 Gerrit-Change-Number: 23814 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 26 Oct 2021 15:25:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 15:39:57 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 15:39:57 +0000 Subject: Change in osmo-ci[master]: lint: checkpatch_osmo.sh: exclude asn1c generated References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25963 ) Change subject: lint: checkpatch_osmo.sh: exclude asn1c generated ...................................................................... lint: checkpatch_osmo.sh: exclude asn1c generated Does not make a noticable speed difference on a typical patch with few changed files, but makes linting on big patches with ~1000 files and lots of asn1c generated files in the repository significantly slower. The next patch will optimize that case. Change-Id: I7437d888b433fec8a444e4d7c285fff47d16c0c7 --- M lint/checkpatch/checkpatch_osmo.sh 1 file changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/63/25963/1 diff --git a/lint/checkpatch/checkpatch_osmo.sh b/lint/checkpatch/checkpatch_osmo.sh index 91e9abe..f9cc74f 100755 --- a/lint/checkpatch/checkpatch_osmo.sh +++ b/lint/checkpatch/checkpatch_osmo.sh @@ -1,6 +1,7 @@ #!/bin/sh -e SCRIPT_DIR="$(dirname "$(realpath "$0")")" -PROJECT="$(basename "$(git rev-parse --show-toplevel)")" +PROJECT_DIR="$(git rev-parse --show-toplevel)" +PROJECT="$(basename "$PROJECT_DIR")" exclude_paths_common() { # Stdout and stderr of regression tests @@ -9,6 +10,21 @@ echo '--exclude ^debian/changelog$' } +exclude_paths_common_asn1c() { + local pattern="^ \* Generated by asn1c-" + local files="$(find -name '*.c' -o -name '*.h' | cut -d / -f 2-)" + local i + + if [ -z "$files" ]; then + return + fi + + for i in $(grep -l "$pattern" $files); do + # Example: --exclude ^include/osmocom/sabp/SABP_Data-Coding-Scheme.h$ + echo '--exclude ^'$i'$' + done +} + exclude_paths_project() { case "$PROJECT" in libosmocore) @@ -56,8 +72,11 @@ # * UNNECESSARY_INT: not followed (see https://gerrit.osmocom.org/c/libosmocore/+/25345) # * UNSPECIFIED_INT: not followed (doesn't seem useful for us) +cd "$PROJECT_DIR" + $SCRIPT_DIR/checkpatch.pl \ $(exclude_paths_common) \ + $(exclude_paths_common_asn1c) \ $(exclude_paths_project) \ --ignore ASSIGN_IN_IF \ --ignore AVOID_EXTERNS \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7437d888b433fec8a444e4d7c285fff47d16c0c7 Gerrit-Change-Number: 25963 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 15:39:58 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 15:39:58 +0000 Subject: Change in osmo-ci[master]: lint: checkpatch.pl: break exclude loop early References: Message-ID: osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/25964 ) Change subject: lint: checkpatch.pl: break exclude loop early ...................................................................... lint: checkpatch.pl: break exclude loop early When running the linter on a patch with lots of files changed, and lots of exclude files, this makes a big difference. On my machine, running an osmo-iuh patch with 1580 files changed, and the high amount of asn1c related excludes, the time for linting is reduced from 50s to 25s. This should be acceptable, since typically we change only few files. Change-Id: I6fb41dec25ecc1f2df7242ae041a8685a696c3fd --- M lint/checkpatch/checkpatch.pl 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/64/25964/1 diff --git a/lint/checkpatch/checkpatch.pl b/lint/checkpatch/checkpatch.pl index 06e6e36..e31a61f 100755 --- a/lint/checkpatch/checkpatch.pl +++ b/lint/checkpatch/checkpatch.pl @@ -2813,6 +2813,7 @@ foreach (@exclude) { if ($realfile =~ m@$_@) { $skipme = 1; + last; # break out of the loop } } if ($skipme) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25964 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6fb41dec25ecc1f2df7242ae041a8685a696c3fd Gerrit-Change-Number: 25964 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 15:43:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 15:43:29 +0000 Subject: Change in osmo-ci[master]: lint: checkpatch_osmo.sh: exclude asn1c generated In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/25963 ) Change subject: lint: checkpatch_osmo.sh: exclude asn1c generated ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/25963 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7437d888b433fec8a444e4d7c285fff47d16c0c7 Gerrit-Change-Number: 25963 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 15:43:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:00:58 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 16:00:58 +0000 Subject: Change in osmo-trx[master]: trx_rate_ctr: use thread safe strerror() in device_sig_cb() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25935 ) Change subject: trx_rate_ctr: use thread safe strerror() in device_sig_cb() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibd52af22bbe99652f402ada87410de167a124b73 Gerrit-Change-Number: 25935 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 16:00:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:01:31 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 16:01:31 +0000 Subject: Change in osmo-trx[master]: IPCDevice: use thread safe strerror_r() instead of strerror() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25936 ) Change subject: IPCDevice: use thread safe strerror_r() instead of strerror() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia51ffa51ec7729572faca0282ae41c1e4968049f Gerrit-Change-Number: 25936 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 16:01:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:01:36 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 16:01:36 +0000 Subject: Change in osmo-trx[master]: trx_rate_ctr: use thread safe strerror() in device_sig_cb() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25935 ) Change subject: trx_rate_ctr: use thread safe strerror() in device_sig_cb() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibd52af22bbe99652f402ada87410de167a124b73 Gerrit-Change-Number: 25935 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 16:01:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:02:23 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 16:02:23 +0000 Subject: Change in osmo-trx[master]: IPCDevice: check value returned from select() In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25923 ) Change subject: IPCDevice: check value returned from select() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1c823317659547bb2391c57ac4d7931de1a383e3 Gerrit-Change-Number: 25923 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 16:02:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:04:01 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 16:04:01 +0000 Subject: Change in osmo-cbc[master]: varaible for atoi() result shouild be signed integer In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/25931 ) Change subject: varaible for atoi() result shouild be signed integer ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/25931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I650fce5bd64752823ee57d8b528d2b371fada857 Gerrit-Change-Number: 25931 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 26 Oct 2021 16:04:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:04:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 16:04:37 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20296 ) Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... Patch Set 16: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 16 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 16:04:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:08:23 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 16:08:23 +0000 Subject: Change in osmo-trx[master]: LMSDevice: LMS_GetDeviceList() may return a negative number In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25928 ) Change subject: LMSDevice: LMS_GetDeviceList() may return a negative number ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I855bd8ea6d9cb0f285f4dbbf3bcd09bff4e71044 Gerrit-Change-Number: 25928 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 16:08:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:10:15 2021 From: gerrit-no-reply at lists.osmocom.org (osmith) Date: Tue, 26 Oct 2021 16:10:15 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20296 ) Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... Patch Set 16: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 16 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 16:10:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:17:30 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 16:17:30 +0000 Subject: Change in osmo-trx[master]: trx_rate_ctr: use thread safe strerror() in device_sig_cb() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25935 ) Change subject: trx_rate_ctr: use thread safe strerror() in device_sig_cb() ...................................................................... trx_rate_ctr: use thread safe strerror() in device_sig_cb() Change-Id: Ibd52af22bbe99652f402ada87410de167a124b73 --- M CommonLibs/trx_rate_ctr.cpp 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/CommonLibs/trx_rate_ctr.cpp b/CommonLibs/trx_rate_ctr.cpp index ba4fcc0..a7467c1 100644 --- a/CommonLibs/trx_rate_ctr.cpp +++ b/CommonLibs/trx_rate_ctr.cpp @@ -214,6 +214,7 @@ struct timespec next_sched = {.tv_sec = 0, .tv_nsec = 20*1000*1000}; /* no automatic re-trigger */ struct timespec intv_sched = {.tv_sec = 0, .tv_nsec = 0}; + char err_buf[256]; switch (signal) { case S_DEVICE_COUNTER_CHANGE: @@ -222,7 +223,8 @@ dev_rate_ctr_mutex.lock(); dev_ctrs_pending[dev_ctr->chan] = *dev_ctr; if (osmo_timerfd_schedule(&dev_rate_ctr_timerfd, &next_sched, &intv_sched) < 0) { - LOGC(DCTR, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno); + LOGC(DCTR, ERROR) << "Failed to schedule timerfd: " << errno + << " = "<< strerror_r(errno, err_buf, sizeof(err_buf)); } dev_rate_ctr_mutex.unlock(); break; @@ -232,7 +234,8 @@ trx_rate_ctr_mutex.lock(); trx_ctrs_pending[trx_ctr->chan] = *trx_ctr; if (osmo_timerfd_schedule(&trx_rate_ctr_timerfd, &next_sched, &intv_sched) < 0) { - LOGC(DCTR, ERROR) << "Failed to schedule timerfd: " << errno << " = "<< strerror(errno); + LOGC(DCTR, ERROR) << "Failed to schedule timerfd: " << errno + << " = "<< strerror_r(errno, err_buf, sizeof(err_buf)); } trx_rate_ctr_mutex.unlock(); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ibd52af22bbe99652f402ada87410de167a124b73 Gerrit-Change-Number: 25935 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:17:31 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 16:17:31 +0000 Subject: Change in osmo-trx[master]: IPCDevice: use thread safe strerror_r() instead of strerror() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25936 ) Change subject: IPCDevice: use thread safe strerror_r() instead of strerror() ...................................................................... IPCDevice: use thread safe strerror_r() instead of strerror() Change-Id: Ia51ffa51ec7729572faca0282ae41c1e4968049f --- M Transceiver52M/device/ipc/IPCDevice.cpp 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/Transceiver52M/device/ipc/IPCDevice.cpp b/Transceiver52M/device/ipc/IPCDevice.cpp index 5ed428e..c1c6449 100644 --- a/Transceiver52M/device/ipc/IPCDevice.cpp +++ b/Transceiver52M/device/ipc/IPCDevice.cpp @@ -100,12 +100,14 @@ int IPCDevice::ipc_shm_connect(const char *shm_name) { int fd; + char err_buf[256]; size_t shm_len; int rc; LOGP(DDEV, LOGL_NOTICE, "Opening shm path %s\n", shm_name); if ((fd = shm_open(shm_name, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR)) < 0) { - LOGP(DDEV, LOGL_ERROR, "shm_open %d: %s\n", errno, strerror(errno)); + LOGP(DDEV, LOGL_ERROR, "shm_open %d: %s\n", errno, + strerror_r(errno, err_buf, sizeof(err_buf))); rc = -errno; goto err_shm_open; } @@ -113,7 +115,8 @@ // Get size of the allocated memory struct stat shm_stat; if (fstat(fd, &shm_stat) < 0) { - LOGP(DDEV, LOGL_ERROR, "fstat %d: %s\n", errno, strerror(errno)); + LOGP(DDEV, LOGL_ERROR, "fstat %d: %s\n", errno, + strerror_r(errno, err_buf, sizeof(err_buf))); rc = -errno; goto err_mmap; } @@ -122,7 +125,8 @@ LOGP(DDEV, LOGL_NOTICE, "mmaping shared memory fd %d (size=%zu)\n", fd, shm_len); if ((shm = mmap(NULL, shm_len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) == MAP_FAILED) { - LOGP(DDEV, LOGL_ERROR, "mmap %d: %s\n", errno, strerror(errno)); + LOGP(DDEV, LOGL_ERROR, "mmap %d: %s\n", errno, + strerror_r(errno, err_buf, sizeof(err_buf))); rc = -errno; goto err_mmap; } -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25936 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ia51ffa51ec7729572faca0282ae41c1e4968049f Gerrit-Change-Number: 25936 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:17:32 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 16:17:32 +0000 Subject: Change in osmo-trx[master]: IPCDevice: check value returned from select() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25923 ) Change subject: IPCDevice: check value returned from select() ...................................................................... IPCDevice: check value returned from select() Change-Id: I1c823317659547bb2391c57ac4d7931de1a383e3 Fxies: CID#240744 --- M Transceiver52M/device/ipc/IPCDevice.cpp 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/Transceiver52M/device/ipc/IPCDevice.cpp b/Transceiver52M/device/ipc/IPCDevice.cpp index c1c6449..2e40aa3 100644 --- a/Transceiver52M/device/ipc/IPCDevice.cpp +++ b/Transceiver52M/device/ipc/IPCDevice.cpp @@ -839,6 +839,7 @@ { struct timeval wait = { 0, 100000 }; fd_set crfds, cwfds; + char err_buf[256]; int max_fd = 0; FD_ZERO(&crfds); @@ -853,7 +854,11 @@ FD_SET(curr_fd->fd, &cwfds); } - select(max_fd + 1, &crfds, &cwfds, 0, &wait); + if (select(max_fd + 1, &crfds, &cwfds, 0, &wait) < 0) { + LOGP(DDEV, LOGL_ERROR, "select() failed: %s\n", + strerror_r(errno, err_buf, sizeof(err_buf))); + return; + } for (unsigned int i = 0; i < chans; i++) { int flags = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25923 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I1c823317659547bb2391c57ac4d7931de1a383e3 Gerrit-Change-Number: 25923 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:17:32 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 16:17:32 +0000 Subject: Change in osmo-trx[master]: LMSDevice: LMS_GetDeviceList() may return a negative number In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/25928 ) Change subject: LMSDevice: LMS_GetDeviceList() may return a negative number ...................................................................... LMSDevice: LMS_GetDeviceList() may return a negative number Change-Id: I855bd8ea6d9cb0f285f4dbbf3bcd09bff4e71044 Fixes: CID#240718 --- M Transceiver52M/device/lms/LMSDevice.cpp 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved osmith: Looks good to me, approved diff --git a/Transceiver52M/device/lms/LMSDevice.cpp b/Transceiver52M/device/lms/LMSDevice.cpp index 6e5002c..d1ec2e4 100644 --- a/Transceiver52M/device/lms/LMSDevice.cpp +++ b/Transceiver52M/device/lms/LMSDevice.cpp @@ -277,11 +277,12 @@ LMS_RegisterLogHandler(&lms_log_callback); - if ((n = LMS_GetDeviceList(NULL)) < 0) + if ((rc = LMS_GetDeviceList(NULL)) < 0) LOGC(DDEV, ERROR) << "LMS_GetDeviceList(NULL) failed"; - LOGC(DDEV, INFO) << "Devices found: " << n; - if (n < 1) + LOGC(DDEV, INFO) << "Devices found: " << rc; + if (rc < 1) return -1; + n = rc; info_list = new lms_info_str_t[n]; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/25928 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I855bd8ea6d9cb0f285f4dbbf3bcd09bff4e71044 Gerrit-Change-Number: 25928 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:32:40 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 16:32:40 +0000 Subject: Change in osmo-bts[master]: l1sap: Avoid re-(de)activating already (de)active lchans References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25965 ) Change subject: l1sap: Avoid re-(de)activating already (de)active lchans ...................................................................... l1sap: Avoid re-(de)activating already (de)active lchans This avoids triggering all sorts of unexpected paths where one tries to release an already released lchan, etc. This can happen for instance if BTS shuts down due to BSC link going down, and hence resets all lchans, announcing it to the PCU. Then the PCU may try to deactivate the channel sending act_req (disable), but the BTS already unilaterally dropped the channels. That code path seems to trigger some crash, probably because something in lchan has been freed. Related: SYS#4971 Change-Id: I093e4d4e23b527b10bf5d6ff538460626c30a8f8 --- M src/common/l1sap.c 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/65/25965/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index c89b2c3..2338996 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1961,6 +1961,12 @@ struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr); int rc; + if (lchan->state == LCHAN_S_ACTIVE) { + LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Trying to activate already active channel %s\n", + rsl_chan_nr_str(chan_nr)); + return -1; + } + LOGPLCHAN(lchan, DL1C, LOGL_INFO, "Activating channel %s\n", rsl_chan_nr_str(chan_nr)); lchan->s = trx->bts->radio_link_timeout.current; @@ -1994,6 +2000,13 @@ int l1sap_chan_rel(struct gsm_bts_trx *trx, uint8_t chan_nr) { struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr); + + if (lchan->state == LCHAN_S_NONE) { + LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Trying to deactive already deactivated channel %s\n", + rsl_chan_nr_str(chan_nr)); + return -1; + } + LOGPLCHAN(lchan, DL1C, LOGL_INFO, "Deactivating channel %s\n", rsl_chan_nr_str(chan_nr)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I093e4d4e23b527b10bf5d6ff538460626c30a8f8 Gerrit-Change-Number: 25965 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:32:40 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 16:32:40 +0000 Subject: Change in osmo-bts[master]: scheduler: Avoid crash upon call to trx_sched_set_lchan if l1ts is un... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25966 ) Change subject: scheduler: Avoid crash upon call to trx_sched_set_lchan if l1ts is uninitialized ...................................................................... scheduler: Avoid crash upon call to trx_sched_set_lchan if l1ts is uninitialized It could happen if for instance l1 code called trx_sched_clean() when closing the phy, and after that some code called (erroneously) trx_sched_set_lchan(). Let's make sure we don't allow other modules to crash the process when using this function. Related: SYS#4971 Change-Id: I93af7c3dcf0e34e9317eec0ee183dbf18b8d2f3b --- M src/common/scheduler.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/66/25966/1 diff --git a/src/common/scheduler.c b/src/common/scheduler.c index c068ea0..0388445 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -1085,6 +1085,12 @@ bool found = false; int i; + if (!l1ts) { + LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "%s lchan with uninitialized scheduler structure\n", + (active) ? "Activating" : "Deactivating"); + return -EINVAL; + } + /* VAMOS: convert Osmocom specific channel number to a generic one, * otherwise we won't match anything in trx_chan_desc[]. */ if (lchan->ts->vamos.is_shadow) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I93af7c3dcf0e34e9317eec0ee183dbf18b8d2f3b Gerrit-Change-Number: 25966 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:42:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 16:42:31 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25958 ) Change subject: src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN ...................................................................... src/*/Makefile.am: Copy back to srcdir the generated .c files from ASN Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 --- M src/hnbap/Makefile.am M src/ranap/Makefile.am M src/rua/Makefile.am M src/sabp/Makefile.am 4 files changed, 16 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am index c4a8c29..7835bcd 100644 --- a/src/hnbap/Makefile.am +++ b/src/hnbap/Makefile.am @@ -248,3 +248,7 @@ -rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.* # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/hnbap $(ASN_MODULE_INC) +# Finally copy *.c from buildir to srcdir: + if test "$(realpath $(CURDIR))" != "$(realpath $(top_srcdir)/src/hnbap)"; then \ + cp *.c $(top_srcdir)/src/hnbap/; \ + fi diff --git a/src/ranap/Makefile.am b/src/ranap/Makefile.am index 0bb36a0..4ba3a79 100644 --- a/src/ranap/Makefile.am +++ b/src/ranap/Makefile.am @@ -1188,3 +1188,7 @@ sed -i 's/Member/MemberN/' RANAP_RABDataVolumeReport.[ch] # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/ranap $(ASN_MODULE_INC) +# Finally copy *.c from buildir to srcdir: + if test "$(realpath $(CURDIR))" != "$(realpath $(top_srcdir)/src/ranap)"; then \ + cp *.c $(top_srcdir)/src/ranap/; \ + fi diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am index 7e1d18e..c848639 100644 --- a/src/rua/Makefile.am +++ b/src/rua/Makefile.am @@ -86,3 +86,7 @@ @rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.* # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/rua $(ASN_MODULE_INC) +# Finally copy *.c from buildir to srcdir: + if test "$(realpath $(CURDIR))" != "$(realpath $(top_srcdir)/src/rua)"; then \ + cp *.c $(top_srcdir)/src/rua/; \ + fi diff --git a/src/sabp/Makefile.am b/src/sabp/Makefile.am index a30674c..5e1b557 100644 --- a/src/sabp/Makefile.am +++ b/src/sabp/Makefile.am @@ -145,4 +145,7 @@ sed -i '/#include "SABP_Serial-Number.h"/a #include ' SABP_Old-Serial-Number.h SABP_New-Serial-Number.h # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/sabp $(ASN_MODULE_INC) - +# Finally copy *.c from buildir to srcdir: + if test "$(realpath $(CURDIR))" != "$(realpath $(top_srcdir)/src/sabp)"; then \ + cp *.c $(top_srcdir)/src/sabp/; \ + fi -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25958 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I203a25a8059218bb9fd6d10cbc028a296d347382 Gerrit-Change-Number: 25958 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:49:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 16:49:58 +0000 Subject: Change in osmo-bts[master]: scheduler: Avoid crash upon call to trx_sched_set_lchan if l1ts is un... In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25966 to look at the new patch set (#2). Change subject: scheduler: Avoid crash upon call to trx_sched_set_lchan if l1ts is uninitialized ...................................................................... scheduler: Avoid crash upon call to trx_sched_set_lchan if l1ts is uninitialized It could happen if for instance l1 code called trx_sched_clean() when closing the phy, and after that some code called (erroneously) trx_sched_set_lchan(). Let's make sure we don't allow other modules to crash the process when using this function. Related: SYS#4971 Change-Id: I93af7c3dcf0e34e9317eec0ee183dbf18b8d2f3b --- M src/common/l1sap.c M src/common/scheduler.c 2 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/66/25966/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I93af7c3dcf0e34e9317eec0ee183dbf18b8d2f3b Gerrit-Change-Number: 25966 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:57:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Tue, 26 Oct 2021 16:57:26 +0000 Subject: Change in osmo-bts[master]: l1sap: Avoid re-(de)activating already (de)active lchans In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/25965 to look at the new patch set (#2). Change subject: l1sap: Avoid re-(de)activating already (de)active lchans ...................................................................... l1sap: Avoid re-(de)activating already (de)active lchans This avoids triggering all sorts of unexpected paths where one tries to release an already released lchan, etc. This can happen for instance if BTS shuts down due to BSC link going down, and hence resets all lchans, announcing it to the PCU. Then the PCU may try to deactivate the channel sending act_req (disable), but the BTS already unilaterally dropped the channels. That code path seems to trigger some crash, probably because something in lchan has been freed. Related: SYS#4971 Change-Id: I093e4d4e23b527b10bf5d6ff538460626c30a8f8 --- M src/common/l1sap.c 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/65/25965/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I093e4d4e23b527b10bf5d6ff538460626c30a8f8 Gerrit-Change-Number: 25965 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 16:57:43 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Tue, 26 Oct 2021 16:57:43 +0000 Subject: Change in osmo-msc[master]: libmsc: fix NULL pointer dereference in trans_lcls_compose() In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25953 ) Change subject: libmsc: fix NULL pointer dereference in trans_lcls_compose() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I96342de4cb3e0bc3d3cac7538d4517aa211e8a38 Gerrit-Change-Number: 25953 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 16:57:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 17:48:17 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 17:48:17 +0000 Subject: Change in osmo-msc[master]: libmsc: fix NULL pointer dereference in trans_lcls_compose() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25953 ) Change subject: libmsc: fix NULL pointer dereference in trans_lcls_compose() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I96342de4cb3e0bc3d3cac7538d4517aa211e8a38 Gerrit-Change-Number: 25953 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 26 Oct 2021 17:48:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 17:48:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 17:48:20 +0000 Subject: Change in osmo-msc[master]: libmsc: fix NULL pointer dereference in trans_lcls_compose() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25953 ) Change subject: libmsc: fix NULL pointer dereference in trans_lcls_compose() ...................................................................... libmsc: fix NULL pointer dereference in trans_lcls_compose() Change-Id: I96342de4cb3e0bc3d3cac7538d4517aa211e8a38 Fixes: CID#240768 --- M src/libmsc/transaction.c 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve keith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 2108ab4..25c0e3c 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -112,6 +112,11 @@ struct osmo_lcls *trans_lcls_compose(const struct gsm_trans *trans, bool use_lac) { + if (!trans) { + LOGP(DCC, LOGL_ERROR, "LCLS: unable to fill parameters for unallocated transaction\n"); + return NULL; + } + if (!trans->net->a.sri->sccp) return NULL; @@ -119,11 +124,6 @@ struct osmo_lcls *lcls; uint8_t w = osmo_ss7_pc_width(&ss7->cfg.pc_fmt); - if (!trans) { - LOGP(DCC, LOGL_ERROR, "LCLS: unable to fill parameters for unallocated transaction\n"); - return NULL; - } - if (!trans->net->lcls_permitted) { LOGP(DCC, LOGL_NOTICE, "LCLS disabled globally\n"); return NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I96342de4cb3e0bc3d3cac7538d4517aa211e8a38 Gerrit-Change-Number: 25953 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 18:12:11 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 18:12:11 +0000 Subject: Change in osmo-bts[master]: l1sap: Avoid re-(de)activating already (de)active lchans In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25965 ) Change subject: l1sap: Avoid re-(de)activating already (de)active lchans ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I093e4d4e23b527b10bf5d6ff538460626c30a8f8 Gerrit-Change-Number: 25965 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 26 Oct 2021 18:12:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 18:16:11 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 18:16:11 +0000 Subject: Change in osmo-bts[master]: scheduler: Avoid crash upon call to trx_sched_set_lchan if l1ts is un... In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25966 ) Change subject: scheduler: Avoid crash upon call to trx_sched_set_lchan if l1ts is uninitialized ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I93af7c3dcf0e34e9317eec0ee183dbf18b8d2f3b Gerrit-Change-Number: 25966 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 26 Oct 2021 18:16:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 18:39:18 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 18:39:18 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: set don't-fragment flag on all TRXD packets In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23814 ) Change subject: osmo-bts-trx: set don't-fragment flag on all TRXD packets ...................................................................... Patch Set 5: Thanks for clarification. At the moment, there is no urgent need for automatic scaling of batched PDUs, because in the current implementation we batch not more than 8 PDUs (8 timeslots), and as you already pointed out TRXD is mostly spoken over the 'lo'. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I25415b76b69ccf43f83ddfb0e7dd1e330fb23aa7 Gerrit-Change-Number: 23814 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 26 Oct 2021 18:39:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 18:39:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 18:39:28 +0000 Subject: Change in osmo-bts[master]: osmo-bts-trx: set don't-fragment flag on all TRXD packets In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23814 ) Change subject: osmo-bts-trx: set don't-fragment flag on all TRXD packets ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I25415b76b69ccf43f83ddfb0e7dd1e330fb23aa7 Gerrit-Change-Number: 23814 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 18:40:13 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 18:40:13 +0000 Subject: Change in osmo-trx[master]: TRXD: set don't-fragment flag on all outgoing packets In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/23813 ) Change subject: TRXD: set don't-fragment flag on all outgoing packets ...................................................................... Abandoned See https://gerrit.osmocom.org/c/osmo-bts/+/23814. -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/23813 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I0891f1d80e4c7c92a58b34ac986ef5334e8c78e2 Gerrit-Change-Number: 23813 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 18:40:30 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 18:40:30 +0000 Subject: Change in osmocom-bb[master]: trx_toolkit/data_if.py: set the don't-fragment flag In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/23815 ) Change subject: trx_toolkit/data_if.py: set the don't-fragment flag ...................................................................... Abandoned See https://gerrit.osmocom.org/c/osmo-bts/+/23814. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/23815 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If49dfe5d2298b3c2f91f790a3a94ead1a103a0cc Gerrit-Change-Number: 23815 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 18:42:03 2021 From: gerrit-no-reply at lists.osmocom.org (roh) Date: Tue, 26 Oct 2021 18:42:03 +0000 Subject: Change in simtrace2[master]: add initial testing scripts for a hw-driven ci - flash every image an... References: Message-ID: roh has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/25967 ) Change subject: add initial testing scripts for a hw-driven ci - flash every image and test ...................................................................... add initial testing scripts for a hw-driven ci - flash every image and test Change-Id: I88bc32334f23e6fd702e0cbcb1b1510029909b20 --- A tests/README A tests/run-tests A tests/simtrace2/01_check_rig.out A tests/simtrace2/01_check_rig.sh A tests/simtrace2/02_erase_board.out A tests/simtrace2/02_erase_board.sh A tests/simtrace2/03_flash_bl_bossac.out A tests/simtrace2/03_flash_bl_bossac.sh A tests/simtrace2/04_flash_dfu.out A tests/simtrace2/04_flash_dfu.sh A tests/simtrace2/05_check_lsusb.out A tests/simtrace2/05_check_lsusb.sh A tests/simtrace2/06_check_dfu_lsusb.out A tests/simtrace2/06_check_dfu_lsusb.sh A tests/simtrace2/07_flash_dfu_from_app.out A tests/simtrace2/07_flash_dfu_from_app.sh A tests/simtrace2/08_test_simtrace.out A tests/simtrace2/08_test_simtrace.sh A tests/simtrace2/README A tests/simtrace2/TODO A tests/simtrace2/ctl_erase_target.sh A tests/simtrace2/ctl_get_relay_sn.sh A tests/simtrace2/ctl_reset_target.sh A tests/simtrace2/ctl_reset_to_dfu.sh A tests/simtrace2/fetch_image.sh A tests/simtrace2/flash_simtrace_bossac.sh A tests/simtrace2/flash_simtrace_dfu.sh A tests/simtrace2/get_installed_version.sh A tests/simtrace2/notes_relay_board.txt A tests/simtrace2/notes_wiring.txt A tests/simtrace2/prepare A tests/simtrace2/regen A tests/simtrace2/run-tests A tests/simtrace2/test-data 34 files changed, 879 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/67/25967/1 diff --git a/tests/README b/tests/README new file mode 100644 index 0000000..3c10c7f --- /dev/null +++ b/tests/README @@ -0,0 +1,9 @@ +simtrace2-firmware +================== + +this testbed is the hardware-CI interface to make sure the firmware built is also working when flashed onto hardware. + +to run it you will need a usb controlled relay board and a simtrace board, a simcard and a pcsc compatible cardreader. a hub is recommended to only need one instead of 3 upstream ports. + +the simtrace is modified to allow for switchable vcc, remote buttons and jumpers - vcc, bootloader, reset, erase-jumper which are wired to 4 relays. + diff --git a/tests/run-tests b/tests/run-tests new file mode 100755 index 0000000..6bb5f63 --- /dev/null +++ b/tests/run-tests @@ -0,0 +1,14 @@ +#!/bin/sh -e +echo "==========================================================" +echo " EXECUTING TESTS FOR SIMTRACE-FIRMWARE" +echo "==========================================================" +echo "" +cd ./simtrace2 +echo "Location $PWD" +echo "" +sh ./run-tests +cd .. +echo "" +echo "" +echo "" +echo "" diff --git a/tests/simtrace2/01_check_rig.out b/tests/simtrace2/01_check_rig.out new file mode 100644 index 0000000..4a6e0f1 --- /dev/null +++ b/tests/simtrace2/01_check_rig.out @@ -0,0 +1,240 @@ +relay box + +ID 04d8:ffee Microchip Technology, Inc. Devantech USB-ISS +Device Descriptor: + bLength 18 + bDescriptorType 1 + bcdUSB 2.00 + bDeviceClass 2 Communications + bDeviceSubClass 0 + bDeviceProtocol 0 + bMaxPacketSize0 8 + idVendor 0x04d8 Microchip Technology, Inc. + idProduct 0xffee Devantech USB-ISS + bcdDevice 1.00 + iManufacturer 1 + iProduct 2 + iSerial 3 + bNumConfigurations 1 + Configuration Descriptor: + bLength 9 + bDescriptorType 2 + wTotalLength 67 + bNumInterfaces 2 + bConfigurationValue 1 + iConfiguration 0 + bmAttributes 0xc0 + Self Powered + MaxPower 100mA + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 0 + bAlternateSetting 0 + bNumEndpoints 1 + bInterfaceClass 2 Communications + bInterfaceSubClass 2 Abstract (modem) + bInterfaceProtocol 1 AT-commands (v.25ter) + iInterface 0 + CDC Header: + bcdCDC 1.10 + CDC ACM: + bmCapabilities 0x02 + line coding and serial state + CDC Union: + bMasterInterface 0 + bSlaveInterface 1 + CDC Call Management: + bmCapabilities 0x00 + bDataInterface 1 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x81 EP 1 IN + bmAttributes 3 + Transfer Type Interrupt + Synch Type None + Usage Type Data + wMaxPacketSize 0x0008 1x 8 bytes + bInterval 2 + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 1 + bAlternateSetting 0 + bNumEndpoints 2 + bInterfaceClass 10 CDC Data + bInterfaceSubClass 0 Unused + bInterfaceProtocol 0 + iInterface 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x02 EP 2 OUT + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0040 1x 64 bytes + bInterval 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x82 EP 2 IN + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0040 1x 64 bytes + bInterval 0 + +ccid reader + +ID 076b:6632 OmniKey AG +Device Descriptor: + bLength 18 + bDescriptorType 1 + bcdUSB 2.00 + bDeviceClass 0 (Defined at Interface level) + bDeviceSubClass 0 + bDeviceProtocol 0 + bMaxPacketSize0 8 + idVendor 0x076b OmniKey AG + idProduct 0x6632 + bcdDevice 1.03 + iManufacturer 1 + iProduct 2 + iSerial 0 + bNumConfigurations 1 + Configuration Descriptor: + bLength 9 + bDescriptorType 2 + wTotalLength 93 + bNumInterfaces 1 + bConfigurationValue 1 + iConfiguration 0 + bmAttributes 0xa0 + (Bus Powered) + Remote Wakeup + MaxPower 100mA + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 0 + bAlternateSetting 0 + bNumEndpoints 3 + bInterfaceClass 11 Chip/SmartCard + bInterfaceSubClass 0 + bInterfaceProtocol 0 + iInterface 2 + ChipCard Interface Descriptor: + bLength 54 + bDescriptorType 33 + bcdCCID 1.10 (Warning: Only accurate for version 1.0) + nMaxSlotIndex 0 + bVoltageSupport 7 5.0V 3.0V 1.8V + dwProtocols 3 T=0 T=1 + dwDefaultClock 4800 + dwMaxiumumClock 8000 + bNumClockSupported 4 + dwDataRate 10752 bps + dwMaxDataRate 412903 bps + bNumDataRatesSupp. 96 + dwMaxIFSD 254 + dwSyncProtocols 00000007 2-wire 3-wire I2C + dwMechanical 00000000 + dwFeatures 000407B8 + Auto voltage selection + Auto clock change + Auto baud rate change + Auto PPS made by CCID + CCID can set ICC in clock stop mode + NAD value other than 0x00 accepted + Auto IFSD exchange + Short and extended APDU level exchange + dwMaxCCIDMsgLen 271 + bClassGetResponse echo + bClassEnvelope echo + wlcdLayout none + bPINSupport 3 verification modification + bMaxCCIDBusySlots 1 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x02 EP 2 OUT + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0040 1x 64 bytes + bInterval 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x83 EP 3 IN + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0040 1x 64 bytes + bInterval 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x84 EP 4 IN + bmAttributes 3 + Transfer Type Interrupt + Synch Type None + Usage Type Data + wMaxPacketSize 0x0008 1x 8 bytes + bInterval 24 + +usb hub + +ID 05e3:0608 Genesys Logic, Inc. Hub +Device Descriptor: + bLength 18 + bDescriptorType 1 + bcdUSB 2.00 + bDeviceClass 9 Hub + bDeviceSubClass 0 Unused + bDeviceProtocol 1 Single TT + bMaxPacketSize0 64 + idVendor 0x05e3 Genesys Logic, Inc. + idProduct 0x0608 Hub + bcdDevice 7.02 + iManufacturer 0 + iProduct 1 + iSerial 0 + bNumConfigurations 1 + Configuration Descriptor: + bLength 9 + bDescriptorType 2 + wTotalLength 25 + bNumInterfaces 1 + bConfigurationValue 1 + iConfiguration 0 + bmAttributes 0xe0 + Self Powered + Remote Wakeup + MaxPower 100mA + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 0 + bAlternateSetting 0 + bNumEndpoints 1 + bInterfaceClass 9 Hub + bInterfaceSubClass 0 Unused + bInterfaceProtocol 0 Full speed (or root) hub + iInterface 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x81 EP 1 IN + bmAttributes 3 + Transfer Type Interrupt + Synch Type None + Usage Type Data + wMaxPacketSize 0x0001 1x 1 bytes + bInterval 12 diff --git a/tests/simtrace2/01_check_rig.sh b/tests/simtrace2/01_check_rig.sh new file mode 100755 index 0000000..7592a77 --- /dev/null +++ b/tests/simtrace2/01_check_rig.sh @@ -0,0 +1,12 @@ +#!/bin/sh -e +. ./test-data + +echo relay box +lsusb -d $USBD_RELAY -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g" +echo +echo ccid reader +lsusb -d $USBD_CCID -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g" +echo +echo usb hub +lsusb -d $USBD_HUB -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g" + diff --git a/tests/simtrace2/02_erase_board.out b/tests/simtrace2/02_erase_board.out new file mode 100644 index 0000000..1d258ce --- /dev/null +++ b/tests/simtrace2/02_erase_board.out @@ -0,0 +1,2 @@ +erasing target +done diff --git a/tests/simtrace2/02_erase_board.sh b/tests/simtrace2/02_erase_board.sh new file mode 100755 index 0000000..9da0356 --- /dev/null +++ b/tests/simtrace2/02_erase_board.sh @@ -0,0 +1,4 @@ +#!/bin/sh -e +. ./test-data + +./ctl_erase_target.sh diff --git a/tests/simtrace2/03_flash_bl_bossac.out b/tests/simtrace2/03_flash_bl_bossac.out new file mode 100644 index 0000000..e446885 --- /dev/null +++ b/tests/simtrace2/03_flash_bl_bossac.out @@ -0,0 +1,11 @@ +Erase flash + +Done in 0.009 seconds +Write 13488 bytes to flash (53 pages) + [ ] 0% (0/53 pages) [= ] 3% (2/53 pages) [= ] 5% (3/53 pages) [== ] 7% (4/53 pages) [== ] 9% (5/53 pages) [=== ] 11% (6/53 pages) [=== ] 13% (7/53 pages) [==== ] 15% (8/53 pages) [===== ] 16% (9/53 pages) [===== ] 18% (10/53 pages) [====== ] 20% (11/53 pages) [====== ] 22% (12/53 pages) [======= ] 24% (13/53 pages) [======= ] 26% (14/53 pages) [======== ] 28% (15/53 pages) [========= ] 30% (16/53 pages) [========= ] 32% (17/53 pages) [========== ] 33% (18/53 pages) [========== ] 35% (19/53 pages) [=========== ] 37% (20/53 pages) [=========== ] 39% (21/53 pages) [============ ] 41% (22/53 pages) [============= ] 43% (23/53 pages) [============= ] 45% (24/53 pages) [============== ] 47% (25/53 pages) [============== ] 49% (26/53 pages) [=============== ] 50% (27/53 pages) [=============== ] 52% (28/53 pages) [================ ] 54% (29/53 pages) [================ ] 56% (30/53 pages) [================= ] 58% (31/53 pages) [================== ] 60% (32/53 pages) [================== ] 62% (33/53 pages) [=================== ] 64% (34/53 pages) [=================== ] 66% (35/53 pages) [==================== ] 67% (36/53 pages) [==================== ] 69% (37/53 pages) [===================== ] 71% (38/53 pages) [====================== ] 73% (39/53 pages) [====================== ] 75% (40/53 pages) [======================= ] 77% (41/53 pages) [======================= ] 79% (42/53 pages) [======================== ] 81% (43/53 pages) [======================== ] 83% (44/53 pages) [========================= ] 84% (45/53 pages) [========================== ] 86% (46/53 pages) [========================== ] 88% (47/53 pages) [=========================== ] 90% (48/53 pages) [=========================== ] 92% (49/53 pages) [============================ ] 94% (50/53 pages) [============================ ] 96% (51/53 pages) [============================= ] 98% (52/53 pages) [==============================] 100% (53/53 pages) +Done in 0.378 seconds +Verify 13488 bytes of flash + [= ] 3% (2/53 pages) [= ] 5% (3/53 pages) [== ] 7% (4/53 pages) [== ] 9% (5/53 pages) [=== ] 11% (6/53 pages) [=== ] 13% (7/53 pages) [==== ] 15% (8/53 pages) [===== ] 16% (9/53 pages) [===== ] 18% (10/53 pages) [====== ] 20% (11/53 pages) [====== ] 22% (12/53 pages) [======= ] 24% (13/53 pages) [======= ] 26% (14/53 pages) [======== ] 28% (15/53 pages) [========= ] 30% (16/53 pages) [========= ] 32% (17/53 pages) [========== ] 33% (18/53 pages) [========== ] 35% (19/53 pages) [=========== ] 37% (20/53 pages) [=========== ] 39% (21/53 pages) [============ ] 41% (22/53 pages) [============= ] 43% (23/53 pages) [============= ] 45% (24/53 pages) [============== ] 47% (25/53 pages) [============== ] 49% (26/53 pages) [=============== ] 50% (27/53 pages) [=============== ] 52% (28/53 pages) [================ ] 54% (29/53 pages) [================ ] 56% (30/53 pages) [================= ] 58% (31/53 pages) [================== ] 60% (32/53 pages) [================== ] 62% (33/53 pages) [=================== ] 64% (34/53 pages) [=================== ] 66% (35/53 pages) [==================== ] 67% (36/53 pages) [==================== ] 69% (37/53 pages) [===================== ] 71% (38/53 pages) [====================== ] 73% (39/53 pages) [====================== ] 75% (40/53 pages) [======================= ] 77% (41/53 pages) [======================= ] 79% (42/53 pages) [======================== ] 81% (43/53 pages) [======================== ] 83% (44/53 pages) [========================= ] 84% (45/53 pages) [========================== ] 86% (46/53 pages) [========================== ] 88% (47/53 pages) [=========================== ] 90% (48/53 pages) [=========================== ] 92% (49/53 pages) [============================ ] 94% (50/53 pages) [============================ ] 96% (51/53 pages) [============================= ] 98% (52/53 pages) [==============================] 100% (53/53 pages) +Verify successful +Done in 0.297 seconds +Set boot flash true diff --git a/tests/simtrace2/03_flash_bl_bossac.sh b/tests/simtrace2/03_flash_bl_bossac.sh new file mode 100755 index 0000000..1a53763 --- /dev/null +++ b/tests/simtrace2/03_flash_bl_bossac.sh @@ -0,0 +1,5 @@ +#!/bin/sh -e +. ./test-data + +./flash_simtrace_bossac.sh +sleep 1 diff --git a/tests/simtrace2/04_flash_dfu.out b/tests/simtrace2/04_flash_dfu.out new file mode 100644 index 0000000..2f7712d --- /dev/null +++ b/tests/simtrace2/04_flash_dfu.out @@ -0,0 +1,25 @@ +installed fw version: resetting target to dfu +done +dfu-util 0.9 + +Copyright 2005-2009 Weston Schmidt, Harald Welte and OpenMoko Inc. +Copyright 2010-2016 Tormod Volden and Stefan Schmidt +This program is Free Software and has ABSOLUTELY NO WARRANTY +Please report bugs to http://sourceforge.net/p/dfu-util/tickets/ + +Opening DFU capable USB device... +ID 1d50:60e3 +Run-time device DFU version 0100 +Claiming USB DFU Interface... +Setting Alternate Setting #1 ... +Determining device status: state = dfuIDLE, status = 0 +dfuIDLE, continuing +DFU mode device DFU version 0100 +Device returned transfer size 512 +Copying data from PC to DFU device +Download done. +state(7) = dfuMANIFEST, status(0) = No error condition is present +state(2) = dfuIDLE, status(0) = No error condition is present +Done! +Resetting USB to switch back to runtime mode +installed fw version: 0.7.0.158-020ed diff --git a/tests/simtrace2/04_flash_dfu.sh b/tests/simtrace2/04_flash_dfu.sh new file mode 100755 index 0000000..f9d6f3a --- /dev/null +++ b/tests/simtrace2/04_flash_dfu.sh @@ -0,0 +1,8 @@ +#!/bin/sh -e +. ./test-data + +./get_installed_version.sh +./ctl_reset_to_dfu.sh +./flash_simtrace_dfu.sh +sleep 1 +./get_installed_version.sh diff --git a/tests/simtrace2/05_check_lsusb.out b/tests/simtrace2/05_check_lsusb.out new file mode 100644 index 0000000..a59be4b --- /dev/null +++ b/tests/simtrace2/05_check_lsusb.out @@ -0,0 +1,110 @@ + +ID 1d50:60e3 OpenMoko, Inc. Osmocom SIMtrace 2 +Device Descriptor: + bLength 18 + bDescriptorType 1 + bcdUSB 2.00 + bDeviceClass 0 (Defined at Interface level) + bDeviceSubClass 0 + bDeviceProtocol 0 + bMaxPacketSize0 64 + idVendor 0x1d50 OpenMoko, Inc. + idProduct 0x60e3 Osmocom SIMtrace 2 + bcdDevice 0.02 + iManufacturer 1 sysmocom - s.f.m.c. GmbH + iProduct 2 SIMtrace 2 + iSerial 11 51203220574a4a523030362030323037 + bNumConfigurations 2 + Configuration Descriptor: + bLength 9 + bDescriptorType 2 + wTotalLength 57 + bNumInterfaces 2 + bConfigurationValue 1 + iConfiguration 3 SIMtrace Sniffer + bmAttributes 0x80 + (Bus Powered) + MaxPower 100mA + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 0 + bAlternateSetting 0 + bNumEndpoints 3 + bInterfaceClass 255 Vendor Specific Class + bInterfaceSubClass 1 + bInterfaceProtocol 0 + iInterface 3 SIMtrace Sniffer + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x01 EP 1 OUT + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0040 1x 64 bytes + bInterval 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x82 EP 2 IN + bmAttributes 2 + Transfer Type Bulk + Synch Type None + Usage Type Data + wMaxPacketSize 0x0040 1x 64 bytes + bInterval 0 + Endpoint Descriptor: + bLength 7 + bDescriptorType 5 + bEndpointAddress 0x83 EP 3 IN + bmAttributes 3 + Transfer Type Interrupt + Synch Type None + Usage Type Data + wMaxPacketSize 0x0040 1x 64 bytes + bInterval 16 + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 1 + bAlternateSetting 0 + bNumEndpoints 0 + bInterfaceClass 254 Application Specific Interface + bInterfaceSubClass 1 Device Firmware Update + bInterfaceProtocol 1 + iInterface 0 + Device Firmware Upgrade Interface Descriptor: + bLength 9 + bDescriptorType 33 + bmAttributes 11 + Will Detach + Manifestation Intolerant + Upload Supported + Download Supported + wDetachTimeout 0 milliseconds + wTransferSize 512 bytes + bcdDFUVersion 1.00 + Configuration Descriptor: + bLength 9 + bDescriptorType 2 + wTotalLength 18 + bNumInterfaces 1 + bConfigurationValue 2 + iConfiguration 12 firmware version + bmAttributes 0x80 + (Bus Powered) + MaxPower 100mA + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 0 + bAlternateSetting 0 + bNumEndpoints 0 + bInterfaceClass 255 Vendor Specific Class + bInterfaceSubClass 255 Vendor Specific Subclass + bInterfaceProtocol 0 + iInterface 13 0.7.0.158-020ed +Device Status: 0x0000 + (Bus Powered) diff --git a/tests/simtrace2/05_check_lsusb.sh b/tests/simtrace2/05_check_lsusb.sh new file mode 100755 index 0000000..3facf79 --- /dev/null +++ b/tests/simtrace2/05_check_lsusb.sh @@ -0,0 +1,5 @@ +#!/bin/sh -e +. ./test-data + +lsusb -d $USBD_TARGET -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g" +#|sed -e "s/^.*iProduct.*2.*sysmoOCTSIM.*$/ iProduct 2 sysmoOCTSIM/g" diff --git a/tests/simtrace2/06_check_dfu_lsusb.out b/tests/simtrace2/06_check_dfu_lsusb.out new file mode 100644 index 0000000..755cad7 --- /dev/null +++ b/tests/simtrace2/06_check_dfu_lsusb.out @@ -0,0 +1,94 @@ +resetting target to dfu +done + +ID 1d50:60e3 OpenMoko, Inc. Osmocom SIMtrace 2 +Device Descriptor: + bLength 18 + bDescriptorType 1 + bcdUSB 2.00 + bDeviceClass 0 (Defined at Interface level) + bDeviceSubClass 0 + bDeviceProtocol 0 + bMaxPacketSize0 64 + idVendor 0x1d50 OpenMoko, Inc. + idProduct 0x60e3 Osmocom SIMtrace 2 + bcdDevice 0.00 + iManufacturer 1 sysmocom - s.f.m.c. GmbH + iProduct 2 SIMtrace 2 + iSerial 7 51203220574a4a523030362030323037 + bNumConfigurations 2 + Configuration Descriptor: + bLength 9 + bDescriptorType 2 + wTotalLength 45 + bNumInterfaces 1 + bConfigurationValue 1 + iConfiguration 3 DFU (Device Firmware Upgrade) + bmAttributes 0x80 + (Bus Powered) + MaxPower 200mA + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 0 + bAlternateSetting 0 + bNumEndpoints 0 + bInterfaceClass 254 Application Specific Interface + bInterfaceSubClass 1 Device Firmware Update + bInterfaceProtocol 2 + iInterface 4 RAM + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 0 + bAlternateSetting 1 + bNumEndpoints 0 + bInterfaceClass 254 Application Specific Interface + bInterfaceSubClass 1 Device Firmware Update + bInterfaceProtocol 2 + iInterface 5 Flash (Application Partition) + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 0 + bAlternateSetting 2 + bNumEndpoints 0 + bInterfaceClass 254 Application Specific Interface + bInterfaceSubClass 1 Device Firmware Update + bInterfaceProtocol 2 + iInterface 6 not available + Device Firmware Upgrade Interface Descriptor: + bLength 9 + bDescriptorType 33 + bmAttributes 11 + Will Detach + Manifestation Intolerant + Upload Supported + Download Supported + wDetachTimeout 0 milliseconds + wTransferSize 512 bytes + bcdDFUVersion 1.00 + Configuration Descriptor: + bLength 9 + bDescriptorType 2 + wTotalLength 18 + bNumInterfaces 1 + bConfigurationValue 2 + iConfiguration 8 firmware version + bmAttributes 0x80 + (Bus Powered) + MaxPower 100mA + Interface Descriptor: + bLength 9 + bDescriptorType 4 + bInterfaceNumber 0 + bAlternateSetting 0 + bNumEndpoints 0 + bInterfaceClass 255 Vendor Specific Class + bInterfaceSubClass 255 Vendor Specific Subclass + bInterfaceProtocol 0 + iInterface 9 0.7.0.158-020ed +Device Status: 0x0000 + (Bus Powered) +resetting target +done diff --git a/tests/simtrace2/06_check_dfu_lsusb.sh b/tests/simtrace2/06_check_dfu_lsusb.sh new file mode 100755 index 0000000..fda72c4 --- /dev/null +++ b/tests/simtrace2/06_check_dfu_lsusb.sh @@ -0,0 +1,6 @@ +#!/bin/sh -e +. ./test-data + +./ctl_reset_to_dfu.sh +lsusb -d $USBD_TARGET -v 2>/dev/null | sed -e "s/$Bus.*Device.*:\ ID/ID/g" +./ctl_reset_target.sh diff --git a/tests/simtrace2/07_flash_dfu_from_app.out b/tests/simtrace2/07_flash_dfu_from_app.out new file mode 100644 index 0000000..82a156f --- /dev/null +++ b/tests/simtrace2/07_flash_dfu_from_app.out @@ -0,0 +1,31 @@ +installed fw version: 0.7.0.158-020ed +resetting target +done +dfu-util 0.9 + +Copyright 2005-2009 Weston Schmidt, Harald Welte and OpenMoko Inc. +Copyright 2010-2016 Tormod Volden and Stefan Schmidt +This program is Free Software and has ABSOLUTELY NO WARRANTY +Please report bugs to http://sourceforge.net/p/dfu-util/tickets/ + +Opening DFU capable USB device... +ID 1d50:60e3 +Run-time device DFU version 0100 +Claiming USB DFU Runtime Interface... +Determining device status: state = appIDLE, status = 0 +Device really in Runtime Mode, send DFU detach request... +Device will detach and reattach... +Opening DFU USB Device... +Claiming USB DFU Interface... +Setting Alternate Setting #1 ... +Determining device status: state = dfuIDLE, status = 0 +dfuIDLE, continuing +DFU mode device DFU version 0100 +Device returned transfer size 512 +Copying data from PC to DFU device +Download done. +state(7) = dfuMANIFEST, status(0) = No error condition is present +state(2) = dfuIDLE, status(0) = No error condition is present +Done! +Resetting USB to switch back to runtime mode +installed fw version: 0.7.0.158-020ed diff --git a/tests/simtrace2/07_flash_dfu_from_app.sh b/tests/simtrace2/07_flash_dfu_from_app.sh new file mode 100755 index 0000000..3f9d770 --- /dev/null +++ b/tests/simtrace2/07_flash_dfu_from_app.sh @@ -0,0 +1,8 @@ +#!/bin/sh -e +. ./test-data + +./get_installed_version.sh +./ctl_reset_target.sh +./flash_simtrace_dfu.sh +sleep 1 +./get_installed_version.sh diff --git a/tests/simtrace2/08_test_simtrace.out b/tests/simtrace2/08_test_simtrace.out new file mode 100644 index 0000000..5ef2c84 --- /dev/null +++ b/tests/simtrace2/08_test_simtrace.out @@ -0,0 +1,35 @@ +resetting target +done +installed fw version: 0.7.0.158-020ed + +simtrace2-list +USB matches: 2 + 1d50:60e3 Addr=125, Path=2-1.2.3, Cfg=1, Intf=0, Alt=0: 255/1/0 (SIMtrace Sniffer) + 1d50:60e3 Addr=125, Path=2-1.2.3, Cfg=2, Intf=0, Alt=0: 255/255/0 (0.7.0.158-020ed) + +start simtrace2-sniff + +start pcsc_scan -n +stop pcsc_scan +PCSC PC/SC device scanner +PCSC V 1.4.27 (c) 2001-2011, Ludovic Rousseau +PCSC Compiled with PC/SC lite version: 1.8.17 +PCSC Using reader plug'n play mechanism +PCSC Scanning present readers... +PCSC 0: HID Global OMNIKEY 6121 Smart Card Reader [OMNIKEY 6121 Smart Card Reader] 00 00 +PCSC +PCSC Tue Oct 26 20:30:03 2021 +PCSC Reader 0: HID Global OMNIKEY 6121 Smart Card Reader [OMNIKEY 6121 Smart Card Reader] 00 00 +PCSC Card state: Card inserted, +PCSC ATR: 3B 9F 96 80 1F C7 80 31 A0 73 BE 21 13 67 43 20 07 18 00 00 01 A5 +PCSC SCardGetStatusChange: RPC transport error. +stop simtrace2-sniff +ST2 simtrace2-sniff - Phone-SIM card communication sniffer +ST2 (C) 2010-2017 by Harald Welte +ST2 (C) 2018 by Kevin Redon +ST2 +ST2 Using USB device 1d50:60e3 Addr=125, Path=2-1.2.3, Cfg=1, Intf=0, Alt=0: 255/1/0 (SIMtrace Sniffer) +ST2 Entering main loop +ST2 Card state change: reset de-asserted +ST2 ATR: 3b 9f 96 80 1f c7 80 31 a0 73 be 21 13 67 43 20 07 18 00 00 01 a5 +ST2 Card state change: reset asserted diff --git a/tests/simtrace2/08_test_simtrace.sh b/tests/simtrace2/08_test_simtrace.sh new file mode 100755 index 0000000..f430d7a --- /dev/null +++ b/tests/simtrace2/08_test_simtrace.sh @@ -0,0 +1,22 @@ +#!/bin/sh -e +. ./test-data +./ctl_reset_target.sh +sleep 1 +./get_installed_version.sh +echo +echo simtrace2-list +$SIMTRACE2_HOST_PATH/simtrace2-list +echo +echo start simtrace2-sniff +$SIMTRACE2_HOST_PATH/simtrace2-sniff 2>&1 |sed -e 's/^/ST2\ /;' & +sleep 1 +echo +echo start pcsc_scan -n +pcsc_scan -n 2>&1 |sed -e 's/^/PCSC\ /;' & +sleep 2 +echo stop pcsc_scan +killall -SIGINT pcsc_scan +sudo killall pcscd +echo stop simtrace2-sniff +killall -SIGINT simtrace2-sniff + diff --git a/tests/simtrace2/README b/tests/simtrace2/README new file mode 100644 index 0000000..6d442da --- /dev/null +++ b/tests/simtrace2/README @@ -0,0 +1,9 @@ +This testsuite assumes you have installed the following utilities: +- lsusb +- dfu-util +- wget +- bossac +- simtrace2-list +- simtrace2-sniff +- pcsc_scan/pcscd +- killall diff --git a/tests/simtrace2/TODO b/tests/simtrace2/TODO new file mode 100644 index 0000000..33e0891 --- /dev/null +++ b/tests/simtrace2/TODO @@ -0,0 +1,4 @@ + +maybe: +- send '8' to usbrelay box to get serial - how to read it back? expect? +- require serial for prepare to return 0 diff --git a/tests/simtrace2/ctl_erase_target.sh b/tests/simtrace2/ctl_erase_target.sh new file mode 100755 index 0000000..3b29d17 --- /dev/null +++ b/tests/simtrace2/ctl_erase_target.sh @@ -0,0 +1,27 @@ +#!/bin/sh -e +. ./test-data + +#usb_rly08 +# all off-on n-d +# relay1 = usbpower o-e +# relay2 = dfu-btn p-f +# relay3 = reset-btn q-g +# relay4 = erase jumper r-h + +echo "erasing target" +#all off +echo -n "n" > $USB_RELAY +sleep 1 +# 4 on +echo -n "h" > $USB_RELAY +sleep 1 +# 1 on +echo -n "e" > $USB_RELAY +sleep 1 +# all off +echo -n "n" > $USB_RELAY +sleep 1 +# 1 on +echo -n "e" > $USB_RELAY +sleep 1 +echo "done" diff --git a/tests/simtrace2/ctl_get_relay_sn.sh b/tests/simtrace2/ctl_get_relay_sn.sh new file mode 100755 index 0000000..ecfb39a --- /dev/null +++ b/tests/simtrace2/ctl_get_relay_sn.sh @@ -0,0 +1,12 @@ +#!/bin/sh +. ./test-data + +#usb_rly08 +# all off-on n-d +# relay1 = usbpower o-e +# relay2 = dfu-btn p-f +# relay3 = reset-btn q-g +# relay4 = erase jumper r-h + +echo "getting relay SN" +echo -n "8" > $USB_RELAY diff --git a/tests/simtrace2/ctl_reset_target.sh b/tests/simtrace2/ctl_reset_target.sh new file mode 100755 index 0000000..1d8427f --- /dev/null +++ b/tests/simtrace2/ctl_reset_target.sh @@ -0,0 +1,18 @@ +#!/bin/sh -e +. ./test-data + +#usb_rly08 +# all off-on n-d +# relay1 = usbpower o-e +# relay2 = dfu-btn p-f +# relay3 = reset-btn q-g +# relay4 = erase jumper r-h + +#all off +echo "resetting target" +echo -n "n" > $USB_RELAY +sleep 1 +# 1 on +echo -n "e" > $USB_RELAY +sleep 1 +echo "done" diff --git a/tests/simtrace2/ctl_reset_to_dfu.sh b/tests/simtrace2/ctl_reset_to_dfu.sh new file mode 100755 index 0000000..9c05340 --- /dev/null +++ b/tests/simtrace2/ctl_reset_to_dfu.sh @@ -0,0 +1,24 @@ +#!/bin/sh -e +. ./test-data + +#usb_rly08 +# all off-on n-d +# relay1 = usbpower o-e +# relay2 = dfu-btn p-f +# relay3 = reset-btn q-g +# relay4 = erase jumper r-h + +echo "resetting target to dfu" +#all off +echo -n "n" > $USB_RELAY +sleep 1 +# 2 on +echo -n "f" > $USB_RELAY +sleep 1 +# 1 on +echo -n "e" > $USB_RELAY +sleep 1 +# 2 off +echo -n "p" > $USB_RELAY +sleep 1 +echo "done" diff --git a/tests/simtrace2/fetch_image.sh b/tests/simtrace2/fetch_image.sh new file mode 100755 index 0000000..5ce3591 --- /dev/null +++ b/tests/simtrace2/fetch_image.sh @@ -0,0 +1,7 @@ +#!/bin/sh -e +. ./test-data + +echo "fetch images" +wget -O $BL_IMAGE $BL_URL -nv +wget -O $APP_IMAGE $APP_URL -nv +echo "done" diff --git a/tests/simtrace2/flash_simtrace_bossac.sh b/tests/simtrace2/flash_simtrace_bossac.sh new file mode 100755 index 0000000..0065925 --- /dev/null +++ b/tests/simtrace2/flash_simtrace_bossac.sh @@ -0,0 +1,6 @@ +#!/bin/sh -e +. ./test-data + +sudo bossac --port $USB_TARGET --erase --write $BL_IMAGE --verify --boot=1 + +sleep 1 diff --git a/tests/simtrace2/flash_simtrace_dfu.sh b/tests/simtrace2/flash_simtrace_dfu.sh new file mode 100755 index 0000000..1bb175a --- /dev/null +++ b/tests/simtrace2/flash_simtrace_dfu.sh @@ -0,0 +1,5 @@ +#!/bin/sh -e +. ./test-data + +dfu-util --device $USBD_TARGET --cfg 1 --alt 1 --reset --download $APP_IMAGE 2>/dev/null |grep -v "Download\t"|grep -v "\[" +sleep 1 diff --git a/tests/simtrace2/get_installed_version.sh b/tests/simtrace2/get_installed_version.sh new file mode 100755 index 0000000..1b3f2b9 --- /dev/null +++ b/tests/simtrace2/get_installed_version.sh @@ -0,0 +1,6 @@ +#!/bin/sh -e +. ./test-data + +echo -n "installed fw version: " +lsusb -d $USBD_TARGET -v 2>/dev/null | grep iInterface -B 2|tr -d '\n' | sed 's/--/\n/g'|grep "bInterfaceSubClass 255"| rev | cut -d ' ' -f 1|rev + diff --git a/tests/simtrace2/notes_relay_board.txt b/tests/simtrace2/notes_relay_board.txt new file mode 100644 index 0000000..5669e92 --- /dev/null +++ b/tests/simtrace2/notes_relay_board.txt @@ -0,0 +1,28 @@ +usb_rly08 board http://www.robot-electronics.co.uk/htm/usb_rly08btech.htm + +Command + +Action +dec hex ascii + 56 38 8 Get serial number - returns 8 bytes of ASCII that form the unique serial number for module, I.E "00001543" + 90 5A Z Get software version - returns 2 bytes, the first being the Module ID which is 8, followed by the software version + 91 5B [ Get relay states - sends a single byte back to the controller, bit high meaning the corresponding relay is powered + 92 5C \ Set relay states - the next single byte will set all relays states, All on = 255 (11111111) All off = 0 +100 64 d All relays on +101 65 e Turn relay 1 on +102 66 f Turn relay 2 on +103 67 g Turn relay 3 on +104 68 h Turn relay 4 on +105 69 i Turn relay 5 on +106 6A j Turn relay 6 on +107 6B k Turn relay 7 on +108 6C l Turn relay 8 on +110 6E n All relays off +111 6F o Turn relay 1 off +112 70 p Turn relay 2 off +113 71 q Turn relay 3 off +114 72 r Turn relay 4 off +115 73 s Turn relay 5 off +116 74 t Turn relay 6 off +117 75 u Turn relay 7 off +118 76 v Turn relay 8 off diff --git a/tests/simtrace2/notes_wiring.txt b/tests/simtrace2/notes_wiring.txt new file mode 100644 index 0000000..6b8c1d9 --- /dev/null +++ b/tests/simtrace2/notes_wiring.txt @@ -0,0 +1,5 @@ + +relay1 - usb power target +relay2 - dfu-button (bootloader) target +relay3 - reset-button target - currently not used +relay4 - erase jumper target diff --git a/tests/simtrace2/prepare b/tests/simtrace2/prepare new file mode 100755 index 0000000..63ff09c --- /dev/null +++ b/tests/simtrace2/prepare @@ -0,0 +1,10 @@ +#!/bin/sh -e + +. ./test-data + +echo "================ PREPARING TEST RIG ================" +./ctl_reset_target.sh +echo "================ TEST RIG PREPARED =================" +echo "" + +./fetch_image.sh diff --git a/tests/simtrace2/regen b/tests/simtrace2/regen new file mode 100755 index 0000000..2978a0a --- /dev/null +++ b/tests/simtrace2/regen @@ -0,0 +1,19 @@ +#!/bin/sh -e +. ./test-data + +echo "Regenerating test output..." +./prepare +for T in $TESTS; do + echo "==> Executing Testcase $T" + EXPOUT=${T%%.sh}.out + ./$T > $EXPOUT + if [ $? -eq 0 ]; then + echo "Test $T passed" + else + echo "Test $T FAILED!" + fi +done + +echo "Reference output regenerated!" +echo "" + diff --git a/tests/simtrace2/run-tests b/tests/simtrace2/run-tests new file mode 100755 index 0000000..04b4591 --- /dev/null +++ b/tests/simtrace2/run-tests @@ -0,0 +1,46 @@ +#!/bin/sh + +# default: execute all tests + +. ./test-data + +# if command line specifies some specific tests, execute only those +if [ $# -ge 1 ]; then + TESTS=$* +fi + +TMP=`tempfile` +NUM_FAIL=0 + +# prepare test card +./prepare +if [ $? -eq 0 ]; then + echo "Prepare done" +else + echo "Prepare Test FAILED!" + exit 2 +fi + +for T in $TESTS; do + echo "==> Executing Testcase $T" + EXPOUT=${T%%.sh}.out + rm $TMP + ./$T > $TMP + diff -u $EXPOUT $TMP + if [ $? -eq 0 ]; then + echo "Test $T passed" + else + echo "Test $T FAILED!" + NUM_FAIL=$((NUM_FAIL+1)) + fi +done + +echo +echo +echo "Summary: $NUM_FAIL Tests failed" + +if [ $NUM_FAIL -gt 0 ]; then + exit 1 +else + exit 0 +fi diff --git a/tests/simtrace2/test-data b/tests/simtrace2/test-data new file mode 100644 index 0000000..05d6c95 --- /dev/null +++ b/tests/simtrace2/test-data @@ -0,0 +1,12 @@ +USBD_RELAY="04d8:ffee" +USB_RELAY="/dev/ttyACM0" +USBD_TARGET="1d50:60e3" +USB_TARGET="/dev/ttyACM1" +USBD_CCID="076b:6632" +USBD_HUB="05e3:0608" +BL_URL="https://downloads.osmocom.org/binaries/simtrace2/firmware/latest/simtrace-dfu-flash-latest.bin" +APP_URL="https://downloads.osmocom.org/binaries/simtrace2/firmware/latest/simtrace-trace-dfu-latest.bin" +BL_IMAGE="dl/simtrace-dfu-flash.bin" +APP_IMAGE="dl/simtrace-trace-dfu.bin" +SIMTRACE2_HOST_PATH="/home/roh/kunde/sysmocom/git.admin.sysmocom.de/simtrace2/host/src" +TESTS="01_check_rig.sh 02_erase_board.sh 03_flash_bl_bossac.sh 04_flash_dfu.sh 05_check_lsusb.sh 06_check_dfu_lsusb.sh 07_flash_dfu_from_app.sh 08_test_simtrace.sh" -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I88bc32334f23e6fd702e0cbcb1b1510029909b20 Gerrit-Change-Number: 25967 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 18:42:57 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 18:42:57 +0000 Subject: Change in osmo-msc[master]: libmsc: struct smsc: drop 'const' qualifier from bind_addr In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25950 ) Change subject: libmsc: struct smsc: drop 'const' qualifier from bind_addr ...................................................................... libmsc: struct smsc: drop 'const' qualifier from bind_addr This pointer holds an address of a string allocated on heap. Change-Id: I50145b57494aaccd4793f7b0ed2f65a6641db929 Related: CID#240711 --- M src/libmsc/smpp_smsc.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/smpp_smsc.h b/src/libmsc/smpp_smsc.h index b26d011..4c0d701 100644 --- a/src/libmsc/smpp_smsc.h +++ b/src/libmsc/smpp_smsc.h @@ -110,7 +110,7 @@ struct llist_head esme_list; struct llist_head acl_list; struct llist_head route_list; - const char *bind_addr; + char *bind_addr; uint16_t listen_port; char system_id[SMPP_SYS_ID_LEN+1]; int accept_all; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25950 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I50145b57494aaccd4793f7b0ed2f65a6641db929 Gerrit-Change-Number: 25950 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 18:46:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Tue, 26 Oct 2021 18:46:35 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: add TC_meas_res_speech_{tchf, tchh}_sapi3() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25968 ) Change subject: BTS_Tests: add TC_meas_res_speech_{tchf,tchh}_sapi3() ...................................................................... BTS_Tests: add TC_meas_res_speech_{tchf,tchh}_sapi3() The idea behind these test cases is to make sure that osmo-bts does send RSL MEASurement RESult messages regardless of what was received on SACCH: RR Measurement Report or SAPI=3 data. Change-Id: I7d17d6e5f413f2de78db944f23ad731b81ad24cf --- M bts/BTS_Tests.ttcn 1 file changed, 82 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/68/25968/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 03519d9..d7419a9 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3310,6 +3310,86 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +/* Make sure that we always get RSL MEASurement RESult messages regardless + * of what is sent on SACCH: (RR) Measurement Report or SAPI=3 data (SMS). */ +private function f_TC_meas_res_sapi3(charstring id) runs on ConnHdlr { + timer Texec := 8.0; + timer Timpf := 2.0; + timer Tmr; + + f_l1_tune(L1CTL); + RSL.clear; + + f_est_dchan(); + L1CTL.clear; + + /* Establish the main SAPI=0 link on DCCH first */ + f_tx_lapdm(ts_LAPDm_SABM(0, cr_MO_CMD, true, ''O), ts_RslLinkID_DCCH(0)); + + /* Give more time for the first RSL MEASurement RESult */ + Tmr.start(0.480 * 2.0); + Texec.start; /* EXECution timer */ + Timpf.start; /* IMPFung timer */ + + alt { + /* We expect RSL MEASurement RESult messages every ~480ms (plus some guard) */ + [] RSL.receive(tr_RSL_MEAS_RES(g_pars.chan_nr)) { + /* Reschedule the MEAS RES timer */ + Tmr.start(0.480 + 0.120); + repeat; + } + [] RSL.receive { repeat; } + [] Tmr.timeout { + setverdict(fail, "Timeout waiting for RSL MEAS RES"); + } + /* Inject some SAPI=3 traffic on SACCH every 2 seconds */ + [] Timpf.timeout { + f_tx_lapdm(ts_LAPDm_SABM(3, cr_MO_CMD, true, ''O), ts_RslLinkID_SACCH(3)); + log("Injected SAPI=3 traffic on SACCH"); + Timpf.start; + repeat; + } + /* We're good if survived so far */ + [] Texec.timeout { + setverdict(pass); + } + } + + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_meas_res_speech_tchf_sapi3() runs on test_CT { + var template RSL_IE_ChannelMode ch_mode; + var template ConnHdlrPars pars; + var ConnHdlr vc_conn; + + f_init(); + + ch_mode := ts_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM1); + pars := t_Pars(t_RslChanNr_Bm(1), ch_mode); + + vc_conn := f_start_handler(refers(f_TC_meas_res_sapi3), valueof(pars)); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} +testcase TC_meas_res_speech_tchh_sapi3() runs on test_CT { + var template RSL_IE_ChannelMode ch_mode; + var template ConnHdlrPars pars; + var ConnHdlr vc_conn; + + f_init(); + + ch_mode := ts_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_SP_GSM1); + pars := t_Pars(t_RslChanNr_Lm(5, 0), ch_mode); + + vc_conn := f_start_handler(refers(f_TC_meas_res_sapi3), valueof(pars)); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} + /* establish DChan, and send MS POWER CONTROL messages via RSL, verify that * the BTS is forwarding those values to the MS via the SACCH L1 header. */ private function f_tc_rsl_ms_pwr_ctrl(charstring id) runs on ConnHdlr { @@ -7890,6 +7970,8 @@ execute( TC_meas_res_sign_sdcch4() ); execute( TC_meas_res_sign_sdcch8() ); execute( TC_meas_res_sign_tchh_toa256() ); + execute( TC_meas_res_speech_tchf_sapi3() ); + execute( TC_meas_res_speech_tchh_sapi3() ); execute( TC_tx_power_start_ramp_up_bcch() ); execute( TC_tx_power_start_ramp_down_bcch() ); execute( TC_tx_power_ramp_adm_state_change() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7d17d6e5f413f2de78db944f23ad731b81ad24cf Gerrit-Change-Number: 25968 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 20:20:30 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 26 Oct 2021 20:20:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used In-Reply-To: References: Message-ID: neels has uploaded a new patch set (#3) to the change originally created by pespin. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 ) Change subject: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used ...................................................................... bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used Related: OS#5278 Related: SYS#5309 Change-Id: Iee37eef2012ce2c2e2f0a0db4c26abb75a947d84 --- M bsc/BSC_Tests.ttcn 1 file changed, 79 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/38/25938/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iee37eef2012ce2c2e2f0a0db4c26abb75a947d84 Gerrit-Change-Number: 25938 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 20:20:31 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 26 Oct 2021 20:20:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add TC_ratectr_all_available_allocated and _dyn References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25969 ) Change subject: bsc: add TC_ratectr_all_available_allocated and _dyn ...................................................................... bsc: add TC_ratectr_all_available_allocated and _dyn Test new rate counters all_allocated:{sdcch,tch,static_sdcch,static_tch} Related: SYS#4878 Depends: I2fa14531f16d3f07085620f1c50eb839c420da6a (osmo-bsc) Change-Id: Ib3997a827c9cc43d1361bb0cf3bfab9f6d91bf82 --- M bsc/BSC_Tests.ttcn M library/Osmocom_CTRL_Functions.ttcn 2 files changed, 226 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/25969/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index ee4dac2..385b46a 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1642,6 +1642,8 @@ RslChannelNr rsl_chan_nr } +type record of DchanTuple DchanTuples; + /* Send CHAN RQD and wait for allocation; acknowledge it */ private function f_chreq_act_ack(OCT1 ra := '23'O, GsmFrameNumber fn := 23) runs on test_CT return RslChannelNr { @@ -10365,6 +10367,147 @@ f_shutdown_helper(); } +const CounterNameVals counternames_bsc_bts_all_available_allocated := { + { "all_allocated:sdcch", 0 }, + { "all_allocated:static_sdcch", 0 }, + { "all_allocated:tch", 0 }, + { "all_allocated:static_tch", 0 } +} + +private function f_all_allocated_expect_counter_change(charstring_list expect_changed) runs on test_CT +{ + f_ctrs_bsc_and_bts_init(1, counternames_bsc_bts_all_available_allocated); + f_sleep(2.0); + var charstring_list all_changed := {}; + all_changed := all_changed & f_counter_name_vals_get_changed_n(IPA_CTRL, "bsc", g_ctr_bsc); + all_changed := all_changed & f_counter_name_vals_get_changed_n(IPA_CTRL, "bts", g_ctr_bts); + + var charstring_list all_expect_changed := {}; + for (var integer i := 0; i < lengthof(expect_changed); i := i + 1) { + all_expect_changed := all_expect_changed & { "bsc.0." & expect_changed[i], "bts.0." & expect_changed[i] }; + } + f_counter_name_vals_expect_changed_list(all_changed, all_expect_changed); +} + +testcase TC_ratectr_all_available_allocated() runs on test_CT { + var ASP_RSL_Unitdata rsl_ud; + var integer i; + var integer chreq_total, chreq_nochan; + + f_init(1); + f_sleep(1.0); + + /* Exhaust all dedicated SDCCH lchans. + /* GSM 44.018 Table 9.1.8.2: + * RA = '13'O -> Establishment cause = 0001xxxx (MS dual rate capable and asks for "SDCCH"). + */ + for (i := 0; i < NUM_SDCCH_PER_BTS; i := i+1) { + f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + } + + /* Since only bts 0 is connected, expecting all_allocated to become true for both bts 0 and the "global" bsc + * level. + * All SDCCH are now occupied. */ + f_all_allocated_expect_counter_change({"all_allocated:sdcch", "all_allocated:static_sdcch"}); + + /* Also fill up all remaining (TCH) channels */ + for (i := 0; i < NUM_TCHF_PER_BTS + NUM_TCHH_PER_BTS; i := i+1) { + f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + } + + /* All TCH are now also occupied */ + f_all_allocated_expect_counter_change({"all_allocated:sdcch", "all_allocated:static_sdcch", + "all_allocated:tch", "all_allocated:static_tch"}); + + f_shutdown_helper(); +} + +testcase TC_ratectr_all_available_allocated_dyn() runs on test_CT { + var ASP_RSL_Unitdata rsl_ud; + var integer i; + var integer chreq_total, chreq_nochan; + + f_init_vty(); + f_ts_set_chcomb(0, 0, 2, "TCH/F_TCH/H_PDCH"); + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); + /* Now we have 3 TCH/F, 1 OSMO_DYN, 1 TCH/H */ + + f_init(1, guard_timeout := 60.0); + f_sleep(1.0); + + /* The dyn TS wants to activate PDCH mode, ACK that. */ + var RslChannelNr chan_nr; + chan_nr := valueof(t_RslChanNr_PDCH(2)); + f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?)); + f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2342)); + + /* Exhaust all dedicated SDCCH lchans. + /* GSM 44.018 Table 9.1.8.2: + * RA = '13'O -> Establishment cause = 0001xxxx (MS dual rate capable and asks for "SDCCH"). + */ + for (i := 0; i < NUM_SDCCH_PER_BTS; i := i+1) { + f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + } + + /* The static SDCCH should now be occupied, while still 3x8 dynamic SDCCH potentially remain. So only + * all_allocated:static_sdcch is counted, all_allocated:sdcch remains zero. */ + f_all_allocated_expect_counter_change({"all_allocated:static_sdcch"}); + + /* Request more SDCCH, hence convert the first dyn TS to SDCCH8. + * Will release them later, so remember all the DchanTuples. */ + var DchanTuples dyn_sddch := {}; + dyn_sddch := dyn_sddch & { f_est_dchan_dyn('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; + + /* Also occupy the seven other SDCCH of the dyn TS */ + for (i := 0; i < 7; i := i+1) { + dyn_sddch := dyn_sddch & { f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O) }; + } + + /* Now all dynamic SDCCH are also occupied, so for the first time all_allocated:sdcch will trigger... */ + f_all_allocated_expect_counter_change({"all_allocated:sdcch", "all_allocated:static_sdcch"}); + + /* occupy the remaining TCH, three TCH/F and two TCH/H lchans */ + for (i := 0; i < 5; i := i+1) { + f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + } + + /* All TCH lchans are now also occupied, both static and dynamic */ + f_all_allocated_expect_counter_change({"all_allocated:sdcch", "all_allocated:static_sdcch", + "all_allocated:tch", "all_allocated:static_tch"}); + + /* Starting to release the dyn TS: as soon as the first SDCCH gets released, all_allocated:sdcch stops + * incrementing. */ + var BssmapCause cause := 0; + var DchanTuple dt := dyn_sddch[0]; + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_ClearCommand(cause))); + f_exp_chan_rel_and_clear(dt, 0); + + /* one dyn TS SDCCH is free again, so only the static_sdcch should increment. For tch, both static and dynamic + * count as occupied, so those still both increment. */ + f_all_allocated_expect_counter_change({"all_allocated:static_sdcch", + "all_allocated:tch", "all_allocated:static_tch"}); + + /* Release the remaining SDCCH of the dyn TS, so it becomes available as TCH again */ + for (i := 1; i < lengthof(dyn_sddch); i := i+1) { + dt := dyn_sddch[i]; + BSSAP.send(ts_BSSAP_DATA_req(dt.sccp_conn_id, ts_BSSMAP_ClearCommand(cause))); + f_exp_chan_rel_and_clear(dt, 0); + } + + /* All SDCCH on the dyn TS are released, the dyn TS wants to activate PDCH again */ + chan_nr := valueof(t_RslChanNr_PDCH(2)); + f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?)); + f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2342)); + + /* Now all channels are occupied except the dyn TS, so expecting only the static counters to increment */ + f_all_allocated_expect_counter_change({"all_allocated:static_sdcch", "all_allocated:static_tch"}); + + /* clean up config */ + f_ts_reset_chcomb(0); + + f_shutdown_helper(); +} + control { /* CTRL interface testing */ execute( TC_ctrl_msc_connection_status() ); @@ -10674,6 +10817,11 @@ execute( TC_ctrl_trx_rf_locked() ); + execute( TC_osmo_dyn_as_sdcch() ); + + execute( TC_ratectr_all_available_allocated() ); + execute( TC_ratectr_all_available_allocated_dyn() ); + execute( TC_lost_sdcch_during_assignment() ); } diff --git a/library/Osmocom_CTRL_Functions.ttcn b/library/Osmocom_CTRL_Functions.ttcn index 8d5607b..ad44e76 100644 --- a/library/Osmocom_CTRL_Functions.ttcn +++ b/library/Osmocom_CTRL_Functions.ttcn @@ -23,6 +23,8 @@ import from Osmocom_CTRL_Types all; import from IPA_Emulation all; + type record of charstring charstring_list; + private function f_gen_rand_id() return CtrlId { return int2str(float2int(rnd()*999999999.0)); } @@ -289,4 +291,80 @@ } } + /* For a specific instance, call f_counter_name_vals_get() and indentify counters that have changed with respect + * to 'vals'. Return list of the changed counter names in the order they appear in 'vals'. */ + function f_counter_name_vals_get_changed(IPA_CTRL_PT pt, charstring instance_name, integer instance_nr, + CounterNameVals vals) + return charstring_list { + var charstring_list changed := {}; + var CounterNameVals last := f_counter_name_vals_get(pt, instance_name, instance_nr, vals); + for (var integer i := 0; i < lengthof(vals); i := i + 1) { + if (last[i].name != vals[i].name) { + setverdict(fail, "Internal error"); + } + if (last[i].val != vals[i].val) { + changed := changed & { instance_name & "." & int2str(instance_nr) & "." & vals[i].name }; + } + } + return changed; + } + + /* For N instances, call f_counter_name_vals_get() and indentify counters that have changed with respect + * to 'vals'. Return list of the changed counter names in the order they appear in 'vals'. */ + function f_counter_name_vals_get_changed_n(IPA_CTRL_PT pt, charstring instance_name, CounterNameValsList valslist) + return charstring_list { + var charstring_list changed := {}; + for (var integer instance_nr := 0; instance_nr < lengthof(valslist); instance_nr := instance_nr + 1) { + changed := changed & f_counter_name_vals_get_changed(pt, instance_name, instance_nr, valslist[instance_nr]); + } + return changed; + } + + function f_counter_name_vals_expect_changed(IPA_CTRL_PT pt, charstring instance_name, CounterNameValsList valslist, + charstring_list expect_changed) { + var charstring_list changed := f_counter_name_vals_get_changed_n(pt, instance_name, valslist); + f_counter_name_vals_expect_changed_list(changed, expect_changed); + } + + function f_counter_name_vals_expect_changed_list(charstring_list got_list, charstring_list expect_list) { + var charstring unexpected_change := ""; + for (var integer i := 0; i < lengthof(got_list); i := i + 1) { + var boolean found := false; + for (var integer j := 0; j < lengthof(expect_list); j := j + 1) { + if (got_list[i] == expect_list[j]) { + found := true; + break; + } + } + if (not found) { + unexpected_change := unexpected_change & " " & got_list[i]; + } + } + var charstring missing_change := ""; + for (var integer i := 0; i < lengthof(expect_list); i := i + 1) { + var boolean found := false; + for (var integer j := 0; j < lengthof(got_list); j := j + 1) { + if (expect_list[i] == got_list[j]) { + found := true; + break; + } + } + if (not found) { + missing_change := missing_change & " " & expect_list[i]; + } + } + var charstring diff := ""; + if (lengthof(unexpected_change) > 0) { + diff := diff & " Unexpected changes in" & unexpected_change & ";"; + } + if (lengthof(missing_change) > 0) { + diff := diff & " Missing changes in" & missing_change & ";"; + } + if (lengthof(diff) > 0) { + setverdict(fail, "Rate counters did not change as expected:" & diff); + } else { + setverdict(pass); + } + } + } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib3997a827c9cc43d1361bb0cf3bfab9f6d91bf82 Gerrit-Change-Number: 25969 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 20:20:31 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 26 Oct 2021 20:20:31 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: comment: tweak TS reference References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25970 ) Change subject: bsc: comment: tweak TS reference ...................................................................... bsc: comment: tweak TS reference Change-Id: I53ec51240d6e9a0f93f784c8afee2f54226cc51f --- M bsc/BSC_Tests.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/70/25970/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 385b46a..029b604 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1400,7 +1400,7 @@ chreq_total := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:total"); chreq_nochan := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:no_channel"); - /* GSM 04.08 Table 9.9a: + /* GSM 44.018 Table 9.1.8.2: * RA = '33'O -> Establishment cause = 0011xxxx (MS dual rate capable and asks for "TCH/H or TCH/F"). * With current setup, expect 4xSDCCH + 4xTCH/F + 1xTCH/H to succeed */ for (i := 0; i < NUM_TCHF_PER_BTS + NUM_TCHH_PER_BTS + NUM_SDCCH_PER_BTS; i := i+1) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I53ec51240d6e9a0f93f784c8afee2f54226cc51f Gerrit-Change-Number: 25970 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 20:23:22 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 26 Oct 2021 20:23:22 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 ) Change subject: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used ...................................................................... Patch Set 3: @pespin, i took the liberty to tweak our patch according to code review, take care not to overwrite it. It's also at the start of branch neels/wip -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iee37eef2012ce2c2e2f0a0db4c26abb75a947d84 Gerrit-Change-Number: 25938 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Tue, 26 Oct 2021 20:23:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 20:57:25 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 26 Oct 2021 20:57:25 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add TC_ratectr_all_available_allocated and _dyn In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25969 to look at the new patch set (#2). Change subject: bsc: add TC_ratectr_all_available_allocated and _dyn ...................................................................... bsc: add TC_ratectr_all_available_allocated and _dyn Test new rate counters all_allocated:{sdcch,tch,static_sdcch,static_tch} Related: SYS#4878 Depends: I2fa14531f16d3f07085620f1c50eb839c420da6a (osmo-bsc) Change-Id: Ib3997a827c9cc43d1361bb0cf3bfab9f6d91bf82 --- M bsc/BSC_Tests.ttcn M library/Osmocom_CTRL_Functions.ttcn 2 files changed, 224 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/25969/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib3997a827c9cc43d1361bb0cf3bfab9f6d91bf82 Gerrit-Change-Number: 25969 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 21:10:42 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 26 Oct 2021 21:10:42 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add TC_ratectr_all_available_allocated and _dyn In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25969 to look at the new patch set (#3). Change subject: bsc: add TC_ratectr_all_available_allocated and _dyn ...................................................................... bsc: add TC_ratectr_all_available_allocated and _dyn Test new rate counters all_allocated:{sdcch,tch,static_sdcch,static_tch} Related: SYS#4878 Depends: I2fa14531f16d3f07085620f1c50eb839c420da6a (osmo-bsc) Change-Id: Ib3997a827c9cc43d1361bb0cf3bfab9f6d91bf82 --- M bsc/BSC_Tests.ttcn M library/Osmocom_CTRL_Functions.ttcn 2 files changed, 234 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/69/25969/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib3997a827c9cc43d1361bb0cf3bfab9f6d91bf82 Gerrit-Change-Number: 25969 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 22:27:05 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 26 Oct 2021 22:27:05 +0000 Subject: Change in osmo-bsc[master]: constify lchan_state_is() References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25971 ) Change subject: constify lchan_state_is() ...................................................................... constify lchan_state_is() An upcoming patch would rather pass a const struct gsm_lchan*. See I2fb48c549186db812b1e9d6b735a92e80f27b8d3. Related: OS#4878 Change-Id: I523cbf04e77f43924c3f09094d56f815d3de640d --- M include/osmocom/bsc/lchan_fsm.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/71/25971/1 diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index e7a06d5..fa0d299 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -72,7 +72,7 @@ return lchan->fi ? osmo_fsm_inst_state_name(lchan->fi) : "NULL"; } -static inline bool lchan_state_is(struct gsm_lchan *lchan, uint32_t state) +static inline bool lchan_state_is(const struct gsm_lchan *lchan, uint32_t state) { return (!lchan->fi && state == LCHAN_ST_UNUSED) || (lchan->fi && lchan->fi->state == state); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I523cbf04e77f43924c3f09094d56f815d3de640d Gerrit-Change-Number: 25971 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 22:27:06 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 26 Oct 2021 22:27:06 +0000 Subject: Change in osmo-bsc[master]: refactor lchan counting References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25972 ) Change subject: refactor lchan counting ...................................................................... refactor lchan counting Add trx_count_lchans() and bts_count_lchans(). Drop bts_count_free_ts() and trx_count_free_ts(). Rationale: The bts_count_free_ts() and trx_count_free_ts() always returned the number of free lchans, not timeslots. Hence, passing the pchan type as argument never really matched the semantics. Especially, when looking for free SDCCH, there is no clear match on a gsm_phys_chan_config enum value: SDCCH8_SACCH8C, CCCH_SDCCH4, CCCH_SDCCH4_CBCH, SDCCH8_SACCH8C_CBCH? -- GSM_LCHAN_SDCCH is clear. ==> Rather count free lchans by enum gsm_chan_t. Counting lchans of distinct types required separate iterations for each lchan type. ==> Rather compose an array of counts for all types, in one go. I need to count the amount of free SDCCH lchans in an upcoming patch to implement the performance indicator allAvailableAllocatedSDCCH (cumulate time for which no SDCCH are available). To implement allAvailableAllocated{SDCCH,TCH}, I need a count of both the used as well as the total lchans for a type: it does not make sense to flag "all available allocated" if none are ever available. To properly count dynamic ts, I need the maximum total that can be possible at any time. And to count currently free lchans, I need the current total. This may seem counter intuitive, but consider, e.g.: - Obviously, if a cell has only static TCH/F timeslots, it does not make sense to flag that all available TCH/H are occupied, because no TCH/H are available ever. Just stating this as contrast to dyn TS. - If a cell has OSMO_DYN timeslots, I *do* want to flag that all TCH/H are occupied when all dyn timeslots are fully occupied. - If those OSMO_DYN however are all used as TCH/F, the current total of TCH/H becomes zero, and it seems like TCH/H should not be considered. - To count the nr of currently free lchans, I need the currently possible total of lchans and the nr of occupied lchans. So return both a maximum total and a current total of lchans. In above example, the maximum total shows that there would be TCH/H possible. BTW, it would be nice to keep a chan_counts array on trx, bts and bsc level and update as channels are allocated and released, instead of counting them all over periodically. But it's less error prone this way. Related: SYS#4878 Change-Id: I2fb48c549186db812b1e9d6b735a92e80f27b8d3 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/bts_trx.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/bts.c M src/osmo-bsc/bts_trx.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/handover_decision_2.c 8 files changed, 265 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/72/25972/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 68654f2..700033c 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -712,7 +712,7 @@ void gsm_bts_all_ts_dispatch(struct gsm_bts *bts, uint32_t ts_ev, void *data); -int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan); +void bts_count_lchans(chan_counts_t bts_counts, struct gsm_bts *bts); int gsm_bts_set_system_infos(struct gsm_bts *bts); diff --git a/include/osmocom/bsc/bts_trx.h b/include/osmocom/bsc/bts_trx.h index 4d705d0..ca6e8b5 100644 --- a/include/osmocom/bsc/bts_trx.h +++ b/include/osmocom/bsc/bts_trx.h @@ -95,7 +95,7 @@ bool trx_is_usable(const struct gsm_bts_trx *trx); void gsm_trx_all_ts_dispatch(struct gsm_bts_trx *trx, uint32_t ts_ev, void *data); -int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan); +void trx_count_lchans(chan_counts_t counts, const struct gsm_bts_trx *trx); bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx); int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index cb56028..3d2c901 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1135,6 +1135,7 @@ uint8_t pchan_subslots(enum gsm_phys_chan_config pchan); uint8_t pchan_subslots_vamos(enum gsm_phys_chan_config pchan); +int pchan_subslots_for_lchant(enum gsm_phys_chan_config pchan, enum gsm_chan_t type); bool ts_is_tch(struct gsm_bts_trx_ts *ts); struct gsm_lchan *gsm_lchan_vamos_to_primary(const struct gsm_lchan *lchan_vamos); @@ -1410,4 +1411,73 @@ enum rsl_cmod_spd chan_mode_to_rsl_cmod_spd(enum gsm48_chan_mode chan_mode); +/* First array index to typedef chan_counts_t. */ +enum chan_counts_dim1 { + CHAN_COUNTS1_ALL = 0, + CHAN_COUNTS1_STATIC = 1, + CHAN_COUNTS1_DYNAMIC = 2, + CHAN_COUNTS1_N +}; + +extern const struct value_string chan_count1_strs[]; +static inline const char *chan_count1_str(enum chan_counts_dim1 val) +{ return get_value_string(chan_count1_strs, val); } + +/* Second array index to typedef chan_counts_t. */ +enum chan_counts_dim2 { + /* The maximum possible nr of lchans of this type. Counts all dynamic timeslots as if they are fully available + * for this type, regardless of the current pchan mode. (For CHAN_COUNTS1_STATIC, of course no dyn TS are counted + * at all.) */ + CHAN_COUNTS2_MAX_TOTAL = 0, + /* Like MAX_TOTAL, but as soon as dynamic timeslots are switched to a specific pchan kind, current_total shrinks + * to count only currently present lchans (used and unused). */ + CHAN_COUNTS2_CURRENT_TOTAL = 1, + /* Currently used lchans of this type. To get currently free lchans, calculate CURRENT_TOTAL - ALLOCATED. */ + CHAN_COUNTS2_ALLOCATED = 2, + /* Currently assignable lchans of this type, same as CURRENT_TOTAL - ALLOCATED. */ + CHAN_COUNTS2_FREE = 3, + CHAN_COUNTS2_N +}; + +extern const struct value_string chan_count2_strs[]; +static inline const char *chan_count2_str(enum chan_counts_dim2 val) +{ return get_value_string(chan_count2_strs, val); } + +typedef unsigned int chan_counts_dim3 [_GSM_LCHAN_MAX]; +typedef unsigned int chan_counts_dim2 [CHAN_COUNTS2_N][_GSM_LCHAN_MAX]; +typedef unsigned int chan_counts_t [CHAN_COUNTS1_N][CHAN_COUNTS2_N][_GSM_LCHAN_MAX]; + +static inline void chan_counts_zero(chan_counts_t counts) +{ + memset(counts, 0, sizeof(chan_counts_t)); +} + +static inline void chan_counts_dim3_add(chan_counts_dim3 dst, const chan_counts_dim3 add) +{ + int i; + for (i = 0; i < _GSM_LCHAN_MAX; i++) + dst[i] += add[i]; +} + +static inline void chan_counts_dim3_sub(chan_counts_dim3 dst, const chan_counts_dim3 sub) +{ + int i; + for (i = 0; i < _GSM_LCHAN_MAX; i++) + dst[i] = (sub[i] < dst[i]) ? dst[i] - sub[i] : 0; +} + +static inline void chan_counts_dim2_add(chan_counts_dim2 dst, const chan_counts_dim2 add) +{ + int i; + for (i = 0; i < CHAN_COUNTS2_N; i++) + chan_counts_dim3_add(dst[i], add[i]); +} + +static inline void chan_counts_add(chan_counts_t dst, const chan_counts_t add) +{ + int i; + for (i = 0; i < CHAN_COUNTS1_N; i++) + chan_counts_dim2_add(dst[i], add[i]); +} + #endif /* _GSM_DATA_H */ diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 0e2ffc6..f539b07 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1958,6 +1958,7 @@ struct gsm_lchan *_select_sdcch_for_call(struct gsm_bts *bts, const struct chan_rqd *rqd, enum gsm_chan_t lctype) { + chan_counts_t bts_counts; struct gsm_lchan *lchan = NULL; int free_tchf, free_tchh; bool needs_dyn_switch; @@ -1969,8 +1970,9 @@ needs_dyn_switch = lchan->ts->pchan_on_init == GSM_PCHAN_OSMO_DYN && lchan->ts->pchan_is != GSM_PCHAN_SDCCH8_SACCH8C; - free_tchf = bts_count_free_ts(bts, GSM_PCHAN_TCH_F); - free_tchh = bts_count_free_ts(bts, GSM_PCHAN_TCH_H); + bts_count_lchans(bts_counts, bts); + free_tchf = bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F]; + free_tchh = bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_H]; if (free_tchf == 0 && free_tchh == 0) { LOG_BTS(bts, DRSL, LOGL_INFO, "CHAN RQD: 0x%x Requesting %s reason=call but no TCH available\n", diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 21ee01a..2e4b520 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -719,17 +719,16 @@ gsm_trx_all_ts_dispatch(trx, ts_ev, data); } - -/* Count number of free TS of given pchan type */ -int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan) +void bts_count_lchans(chan_counts_t bts_counts, struct gsm_bts *bts) { struct gsm_bts_trx *trx; - int count = 0; + chan_counts_zero(bts_counts); - llist_for_each_entry(trx, &bts->trx_list, list) - count += trx_count_free_ts(trx, pchan); - - return count; + llist_for_each_entry(trx, &bts->trx_list, list) { + chan_counts_t trx_counts; + trx_count_lchans(trx_counts, trx); + chan_counts_add(bts_counts, trx_counts); + } } /* set all system information types for a BTS */ diff --git a/src/osmo-bsc/bts_trx.c b/src/osmo-bsc/bts_trx.c index f30c748..523a7c4 100644 --- a/src/osmo-bsc/bts_trx.c +++ b/src/osmo-bsc/bts_trx.c @@ -292,52 +292,94 @@ } } -int trx_count_free_ts(struct gsm_bts_trx *trx, enum gsm_phys_chan_config pchan) +static const unsigned int lchans_per_pchan[_GSM_PCHAN_MAX][_GSM_LCHAN_MAX] = { + [GSM_PCHAN_NONE] = {0}, + [GSM_PCHAN_CCCH] = { [GSM_LCHAN_CCCH] = 1, }, + [GSM_PCHAN_PDCH] = { [GSM_LCHAN_PDTCH] = 1, }, + [GSM_PCHAN_CCCH_SDCCH4] = { + [GSM_LCHAN_CCCH] = 1, + [GSM_LCHAN_SDCCH] = 3, + }, + [GSM_PCHAN_TCH_F] = { [GSM_LCHAN_TCH_F] = 1, }, + [GSM_PCHAN_TCH_H] = { [GSM_LCHAN_TCH_H] = 2, }, + [GSM_PCHAN_SDCCH8_SACCH8C] = { [GSM_LCHAN_SDCCH] = 8, }, + [GSM_PCHAN_CCCH_SDCCH4_CBCH] = { + [GSM_LCHAN_CCCH] = 1, + [GSM_LCHAN_SDCCH] = 3, + [GSM_LCHAN_CBCH] = 1, + }, + [GSM_PCHAN_SDCCH8_SACCH8C_CBCH] = { + [GSM_LCHAN_SDCCH] = 8, + [GSM_LCHAN_CBCH] = 1, + }, + [GSM_PCHAN_OSMO_DYN] = { + [GSM_LCHAN_TCH_F] = 1, + [GSM_LCHAN_TCH_H] = 2, + [GSM_LCHAN_SDCCH] = 8, + [GSM_LCHAN_PDTCH] = 1, + }, + [GSM_PCHAN_TCH_F_PDCH] = { + [GSM_LCHAN_TCH_F] = 1, + [GSM_LCHAN_PDTCH] = 1, + }, +}; + +void trx_count_lchans(chan_counts_t ret, const struct gsm_bts_trx *trx) { - struct gsm_bts_trx_ts *ts; - struct gsm_lchan *lchan; - int j; - int count = 0; + const struct gsm_bts_trx_ts *ts; + const struct gsm_lchan *lchan; + int i; + + chan_counts_zero(ret); if (!trx_is_usable(trx)) - return 0; + return; - for (j = 0; j < ARRAY_SIZE(trx->ts); j++) { - ts = &trx->ts[j]; + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { + bool ts_is_dynamic; + chan_counts_dim2 ts_count = {0}; + ts = &trx->ts[i]; if (!ts_is_usable(ts)) continue; - if (ts->pchan_is == GSM_PCHAN_PDCH) { - /* Dynamic timeslots in PDCH mode will become TCH if needed. */ - switch (ts->pchan_on_init) { - case GSM_PCHAN_TCH_F_PDCH: - if (pchan == GSM_PCHAN_TCH_F) - count++; - continue; + /* Count the full potential nr of lchans for dynamic TS */ + chan_counts_dim3_add(ts_count[CHAN_COUNTS2_MAX_TOTAL], lchans_per_pchan[ts->pchan_on_init]); - case GSM_PCHAN_OSMO_DYN: - if (pchan == GSM_PCHAN_TCH_F) - count++; - else if (pchan == GSM_PCHAN_TCH_H) - count += 2; - continue; - - default: - /* Not dynamic, not applicable. */ - continue; - } + switch (ts->pchan_on_init) { + case GSM_PCHAN_TCH_F_PDCH: + case GSM_PCHAN_OSMO_DYN: + ts_is_dynamic = true; + break; + default: + ts_is_dynamic = false; + break; } - if (ts->pchan_is != pchan) - continue; + if (ts_is_dynamic && ts->pchan_is == GSM_PCHAN_PDCH) { + /* Dynamic timeslots in PDCH mode can become TCH or SDCCH immediately, + * so set CURRENT_TOTAL = MAX_TOTAL. */ + chan_counts_dim3_add(ts_count[CHAN_COUNTS2_CURRENT_TOTAL], ts_count[CHAN_COUNTS2_MAX_TOTAL]); + } else { + /* Static TS, or dyn TS that are currently fixed on a specific pchan: count lchans for the + * current pchan mode. */ + chan_counts_dim3_add(ts_count[CHAN_COUNTS2_CURRENT_TOTAL], lchans_per_pchan[ts->pchan_is]); + } + /* Count currently allocated lchans */ ts_for_n_lchans(lchan, ts, ts->max_primary_lchans) { - if (lchan_state_is(lchan, LCHAN_ST_UNUSED)) - count++; + if (!lchan_state_is(lchan, LCHAN_ST_UNUSED)) + ts_count[CHAN_COUNTS2_ALLOCATED][lchan->type]++; } - } - return count; + chan_counts_dim3_add(ts_count[CHAN_COUNTS2_FREE], ts_count[CHAN_COUNTS2_CURRENT_TOTAL]); + chan_counts_dim3_sub(ts_count[CHAN_COUNTS2_FREE], ts_count[CHAN_COUNTS2_ALLOCATED]); + + if (ts_is_dynamic) + chan_counts_dim2_add(ret[CHAN_COUNTS1_DYNAMIC], ts_count); + else + chan_counts_dim2_add(ret[CHAN_COUNTS1_STATIC], ts_count); + chan_counts_dim2_add(ret[CHAN_COUNTS1_ALL], ts_count); + } } bool trx_has_valid_pchan_config(const struct gsm_bts_trx *trx) diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 0134e34..9a5128a 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -646,6 +646,102 @@ return subslots_per_pchan_vamos[pchan]; } +/*! Return the maximum nr of lchans of the given type possible in the given pchan config. + * TODO: include possible VAMOS secondary lchans? */ +int pchan_subslots_for_lchant(enum gsm_phys_chan_config pchan, enum gsm_chan_t type) +{ + switch (pchan) { + default: + case GSM_PCHAN_UNKNOWN: + case GSM_PCHAN_NONE: + return 0; + case GSM_PCHAN_CCCH: + switch (type) { + case GSM_LCHAN_CCCH: + return 1; + default: + return 0; + } + case GSM_PCHAN_CCCH_SDCCH4: + switch (type) { + case GSM_LCHAN_CCCH: + return 1; + case GSM_LCHAN_SDCCH: + return 4; + default: + return 0; + } + case GSM_PCHAN_TCH_F: + switch (type) { + case GSM_LCHAN_TCH_F: + return 1; + default: + return 0; + } + case GSM_PCHAN_TCH_H: + switch (type) { + case GSM_LCHAN_TCH_H: + return 2; + default: + return 0; + } + case GSM_PCHAN_SDCCH8_SACCH8C: + switch (type) { + case GSM_LCHAN_SDCCH: + return 8; + default: + return 0; + } + case GSM_PCHAN_PDCH: + switch (type) { + case GSM_LCHAN_PDTCH: + return 1; + default: + return 0; + } + case GSM_PCHAN_TCH_F_PDCH: + switch (type) { + case GSM_LCHAN_PDTCH: + case GSM_LCHAN_TCH_F: + return 1; + default: + return 0; + } + case GSM_PCHAN_CCCH_SDCCH4_CBCH: + switch (type) { + case GSM_LCHAN_CCCH: + case GSM_LCHAN_CBCH: + return 1; + case GSM_LCHAN_SDCCH: + return 4; + default: + return 0; + } + case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: + switch (type) { + case GSM_LCHAN_SDCCH: + return 8; + case GSM_LCHAN_CBCH: + return 1; + default: + return 0; + } + case GSM_PCHAN_OSMO_DYN: + switch (type) { + case GSM_LCHAN_SDCCH: + return 8; + case GSM_LCHAN_TCH_F: + return 1; + case GSM_LCHAN_TCH_H: + return 2; + case GSM_LCHAN_PDTCH: + return 1; + default: + return 0; + } + } +} + static bool pchan_is_tch(enum gsm_phys_chan_config pchan) { switch (pchan) { diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index d08173c..387561c 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -990,12 +990,15 @@ static void candidate_set_free_tch(struct ho_candidate *c) { + chan_counts_t bts_counts; struct gsm_lchan *next_lchan; - c->current.free_tchf = bts_count_free_ts(c->current.bts, GSM_PCHAN_TCH_F); + bts_count_lchans(bts_counts, c->current.bts); + c->current.free_tchf = bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F]; c->current.min_free_tchf = ho_get_hodec2_tchf_min_slots(c->current.bts->ho); - c->current.free_tchh = bts_count_free_ts(c->current.bts, GSM_PCHAN_TCH_H); + c->current.free_tchh = bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_H]; c->current.min_free_tchh = ho_get_hodec2_tchh_min_slots(c->current.bts->ho); + switch (c->current.lchan->ts->pchan_is) { case GSM_PCHAN_TCH_F: c->current.free_tch = c->current.free_tchf; @@ -1023,9 +1026,10 @@ break; } - c->target.free_tchf = bts_count_free_ts(c->target.bts, GSM_PCHAN_TCH_F); + bts_count_lchans(bts_counts, c->target.bts); + c->target.free_tchf = bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F]; c->target.min_free_tchf = ho_get_hodec2_tchf_min_slots(c->target.bts->ho); - c->target.free_tchh = bts_count_free_ts(c->target.bts, GSM_PCHAN_TCH_H); + c->target.free_tchh = bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_H]; c->target.min_free_tchh = ho_get_hodec2_tchh_min_slots(c->target.bts->ho); /* Would the next TCH/F lchan occupy a dynamic timeslot that currently counts for free TCH/H timeslots? */ @@ -1928,6 +1932,7 @@ static void bts_congestion_check(struct gsm_bts *bts) { + chan_counts_t bts_counts; int min_free_tchf, min_free_tchh; int free_tchf, free_tchh; @@ -1955,8 +1960,9 @@ return; } - free_tchf = bts_count_free_ts(bts, GSM_PCHAN_TCH_F); - free_tchh = bts_count_free_ts(bts, GSM_PCHAN_TCH_H); + bts_count_lchans(bts_counts, bts); + free_tchf = bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F]; + free_tchh = bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_H]; LOGPHOBTS(bts, LOGL_INFO, "Congestion check: (free/want-free) TCH/F=%d/%d TCH/H=%d/%d\n", free_tchf, min_free_tchf, free_tchh, min_free_tchh); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2fb48c549186db812b1e9d6b735a92e80f27b8d3 Gerrit-Change-Number: 25972 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 22:27:06 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 26 Oct 2021 22:27:06 +0000 Subject: Change in osmo-bsc[master]: add time_cc API: cumlative counter for time, reported as rate_ctr References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25973 ) Change subject: add time_cc API: cumlative counter for time, reported as rate_ctr ...................................................................... add time_cc API: cumlative counter for time, reported as rate_ctr This is a candidate for adding to libosmocore (as osmo_time_cc), but let's first use this in osmo-bsc to make sure that it works as intended. I started out expecting to be done with this in half an hour, but I found out that accumulating elapsed time to an integer counter has a staggering amount of complexity to it, and a million pitfalls. The intended use is to report allAvailableSDCCHAllocated and allAvailableTCHAllocated performance indicators in OsmoBSC. Hopefully this will also be generally useful elsewhere, to be worth the effort. Related: SYS#4878 Change-Id: Icdd36f27cb54b2e1b940c9e6404ba9dd3692a310 --- M configure.ac M include/osmocom/bsc/Makefile.am A include/osmocom/bsc/time_cc.h M src/osmo-bsc/Makefile.am A src/osmo-bsc/time_cc.c M tests/Makefile.am M tests/testsuite.at A tests/time_cc/Makefile.am A tests/time_cc/time_cc_test.c A tests/time_cc/time_cc_test.ok 10 files changed, 1,499 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/73/25973/1 diff --git a/configure.ac b/configure.ac index 195acfe..1f96241 100644 --- a/configure.ac +++ b/configure.ac @@ -250,6 +250,7 @@ tests/subscr/Makefile tests/nanobts_omlattr/Makefile tests/handover/Makefile + tests/time_cc/Makefile doc/Makefile doc/examples/Makefile doc/manuals/Makefile diff --git a/include/osmocom/bsc/Makefile.am b/include/osmocom/bsc/Makefile.am index 3bccf44..aa611af 100644 --- a/include/osmocom/bsc/Makefile.am +++ b/include/osmocom/bsc/Makefile.am @@ -57,6 +57,7 @@ signal.h \ system_information.h \ timeslot_fsm.h \ + time_cc.h \ vty.h \ gsm_08_08.h \ penalty_timers.h \ diff --git a/include/osmocom/bsc/time_cc.h b/include/osmocom/bsc/time_cc.h new file mode 100644 index 0000000..0f97e6e --- /dev/null +++ b/include/osmocom/bsc/time_cc.h @@ -0,0 +1,155 @@ +/* Report the cumulative counter of time for which a flag is true as rate counter. */ +#pragma once + +#include + +#include + +struct osmo_tdef; +struct rate_ctr; + +/*! Configuration for time_cc. + * Report the cumulative counter of time for which a flag is true as rate counter. + * For example, for each second that the flag is true, increment a rate counter. + * + * The flag to be monitored is reported by time_cc_set_flag(). + * + * The granularity defines how much time one rate counter increment represents: + * the default configuration is gran_usec = 1000000, i.e. one rate counter increment represents one second. + * + * Reporting as rate counter is configurable by round_threshold_usec and forget_sum_usec, examples: + * + * round_threshold_usec: + * - To get "ceil()" behavior, set round_threshold_usec = 1. This increments the rate counter for each gran_usec period + * where the flag was seen true, even if it was true for only a very short fraction of a gran_usec period. + * - To get "round()" behavior, set round_threshold_usec = half of gran_usec. The rate counter increments when the flag + * has been true for 0.5 of a gran_usec (and then again at 1.5 * gran_usec of 'true' flag). round_threshold_usec = 0 + * is a special value that means to use half of gran_usec. + * - To get "floor()" behavior, set round_threshold_usec >= gran_usec. The rate counter increments when reaching full + * gran_usec periods of the flag being true. + * + * forget_sum_usec: + * This is a tradeoff between the accuracy of the reported rate counter and making sure that the events reported are not + * irrelevantly long ago. + * - To keep sub-granularity-period surplus time forever, set forget_sum_usec = 0. + * - To keep surplus time for up to a minute, set forget_sum_usec = 60000000 (60 seconds). + * - To get rid of "leftover" time (almost) immediately after the flag goes false, set forget_sum_usec = 1. + * - If gran_usec is set to one second and forget_sum_usec is set to one minute, the reported rate counter has a possible + * inaccuracy of 1/60th, but makes sure that no timings older than a minute affect the current reports. + * + * Reporting modes in detail: + * + * The rate_ctr increments when the cumulative counter passes round_threshold_usec (default: half of gran_usec). + * + * sum ^ + * | ________ + * | / + * | / + * | / + * 3*gran --+--------------------------------------+ + * | /: + * | / : + * | - - - - - - - - - - - - - - - - - / : + * | /. : + * | / . : + * 2*gran --+--------------------------------+ . : + * | /: . : + * | / : . : + * | - - - - - - - - - -_________/ : . : + * | / . : . : + * | / . : . : + * 1*gran --+-----------------+ . : . : + * | /: . : . : + * | / : . : . : + * | - - - - - - -/ : . : . : + * | /. : . : . : + * | ....-------' . : . : . : + * 0 +------------------------------------------------------------------------> elapsed time + * . : . : . : + * _ _ _______ ____________ + * flag: __| |_| |____| . : |_______|. : . : |__________ + * f t f t f t . : f t. : . : f + * round_threshold_usec : . : . : . : + * = 1 usec: 0 1 . :2 . :3 . :4 = "ceil()" + * = 0 == gran_usec/2: 0 1 : 2 : 3 : = "round()" + * >= gran_usec: 0 1 2 3 = "floor()" + * + */ +struct time_cc_cfg { + /*! Granularity in microseconds: nr of microseconds that one rate_ctr increment represents. A typical value is + * gran_usec = 1000000, meaning one rate counter increment represents one second. */ + uint64_t gran_usec; + /*! Nr of microseconds above a full gran_usec at which to trigger rate_ctr_round. When zero, half a gran_usec. */ + uint64_t round_threshold_usec; + /*! Forget counted sub-gran time after the flag was false for this long. */ + uint64_t forget_sum_usec; + /*! Rate counter to report to, or NULL to not use it. */ + struct rate_ctr *rate_ctr; + + /*! Update gran_usec from this T timer value, or zero to not use any T timer. */ + int T_gran; + /*! Update round_threshold_usec from this T timer value, or zero to not use any T timer. */ + int T_round_threshold; + /*! Update forget_sum_usec from this T timer value, or zero to not use any T timer. */ + int T_forget_sum; + /*! Look up T_gran and T_forget_sum in this list of timers, or NULL to not use any T timers. */ + struct osmo_tdef *T_defs; +}; + +/*! Report the cumulative counter of time for which a flag is true as rate counter. + * See also time_cc_cfg for details on configuring. + * + * Usage: + * + * struct my_obj { + * struct time_cc flag_cc; + * }; + * + * void my_obj_init(struct my_obj *my_obj) + * { + * my_obj->flag_cc.cfg = (struct time_cc_cfg){ + * .gran_usec = 1000000, + * .forget_sum_usec = 60000000, + * .rate_ctr = rate_ctr_group_get_ctr(my_ctrg, MY_CTR_IDX), + * }; + * // optional: set initial flag state, default is 'false': + * // time_cc_set_flag(&my_obj->flag_cc, false); + * } + * + * void my_obj_event(struct my_obj *my_obj, bool flag) + * { + * time_cc_set_flag(&my_obj->flag_cc, flag); + * } + * + * void my_obj_destruct(struct my_obj *my_obj) + * { + * time_cc_cleanup(&my_obj->flag_cc); + * } + */ +struct time_cc { + struct time_cc_cfg cfg; + + bool flag_state; + + /** Overall cumulative sum. Does not get reset for the entire lifetime of a time_cc. + * (Informational only, not used by the time_cc implementation.) */ + uint64_t total_sum; + + struct osmo_timer_list timer; + + /** CLOCK_MONOTONIC reading in microseconds, at the time when the time_cc instance started counting. */ + uint64_t start_time; + /** CLOCK_MONOTONIC reading in microseconds, at the time when the time_cc last evaluated the flag state and + * possibly added to the cumulated sum. */ + uint64_t last_counted_time; + + /** Internal cumulative counter of time that flag_state was true. It may get reset to zero regularly, depending + * on cfg.forget_sum_usec. This is the basis for incrementing cfg.rate_ctr. */ + uint64_t sum; + /** The amount of time that already reported cfg.rate_ctr increments account for. This may be ahead of or behind + * 'sum', depending on cfg.round_threshold_usec. */ + uint64_t reported_sum; +}; + +void time_cc_set_flag(struct time_cc *tc, bool flag); +void time_cc_cleanup(struct time_cc *tc); diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index 19af569..77a4bda 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -103,6 +103,7 @@ bssmap_reset.c \ system_information.c \ timeslot_fsm.c \ + time_cc.c \ smscb.c \ cbch_scheduler.c \ cbsp_link.c \ diff --git a/src/osmo-bsc/time_cc.c b/src/osmo-bsc/time_cc.c new file mode 100644 index 0000000..52afe23 --- /dev/null +++ b/src/osmo-bsc/time_cc.c @@ -0,0 +1,204 @@ +/* Report the cumulative counter of time for which a flag is true as rate counter. */ +/* Copyright (C) 2021 by sysmocom - s.f.m.c. GmbH + * + * All Rights Reserved + * + * Author: Neels Hofmeyr + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include + +#include + +#define GRAN_USEC(TIME_CC) ((TIME_CC)->cfg.gran_usec ? : 1000000) +#define ROUND_THRESHOLD_USEC(TIME_CC) ((TIME_CC)->cfg.round_threshold_usec ? \ + OSMO_MIN((TIME_CC)->cfg.round_threshold_usec, GRAN_USEC(TIME_CC)) \ + : (GRAN_USEC(TIME_CC) / 2)) + +static uint64_t time_now_usec() +{ + struct timespec tp; + if (osmo_clock_gettime(CLOCK_MONOTONIC, &tp)) + return 0; + return (uint64_t)tp.tv_sec * 1000000 + tp.tv_nsec / 1000; +} + +static void time_cc_forget_sum(struct time_cc *tc, uint64_t now); + +static void time_cc_update_from_tdef(struct time_cc *tc, uint64_t now) +{ + bool do_forget_sum = false; + if (!tc->cfg.T_defs) + return; + if (tc->cfg.T_gran) { + uint64_t was = GRAN_USEC(tc); + tc->cfg.gran_usec = osmo_tdef_get(tc->cfg.T_defs, tc->cfg.T_gran, OSMO_TDEF_US, -1); + if (was != GRAN_USEC(tc)) + do_forget_sum = true; + } + if (tc->cfg.T_round_threshold) + tc->cfg.round_threshold_usec = osmo_tdef_get(tc->cfg.T_defs, tc->cfg.T_round_threshold, + OSMO_TDEF_US, -1); + if (tc->cfg.T_forget_sum) { + uint64_t was = tc->cfg.forget_sum_usec; + tc->cfg.forget_sum_usec = osmo_tdef_get(tc->cfg.T_defs, tc->cfg.T_forget_sum, OSMO_TDEF_US, -1); + if (tc->cfg.forget_sum_usec && was != tc->cfg.forget_sum_usec) + do_forget_sum = true; + } + + if (do_forget_sum && tc->sum) + time_cc_forget_sum(tc, now); +} + +static void time_cc_schedule_timer(struct time_cc *tc, uint64_t now); + +void time_cc_cleanup(struct time_cc *tc) +{ + osmo_timer_del(&tc->timer); + tc->start_time = 0; + tc->last_counted_time = 0; + tc->flag_state = false; + tc->total_sum = 0; + tc->sum = 0; + tc->reported_sum = 0; +} + +static void time_cc_start(struct time_cc *tc, uint64_t now) +{ + time_cc_cleanup(tc); + /* Set the default of 1 second of granularity */ + tc->start_time = now; + tc->last_counted_time = now; + time_cc_update_from_tdef(tc, now); + time_cc_schedule_timer(tc, now); +} + +static void time_cc_count_time(struct time_cc *tc, uint64_t now) +{ + uint64_t time_delta = now - tc->last_counted_time; + tc->last_counted_time = now; + if (!tc->flag_state) + return; + /* Flag is currently true, cumulate the elapsed time */ + tc->total_sum += time_delta; + tc->sum += time_delta; +} + +static void time_cc_report(struct time_cc *tc, uint64_t now) +{ + uint64_t delta; + uint64_t n; + if (!tc->cfg.rate_ctr) + return; + /* We report a sum "rounded up", ahead of time. If the granularity period has not yet elapsed after the last + * reporting, do not report again yet. */ + if (tc->reported_sum > tc->sum) + return; + delta = tc->sum - tc->reported_sum; + /* elapsed full periods */ + n = delta / GRAN_USEC(tc); + /* If the delta has passed round_threshold (normally half of gran_usec), increment. */ + delta -= n * GRAN_USEC(tc); + if (delta >= ROUND_THRESHOLD_USEC(tc)) + n++; + if (!n) + return; + + /* integer sanity, since rate_ctr_add() takes an int argument. */ + if (n > INT_MAX) + n = INT_MAX; + rate_ctr_add(tc->cfg.rate_ctr, n); + /* Store the increments of gran_usec that were counted. That compensates for possible drift across granularity + * periods. */ + tc->reported_sum += n * GRAN_USEC(tc); +} + +static void time_cc_forget_sum(struct time_cc *tc, uint64_t now) +{ + tc->reported_sum = 0; + tc->sum = 0; + + if (tc->last_counted_time < now) + tc->last_counted_time = now; +} + +void time_cc_set_flag(struct time_cc *tc, bool flag) +{ + uint64_t now = time_now_usec(); + if (!tc->start_time) + time_cc_start(tc, now); + /* No flag change == no effect */ + if (flag == tc->flag_state) + return; + /* Sum up elapsed time, report increments for that. */ + time_cc_count_time(tc, now); + time_cc_report(tc, now); + tc->flag_state = flag; + time_cc_schedule_timer(tc, now); +} + +static void time_cc_timer_cb(void *data) +{ + struct time_cc *tc = data; + uint64_t now = time_now_usec(); + + time_cc_update_from_tdef(tc, now); + + if (tc->flag_state) { + time_cc_count_time(tc, now); + time_cc_report(tc, now); + } else if (tc->cfg.forget_sum_usec && tc->sum + && (now >= tc->last_counted_time + tc->cfg.forget_sum_usec)) { + time_cc_forget_sum(tc, now); + } + time_cc_schedule_timer(tc, now); +} + +static void time_cc_schedule_timer(struct time_cc *tc, uint64_t now) +{ + uint64_t next_event = UINT64_MAX; + + time_cc_update_from_tdef(tc, now); + + /* Figure out the next time we should do anything, if the flag state remains unchanged. */ + /* If it is required, when will the next forget_sum happen? */ + if (tc->cfg.forget_sum_usec && !tc->flag_state && tc->sum > 0) { + uint64_t next_forget_time = tc->last_counted_time + tc->cfg.forget_sum_usec; + next_event = OSMO_MIN(next_event, next_forget_time); + } + /* Next rate_ctr increment? */ + if (tc->flag_state && tc->cfg.rate_ctr) { + uint64_t next_inc = now + (tc->reported_sum - tc->sum) + ROUND_THRESHOLD_USEC(tc); + next_event = OSMO_MIN(next_event, next_inc); + } + + /* No event coming up? */ + if (next_event == UINT64_MAX) + return; + + if (next_event <= now) + next_event = 0; + else + next_event -= now; + + osmo_timer_setup(&tc->timer, time_cc_timer_cb, tc); + osmo_timer_del(&tc->timer); + osmo_timer_schedule(&tc->timer, next_event / 1000000, next_event % 1000000); +} diff --git a/tests/Makefile.am b/tests/Makefile.am index 762561e..aefaae8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -7,6 +7,7 @@ subscr \ nanobts_omlattr \ handover \ + time_cc \ $(NULL) # The `:;' works around a Bash 3.2 bug when the output is not writeable. diff --git a/tests/testsuite.at b/tests/testsuite.at index e7eb76b..094117f 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -49,3 +49,9 @@ cat $abs_srcdir/handover/handover_tests.ok > expout AT_CHECK([$abs_srcdir/handover/handover_tests.sh $abs_srcdir/handover $abs_builddir/handover], [], [expout], [ignore]) AT_CLEANUP + +AT_SETUP([time_cc_test]) +AT_KEYWORDS([time_cc_test]) +cat $abs_srcdir/time_cc/time_cc_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/time_cc/time_cc_test], [], [expout], [ignore]) +AT_CLEANUP diff --git a/tests/time_cc/Makefile.am b/tests/time_cc/Makefile.am new file mode 100644 index 0000000..de407e7 --- /dev/null +++ b/tests/time_cc/Makefile.am @@ -0,0 +1,36 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + -ggdb3 \ + $(LIBOSMOCORE_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(NULL) + +AM_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + $(NULL) + +EXTRA_DIST = \ + time_cc_test.ok \ + $(NULL) + +noinst_PROGRAMS = \ + time_cc_test \ + $(NULL) + +time_cc_test_SOURCES = \ + time_cc_test.c \ + $(NULL) + +time_cc_test_LDADD = \ + $(top_builddir)/src/osmo-bsc/libbsc.la \ + $(LIBOSMOCORE_LIBS) \ + $(NULL) + +.PHONY: update_exp +update_exp: + $(builddir)/time_cc_test >$(srcdir)/time_cc_test.ok diff --git a/tests/time_cc/time_cc_test.c b/tests/time_cc/time_cc_test.c new file mode 100644 index 0000000..1165a6b --- /dev/null +++ b/tests/time_cc/time_cc_test.c @@ -0,0 +1,766 @@ +/* (C) 2021 by sysmocom - s.f.m.c. GmbH + * All Rights Reserved + * + * Author: Neels Janosch Hofmeyr + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include + +#include +#include +#include +#include +#include +#include + +#include + +enum my_ctrs { + CTR_CEIL, + CTR_ROUND, + CTR_FLOOR, +}; + +const struct rate_ctr_desc my_ctr_desc[] = { + [CTR_CEIL] = {"ceil", "testing round_threshold_usec = 1"}, + [CTR_ROUND] = {"round", "testing round_threshold_usec = 0 = gran_usec/2"}, + [CTR_FLOOR] = {"floor", "testing round_threshold_usec = gran_usec"}, +}; + +const struct rate_ctr_group_desc my_ctrg_desc = { + "time_cc_test", + "Counters for time_cc test", + 0, + ARRAY_SIZE(my_ctr_desc), + my_ctr_desc, +}; + +struct rate_ctr_group *my_ctrg; + + +enum my_obj_timers { + T_GRAN = -23, + T_ROUND_THRESH = -24, + T_FORGET_SUM = -25, +}; + +struct osmo_tdef g_my_obj_tdefs[] = { + { .T=T_GRAN, .default_val=0, .unit=OSMO_TDEF_MS, .desc="flag_cc granularity, or zero for 1 second" }, + { .T=T_ROUND_THRESH, .default_val=0, .unit=OSMO_TDEF_MS, + .desc="flag_cc rounding threshold, or zero for half a granularity" }, + { .T=T_FORGET_SUM, .default_val=0, .unit=OSMO_TDEF_MS, + .desc="flag_cc inactivity forget period, or zero to not forget any timings" }, + {} +}; + + +struct my_obj { + struct time_cc flag_cc_ceil; + struct time_cc flag_cc_round; + struct time_cc flag_cc_floor; +}; + +void my_obj_init(struct my_obj *my_obj) +{ + my_obj->flag_cc_ceil.cfg = (struct time_cc_cfg){ + .rate_ctr = rate_ctr_group_get_ctr(my_ctrg, CTR_CEIL), + .round_threshold_usec = 1, + .T_gran = T_GRAN, + .T_forget_sum = T_FORGET_SUM, + .T_defs = g_my_obj_tdefs, + }; + my_obj->flag_cc_round.cfg = (struct time_cc_cfg){ + .rate_ctr = rate_ctr_group_get_ctr(my_ctrg, CTR_ROUND), + .T_gran = T_GRAN, + .T_round_threshold = T_ROUND_THRESH, + .T_forget_sum = T_FORGET_SUM, + .T_defs = g_my_obj_tdefs, + }; + my_obj->flag_cc_floor.cfg = (struct time_cc_cfg){ + .rate_ctr = rate_ctr_group_get_ctr(my_ctrg, CTR_FLOOR), + .round_threshold_usec = UINT64_MAX, /* always >= gran_usec */ + .T_gran = T_GRAN, + .T_forget_sum = T_FORGET_SUM, + .T_defs = g_my_obj_tdefs, + }; +} + +void my_obj_event(struct my_obj *my_obj, bool flag) +{ + time_cc_set_flag(&my_obj->flag_cc_ceil, flag); + time_cc_set_flag(&my_obj->flag_cc_round, flag); + time_cc_set_flag(&my_obj->flag_cc_floor, flag); +} + +void my_obj_destruct(struct my_obj *my_obj) +{ + time_cc_cleanup(&my_obj->flag_cc_ceil); + time_cc_cleanup(&my_obj->flag_cc_round); + time_cc_cleanup(&my_obj->flag_cc_floor); +} + +static const struct log_info_cat log_categories[] = { +}; + +static const struct log_info log_info = { + .cat = log_categories, + .num_cat = ARRAY_SIZE(log_categories), +}; + +int main() +{ + void *ctx = talloc_named_const(NULL, 0, "time_cc_test"); + struct timespec *now; + struct my_obj my_obj = {0}; + + osmo_init_logging2(ctx, &log_info); + + /* enable override for CLOCK_MONOTONIC */ + osmo_clock_override_enable(CLOCK_MONOTONIC, true); + now = osmo_clock_override_gettimespec(CLOCK_MONOTONIC); + now->tv_sec = 23000; + now->tv_nsec = 0; + + /* enable override for osmo_gettimeofday(), for osmo_timer_schedule() */ + osmo_gettimeofday_override = true; + osmo_gettimeofday_override_time = (struct timeval){23000, 0}; + + my_ctrg = rate_ctr_group_alloc(ctx, &my_ctrg_desc, 0); + +#define CHECK_RATE_CTRS(exp_ceil, exp_round, exp_floor) do { \ + printf("%d CHECK_RATE_CTRS(" #exp_ceil ", " #exp_round ", " #exp_floor ")", \ + my_obj.flag_cc_round.flag_state); \ + while (osmo_select_main_ctx(1) > 0); \ + if (exp_ceil != my_obj.flag_cc_ceil.cfg.rate_ctr->current \ + || exp_round != my_obj.flag_cc_round.cfg.rate_ctr->current \ + || exp_floor != my_obj.flag_cc_floor.cfg.rate_ctr->current) \ + printf("\n ERROR on line %d: ctr_ceil=%"PRIu64" ctr_round=%"PRIu64" ctr_floor=%"PRIu64"\n", \ + __LINE__, \ + my_obj.flag_cc_ceil.cfg.rate_ctr->current, \ + my_obj.flag_cc_round.cfg.rate_ctr->current, \ + my_obj.flag_cc_floor.cfg.rate_ctr->current); \ + else \ + printf(" ok\n"); \ + } while (0) + +#define ADD_MILLISECS_NO_SELECT(ms) do { \ + osmo_clock_override_add(CLOCK_MONOTONIC, ms / 1000, (uint64_t)(ms % 1000) * 1000000); \ + osmo_gettimeofday_override_add(ms / 1000, (uint64_t)(ms % 1000) * 1000); \ + printf("%d ADD_MILLISECS(" #ms ") --> %ld.%03ld", my_obj.flag_cc_round.flag_state, \ + now->tv_sec, now->tv_nsec/1000000); \ + printf("\n"); \ + } while (0) + +#define ADD_MILLISECS(ms) do { \ + ADD_MILLISECS_NO_SELECT(ms); \ + while (osmo_select_main_ctx(1) > 0); \ + while (osmo_select_main_ctx(1) > 0); \ + while (osmo_select_main_ctx(1) > 0); \ + } while (0) + +#define FLAG(VAL) do { \ + printf(" flag: %s -> %s\n", my_obj.flag_cc_round.flag_state ? "TRUE" : "FALSE", VAL ? "TRUE" : "FALSE"); \ + my_obj_event(&my_obj, VAL); \ + } while (0) + + /* + * sum ^ + * | ________ + * | / + * | / + * | / + * 3*gran --+--------------------------------------+ + * | /: + * | / : + * | - - - - - - - - - - - - - - - - - / : + * | /. : + * | / . : + * 2*gran --+--------------------------------+ . : + * | /: . : + * | / : . : + * | - - - - - - - - - -_________/ : . : + * | / . : . : + * | / . : . : + * 1*gran --+-----------------+ . : . : + * | /: . : . : + * | / : . : . : + * | - - - - - - -/ : . : . : + * | /. : . : . : + * | ....-------' . : . : . : + * 0 +----------------------------------------------------------> elapsed time + * . : . : . : + * _ _ _______ ____________ + * flag: __| |_| |____| . : |_______|. : . : |__________ + * f t f t f t . : f t. : . : f + * round_threshold_usec : . : . : . : + * = 1 usec: 0 1 . :2 . :3 . :4 = "ceil()" + * = 0 == gran_usec/2: 0 1 : 2 : 3 : = "round()" + * = gran_usec: 0 1 2 3 = "floor()" + */ + + printf("\n----------- cumulating time, without forget_sum\n\n"); + + my_obj_init(&my_obj); + CHECK_RATE_CTRS(0, 0, 0); + + ADD_MILLISECS(100); + CHECK_RATE_CTRS(0, 0, 0); + + FLAG(true); + /* flag has just turned true the first time */ + CHECK_RATE_CTRS(0, 0, 0); + ADD_MILLISECS(1); + /* flag has been true for 0.001s */ + CHECK_RATE_CTRS(1, 0, 0); + ADD_MILLISECS(99); + /* flag has been true for 0.1s */ + CHECK_RATE_CTRS(1, 0, 0); + FLAG(false); + CHECK_RATE_CTRS(1, 0, 0); + + ADD_MILLISECS(100); + + CHECK_RATE_CTRS(1, 0, 0); + FLAG(true); + CHECK_RATE_CTRS(1, 0, 0); + ADD_MILLISECS(100); + /* flag has been true for 0.2s */ + CHECK_RATE_CTRS(1, 0, 0); + FLAG(false); + CHECK_RATE_CTRS(1, 0, 0); + + ADD_MILLISECS(300); + + CHECK_RATE_CTRS(1, 0, 0); + FLAG(true); + CHECK_RATE_CTRS(1, 0, 0); + ADD_MILLISECS(299); + /* flag has been true for 0.499s */ + CHECK_RATE_CTRS(1, 0, 0); + ADD_MILLISECS(1); + /* flag has been true for 0.5s */ + CHECK_RATE_CTRS(1, 1, 0); + ADD_MILLISECS(499); + /* flag has been true for 0.999s */ + CHECK_RATE_CTRS(1, 1, 0); + ADD_MILLISECS(1); + /* flag has been true for 1.0s */ + CHECK_RATE_CTRS(1, 1, 1); + ADD_MILLISECS(1); + /* flag has been true for 1.001s */ + CHECK_RATE_CTRS(2, 1, 1); + ADD_MILLISECS(299); + /* flag has been true for 1.3s */ + CHECK_RATE_CTRS(2, 1, 1); + FLAG(false); + CHECK_RATE_CTRS(2, 1, 1); + + ADD_MILLISECS(400); + + CHECK_RATE_CTRS(2, 1, 1); + FLAG(true); + CHECK_RATE_CTRS(2, 1, 1); + ADD_MILLISECS(199); + /* flag has been true for 1.499s */ + CHECK_RATE_CTRS(2, 1, 1); + ADD_MILLISECS(2); + /* flag has been true for 1.501s */ + CHECK_RATE_CTRS(2, 2, 1); + ADD_MILLISECS(498); + /* flag has been true for 1.999s */ + CHECK_RATE_CTRS(2, 2, 1); + ADD_MILLISECS(2); + /* flag has been true for 2.001s */ + CHECK_RATE_CTRS(3, 2, 2); + ADD_MILLISECS(500); + /* flag has been true for 2.501s */ + CHECK_RATE_CTRS(3, 3, 2); + ADD_MILLISECS(498); + /* flag has been true for 2.999s */ + CHECK_RATE_CTRS(3, 3, 2); + ADD_MILLISECS(3); + /* flag has been true for 3.003s */ + CHECK_RATE_CTRS(4, 3, 3); + ADD_MILLISECS(200); + /* flag has been true for 3.203s */ + CHECK_RATE_CTRS(4, 3, 3); + FLAG(false); + CHECK_RATE_CTRS(4, 3, 3); + + ADD_MILLISECS(4321); + CHECK_RATE_CTRS(4, 3, 3); + + FLAG(true); + CHECK_RATE_CTRS(4, 3, 3); + ADD_MILLISECS(5678); + CHECK_RATE_CTRS(9, 9, 8); + FLAG(false); + CHECK_RATE_CTRS(9, 9, 8); + + my_obj_destruct(&my_obj); + rate_ctr_group_reset(my_ctrg); + + printf("\n----------- test forget_sum_usec\n\n"); + osmo_tdef_set(g_my_obj_tdefs, T_FORGET_SUM, 10, OSMO_TDEF_S); + + now->tv_sec = 23000; + now->tv_nsec = 0; + osmo_gettimeofday_override_time = (struct timeval){23000, 0}; + + my_obj_init(&my_obj); + + CHECK_RATE_CTRS(0, 0, 0); + + FLAG(true); + /* flag has just turned true the first time */ + CHECK_RATE_CTRS(0, 0, 0); + ADD_MILLISECS(100); + /* flag has been true for 0.1s */ + CHECK_RATE_CTRS(1, 0, 0); + FLAG(false); + CHECK_RATE_CTRS(1, 0, 0); + + ADD_MILLISECS(1000); + /* 1 s of being false, forget_sum_usec has not yet occured */ + CHECK_RATE_CTRS(1, 0, 0); + + ADD_MILLISECS(8999); + /* 9.999 s of being false, forget_sum_usec has not yet occured */ + CHECK_RATE_CTRS(1, 0, 0); + + ADD_MILLISECS(1); + /* 10 s of being false, forget_sum_usec has occured */ + CHECK_RATE_CTRS(1, 0, 0); + + FLAG(true); + CHECK_RATE_CTRS(1, 0, 0); + ADD_MILLISECS(1); + /* Since previous sums were forgotton, ceil() triggers again */ + CHECK_RATE_CTRS(2, 0, 0); + /* If the sum had not been forgotten, adding 400 ms to the initial 100 ms would have triggered round(). Verify + * that this does not occur, since now full 500 ms are required */ + ADD_MILLISECS(399); + CHECK_RATE_CTRS(2, 0, 0); + /* Adding another 100 ms will trigger round() */ + ADD_MILLISECS(99); + CHECK_RATE_CTRS(2, 0, 0); + ADD_MILLISECS(1); + CHECK_RATE_CTRS(2, 1, 0); + /* If the sum had not been forgotten, adding 900 ms to the initial 100 ms would have triggered floor(). Verify + * that this does not occur, since now full 1000 ms are required. We already added 500 ms above. */ + ADD_MILLISECS(400); + CHECK_RATE_CTRS(2, 1, 0); + /* Adding another 100 ms will trigger floor() */ + ADD_MILLISECS(99); + CHECK_RATE_CTRS(2, 1, 0); + ADD_MILLISECS(1); + CHECK_RATE_CTRS(2, 1, 1); + + /* Test that durations of false below forget_sum_usec never trigger a forget */ + ADD_MILLISECS(300); + CHECK_RATE_CTRS(3, 1, 1); + /* internal counter is now at 0.3s above the last reported rate counter */ + FLAG(false); + ADD_MILLISECS(9999); + FLAG(true); + ADD_MILLISECS(25); + FLAG(false); + ADD_MILLISECS(9999); + FLAG(true); + ADD_MILLISECS(25); + FLAG(false); + ADD_MILLISECS(9999); + FLAG(true); + ADD_MILLISECS(25); + FLAG(false); + ADD_MILLISECS(9999); + FLAG(true); + ADD_MILLISECS(25); + /* internal counter is now at 0.4s above the last reported rate counter */ + CHECK_RATE_CTRS(3, 1, 1); + ADD_MILLISECS(100); + CHECK_RATE_CTRS(3, 2, 1); + ADD_MILLISECS(500); + CHECK_RATE_CTRS(3, 2, 2); + + /* Test that repeated time_cc_set_flag(false) does not cancel a forget_sum_usec */ + ADD_MILLISECS(300); + /* internal counter is now at 0.3s above the last reported rate counter */ + CHECK_RATE_CTRS(4, 2, 2); + FLAG(false); + ADD_MILLISECS(5000); + /* Repeat 'false', must not affect forget_sum_usec */ + FLAG(false); + ADD_MILLISECS(5000); + CHECK_RATE_CTRS(4, 2, 2); + /* 10 s have passed, forget_sum_usec has occured. + * Hence ceil() will trigger again right away: */ + FLAG(true); + ADD_MILLISECS(1); + CHECK_RATE_CTRS(5, 2, 2); + /* Adding 200 ms to the initial 300 ms would have triggered round(), but no more after forget_sum_usec */ + ADD_MILLISECS(199); + CHECK_RATE_CTRS(5, 2, 2); + /* Adding another 300 ms will trigger round() */ + ADD_MILLISECS(299); + CHECK_RATE_CTRS(5, 2, 2); + ADD_MILLISECS(1); + CHECK_RATE_CTRS(5, 3, 2); + /* Adding 700 ms to the initial 300 ms would have triggered ceil(), but no more after forget_sum_usec */ + ADD_MILLISECS(200); + CHECK_RATE_CTRS(5, 3, 2); + /* Adding another 300 ms will trigger ceil() */ + ADD_MILLISECS(299); + CHECK_RATE_CTRS(5, 3, 2); + ADD_MILLISECS(1); + CHECK_RATE_CTRS(5, 3, 3); + + my_obj_destruct(&my_obj); + rate_ctr_group_reset(my_ctrg); + + + /* Verify correctness when select() lags and runs timer callbacks too late */ + printf("\n----------- cumulating time, without forget_sum, when timer cb are invoked late\n\n"); + osmo_tdef_set(g_my_obj_tdefs, T_FORGET_SUM, 0, OSMO_TDEF_S); + now->tv_sec = 23000; + now->tv_nsec = 0; + osmo_gettimeofday_override_time = (struct timeval){23000, 0}; + + my_obj_init(&my_obj); + CHECK_RATE_CTRS(0, 0, 0); + + ADD_MILLISECS_NO_SELECT(100); + CHECK_RATE_CTRS(0, 0, 0); + + FLAG(true); + /* flag has just turned true the first time */ + CHECK_RATE_CTRS(0, 0, 0); + ADD_MILLISECS_NO_SELECT(100); + /* flag has been true for 0.1s */ + CHECK_RATE_CTRS(1, 0, 0); + FLAG(false); + CHECK_RATE_CTRS(1, 0, 0); + + ADD_MILLISECS_NO_SELECT(100); + + CHECK_RATE_CTRS(1, 0, 0); + FLAG(true); + CHECK_RATE_CTRS(1, 0, 0); + ADD_MILLISECS_NO_SELECT(100); + /* flag has been true for 0.2s */ + CHECK_RATE_CTRS(1, 0, 0); + FLAG(false); + CHECK_RATE_CTRS(1, 0, 0); + + ADD_MILLISECS_NO_SELECT(300); + + CHECK_RATE_CTRS(1, 0, 0); + FLAG(true); + CHECK_RATE_CTRS(1, 0, 0); + ADD_MILLISECS_NO_SELECT(799); + /* flag has been true for 0.999s */ + CHECK_RATE_CTRS(1, 1, 0); + ADD_MILLISECS_NO_SELECT(1); + /* flag has been true for 1.0s */ + CHECK_RATE_CTRS(1, 1, 1); + ADD_MILLISECS_NO_SELECT(300); + /* flag has been true for 1.3s */ + CHECK_RATE_CTRS(2, 1, 1); + FLAG(false); + CHECK_RATE_CTRS(2, 1, 1); + + ADD_MILLISECS_NO_SELECT(400); + + CHECK_RATE_CTRS(2, 1, 1); + FLAG(true); + CHECK_RATE_CTRS(2, 1, 1); + ADD_MILLISECS_NO_SELECT(699); + /* flag has been true for 1.999s */ + CHECK_RATE_CTRS(2, 2, 1); + ADD_MILLISECS_NO_SELECT(1); + /* flag has been true for 2.0s */ + CHECK_RATE_CTRS(2, 2, 2); + ADD_MILLISECS_NO_SELECT(1); + /* flag has been true for 2.001s */ + CHECK_RATE_CTRS(3, 2, 2); + ADD_MILLISECS_NO_SELECT(499); + /* flag has been true for 2.5s */ + CHECK_RATE_CTRS(3, 3, 2); + ADD_MILLISECS_NO_SELECT(499); + /* flag has been true for 2.999s */ + CHECK_RATE_CTRS(3, 3, 2); + ADD_MILLISECS_NO_SELECT(1); + /* flag has been true for 3.0s */ + CHECK_RATE_CTRS(3, 3, 3); + ADD_MILLISECS_NO_SELECT(200); + /* flag has been true for 3.2s */ + CHECK_RATE_CTRS(4, 3, 3); + FLAG(false); + CHECK_RATE_CTRS(4, 3, 3); + + ADD_MILLISECS_NO_SELECT(4321); + CHECK_RATE_CTRS(4, 3, 3); + + FLAG(true); + CHECK_RATE_CTRS(4, 3, 3); + ADD_MILLISECS_NO_SELECT(5678); + CHECK_RATE_CTRS(9, 9, 8); + FLAG(false); + CHECK_RATE_CTRS(9, 9, 8); + + my_obj_destruct(&my_obj); + rate_ctr_group_reset(my_ctrg); + + + printf("\n----------- test forget_sum, when timer cb are invoked late\n\n"); + osmo_tdef_set(g_my_obj_tdefs, T_FORGET_SUM, 10, OSMO_TDEF_S); + + now->tv_sec = 23000; + now->tv_nsec = 0; + osmo_gettimeofday_override_time = (struct timeval){23000, 0}; + + my_obj_init(&my_obj); + + CHECK_RATE_CTRS(0, 0, 0); + + FLAG(true); + /* flag has just turned true the first time */ + CHECK_RATE_CTRS(0, 0, 0); + ADD_MILLISECS_NO_SELECT(100); + /* flag has been true for 0.1s */ + CHECK_RATE_CTRS(1, 0, 0); + FLAG(false); + CHECK_RATE_CTRS(1, 0, 0); + + ADD_MILLISECS_NO_SELECT(1000); + /* 1 s of being false, forget_sum_usec has not yet occured */ + CHECK_RATE_CTRS(1, 0, 0); + + ADD_MILLISECS_NO_SELECT(8999); + /* 9.999 s of being false, forget_sum_usec has not yet occured */ + CHECK_RATE_CTRS(1, 0, 0); + + ADD_MILLISECS_NO_SELECT(1); + /* 10 s of being false, forget_sum_usec has occured */ + CHECK_RATE_CTRS(1, 0, 0); + + FLAG(true); + CHECK_RATE_CTRS(1, 0, 0); + ADD_MILLISECS_NO_SELECT(1); + /* Since previous sums were forgotton, ceil() triggers again */ + CHECK_RATE_CTRS(2, 0, 0); + /* If the sum had not been forgotten, adding 400 ms to the initial 100 ms would have triggered round(). Verify + * that this does not occur, since now full 500 ms are required */ + ADD_MILLISECS_NO_SELECT(399); + CHECK_RATE_CTRS(2, 0, 0); + /* Adding another 100 ms will trigger round() */ + ADD_MILLISECS_NO_SELECT(99); + CHECK_RATE_CTRS(2, 0, 0); + ADD_MILLISECS_NO_SELECT(1); + CHECK_RATE_CTRS(2, 1, 0); + /* If the sum had not been forgotten, adding 900 ms to the initial 100 ms would have triggered floor(). Verify + * that this does not occur, since now full 1000 ms are required. We already added 500 ms above. */ + ADD_MILLISECS_NO_SELECT(400); + CHECK_RATE_CTRS(2, 1, 0); + /* Adding another 100 ms will trigger floor() */ + ADD_MILLISECS_NO_SELECT(99); + CHECK_RATE_CTRS(2, 1, 0); + ADD_MILLISECS_NO_SELECT(1); + CHECK_RATE_CTRS(2, 1, 1); + + /* Test that durations of false below forget_sum_usec never trigger a forget */ + ADD_MILLISECS_NO_SELECT(300); + CHECK_RATE_CTRS(3, 1, 1); + /* internal counter is now at 0.3s above the last reported rate counter */ + FLAG(false); + ADD_MILLISECS_NO_SELECT(9999); + FLAG(true); + ADD_MILLISECS_NO_SELECT(25); + FLAG(false); + ADD_MILLISECS_NO_SELECT(9999); + FLAG(true); + ADD_MILLISECS_NO_SELECT(25); + FLAG(false); + ADD_MILLISECS_NO_SELECT(9999); + FLAG(true); + ADD_MILLISECS_NO_SELECT(25); + FLAG(false); + ADD_MILLISECS_NO_SELECT(9999); + FLAG(true); + ADD_MILLISECS_NO_SELECT(25); + /* internal counter is now at 0.4s above the last reported rate counter */ + CHECK_RATE_CTRS(3, 1, 1); + ADD_MILLISECS_NO_SELECT(100); + CHECK_RATE_CTRS(3, 2, 1); + ADD_MILLISECS_NO_SELECT(500); + CHECK_RATE_CTRS(3, 2, 2); + + my_obj_destruct(&my_obj); + rate_ctr_group_reset(my_ctrg); + + +#define SET_TDEFS(gran, round_thresh, forget_sum) do { \ + osmo_tdef_set(g_my_obj_tdefs, T_GRAN, gran, OSMO_TDEF_MS); \ + osmo_tdef_set(g_my_obj_tdefs, T_ROUND_THRESH, round_thresh, OSMO_TDEF_MS); \ + osmo_tdef_set(g_my_obj_tdefs, T_FORGET_SUM, forget_sum, OSMO_TDEF_S); \ + printf("T_defs: T_gran=%luusec T_round_threshold=%luusec T_forget_sum=%luusec\n", \ + osmo_tdef_get(g_my_obj_tdefs, T_GRAN, OSMO_TDEF_US, -1), \ + osmo_tdef_get(g_my_obj_tdefs, T_ROUND_THRESH, OSMO_TDEF_US, -1), \ + osmo_tdef_get(g_my_obj_tdefs, T_FORGET_SUM, OSMO_TDEF_US, -1)); \ + } while(0) + + printf("\n----------- test T_defs\n\n"); + now->tv_sec = 23000; + now->tv_nsec = 0; + osmo_gettimeofday_override_time = (struct timeval){23000, 0}; + + SET_TDEFS(100, 10, 0); + + my_obj_init(&my_obj); + CHECK_RATE_CTRS(0, 0, 0); + + ADD_MILLISECS(100); + CHECK_RATE_CTRS(0, 0, 0); + + FLAG(true); + /* flag has just turned true the first time */ + CHECK_RATE_CTRS(0, 0, 0); + ADD_MILLISECS(9); + /* flag has been true for 0.009s */ + CHECK_RATE_CTRS(1, 0, 0); + ADD_MILLISECS(1); + /* flag has been true for 0.010s */ + CHECK_RATE_CTRS(1, 1, 0); + ADD_MILLISECS(90); + /* flag has been true for 0.1s */ + CHECK_RATE_CTRS(1, 1, 1); + + SET_TDEFS(200, 190, 1); + /* gran is changed to 200ms, but still continues until the next scheduled event until the change is picked up. + * For ceil(), it is 1 ms ahead. + * For round(), it is 10 ms ahead. + * For floor(), it is at the next full (previous) gran 100 ms ahead. + * When T_defs change, all internal sums are reset to zero without reporting. + */ + CHECK_RATE_CTRS(1, 1, 1); + ADD_MILLISECS(1); + /* 1ms elapsed: ceil() picks up the T_gran change, starts anew. */ + /* elapsed: ceil 0 ms */ + CHECK_RATE_CTRS(1, 1, 1); + ADD_MILLISECS(1); + /* elapsed: ceil 1 ms */ + /* ceil() increments because flag has been true for more than 1 us after reset */ + CHECK_RATE_CTRS(2, 1, 1); + ADD_MILLISECS(8); + /* 10 ms elapsed: round() picks up the T_gran change, starts anew */ + /* elapsed: ceil 9 ms, round 0 ms */ + CHECK_RATE_CTRS(2, 1, 1); + ADD_MILLISECS(90); + /* 100 ms elapsed: floor() picks up the T_gran change, starts anew */ + /* elapsed: ceil 99 ms, round 90 ms, floor 0 ms */ + CHECK_RATE_CTRS(2, 1, 1); + ADD_MILLISECS(99); + /* elapsed: ceil 198 ms, round 189 ms, floor 99 ms */ + CHECK_RATE_CTRS(2, 1, 1); + ADD_MILLISECS(1); + /* elapsed: ceil 199 ms, round 190 ms, floor 100 ms */ + CHECK_RATE_CTRS(2, 2, 1); + ADD_MILLISECS(1); + /* elapsed: ceil 200 ms, round 191 ms, floor 101 ms */ + CHECK_RATE_CTRS(2, 2, 1); + ADD_MILLISECS(1); + /* elapsed: ceil 201 ms, round 192 ms, floor 102 ms */ + CHECK_RATE_CTRS(3, 2, 1); + ADD_MILLISECS(98); + /* elapsed: ceil 299 ms, round 290 ms, floor 200 ms */ + CHECK_RATE_CTRS(3, 2, 2); + ADD_MILLISECS(99); + /* elapsed: ceil 398 ms, round 389 ms, floor 299 ms */ + CHECK_RATE_CTRS(3, 2, 2); + ADD_MILLISECS(1); + /* elapsed: ceil 399 ms, round 390 ms, floor 300 ms */ + CHECK_RATE_CTRS(3, 3, 2); + ADD_MILLISECS(1); + /* elapsed: ceil 400 ms, round 391 ms, floor 301 ms */ + CHECK_RATE_CTRS(3, 3, 2); + ADD_MILLISECS(1); + /* elapsed: ceil 401 ms, round 392 ms, floor 302 ms */ + CHECK_RATE_CTRS(4, 3, 2); + ADD_MILLISECS(98); + /* elapsed: ceil 499 ms, round 490 ms, floor 400 ms */ + CHECK_RATE_CTRS(4, 3, 3); + + + SET_TDEFS(100, 0, 0); + /* T_defs change, but they only get picked up upon the next event: + * For ceil(), it is 102 ms ahead. + * For round(), it is 100 ms ahead (thresh is still 190, currently at 90). + * For floor(), it is 200 ms ahead. + * When T_defs change, all internal sums are reset to zero without reporting. + */ + CHECK_RATE_CTRS(4, 3, 3); + ADD_MILLISECS(100); + CHECK_RATE_CTRS(4, 3, 3); + /* round() picks up the new T_defs. Internal sum resets, nothing else happens yet. + * round() schedules the next event 50 ms ahead. */ + ADD_MILLISECS(2); + CHECK_RATE_CTRS(4, 3, 3); + /* ceil() picks up the change, its next event is 1 ms ahead. */ + ADD_MILLISECS(1); + /* ceil: 0.001 + * round: 0.003 + * floor: still 97 ms until it picks up the change */ + CHECK_RATE_CTRS(5, 3, 3); + ADD_MILLISECS(46); + CHECK_RATE_CTRS(5, 3, 3); + ADD_MILLISECS(1); + /* round() has first counter trigger after T_defs change. */ + CHECK_RATE_CTRS(5, 4, 3); + /* ceil: 0.048 + * round: 0.050 + * floor: still 50 ms until it picks up the change */ + ADD_MILLISECS(50); + /* floor() picks up the change. nothing happens yet. */ + /* ceil: 0.098 + * round: 0.100 + * floor: 0.0 */ + ADD_MILLISECS(2); + /* ceil: 0.100 + * round: 0.102 + * floor: 0.002 */ + CHECK_RATE_CTRS(5, 4, 3); + ADD_MILLISECS(1); + /* ceil: 0.101 + * round: 0.103 + * floor: 0.003 */ + CHECK_RATE_CTRS(6, 4, 3); + ADD_MILLISECS(46); + /* ceil: 0.147 + * round: 0.149 + * floor: 0.049 */ + CHECK_RATE_CTRS(6, 4, 3); + ADD_MILLISECS(1); + /* ceil: 0.148 + * round: 0.150 + * floor: 0.050 */ + CHECK_RATE_CTRS(6, 5, 3); + + my_obj_destruct(&my_obj); + rate_ctr_group_reset(my_ctrg); + + return 0; +} diff --git a/tests/time_cc/time_cc_test.ok b/tests/time_cc/time_cc_test.ok new file mode 100644 index 0000000..ccf84d9 --- /dev/null +++ b/tests/time_cc/time_cc_test.ok @@ -0,0 +1,328 @@ + +----------- cumulating time, without forget_sum + +0 CHECK_RATE_CTRS(0, 0, 0) ok +0 ADD_MILLISECS(100) --> 23000.100 +0 CHECK_RATE_CTRS(0, 0, 0) ok + flag: FALSE -> TRUE +1 CHECK_RATE_CTRS(0, 0, 0) ok +1 ADD_MILLISECS(1) --> 23000.101 +1 CHECK_RATE_CTRS(1, 0, 0) ok +1 ADD_MILLISECS(99) --> 23000.200 +1 CHECK_RATE_CTRS(1, 0, 0) ok + flag: TRUE -> FALSE +0 CHECK_RATE_CTRS(1, 0, 0) ok +0 ADD_MILLISECS(100) --> 23000.300 +0 CHECK_RATE_CTRS(1, 0, 0) ok + flag: FALSE -> TRUE +1 CHECK_RATE_CTRS(1, 0, 0) ok +1 ADD_MILLISECS(100) --> 23000.400 +1 CHECK_RATE_CTRS(1, 0, 0) ok + flag: TRUE -> FALSE +0 CHECK_RATE_CTRS(1, 0, 0) ok +0 ADD_MILLISECS(300) --> 23000.700 +0 CHECK_RATE_CTRS(1, 0, 0) ok + flag: FALSE -> TRUE +1 CHECK_RATE_CTRS(1, 0, 0) ok +1 ADD_MILLISECS(299) --> 23000.999 +1 CHECK_RATE_CTRS(1, 0, 0) ok +1 ADD_MILLISECS(1) --> 23001.000 +1 CHECK_RATE_CTRS(1, 1, 0) ok +1 ADD_MILLISECS(499) --> 23001.499 +1 CHECK_RATE_CTRS(1, 1, 0) ok +1 ADD_MILLISECS(1) --> 23001.500 +1 CHECK_RATE_CTRS(1, 1, 1) ok +1 ADD_MILLISECS(1) --> 23001.501 +1 CHECK_RATE_CTRS(2, 1, 1) ok +1 ADD_MILLISECS(299) --> 23001.800 +1 CHECK_RATE_CTRS(2, 1, 1) ok + flag: TRUE -> FALSE +0 CHECK_RATE_CTRS(2, 1, 1) ok +0 ADD_MILLISECS(400) --> 23002.200 +0 CHECK_RATE_CTRS(2, 1, 1) ok + flag: FALSE -> TRUE +1 CHECK_RATE_CTRS(2, 1, 1) ok +1 ADD_MILLISECS(199) --> 23002.399 +1 CHECK_RATE_CTRS(2, 1, 1) ok +1 ADD_MILLISECS(2) --> 23002.401 +1 CHECK_RATE_CTRS(2, 2, 1) ok +1 ADD_MILLISECS(498) --> 23002.899 +1 CHECK_RATE_CTRS(2, 2, 1) ok +1 ADD_MILLISECS(2) --> 23002.901 +1 CHECK_RATE_CTRS(3, 2, 2) ok +1 ADD_MILLISECS(500) --> 23003.401 +1 CHECK_RATE_CTRS(3, 3, 2) ok +1 ADD_MILLISECS(498) --> 23003.899 +1 CHECK_RATE_CTRS(3, 3, 2) ok +1 ADD_MILLISECS(3) --> 23003.902 +1 CHECK_RATE_CTRS(4, 3, 3) ok +1 ADD_MILLISECS(200) --> 23004.102 +1 CHECK_RATE_CTRS(4, 3, 3) ok + flag: TRUE -> FALSE +0 CHECK_RATE_CTRS(4, 3, 3) ok +0 ADD_MILLISECS(4321) --> 23008.423 +0 CHECK_RATE_CTRS(4, 3, 3) ok + flag: FALSE -> TRUE +1 CHECK_RATE_CTRS(4, 3, 3) ok +1 ADD_MILLISECS(5678) --> 23014.101 +1 CHECK_RATE_CTRS(9, 9, 8) ok + flag: TRUE -> FALSE +0 CHECK_RATE_CTRS(9, 9, 8) ok + +----------- test forget_sum_usec + +0 CHECK_RATE_CTRS(0, 0, 0) ok + flag: FALSE -> TRUE +1 CHECK_RATE_CTRS(0, 0, 0) ok +1 ADD_MILLISECS(100) --> 23000.100 +1 CHECK_RATE_CTRS(1, 0, 0) ok + flag: TRUE -> FALSE +0 CHECK_RATE_CTRS(1, 0, 0) ok +0 ADD_MILLISECS(1000) --> 23001.100 +0 CHECK_RATE_CTRS(1, 0, 0) ok +0 ADD_MILLISECS(8999) --> 23010.099 +0 CHECK_RATE_CTRS(1, 0, 0) ok +0 ADD_MILLISECS(1) --> 23010.100 +0 CHECK_RATE_CTRS(1, 0, 0) ok + flag: FALSE -> TRUE +1 CHECK_RATE_CTRS(1, 0, 0) ok +1 ADD_MILLISECS(1) --> 23010.101 +1 CHECK_RATE_CTRS(2, 0, 0) ok +1 ADD_MILLISECS(399) --> 23010.500 +1 CHECK_RATE_CTRS(2, 0, 0) ok +1 ADD_MILLISECS(99) --> 23010.599 +1 CHECK_RATE_CTRS(2, 0, 0) ok +1 ADD_MILLISECS(1) --> 23010.600 +1 CHECK_RATE_CTRS(2, 1, 0) ok +1 ADD_MILLISECS(400) --> 23011.000 +1 CHECK_RATE_CTRS(2, 1, 0) ok +1 ADD_MILLISECS(99) --> 23011.099 +1 CHECK_RATE_CTRS(2, 1, 0) ok +1 ADD_MILLISECS(1) --> 23011.100 +1 CHECK_RATE_CTRS(2, 1, 1) ok +1 ADD_MILLISECS(300) --> 23011.400 +1 CHECK_RATE_CTRS(3, 1, 1) ok + flag: TRUE -> FALSE +0 ADD_MILLISECS(9999) --> 23021.399 + flag: FALSE -> TRUE +1 ADD_MILLISECS(25) --> 23021.424 + flag: TRUE -> FALSE +0 ADD_MILLISECS(9999) --> 23031.423 + flag: FALSE -> TRUE +1 ADD_MILLISECS(25) --> 23031.448 + flag: TRUE -> FALSE +0 ADD_MILLISECS(9999) --> 23041.447 + flag: FALSE -> TRUE +1 ADD_MILLISECS(25) --> 23041.472 + flag: TRUE -> FALSE +0 ADD_MILLISECS(9999) --> 23051.471 + flag: FALSE -> TRUE +1 ADD_MILLISECS(25) --> 23051.496 +1 CHECK_RATE_CTRS(3, 1, 1) ok +1 ADD_MILLISECS(100) --> 23051.596 +1 CHECK_RATE_CTRS(3, 2, 1) ok +1 ADD_MILLISECS(500) --> 23052.096 +1 CHECK_RATE_CTRS(3, 2, 2) ok +1 ADD_MILLISECS(300) --> 23052.396 +1 CHECK_RATE_CTRS(4, 2, 2) ok + flag: TRUE -> FALSE +0 ADD_MILLISECS(5000) --> 23057.396 + flag: FALSE -> FALSE +0 ADD_MILLISECS(5000) --> 23062.396 +0 CHECK_RATE_CTRS(4, 2, 2) ok + flag: FALSE -> TRUE +1 ADD_MILLISECS(1) --> 23062.397 +1 CHECK_RATE_CTRS(5, 2, 2) ok +1 ADD_MILLISECS(199) --> 23062.596 +1 CHECK_RATE_CTRS(5, 2, 2) ok +1 ADD_MILLISECS(299) --> 23062.895 +1 CHECK_RATE_CTRS(5, 2, 2) ok +1 ADD_MILLISECS(1) --> 23062.896 +1 CHECK_RATE_CTRS(5, 3, 2) ok +1 ADD_MILLISECS(200) --> 23063.096 +1 CHECK_RATE_CTRS(5, 3, 2) ok +1 ADD_MILLISECS(299) --> 23063.395 +1 CHECK_RATE_CTRS(5, 3, 2) ok +1 ADD_MILLISECS(1) --> 23063.396 +1 CHECK_RATE_CTRS(5, 3, 3) ok + +----------- cumulating time, without forget_sum, when timer cb are invoked late + +0 CHECK_RATE_CTRS(0, 0, 0) ok +0 ADD_MILLISECS(100) --> 23000.100 +0 CHECK_RATE_CTRS(0, 0, 0) ok + flag: FALSE -> TRUE +1 CHECK_RATE_CTRS(0, 0, 0) ok +1 ADD_MILLISECS(100) --> 23000.200 +1 CHECK_RATE_CTRS(1, 0, 0) ok + flag: TRUE -> FALSE +0 CHECK_RATE_CTRS(1, 0, 0) ok +0 ADD_MILLISECS(100) --> 23000.300 +0 CHECK_RATE_CTRS(1, 0, 0) ok + flag: FALSE -> TRUE +1 CHECK_RATE_CTRS(1, 0, 0) ok +1 ADD_MILLISECS(100) --> 23000.400 +1 CHECK_RATE_CTRS(1, 0, 0) ok + flag: TRUE -> FALSE +0 CHECK_RATE_CTRS(1, 0, 0) ok +0 ADD_MILLISECS(300) --> 23000.700 +0 CHECK_RATE_CTRS(1, 0, 0) ok + flag: FALSE -> TRUE +1 CHECK_RATE_CTRS(1, 0, 0) ok +1 ADD_MILLISECS(799) --> 23001.499 +1 CHECK_RATE_CTRS(1, 1, 0) ok +1 ADD_MILLISECS(1) --> 23001.500 +1 CHECK_RATE_CTRS(1, 1, 1) ok +1 ADD_MILLISECS(300) --> 23001.800 +1 CHECK_RATE_CTRS(2, 1, 1) ok + flag: TRUE -> FALSE +0 CHECK_RATE_CTRS(2, 1, 1) ok +0 ADD_MILLISECS(400) --> 23002.200 +0 CHECK_RATE_CTRS(2, 1, 1) ok + flag: FALSE -> TRUE +1 CHECK_RATE_CTRS(2, 1, 1) ok +1 ADD_MILLISECS(699) --> 23002.899 +1 CHECK_RATE_CTRS(2, 2, 1) ok +1 ADD_MILLISECS(1) --> 23002.900 +1 CHECK_RATE_CTRS(2, 2, 2) ok +1 ADD_MILLISECS(1) --> 23002.901 +1 CHECK_RATE_CTRS(3, 2, 2) ok +1 ADD_MILLISECS(499) --> 23003.400 +1 CHECK_RATE_CTRS(3, 3, 2) ok +1 ADD_MILLISECS(499) --> 23003.899 +1 CHECK_RATE_CTRS(3, 3, 2) ok +1 ADD_MILLISECS(1) --> 23003.900 +1 CHECK_RATE_CTRS(3, 3, 3) ok +1 ADD_MILLISECS(200) --> 23004.100 +1 CHECK_RATE_CTRS(4, 3, 3) ok + flag: TRUE -> FALSE +0 CHECK_RATE_CTRS(4, 3, 3) ok +0 ADD_MILLISECS(4321) --> 23008.421 +0 CHECK_RATE_CTRS(4, 3, 3) ok + flag: FALSE -> TRUE +1 CHECK_RATE_CTRS(4, 3, 3) ok +1 ADD_MILLISECS(5678) --> 23014.099 +1 CHECK_RATE_CTRS(9, 9, 8) ok + flag: TRUE -> FALSE +0 CHECK_RATE_CTRS(9, 9, 8) ok + +----------- test forget_sum, when timer cb are invoked late + +0 CHECK_RATE_CTRS(0, 0, 0) ok + flag: FALSE -> TRUE +1 CHECK_RATE_CTRS(0, 0, 0) ok +1 ADD_MILLISECS(100) --> 23000.100 +1 CHECK_RATE_CTRS(1, 0, 0) ok + flag: TRUE -> FALSE +0 CHECK_RATE_CTRS(1, 0, 0) ok +0 ADD_MILLISECS(1000) --> 23001.100 +0 CHECK_RATE_CTRS(1, 0, 0) ok +0 ADD_MILLISECS(8999) --> 23010.099 +0 CHECK_RATE_CTRS(1, 0, 0) ok +0 ADD_MILLISECS(1) --> 23010.100 +0 CHECK_RATE_CTRS(1, 0, 0) ok + flag: FALSE -> TRUE +1 CHECK_RATE_CTRS(1, 0, 0) ok +1 ADD_MILLISECS(1) --> 23010.101 +1 CHECK_RATE_CTRS(2, 0, 0) ok +1 ADD_MILLISECS(399) --> 23010.500 +1 CHECK_RATE_CTRS(2, 0, 0) ok +1 ADD_MILLISECS(99) --> 23010.599 +1 CHECK_RATE_CTRS(2, 0, 0) ok +1 ADD_MILLISECS(1) --> 23010.600 +1 CHECK_RATE_CTRS(2, 1, 0) ok +1 ADD_MILLISECS(400) --> 23011.000 +1 CHECK_RATE_CTRS(2, 1, 0) ok +1 ADD_MILLISECS(99) --> 23011.099 +1 CHECK_RATE_CTRS(2, 1, 0) ok +1 ADD_MILLISECS(1) --> 23011.100 +1 CHECK_RATE_CTRS(2, 1, 1) ok +1 ADD_MILLISECS(300) --> 23011.400 +1 CHECK_RATE_CTRS(3, 1, 1) ok + flag: TRUE -> FALSE +0 ADD_MILLISECS(9999) --> 23021.399 + flag: FALSE -> TRUE +1 ADD_MILLISECS(25) --> 23021.424 + flag: TRUE -> FALSE +0 ADD_MILLISECS(9999) --> 23031.423 + flag: FALSE -> TRUE +1 ADD_MILLISECS(25) --> 23031.448 + flag: TRUE -> FALSE +0 ADD_MILLISECS(9999) --> 23041.447 + flag: FALSE -> TRUE +1 ADD_MILLISECS(25) --> 23041.472 + flag: TRUE -> FALSE +0 ADD_MILLISECS(9999) --> 23051.471 + flag: FALSE -> TRUE +1 ADD_MILLISECS(25) --> 23051.496 +1 CHECK_RATE_CTRS(3, 1, 1) ok +1 ADD_MILLISECS(100) --> 23051.596 +1 CHECK_RATE_CTRS(3, 2, 1) ok +1 ADD_MILLISECS(500) --> 23052.096 +1 CHECK_RATE_CTRS(3, 2, 2) ok + +----------- test T_defs + +T_defs: T_gran=100000usec T_round_threshold=10000usec T_forget_sum=0usec +0 CHECK_RATE_CTRS(0, 0, 0) ok +0 ADD_MILLISECS(100) --> 23000.100 +0 CHECK_RATE_CTRS(0, 0, 0) ok + flag: FALSE -> TRUE +1 CHECK_RATE_CTRS(0, 0, 0) ok +1 ADD_MILLISECS(9) --> 23000.109 +1 CHECK_RATE_CTRS(1, 0, 0) ok +1 ADD_MILLISECS(1) --> 23000.110 +1 CHECK_RATE_CTRS(1, 1, 0) ok +1 ADD_MILLISECS(90) --> 23000.200 +1 CHECK_RATE_CTRS(1, 1, 1) ok +T_defs: T_gran=200000usec T_round_threshold=190000usec T_forget_sum=1000000usec +1 CHECK_RATE_CTRS(1, 1, 1) ok +1 ADD_MILLISECS(1) --> 23000.201 +1 CHECK_RATE_CTRS(1, 1, 1) ok +1 ADD_MILLISECS(1) --> 23000.202 +1 CHECK_RATE_CTRS(2, 1, 1) ok +1 ADD_MILLISECS(8) --> 23000.210 +1 CHECK_RATE_CTRS(2, 1, 1) ok +1 ADD_MILLISECS(90) --> 23000.300 +1 CHECK_RATE_CTRS(2, 1, 1) ok +1 ADD_MILLISECS(99) --> 23000.399 +1 CHECK_RATE_CTRS(2, 1, 1) ok +1 ADD_MILLISECS(1) --> 23000.400 +1 CHECK_RATE_CTRS(2, 2, 1) ok +1 ADD_MILLISECS(1) --> 23000.401 +1 CHECK_RATE_CTRS(2, 2, 1) ok +1 ADD_MILLISECS(1) --> 23000.402 +1 CHECK_RATE_CTRS(3, 2, 1) ok +1 ADD_MILLISECS(98) --> 23000.500 +1 CHECK_RATE_CTRS(3, 2, 2) ok +1 ADD_MILLISECS(99) --> 23000.599 +1 CHECK_RATE_CTRS(3, 2, 2) ok +1 ADD_MILLISECS(1) --> 23000.600 +1 CHECK_RATE_CTRS(3, 3, 2) ok +1 ADD_MILLISECS(1) --> 23000.601 +1 CHECK_RATE_CTRS(3, 3, 2) ok +1 ADD_MILLISECS(1) --> 23000.602 +1 CHECK_RATE_CTRS(4, 3, 2) ok +1 ADD_MILLISECS(98) --> 23000.700 +1 CHECK_RATE_CTRS(4, 3, 3) ok +T_defs: T_gran=100000usec T_round_threshold=0usec T_forget_sum=0usec +1 CHECK_RATE_CTRS(4, 3, 3) ok +1 ADD_MILLISECS(100) --> 23000.800 +1 CHECK_RATE_CTRS(4, 3, 3) ok +1 ADD_MILLISECS(2) --> 23000.802 +1 CHECK_RATE_CTRS(4, 3, 3) ok +1 ADD_MILLISECS(1) --> 23000.803 +1 CHECK_RATE_CTRS(5, 3, 3) ok +1 ADD_MILLISECS(46) --> 23000.849 +1 CHECK_RATE_CTRS(5, 3, 3) ok +1 ADD_MILLISECS(1) --> 23000.850 +1 CHECK_RATE_CTRS(5, 4, 3) ok +1 ADD_MILLISECS(50) --> 23000.900 +1 ADD_MILLISECS(2) --> 23000.902 +1 CHECK_RATE_CTRS(5, 4, 3) ok +1 ADD_MILLISECS(1) --> 23000.903 +1 CHECK_RATE_CTRS(6, 4, 3) ok +1 ADD_MILLISECS(46) --> 23000.949 +1 CHECK_RATE_CTRS(6, 4, 3) ok +1 ADD_MILLISECS(1) --> 23000.950 +1 CHECK_RATE_CTRS(6, 5, 3) ok -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icdd36f27cb54b2e1b940c9e6404ba9dd3692a310 Gerrit-Change-Number: 25973 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 22:27:07 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 26 Oct 2021 22:27:07 +0000 Subject: Change in osmo-bsc[master]: implement all_allocated:{sdcch, tch} rate counters References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25974 ) Change subject: implement all_allocated:{sdcch,tch} rate counters ...................................................................... implement all_allocated:{sdcch,tch} rate counters Based on allAvailable{SDCCH,TCH}Allocated performance indicators, see 3GPP TS 52.402. Related: SYS#4878 Related: Ib3997a827c9cc43d1361bb0cf3bfab9f6d91bf82 (osmo-ttcn3-hacks) Change-Id: I8b06e435a224c8708cd6c67e97ee5413718fc1ed --- M include/osmocom/bsc/bsc_stats.h M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_stats.c M src/osmo-bsc/bts.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/net_init.c 8 files changed, 130 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/74/25974/1 diff --git a/include/osmocom/bsc/bsc_stats.h b/include/osmocom/bsc/bsc_stats.h index 4250079..9a2f36c 100644 --- a/include/osmocom/bsc/bsc_stats.h +++ b/include/osmocom/bsc/bsc_stats.h @@ -81,6 +81,8 @@ BSC_CTR_MSCPOOL_SUBSCR_NO_MSC, BSC_CTR_MSCPOOL_EMERG_FORWARDED, BSC_CTR_MSCPOOL_EMERG_LOST, + BSC_CTR_ALL_ALLOCATED_SDCCH, + BSC_CTR_ALL_ALLOCATED_TCH, }; extern const struct rate_ctr_desc bsc_ctr_description[]; @@ -105,3 +107,4 @@ extern const struct osmo_stat_item_group_desc bsc_statg_desc; void bsc_update_connection_stats(struct gsm_network *net); +void bsc_update_time_cc_all_allocated(struct gsm_network *net); diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 700033c..26ffaf1 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -144,6 +144,8 @@ BTS_CTR_SRVCC_TIMEOUT, BTS_CTR_SRVCC_FAILED, BTS_CTR_SRVCC_ERROR, + BTS_CTR_ALL_ALLOCATED_SDCCH, + BTS_CTR_ALL_ALLOCATED_TCH, }; extern const struct rate_ctr_desc bts_ctr_description[]; @@ -576,6 +578,9 @@ /* At what point in the channel allocation sequence to dispatch the Immediate Assignment (Abis optimization) */ enum imm_ass_time imm_ass_time; + + struct time_cc all_allocated_sdcch; + struct time_cc all_allocated_tch; }; #define GSM_BTS_SI2Q(bts, i) (struct gsm48_system_information_type_2quater *)((bts)->si_buf[SYSINFO_TYPE_2quater][i]) diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 3d2c901..2917be3 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -32,6 +32,7 @@ #include #include #include +#include #define GSM_T3122_DEFAULT 10 @@ -1259,6 +1260,9 @@ struct osmo_nri_ranges *null_nri_ranges; struct smlc_config *smlc; + + struct time_cc all_allocated_sdcch; + struct time_cc all_allocated_tch; }; struct gsm_audio_support { diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c index bf150cb..11cda69 100644 --- a/src/osmo-bsc/bsc_init.c +++ b/src/osmo-bsc/bsc_init.c @@ -120,6 +120,29 @@ if (!net->bts_unknown_statg) goto err_free_all; + net->all_allocated_sdcch = (struct time_cc){ + .cfg = { + .gran_usec = 1*1000000, + .forget_sum_usec = 60*1000000, + .rate_ctr = rate_ctr_group_get_ctr(net->bsc_ctrs, BSC_CTR_ALL_ALLOCATED_SDCCH), + .T_gran = -16, + .T_round_threshold = -17, + .T_forget_sum = -18, + .T_defs = net->T_defs, + }, + }; + net->all_allocated_tch = (struct time_cc){ + .cfg = { + .gran_usec = 1*1000000, + .forget_sum_usec = 60*1000000, + .rate_ctr = rate_ctr_group_get_ctr(net->bsc_ctrs, BSC_CTR_ALL_ALLOCATED_TCH), + .T_gran = -16, + .T_round_threshold = -17, + .T_forget_sum = -18, + .T_defs = net->T_defs, + }, + }; + INIT_LLIST_HEAD(&net->bts_rejected); gsm_net_update_ctype(net); diff --git a/src/osmo-bsc/bsc_stats.c b/src/osmo-bsc/bsc_stats.c index 7176809..cae5300 100644 --- a/src/osmo-bsc/bsc_stats.c +++ b/src/osmo-bsc/bsc_stats.c @@ -102,6 +102,8 @@ "Emergency call requests forwarded to an MSC (see also per-MSC counters"}, [BSC_CTR_MSCPOOL_EMERG_LOST] = {"mscpool:emerg:lost", "Emergency call requests lost because no MSC was found available"}, + [BSC_CTR_ALL_ALLOCATED_SDCCH] = {"all_allocated:sdcch", "Cumulative counter of seconds where all SDCCH channels were allocated"}, + [BSC_CTR_ALL_ALLOCATED_TCH] = {"all_allocated:tch", "Cumulative counter of seconds where all TCH channels were allocated"}, }; const struct rate_ctr_group_desc bsc_ctrg_desc = { @@ -185,4 +187,49 @@ osmo_stat_item_set(osmo_stat_item_group_get_item(net->bsc_statg, BSC_STAT_NUM_TRX_RSL_CONNECTED), trx_rsl_connected_total); osmo_stat_item_set(osmo_stat_item_group_get_item(net->bsc_statg, BSC_STAT_NUM_TRX_TOTAL), num_trx_total); + + /* Make sure to notice cells that become disconnected */ + bsc_update_time_cc_all_allocated(net); +} + +void bsc_update_time_cc_all_allocated(struct gsm_network *net) +{ + struct gsm_bts *bts; + struct gsm_bts_trx *trx; + + chan_counts_t bsc_counts; + chan_counts_zero(bsc_counts); + + llist_for_each_entry(bts, &net->bts_list, list) { + chan_counts_t bts_counts; + chan_counts_zero(bts_counts); + + llist_for_each_entry(trx, &bts->trx_list, list) { + chan_counts_t trx_counts; + trx_count_lchans(trx_counts, trx); + chan_counts_add(bts_counts, trx_counts); + } + + time_cc_set_flag(&bts->all_allocated_sdcch, + bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_SDCCH] + && !bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_SDCCH]); + + time_cc_set_flag(&bts->all_allocated_tch, + (bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_TCH_F] + + bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_TCH_H]) + && !(bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F] + + bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_H])); + + chan_counts_add(bsc_counts, bts_counts); + } + + time_cc_set_flag(&net->all_allocated_sdcch, + bsc_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_SDCCH] + && !bsc_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_SDCCH]); + + time_cc_set_flag(&net->all_allocated_tch, + (bsc_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_TCH_F] + + bsc_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_TCH_H]) + && !(bsc_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F] + + bsc_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_H])); } diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 2e4b520..95015ba 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -211,6 +211,29 @@ } bts->bts_statg = osmo_stat_item_group_alloc(bts, &bts_statg_desc, bts->nr); + bts->all_allocated_sdcch = (struct time_cc){ + .cfg = { + .gran_usec = 1*1000000, + .forget_sum_usec = 60*1000000, + .rate_ctr = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_ALL_ALLOCATED_SDCCH), + .T_gran = -16, + .T_round_threshold = -17, + .T_forget_sum = -18, + .T_defs = net->T_defs, + }, + }; + bts->all_allocated_tch = (struct time_cc){ + .cfg = { + .gran_usec = 1*1000000, + .forget_sum_usec = 60*1000000, + .rate_ctr = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_ALL_ALLOCATED_TCH), + .T_gran = -16, + .T_round_threshold = -17, + .T_forget_sum = -18, + .T_defs = net->T_defs, + }, + }; + /* create our primary TRX */ bts->c0 = gsm_bts_trx_alloc(bts); if (!bts->c0) { @@ -1205,6 +1228,12 @@ [BTS_CTR_SRVCC_ERROR] = \ { "srvcc:error", "Re-assignment failed for other reason" }, + [BTS_CTR_ALL_ALLOCATED_SDCCH] = + { "all_allocated:sdcch", + "Cumulative counter of seconds where all SDCCH channels were allocated" }, + [BTS_CTR_ALL_ALLOCATED_TCH] = + { "all_allocated:tch", + "Cumulative counter of seconds where all TCH channels were allocated" }, }; const struct rate_ctr_group_desc bts_ctrg_desc = { diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 2f62487..c963d9e 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -40,6 +40,7 @@ #include #include #include +#include static struct osmo_fsm lchan_fsm; @@ -512,6 +513,8 @@ lchan_reset(lchan); osmo_fsm_inst_dispatch(lchan->ts->fi, TS_EV_LCHAN_UNUSED, lchan); + bsc_update_time_cc_all_allocated(bts->network); + /* Poll the channel request queue, so that waiting calls can make use of the lchan that just * has become unused now. */ abis_rsl_chan_rqd_queue_poll(bts); @@ -688,6 +691,8 @@ return; } + bsc_update_time_cc_all_allocated(bts->network); + lchan->conn = info->for_conn; /* If there is a previous lchan, and the new lchan is on the same cell as previous one, diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c index 6d88adb..26b3322 100644 --- a/src/osmo-bsc/net_init.c +++ b/src/osmo-bsc/net_init.c @@ -56,6 +56,20 @@ { .T=-12, .default_val=5, .desc="Timeout for obtaining TA after BSSLAP TA Request" }, { .T=-13, .default_val=5, .desc="Timeout for RR Channel Mode Modify ACK (BSC <-> MS)" }, { .T=-14, .default_val=5, .desc="Timeout for RSL Channel Mode Modify ACK (BSC <-> BTS)" }, + { .T=-16, .default_val=1000, .unit=OSMO_TDEF_MS, + .desc="Granularity for all_allocated:* rate counters: in milliseconds, how much elapsed time does one" + " counter increment represent? See also X17, X18" }, + { .T=-17, .default_val=0, .unit=OSMO_TDEF_MS, + .desc="Rounding threshold for all_allocated:* rate counters: round up to the next counter increment" + " after this many milliseconds. If set to half of X16 (or 0), employ the usual round() behavior:" + " round up after half of a granularity period. If set to 1, behave like ceil(): already" + " increment the counter immediately when all channels are allocated. If set >= X16, behave like" + " floor(): only increment after a full X16 period of all channels being occupied." + " See also X16, X18" }, + { .T=-18, .default_val=60000, .unit=OSMO_TDEF_MS, + .desc="Reset-sum period for all_allocated:* rate counters:" + " after this time, forget internally cumulated time remainders. Zero to always keep remainders." + " See also X16, X17." }, { .T=-3111, .default_val=4, .desc="Wait time after lchan was released in error (should be T3111 + 2s)" }, { .T=-3210, .default_val=20, .desc="After L3 Complete, wait for MSC to confirm" }, {} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8b06e435a224c8708cd6c67e97ee5413718fc1ed Gerrit-Change-Number: 25974 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Tue Oct 26 22:27:07 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Tue, 26 Oct 2021 22:27:07 +0000 Subject: Change in osmo-bsc[master]: implement all_allocated:{static_sdcch, static_tch} rate counters References: Message-ID: neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25975 ) Change subject: implement all_allocated:{static_sdcch,static_tch} rate counters ...................................................................... implement all_allocated:{static_sdcch,static_tch} rate counters Same as all_allocated:{sdcch,tch}, but already trigger when all non-dynamic timeslots are allocated. Related: SYS#4878 Related: Ib3997a827c9cc43d1361bb0cf3bfab9f6d91bf82 (osmo-ttcn3-hacks) Change-Id: I2fa14531f16d3f07085620f1c50eb839c420da6a --- M include/osmocom/bsc/bsc_stats.h M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bsc_stats.c M src/osmo-bsc/bts.c 6 files changed, 82 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/75/25975/1 diff --git a/include/osmocom/bsc/bsc_stats.h b/include/osmocom/bsc/bsc_stats.h index 9a2f36c..9140f85 100644 --- a/include/osmocom/bsc/bsc_stats.h +++ b/include/osmocom/bsc/bsc_stats.h @@ -82,7 +82,9 @@ BSC_CTR_MSCPOOL_EMERG_FORWARDED, BSC_CTR_MSCPOOL_EMERG_LOST, BSC_CTR_ALL_ALLOCATED_SDCCH, + BSC_CTR_ALL_ALLOCATED_STATIC_SDCCH, BSC_CTR_ALL_ALLOCATED_TCH, + BSC_CTR_ALL_ALLOCATED_STATIC_TCH, }; extern const struct rate_ctr_desc bsc_ctr_description[]; diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 26ffaf1..4ea0735 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -145,7 +145,9 @@ BTS_CTR_SRVCC_FAILED, BTS_CTR_SRVCC_ERROR, BTS_CTR_ALL_ALLOCATED_SDCCH, + BTS_CTR_ALL_ALLOCATED_STATIC_SDCCH, BTS_CTR_ALL_ALLOCATED_TCH, + BTS_CTR_ALL_ALLOCATED_STATIC_TCH, }; extern const struct rate_ctr_desc bts_ctr_description[]; @@ -580,7 +582,9 @@ enum imm_ass_time imm_ass_time; struct time_cc all_allocated_sdcch; + struct time_cc all_allocated_static_sdcch; struct time_cc all_allocated_tch; + struct time_cc all_allocated_static_tch; }; #define GSM_BTS_SI2Q(bts, i) (struct gsm48_system_information_type_2quater *)((bts)->si_buf[SYSINFO_TYPE_2quater][i]) diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 2917be3..e1bba80 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1262,7 +1262,9 @@ struct smlc_config *smlc; struct time_cc all_allocated_sdcch; + struct time_cc all_allocated_static_sdcch; struct time_cc all_allocated_tch; + struct time_cc all_allocated_static_tch; }; struct gsm_audio_support { diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c index 11cda69..9328707 100644 --- a/src/osmo-bsc/bsc_init.c +++ b/src/osmo-bsc/bsc_init.c @@ -131,6 +131,17 @@ .T_defs = net->T_defs, }, }; + net->all_allocated_static_sdcch = (struct time_cc){ + .cfg = { + .gran_usec = 1*1000000, + .forget_sum_usec = 60*1000000, + .rate_ctr = rate_ctr_group_get_ctr(net->bsc_ctrs, BSC_CTR_ALL_ALLOCATED_STATIC_SDCCH), + .T_gran = -16, + .T_round_threshold = -17, + .T_forget_sum = -18, + .T_defs = net->T_defs, + }, + }; net->all_allocated_tch = (struct time_cc){ .cfg = { .gran_usec = 1*1000000, @@ -142,6 +153,17 @@ .T_defs = net->T_defs, }, }; + net->all_allocated_static_tch = (struct time_cc){ + .cfg = { + .gran_usec = 1*1000000, + .forget_sum_usec = 60*1000000, + .rate_ctr = rate_ctr_group_get_ctr(net->bsc_ctrs, BSC_CTR_ALL_ALLOCATED_STATIC_TCH), + .T_gran = -16, + .T_round_threshold = -17, + .T_forget_sum = -18, + .T_defs = net->T_defs, + }, + }; INIT_LLIST_HEAD(&net->bts_rejected); gsm_net_update_ctype(net); diff --git a/src/osmo-bsc/bsc_stats.c b/src/osmo-bsc/bsc_stats.c index cae5300..cb2c025 100644 --- a/src/osmo-bsc/bsc_stats.c +++ b/src/osmo-bsc/bsc_stats.c @@ -103,7 +103,11 @@ [BSC_CTR_MSCPOOL_EMERG_LOST] = {"mscpool:emerg:lost", "Emergency call requests lost because no MSC was found available"}, [BSC_CTR_ALL_ALLOCATED_SDCCH] = {"all_allocated:sdcch", "Cumulative counter of seconds where all SDCCH channels were allocated"}, + [BSC_CTR_ALL_ALLOCATED_STATIC_SDCCH] = {"all_allocated:static_sdcch", + "Cumulative counter of seconds where all non-dynamic SDCCH channels were allocated"}, [BSC_CTR_ALL_ALLOCATED_TCH] = {"all_allocated:tch", "Cumulative counter of seconds where all TCH channels were allocated"}, + [BSC_CTR_ALL_ALLOCATED_STATIC_TCH] = {"all_allocated:static_tch", + "Cumulative counter of seconds where all non-dynamic TCH channels were allocated"}, }; const struct rate_ctr_group_desc bsc_ctrg_desc = { @@ -214,12 +218,22 @@ bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_SDCCH] && !bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_SDCCH]); + time_cc_set_flag(&bts->all_allocated_static_sdcch, + bts_counts[CHAN_COUNTS1_STATIC][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_SDCCH] + && !bts_counts[CHAN_COUNTS1_STATIC][CHAN_COUNTS2_FREE][GSM_LCHAN_SDCCH]); + time_cc_set_flag(&bts->all_allocated_tch, (bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_TCH_F] + bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_TCH_H]) && !(bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F] + bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_H])); + time_cc_set_flag(&bts->all_allocated_static_tch, + (bts_counts[CHAN_COUNTS1_STATIC][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_TCH_F] + + bts_counts[CHAN_COUNTS1_STATIC][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_TCH_H]) + && !(bts_counts[CHAN_COUNTS1_STATIC][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F] + + bts_counts[CHAN_COUNTS1_STATIC][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_H])); + chan_counts_add(bsc_counts, bts_counts); } @@ -227,9 +241,19 @@ bsc_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_SDCCH] && !bsc_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_SDCCH]); + time_cc_set_flag(&net->all_allocated_static_sdcch, + bsc_counts[CHAN_COUNTS1_STATIC][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_SDCCH] + && !bsc_counts[CHAN_COUNTS1_STATIC][CHAN_COUNTS2_FREE][GSM_LCHAN_SDCCH]); + time_cc_set_flag(&net->all_allocated_tch, (bsc_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_TCH_F] + bsc_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_TCH_H]) && !(bsc_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F] + bsc_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_H])); + + time_cc_set_flag(&net->all_allocated_static_tch, + (bsc_counts[CHAN_COUNTS1_STATIC][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_TCH_F] + + bsc_counts[CHAN_COUNTS1_STATIC][CHAN_COUNTS2_MAX_TOTAL][GSM_LCHAN_TCH_H]) + && !(bsc_counts[CHAN_COUNTS1_STATIC][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F] + + bsc_counts[CHAN_COUNTS1_STATIC][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_H])); } diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 95015ba..5202e31 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -222,6 +222,17 @@ .T_defs = net->T_defs, }, }; + bts->all_allocated_static_sdcch = (struct time_cc){ + .cfg = { + .gran_usec = 1*1000000, + .forget_sum_usec = 60*1000000, + .rate_ctr = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_ALL_ALLOCATED_STATIC_SDCCH), + .T_gran = -16, + .T_round_threshold = -17, + .T_forget_sum = -18, + .T_defs = net->T_defs, + }, + }; bts->all_allocated_tch = (struct time_cc){ .cfg = { .gran_usec = 1*1000000, @@ -233,6 +244,17 @@ .T_defs = net->T_defs, }, }; + bts->all_allocated_static_tch = (struct time_cc){ + .cfg = { + .gran_usec = 1*1000000, + .forget_sum_usec = 60*1000000, + .rate_ctr = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_ALL_ALLOCATED_STATIC_TCH), + .T_gran = -16, + .T_round_threshold = -17, + .T_forget_sum = -18, + .T_defs = net->T_defs, + }, + }; /* create our primary TRX */ bts->c0 = gsm_bts_trx_alloc(bts); @@ -1231,9 +1253,15 @@ [BTS_CTR_ALL_ALLOCATED_SDCCH] = { "all_allocated:sdcch", "Cumulative counter of seconds where all SDCCH channels were allocated" }, + [BTS_CTR_ALL_ALLOCATED_STATIC_SDCCH] = + { "all_allocated:static_sdcch", + "Cumulative counter of seconds where all non-dynamic SDCCH channels were allocated" }, [BTS_CTR_ALL_ALLOCATED_TCH] = { "all_allocated:tch", "Cumulative counter of seconds where all TCH channels were allocated" }, + [BTS_CTR_ALL_ALLOCATED_STATIC_TCH] = + { "all_allocated:static_tch", + "Cumulative counter of seconds where all non-dynamic TCH channels were allocated" }, }; const struct rate_ctr_group_desc bts_ctrg_desc = { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2fa14531f16d3f07085620f1c50eb839c420da6a Gerrit-Change-Number: 25975 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Wed Oct 27 01:26:09 2021 From: noreply at opensuse.org (OBS Notification) Date: Wed, 27 Oct 2021 01:26:09 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <6178aab95c966_24ca2af300e165f41900829@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 174s] intention of the Shared Library Policy is to allow parallel installation of [ 174s] multiple versions of the same shared library, hard dependencies likely make [ 174s] that impossible. Please remove this dependency and instead move it to the [ 174s] runtime uses of your library. [ 174s] [ 174s] osmo-iuh.aarch64: W: suse-missing-rclink osmo-hnbgw [ 174s] The package contains an init script or systemd service file but lacks the [ 174s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 174s] [ 174s] libosmo-hnbap0.aarch64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 174s] libosmo-rua0.aarch64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 174s] This package contains a library and provides no %post scriptlet containing a [ 174s] call to ldconfig. [ 174s] [ 174s] libosmo-hnbap0.aarch64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 174s] libosmo-rua0.aarch64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 174s] This package contains a library and provides no %postun scriptlet containing a [ 174s] call to ldconfig. [ 174s] [ 174s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 174s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 174s] [ 174s] ### VM INTERACTION START ### [ 177s] [ 158.664301] sysrq: SysRq : Power Off [ 177s] [ 158.665035] reboot: Power down [ 177s] ### VM INTERACTION END ### [ 177s] [ 177s] obs-arm-11 failed "build osmo-iuh.spec" at Wed Oct 27 01:25:54 UTC 2021. [ 177s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Wed Oct 27 01:43:52 2021 From: noreply at opensuse.org (OBS Notification) Date: Wed, 27 Oct 2021 01:43:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1_ARM/armv7l In-Reply-To: References: Message-ID: <6178aef1392b2_24ca2af300e165f41906829@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1_ARM/armv7l Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 1245s] intention of the Shared Library Policy is to allow parallel installation of [ 1245s] multiple versions of the same shared library, hard dependencies likely make [ 1245s] that impossible. Please remove this dependency and instead move it to the [ 1245s] runtime uses of your library. [ 1245s] [ 1245s] osmo-iuh.armv7hl: W: suse-missing-rclink osmo-hnbgw [ 1245s] The package contains an init script or systemd service file but lacks the [ 1245s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 1245s] [ 1245s] libosmo-hnbap0.armv7hl: E: library-without-ldconfig-postin (Badness: 300) /usr/lib/libosmo-hnbap.so.0.0.0 [ 1245s] libosmo-rua0.armv7hl: E: library-without-ldconfig-postin (Badness: 300) /usr/lib/libosmo-rua.so.0.0.0 [ 1245s] This package contains a library and provides no %post scriptlet containing a [ 1245s] call to ldconfig. [ 1245s] [ 1245s] libosmo-hnbap0.armv7hl: E: library-without-ldconfig-postun (Badness: 300) /usr/lib/libosmo-hnbap.so.0.0.0 [ 1245s] libosmo-rua0.armv7hl: E: library-without-ldconfig-postun (Badness: 300) /usr/lib/libosmo-rua.so.0.0.0 [ 1245s] This package contains a library and provides no %postun scriptlet containing a [ 1245s] call to ldconfig. [ 1245s] [ 1245s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 1245s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 1245s] [ 1245s] ### VM INTERACTION START ### [ 1248s] [ 1232.323035] sysrq: SysRq : Power Off [ 1248s] [ 1232.341616] reboot: Power down [ 1249s] ### VM INTERACTION END ### [ 1249s] [ 1249s] armbuild21 failed "build osmo-iuh.spec" at Wed Oct 27 01:43:49 UTC 2021. [ 1249s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Wed Oct 27 02:03:52 2021 From: noreply at opensuse.org (OBS Notification) Date: Wed, 27 Oct 2021 02:03:52 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <6178b3a1b5620_24ca2af300e165f419167b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 132s] intention of the Shared Library Policy is to allow parallel installation of [ 132s] multiple versions of the same shared library, hard dependencies likely make [ 132s] that impossible. Please remove this dependency and instead move it to the [ 132s] runtime uses of your library. [ 132s] [ 132s] osmo-iuh.x86_64: W: suse-missing-rclink osmo-hnbgw [ 132s] The package contains an init script or systemd service file but lacks the [ 132s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 132s] [ 132s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 132s] libosmo-rua0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 132s] This package contains a library and provides no %post scriptlet containing a [ 132s] call to ldconfig. [ 132s] [ 132s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 132s] libosmo-rua0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 132s] This package contains a library and provides no %postun scriptlet containing a [ 132s] call to ldconfig. [ 132s] [ 132s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 132s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 132s] [ 132s] ### VM INTERACTION START ### [ 136s] [ 129.172276] sysrq: Power Off [ 136s] [ 129.175282] reboot: Power down [ 136s] ### VM INTERACTION END ### [ 136s] [ 136s] goat17 failed "build osmo-iuh.spec" at Wed Oct 27 02:03:41 UTC 2021. [ 136s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Wed Oct 27 02:05:01 2021 From: noreply at opensuse.org (OBS Notification) Date: Wed, 27 Oct 2021 02:05:01 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <6178b3dcc683b_24ca2af300e165f41917266@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 634s] intention of the Shared Library Policy is to allow parallel installation of [ 634s] multiple versions of the same shared library, hard dependencies likely make [ 634s] that impossible. Please remove this dependency and instead move it to the [ 634s] runtime uses of your library. [ 634s] [ 634s] osmo-iuh.x86_64: W: suse-missing-rclink osmo-hnbgw [ 634s] The package contains an init script or systemd service file but lacks the [ 634s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 634s] [ 634s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 634s] libosmo-rua0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 634s] This package contains a library and provides no %post scriptlet containing a [ 634s] call to ldconfig. [ 634s] [ 634s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 634s] libosmo-rua0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 634s] This package contains a library and provides no %postun scriptlet containing a [ 634s] call to ldconfig. [ 634s] [ 634s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 634s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 634s] [ 634s] ### VM INTERACTION START ### [ 637s] [ 580.034843] sysrq: SysRq : Power Off [ 637s] [ 580.053811] reboot: Power down [ 637s] ### VM INTERACTION END ### [ 637s] [ 637s] lamb04 failed "build osmo-iuh.spec" at Wed Oct 27 02:04:49 UTC 2021. [ 637s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Wed Oct 27 08:08:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 08:08:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 ) Change subject: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iee37eef2012ce2c2e2f0a0db4c26abb75a947d84 Gerrit-Change-Number: 25938 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Comment-Date: Wed, 27 Oct 2021 08:08:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 08:39:55 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 08:39:55 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: comment: tweak TS reference In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25970 ) Change subject: bsc: comment: tweak TS reference ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25970 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I53ec51240d6e9a0f93f784c8afee2f54226cc51f Gerrit-Change-Number: 25970 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 27 Oct 2021 08:39:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 08:40:14 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 08:40:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: add TC_meas_res_speech_{tchf, tchh}_sapi3() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25968 ) Change subject: BTS_Tests: add TC_meas_res_speech_{tchf,tchh}_sapi3() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7d17d6e5f413f2de78db944f23ad731b81ad24cf Gerrit-Change-Number: 25968 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 27 Oct 2021 08:40:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 08:40:20 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 08:40:20 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: add TC_meas_res_speech_{tchf, tchh}_sapi3() In-Reply-To: References: Message-ID: fixeria has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25968 ) Change subject: BTS_Tests: add TC_meas_res_speech_{tchf,tchh}_sapi3() ...................................................................... Removed Code-Review+1 by fixeria -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7d17d6e5f413f2de78db944f23ad731b81ad24cf Gerrit-Change-Number: 25968 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 09:12:12 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 27 Oct 2021 09:12:12 +0000 Subject: Change in osmo-bsc[master]: heighbor_ident: add/del neighbor cells via ctrl interface References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25976 ) Change subject: heighbor_ident: add/del neighbor cells via ctrl interface ...................................................................... heighbor_ident: add/del neighbor cells via ctrl interface The VTY allows flexible control over the neighbor cell information via the neighbor command, which can be found in the configure terminal under the bts node. Lets add pendant of this command on the control interface as well. Change-Id: I343a40e18fa9b91e6c381912c0426a002841e079 Related: SYS#5641 --- M doc/manuals/chapters/control.adoc M include/osmocom/bsc/neighbor_ident.h M src/osmo-bsc/Makefile.am M src/osmo-bsc/bsc_ctrl_commands.c A src/osmo-bsc/neighbor_ident_ctrl.c M src/osmo-bsc/neighbor_ident_vty.c 6 files changed, 729 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/76/25976/1 diff --git a/doc/manuals/chapters/control.adoc b/doc/manuals/chapters/control.adoc index 2585126..40a5cb9 100644 --- a/doc/manuals/chapters/control.adoc +++ b/doc/manuals/chapters/control.adoc @@ -121,3 +121,28 @@ accepted. FIXME: add variables defined in src/ctrl/control_if.c? + +=== add/del neighbor cell + +The control interface allows for editing the neighbor cell configuration. Neighbor +cells can be added or removed during runtime. It is also possible to clear the +entire neighbor list if necessary. + +.Variables available over control interface +[options="header",width="100%",cols="20%,5%,5%,50%,20%"] +|=== +|Name|Access|Trap|Value|Comment +|bts.N.neighbor-bts.add|WO|No|""|Add neighbor cell by local BTS number. +|bts.N.neighbor-bts.del|WO|No|""|Delete neighbor cell by local BTS number. +|bts.N.neighbor-lac.add|WO|No|"[--]"|Add neighbor cell by LAC. +|bts.N.neighbor-lac.del|WO|No|"[--]"|Delete neighbor cell by LAC. +|bts.N.neighbor-lac-ci.add|WO|No|"-[--]"|Add neighbor cell by LAC and CI. +|bts.N.neighbor-lac-ci.del|WO|No|"-[--]"|Delete neighbor cell by LAC and CI. +|bts.N.neighbor-cgi.add|WO|No|"---[--]"|Add neighbor cell by cgi. +|bts.N.neighbor-cgi.del|WO|No|"---[--]"|Delete neighbor cell by cgi. +|bts.N.neighbor-cgi-ps.add|WO|No|"----[--]"|Add neighbor cell by cgi (Packet Switched, with RAC) +|bts.N.neighbor-cgi-ps.del|WO|No|"----[--]"|Delete neighbor cell by cgi (Packet Switched, with RAC). +|bts.N.neighbor-clear|WO|No|Ignored|Delete all neighbor cells. +|=== + +NOTE: The bsic-number () can also be set to "any" if no explcit bsic shall be given diff --git a/include/osmocom/bsc/neighbor_ident.h b/include/osmocom/bsc/neighbor_ident.h index 58300ba..c6a2c42 100644 --- a/include/osmocom/bsc/neighbor_ident.h +++ b/include/osmocom/bsc/neighbor_ident.h @@ -77,6 +77,10 @@ void neighbor_ident_vty_write_bts(struct vty *vty, const char *indent, struct gsm_bts *bts); void neighbor_ident_vty_write_network(struct vty *vty, const char *indent); +int neighbor_ident_add_neighbor(struct vty *vty, struct gsm_bts *bts, struct neighbor *n); +int neighbor_ident_del_neighbor(struct vty *vty, struct gsm_bts *bts, struct neighbor *n); +int neighbor_ident_ctrl_init(void); + int neighbors_check_cfg(); #define CELL_AB_VTY_PARAMS "arfcn <0-1023> bsic (<0-63>|any)" diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index 19af569..3d6666e 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -78,6 +78,7 @@ meas_rep.c \ neighbor_ident.c \ neighbor_ident_vty.c \ + neighbor_ident_ctrl.c \ net_init.c \ nm_common_fsm.c \ nm_bb_transc_fsm.c \ diff --git a/src/osmo-bsc/bsc_ctrl_commands.c b/src/osmo-bsc/bsc_ctrl_commands.c index 4c8cb99..a902eb2 100644 --- a/src/osmo-bsc/bsc_ctrl_commands.c +++ b/src/osmo-bsc/bsc_ctrl_commands.c @@ -35,6 +35,7 @@ #include #include #include +#include static int verify_net_apply_config_file(struct ctrl_cmd *cmd, const char *value, void *_data) { @@ -706,6 +707,8 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_c0_power_red); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_resend_si); + rc |= neighbor_ident_ctrl_init(); + rc |= ctrl_cmd_install(CTRL_NODE_TRX, &cmd_trx_max_power); rc |= ctrl_cmd_install(CTRL_NODE_TRX, &cmd_trx_arfcn); rc |= ctrl_cmd_install(CTRL_NODE_TRX, &cmd_trx_rf_locked); diff --git a/src/osmo-bsc/neighbor_ident_ctrl.c b/src/osmo-bsc/neighbor_ident_ctrl.c new file mode 100644 index 0000000..d476da6 --- /dev/null +++ b/src/osmo-bsc/neighbor_ident_ctrl.c @@ -0,0 +1,656 @@ +/* CTRL interface implementation to manage identity of neighboring BSS cells for inter-BSC handover. */ +/* (C) 2021 by sysmocom - s.f.m.c. GmbH + * + * All Rights Reserved + * + * Author: Neels Hofmeyr + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include +#include + +#include + +#include +#include + +#include +#include +#include +#include +#include + +/* Continue to parse ARFCN and BSIC, which are optional parameters at the end of the parameter string in most of the + * commands. The result is ignored when parameter n is set to NULL. */ +static int continue_parse_arfcn_and_bsic(char **saveptr, struct neighbor *n) +{ + int arfcn; + int bsic; + char *tok; + + tok = strtok_r(NULL, "-", saveptr); + + /* No ARFCN and BSIC persent - stop */ + if (!tok) + return 0; + + if (osmo_str_to_int(&arfcn, tok, 10, 0, 1023) < 0) + return 1; + + tok = strtok_r(NULL, "-", saveptr); + + /* When an ARFCN is given, then the BSIC parameter is + * mandatory */ + if (!tok) + return 1; + + if (strcmp(tok, "any") == 0) { + bsic = BSIC_ANY; + } else { + if (osmo_str_to_int(&bsic, tok, 10, 0, 63) < 0) + return 1; + } + + /* Make sure there are no excess parameters */ + if(strtok_r(NULL, "-", saveptr)) + return 1; + + if (n) { + n->cell_id.ab_present = true; + n->cell_id.ab.arfcn = arfcn; + n->cell_id.ab.bsic = bsic; + } + + return 0; +} + +/* This and the following: Add/Remove a BTS as neighbor */ +static int verify_neighbor_bts(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + struct gsm_bts *bts = cmd->node; + const int neigh_bts_nr = atoi(value); + struct gsm_bts *neigh_bts = gsm_bts_num(bts->network, neigh_bts_nr); + + if (!neigh_bts) { + cmd->reply = "Invalid Neighbor BTS number - no such BTS"; + return 1; + } + + return 0; +} + +static int verify_neighbor_bts_add(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return verify_neighbor_bts(cmd, value, _data); +} + +static int set_neighbor_bts_add(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + const int bts_nr = atoi(cmd->value); + int rc; + + struct neighbor n = { + .type = NEIGHBOR_TYPE_BTS_NR, + .bts_nr = bts_nr, + }; + rc = neighbor_ident_add_neighbor(NULL, bts, &n); + if (rc != CMD_SUCCESS) + return CTRL_CMD_ERROR; + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_WO(neighbor_bts_add, "neighbor-bts add"); + +static int verify_neighbor_bts_del(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return verify_neighbor_bts(cmd, value, _data); +} + +static int set_neighbor_bts_del(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + const int bts_nr = atoi(cmd->value); + int rc; + + struct neighbor n = { + .type = NEIGHBOR_TYPE_BTS_NR, + .bts_nr = bts_nr, + }; + rc = neighbor_ident_del_neighbor(NULL, bts, &n); + if (rc != CMD_SUCCESS) + return CTRL_CMD_ERROR; + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_WO(neighbor_bts_del, "neighbor-bts del"); + + +/* This and the following: Add/Remove a LAC as neighbor */ +static int parse_lac(void *ctx, struct neighbor *n, const char *value) +{ + char *tmp = NULL, *tok, *saveptr; + int rc = 0; + int lac; + + if (n) + memset(n, 0, sizeof(*n)); + + tmp = talloc_strdup(ctx, value); + if (!tmp) + return 1; + + /* Parse LAC */ + tok = strtok_r(tmp, "-", &saveptr); + if (tok) { + if (osmo_str_to_int(&lac, tok, 10, 0, 65535) < 0) { + rc = 1; + goto exit; + } + } else { + rc = 1; + goto exit; + } + + /* Optional parameters: ARFCN and BSIC */ + if(continue_parse_arfcn_and_bsic(&saveptr, n)) { + rc = 1; + goto exit; + } + + if (n) { + n->type = NEIGHBOR_TYPE_CELL_ID; + n->cell_id.id.id_discr = CELL_IDENT_LAC; + n->cell_id.id.id.lac = lac; + } + +exit: + talloc_free(tmp); + return rc; +} + +static int verify_neighbor_lac_add(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return parse_lac(cmd, NULL, value); +} + +static int set_neighbor_lac_add(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + int rc; + + struct neighbor n; + + parse_lac(cmd, &n, cmd->value); + rc = neighbor_ident_add_neighbor(NULL, bts, &n); + if (rc != CMD_SUCCESS) + return CTRL_CMD_ERROR; + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_WO(neighbor_lac_add, "neighbor-lac add"); + +static int verify_neighbor_lac_del(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return parse_lac(cmd, NULL, value); +} + +static int set_neighbor_lac_del(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + int rc; + + struct neighbor n; + parse_lac(cmd, &n, cmd->value); + rc = neighbor_ident_del_neighbor(NULL, bts, &n); + if (rc != CMD_SUCCESS) + return CTRL_CMD_ERROR; + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_WO(neighbor_lac_del, "neighbor-lac del"); + + +/* This and the following: Add/Remove a LAC-CI as neighbor */ +static int parse_lac_ci(void *ctx, struct neighbor *n, const char *value) +{ + char *tmp = NULL, *tok, *saveptr; + int rc = 0; + int lac; + int ci; + + if (n) + memset(n, 0, sizeof(*n)); + + tmp = talloc_strdup(ctx, value); + if (!tmp) + return 1; + + /* Parse LAC */ + tok = strtok_r(tmp, "-", &saveptr); + if (tok) { + if (osmo_str_to_int(&lac, tok, 10, 0, 65535) < 0) { + rc = 1; + goto exit; + } + } else { + rc = 1; + goto exit; + } + + /* Parse CI */ + tok = strtok_r(NULL, "-", &saveptr); + if (tok) { + if (osmo_str_to_int(&ci, tok, 10, 0, 65535) < 0) { + rc = 1; + goto exit; + } + } else { + rc = 1; + goto exit; + } + + /* Optional parameters: ARFCN and BSIC */ + if(continue_parse_arfcn_and_bsic(&saveptr, n)) { + rc = 1; + goto exit; + } + + if (n) { + n->type = NEIGHBOR_TYPE_CELL_ID; + n->cell_id.id.id_discr = CELL_IDENT_LAC_AND_CI; + n->cell_id.id.id.lac = lac; + n->cell_id.id.id.ci = ci; + } + +exit: + talloc_free(tmp); + return rc; +} + +static int verify_neighbor_lac_ci_add(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return parse_lac_ci(cmd, NULL, value); +} + +static int set_neighbor_lac_ci_add(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + int rc; + + struct neighbor n; + + parse_lac_ci(cmd, &n, cmd->value); + rc = neighbor_ident_add_neighbor(NULL, bts, &n); + if (rc != CMD_SUCCESS) + return CTRL_CMD_ERROR; + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_WO(neighbor_lac_ci_add, "neighbor-lac-ci add"); + +static int verify_neighbor_lac_ci_del(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return parse_lac_ci(cmd, NULL, value); +} + +static int set_neighbor_lac_ci_del(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + int rc; + + struct neighbor n; + parse_lac_ci(cmd, &n, cmd->value); + rc = neighbor_ident_del_neighbor(NULL, bts, &n); + if (rc != CMD_SUCCESS) + return CTRL_CMD_ERROR; + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_WO(neighbor_lac_ci_del, "neighbor-lac-ci del"); + + +/* This and the following: Add/Remove a CGI as neighbor */ +static int parse_cgi(void *ctx, struct neighbor *n, const char *value) +{ + char *tmp = NULL, *tok, *saveptr; + int rc = 0; + uint16_t mcc; + uint16_t mnc; + bool mnc_3_digits; + int lac; + int ci; + + if (n) + memset(n, 0, sizeof(*n)); + + tmp = talloc_strdup(ctx, value); + if (!tmp) + return 1; + + /* Parse MCC */ + tok = strtok_r(tmp, "-", &saveptr); + if (tok) { + if (osmo_mcc_from_str(tok, &mcc)) { + rc = 1; + goto exit; + } + } else { + rc = 1; + goto exit; + } + + /* Parse MNC */ + tok = strtok_r(NULL, "-", &saveptr); + if (tok) { + if (osmo_mnc_from_str(tok, &mnc, &mnc_3_digits)) { + rc = 1; + goto exit; + } + } else { + rc = 1; + goto exit; + } + + /* Parse LAC */ + tok = strtok_r(NULL, "-", &saveptr); + if (tok) { + if (osmo_str_to_int(&lac, tok, 10, 0, 65535) < 0) { + rc = 1; + goto exit; + } + } else { + rc = 1; + goto exit; + } + + /* Parse CI */ + tok = strtok_r(NULL, "-", &saveptr); + if (tok) { + if (osmo_str_to_int(&ci, tok, 10, 0, 65535) < 0) { + rc = 1; + goto exit; + } + } else { + rc = 1; + goto exit; + } + + /* Optional parameters: ARFCN and BSIC */ + if(continue_parse_arfcn_and_bsic(&saveptr, n)) { + rc = 1; + goto exit; + } + + if (n) { + n->type = NEIGHBOR_TYPE_CELL_ID; + n->cell_id.id.id_discr = CELL_IDENT_WHOLE_GLOBAL; + n->cell_id.id.id.global.lai.lac = lac; + n->cell_id.id.id.global.lai.plmn.mcc = mcc; + n->cell_id.id.id.global.lai.plmn.mnc = mnc; + n->cell_id.id.id.global.lai.plmn.mnc_3_digits = mnc_3_digits; + n->cell_id.id.id.global.cell_identity = ci; + } + +exit: + talloc_free(tmp); + return rc; +} + +static int verify_neighbor_cgi_add(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return parse_cgi(cmd, NULL, value); +} + +static int set_neighbor_cgi_add(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + int rc; + + struct neighbor n; + + parse_cgi(cmd, &n, cmd->value); + rc = neighbor_ident_add_neighbor(NULL, bts, &n); + if (rc != CMD_SUCCESS) + return CTRL_CMD_ERROR; + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_WO(neighbor_cgi_add, "neighbor-cgi add"); + +static int verify_neighbor_cgi_del(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return parse_cgi(cmd, NULL, value); +} + +static int set_neighbor_cgi_del(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + int rc; + + struct neighbor n; + parse_cgi(cmd, &n, cmd->value); + rc = neighbor_ident_del_neighbor(NULL, bts, &n); + if (rc != CMD_SUCCESS) + return CTRL_CMD_ERROR; + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_WO(neighbor_cgi_del, "neighbor-cgi del"); + + +/* This and the following: Add/Remove a CGI-PS as neighbor */ +static int parse_cgi_ps(void *ctx, struct neighbor *n, const char *value) +{ + char *tmp = NULL, *tok, *saveptr; + int rc = 0; + uint16_t mcc; + uint16_t mnc; + bool mnc_3_digits; + int lac; + int rac; + int ci; + + if (n) + memset(n, 0, sizeof(*n)); + + tmp = talloc_strdup(ctx, value); + if (!tmp) + return 1; + + /* Parse MCC */ + tok = strtok_r(tmp, "-", &saveptr); + if (tok) { + if (osmo_mcc_from_str(tok, &mcc)) { + rc = 1; + goto exit; + } + } else { + rc = 1; + goto exit; + } + + /* Parse MNC */ + tok = strtok_r(NULL, "-", &saveptr); + if (tok) { + if (osmo_mnc_from_str(tok, &mnc, &mnc_3_digits)) { + rc = 1; + goto exit; + } + } else { + rc = 1; + goto exit; + } + + /* Parse LAC */ + tok = strtok_r(NULL, "-", &saveptr); + if (tok) { + if (osmo_str_to_int(&lac, tok, 10, 0, 65535) < 0) { + rc = 1; + goto exit; + } + } else { + rc = 1; + goto exit; + } + + /* Parse RAC */ + tok = strtok_r(NULL, "-", &saveptr); + if (tok) { + if (osmo_str_to_int(&rac, tok, 10, 0, 255) < 0) { + rc = 1; + goto exit; + } + } else { + rc = 1; + goto exit; + } + + /* Parse CI */ + tok = strtok_r(NULL, "-", &saveptr); + if (tok) { + if (osmo_str_to_int(&ci, tok, 10, 0, 65535) < 0) { + rc = 1; + goto exit; + } + } else { + rc = 1; + goto exit; + } + + /* Optional parameters: ARFCN and BSIC */ + if(continue_parse_arfcn_and_bsic(&saveptr, n)) { + rc = 1; + goto exit; + } + + if (n) { + n->type = NEIGHBOR_TYPE_CELL_ID; + n->cell_id.id.id_discr = CELL_IDENT_WHOLE_GLOBAL_PS; + n->cell_id.id.id.global_ps.rai.lac.lac = lac; + n->cell_id.id.id.global_ps.rai.rac = lac; + n->cell_id.id.id.global_ps.rai.lac.plmn.mcc = mcc; + n->cell_id.id.id.global_ps.rai.lac.plmn.mnc = mnc; + n->cell_id.id.id.global_ps.rai.lac.plmn.mnc_3_digits = mnc_3_digits; + n->cell_id.id.id.global_ps.cell_identity = ci; + } + +exit: + talloc_free(tmp); + return rc; +} + +static int verify_neighbor_cgi_ps_add(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return parse_cgi_ps(cmd, NULL, value); +} + +static int set_neighbor_cgi_ps_add(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + int rc; + + struct neighbor n; + + parse_cgi_ps(cmd, &n, cmd->value); + rc = neighbor_ident_add_neighbor(NULL, bts, &n); + if (rc != CMD_SUCCESS) + return CTRL_CMD_ERROR; + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_WO(neighbor_cgi_ps_add, "neighbor-cgi-ps add"); + +static int verify_neighbor_cgi_ps_del(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return parse_cgi_ps(cmd, NULL, value); +} + +static int set_neighbor_cgi_ps_del(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + int rc; + + struct neighbor n; + parse_cgi_ps(cmd, &n, cmd->value); + rc = neighbor_ident_del_neighbor(NULL, bts, &n); + if (rc != CMD_SUCCESS) + return CTRL_CMD_ERROR; + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_WO(neighbor_cgi_ps_del, "neighbor-cgi-ps del"); + + +/* This and the following: clear all neighbor cell information */ +static int set_neighbor_clear(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + struct neighbor *neighbor; + struct neighbor *neighbor_tmp; + + llist_for_each_entry_safe(neighbor, neighbor_tmp, &bts->neighbors, entry) { + llist_del(&neighbor->entry); + talloc_free(neighbor); + } + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_WO_NOVRF(neighbor_clear, "neighbor-clear"); + + +/* Register control interface commands implemented above */ +int neighbor_ident_ctrl_init(void) +{ + int rc = 0; + + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_neighbor_bts_add); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_neighbor_bts_del); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_neighbor_lac_add); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_neighbor_lac_del); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_neighbor_lac_ci_add); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_neighbor_lac_ci_del); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_neighbor_cgi_add); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_neighbor_cgi_del); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_neighbor_cgi_ps_add); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_neighbor_cgi_ps_del); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_neighbor_clear); + + return rc; +} diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c index b500b34..9630b10 100644 --- a/src/osmo-bsc/neighbor_ident_vty.c +++ b/src/osmo-bsc/neighbor_ident_vty.c @@ -146,23 +146,32 @@ }; } -static int add_neighbor(struct vty *vty, struct neighbor *n) +#define LOGPORVTY(vty, fmt, args...) \ +{ \ + if (vty) \ + vty_out(vty, "%% " fmt "%s", ## args, VTY_NEWLINE); \ + else \ + LOGP(DLINP, LOGL_NOTICE, fmt "\n", ## args); \ +} while(0) \ + +/* Delete a neighbor from neighborlist. When the parameter *vty is set to NULL all error messages are redirected to the + * logtext. */ +int neighbor_ident_add_neighbor(struct vty *vty, struct gsm_bts *bts, struct neighbor *n) { - struct gsm_bts *bts = vty->index; struct neighbor *neighbor; - OSMO_ASSERT((vty->node == BTS_NODE) && bts); + OSMO_ASSERT(bts); + OSMO_ASSERT(!vty || (vty->node == BTS_NODE)); llist_for_each_entry(neighbor, &bts->neighbors, entry) { /* Check against duplicates */ if (neighbor_same(neighbor, n, false)) { /* Found a match on Cell ID or BTS number, without ARFCN+BSIC. If they are fully identical, ignore the * duplicate. If the ARFCN+BSIC part differs, it's an error. */ - vty_out(vty, "%% BTS %u already had neighbor %s%s", bts->nr, neighbor_to_str_c(OTC_SELECT, neighbor), - VTY_NEWLINE); + LOGPORVTY(vty, "BTS %u already had neighbor %s", bts->nr, neighbor_to_str_c(OTC_SELECT, neighbor)); if (!neighbor_same(neighbor, n, true)) { - vty_out(vty, "%% ERROR: duplicate Cell ID in neighbor config, with differing ARFCN+BSIC: %s%s", - neighbor_to_str_c(OTC_SELECT, n), VTY_NEWLINE); + LOGPORVTY(vty, "ERROR: duplicate Cell ID in neighbor config, with differing ARFCN+BSIC: %s", + neighbor_to_str_c(OTC_SELECT, n)); return CMD_WARNING; } /* Exact same neighbor again, just ignore. */ @@ -173,9 +182,9 @@ if (n->type == NEIGHBOR_TYPE_CELL_ID && n->cell_id.ab_present && neighbor->cell_id.ab_present && cell_ab_match(&n->cell_id.ab, &neighbor->cell_id.ab, true)) { - vty_out(vty, "%% Error: only one Cell Identifier entry is allowed per remote neighbor." - " Already have: BTS %u -> %s%s", bts->nr, - neighbor_to_str_c(OTC_SELECT, neighbor), VTY_NEWLINE); + LOGPORVTY(vty, "Error: only one Cell Identifier entry is allowed per remote neighbor." + " Already have: BTS %u -> %s", bts->nr, + neighbor_to_str_c(OTC_SELECT, neighbor)); return CMD_WARNING; } } @@ -186,12 +195,14 @@ return CMD_SUCCESS; } -static int del_neighbor(struct vty *vty, struct neighbor *n) +/* Delete a neighbor from neighborlist. When the parameter *vty is set to NULL all error messages are redirected to the + * logtext. */ +int neighbor_ident_del_neighbor(struct vty *vty, struct gsm_bts *bts, struct neighbor *n) { - struct gsm_bts *bts = vty->index; struct neighbor *neighbor; - OSMO_ASSERT((vty->node == BTS_NODE) && bts); + OSMO_ASSERT(bts); + OSMO_ASSERT(!vty || (vty->node == BTS_NODE)); llist_for_each_entry(neighbor, &bts->neighbors, entry) { if (neighbor->type != n->type) @@ -216,8 +227,8 @@ return CMD_SUCCESS; } - vty_out(vty, "%% Error: no such neighbor on BTS %d: %s%s", - bts->nr, neighbor_to_str_c(OTC_SELECT, n), VTY_NEWLINE); + LOGPORVTY(vty, "%% Error: no such neighbor on BTS %d: %s", + bts->nr, neighbor_to_str_c(OTC_SELECT, n)); return CMD_WARNING; } @@ -271,7 +282,7 @@ .type = NEIGHBOR_TYPE_BTS_NR, .bts_nr = atoi(argv[0]), }; - return add_neighbor(vty, &n); + return neighbor_ident_add_neighbor(vty, vty->index, &n); } DEFUN(cfg_neighbor_add_lac, cfg_neighbor_add_lac_cmd, @@ -283,7 +294,7 @@ }; if (neighbor_ident_vty_parse_lac(vty, &n.cell_id.id, argv)) return CMD_WARNING; - return add_neighbor(vty, &n); + return neighbor_ident_add_neighbor(vty, vty->index, &n); } DEFUN(cfg_neighbor_add_lac_ci, cfg_neighbor_add_lac_ci_cmd, @@ -295,7 +306,7 @@ }; if (neighbor_ident_vty_parse_lac_ci(vty, &n.cell_id.id, argv)) return CMD_WARNING; - return add_neighbor(vty, &n); + return neighbor_ident_add_neighbor(vty, vty->index, &n); } DEFUN(cfg_neighbor_add_cgi, cfg_neighbor_add_cgi_cmd, @@ -307,7 +318,7 @@ }; if (neighbor_ident_vty_parse_cgi(vty, &n.cell_id.id, argv)) return CMD_WARNING; - return add_neighbor(vty, &n); + return neighbor_ident_add_neighbor(vty, vty->index, &n); } DEFUN(cfg_neighbor_add_cgi_ps, cfg_neighbor_add_cgi_ps_cmd, @@ -319,7 +330,7 @@ }; if (neighbor_ident_vty_parse_cgi_ps(vty, &n.cell_id.id, argv)) return CMD_WARNING; - return add_neighbor(vty, &n); + return neighbor_ident_add_neighbor(vty, vty->index, &n); } static int neighbor_del_all(struct vty *vty) @@ -354,7 +365,7 @@ if (neighbor_ident_vty_parse_lac(vty, &n.cell_id.id, argv)) return CMD_WARNING; neighbor_ident_vty_parse_arfcn_bsic(&n.cell_id.ab, argv + LAC_ARGC); - return add_neighbor(vty, &n); + return neighbor_ident_add_neighbor(vty, vty->index, &n); } DEFUN(cfg_neighbor_add_lac_ci_arfcn_bsic, cfg_neighbor_add_lac_ci_arfcn_bsic_cmd, @@ -368,7 +379,7 @@ if (neighbor_ident_vty_parse_lac_ci(vty, &n.cell_id.id, argv)) return CMD_WARNING; neighbor_ident_vty_parse_arfcn_bsic(&n.cell_id.ab, argv + LAC_CI_ARGC); - return add_neighbor(vty, &n); + return neighbor_ident_add_neighbor(vty, vty->index, &n); } DEFUN(cfg_neighbor_add_cgi_arfcn_bsic, cfg_neighbor_add_cgi_arfcn_bsic_cmd, @@ -382,7 +393,7 @@ if (neighbor_ident_vty_parse_cgi(vty, &n.cell_id.id, argv)) return CMD_WARNING; neighbor_ident_vty_parse_arfcn_bsic(&n.cell_id.ab, argv + CGI_ARGC); - return add_neighbor(vty, &n); + return neighbor_ident_add_neighbor(vty, vty->index, &n); } DEFUN(cfg_neighbor_add_cgi_ps_arfcn_bsic, cfg_neighbor_add_cgi_ps_arfcn_bsic_cmd, @@ -396,7 +407,7 @@ if (neighbor_ident_vty_parse_cgi_ps(vty, &n.cell_id.id, argv)) return CMD_WARNING; neighbor_ident_vty_parse_arfcn_bsic(&n.cell_id.ab, argv + CGI_PS_ARGC); - return add_neighbor(vty, &n); + return neighbor_ident_add_neighbor(vty, vty->index, &n); } DEFUN(cfg_neighbor_del_bts_nr, cfg_neighbor_del_bts_nr_cmd, @@ -407,7 +418,7 @@ .type = NEIGHBOR_TYPE_BTS_NR, .bts_nr = atoi(argv[0]), }; - return del_neighbor(vty, &n); + return neighbor_ident_del_neighbor(vty, vty->index, &n); } DEFUN(cfg_neighbor_del_lac, cfg_neighbor_del_lac_cmd, @@ -419,7 +430,7 @@ }; if (neighbor_ident_vty_parse_lac(vty, &n.cell_id.id, argv)) return CMD_WARNING; - return del_neighbor(vty, &n); + return neighbor_ident_del_neighbor(vty, vty->index, &n); } DEFUN(cfg_neighbor_del_lac_ci, cfg_neighbor_del_lac_ci_cmd, @@ -431,7 +442,7 @@ }; if (neighbor_ident_vty_parse_lac_ci(vty, &n.cell_id.id, argv)) return CMD_WARNING; - return del_neighbor(vty, &n); + return neighbor_ident_del_neighbor(vty, vty->index, &n); } DEFUN(cfg_neighbor_del_cgi, cfg_neighbor_del_cgi_cmd, @@ -443,7 +454,7 @@ }; if (neighbor_ident_vty_parse_cgi(vty, &n.cell_id.id, argv)) return CMD_WARNING; - return del_neighbor(vty, &n); + return neighbor_ident_del_neighbor(vty, vty->index, &n); } DEFUN(cfg_neighbor_del_cgi_ps, cfg_neighbor_del_cgi_ps_cmd, @@ -455,7 +466,7 @@ }; if (neighbor_ident_vty_parse_cgi_ps(vty, &n.cell_id.id, argv)) return CMD_WARNING; - return del_neighbor(vty, &n); + return neighbor_ident_del_neighbor(vty, vty->index, &n); } DEFUN(cfg_neighbor_del_arfcn_bsic, cfg_neighbor_del_arfcn_bsic_cmd, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I343a40e18fa9b91e6c381912c0426a002841e079 Gerrit-Change-Number: 25976 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 09:12:12 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 27 Oct 2021 09:12:12 +0000 Subject: Change in osmo-bsc[master]: neighbor_ident: add comment about Neighbor Address Resolution Service References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25977 ) Change subject: neighbor_ident: add comment about Neighbor Address Resolution Service ...................................................................... neighbor_ident: add comment about Neighbor Address Resolution Service The Neighbor Address Resolution Service is using the control interface API as well. Lets add a comment to indicate that this service is not related to the normal control interface. Change-Id: Iec86f72548bfc54a2c86dadec69dd1c64813d852 --- M src/osmo-bsc/neighbor_ident.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/77/25977/1 diff --git a/src/osmo-bsc/neighbor_ident.c b/src/osmo-bsc/neighbor_ident.c index c66d3ac..44b0b43 100644 --- a/src/osmo-bsc/neighbor_ident.c +++ b/src/osmo-bsc/neighbor_ident.c @@ -489,6 +489,7 @@ struct ctrl_handle *neighbor_controlif_setup(struct gsm_network *net) { + /* See also osmobsc-usermanual.pdf, section 14.1 Neighbor Address Resolution Service */ return ctrl_interface_setup_dynip2(net, net->neigh_ctrl.addr, net->neigh_ctrl.port, NULL, _LAST_CTRL_NODE_NEIGHBOR); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iec86f72548bfc54a2c86dadec69dd1c64813d852 Gerrit-Change-Number: 25977 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 09:21:07 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 27 Oct 2021 09:21:07 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25829 ) Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... Patch Set 2: > Patch Set 1: > > NOTE: It's implemented as a set command, This patch wants to implement it as a get command. This is an interesting question. I find this also irritating. The control interface API seems to lack an appropriate abstraction of commands that execute an action. This command here is neither a get or a set command. In any case, I think my implementation is correct, the user manual already mentions some commands that take no parameters. They are WO commands and the value column simply says "Ignored", so I think that this is the right way to use the control interface in this situation. See https://ftp.osmocom.org/docs/latest/osmobsc-usermanual.pdf "bts.N.apply-configuration" for example. I also think that using a get command here would be even more confusing since there is nothing to get... (also I forgot to update the manual with this command...) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Comment-Date: Wed, 27 Oct 2021 09:21:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 09:29:05 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 27 Oct 2021 09:29:05 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25829 ) Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... Patch Set 2: > Patch Set 2: > > > Patch Set 1: > > > > NOTE: It's implemented as a set command, This patch wants to implement it as a get command. > > This is an interesting question. I find this also irritating. The control interface API seems to lack an appropriate abstraction of commands that execute an action. This command here is neither a get or a set command. > > In any case, I think my implementation is correct, the user manual already mentions some commands that take no parameters. They are WO commands and the value column simply says "Ignored", so I think that this is the right way to use the control interface in this situation. > > See https://ftp.osmocom.org/docs/latest/osmobsc-usermanual.pdf "bts.N.apply-configuration" for example. > > I also think that using a get command here would be even more confusing since there is nothing to get... > > (also I forgot to update the manual with this command...) Its actually the other way around - how confusing ;-) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Comment-Date: Wed, 27 Oct 2021 09:29:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 09:55:34 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 27 Oct 2021 09:55:34 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, keith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 to look at the new patch set (#3). Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... bsc_ctrl_commands: add ctrl command to resend system information The system information can be modified via the ctrl interface, but there is no way to resend it to the BTS afterwards. At the moment it is only possible to resend the system information via VTY. Lets add a control command that does the same via the control interface. Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Related: SYS#5641 --- M doc/manuals/chapters/control.adoc M src/osmo-bsc/bsc_ctrl_commands.c 2 files changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/29/25829/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 10:03:49 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 27 Oct 2021 10:03:49 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25829 ) Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... Patch Set 3: Ok, I hope now everything is resolved now. Please have another look. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Comment-Date: Wed, 27 Oct 2021 10:03:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:02:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 27 Oct 2021 12:02:05 +0000 Subject: Change in libosmo-sccp[master]: sccp: Add minimalistic support for XUDT / XUDTS In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 ) Change subject: sccp: Add minimalistic support for XUDT / XUDTS ...................................................................... sccp: Add minimalistic support for XUDT / XUDTS XUDT and XUDTS can be used in two situations: a) because the sender wants to use segmentation b) because the sender wants to include a hop counter In this patch, we implement support for case "b" only. Change-Id: Ic5b9486f1aeb4bb90cfe702a7ce996f5d82ded2c Related: OS#5281, SYS#5674 --- M include/osmocom/sccp/sccp_types.h M src/sccp2sua.c 2 files changed, 110 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/sccp/sccp_types.h b/include/osmocom/sccp/sccp_types.h index 616a7ee..4ad7edf 100644 --- a/include/osmocom/sccp/sccp_types.h +++ b/include/osmocom/sccp/sccp_types.h @@ -446,6 +446,9 @@ data #endif + /* optional */ + uint8_t optional_start; + #if OPTIONAL segmentation importance @@ -475,6 +478,9 @@ data #endif + /* optional */ + uint8_t optional_start; + #if OPTIONAL segmentation importancd diff --git a/src/sccp2sua.c b/src/sccp2sua.c index c937231..51fe00b 100644 --- a/src/sccp2sua.c +++ b/src/sccp2sua.c @@ -1200,9 +1200,16 @@ } +static int sua_to_sccp_xudt(struct msgb *msg, struct xua_msg *xua); + static int sua_to_sccp_udt(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_unitdata *udt; + + /* Use XUDT if we have a hop counter on the SUA side */ + if (xua_msg_find_tag(xua, SUA_IEI_S7_HOP_CTR)) + return sua_to_sccp_xudt(msg, xua); + udt = (struct sccp_data_unitdata *) msgb_put(msg, sizeof(*udt)); /* Fixed Part */ @@ -1216,6 +1223,46 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ +static struct xua_msg *sccp_to_xua_xudt(struct msgb *msg, struct xua_msg *xua) +{ + struct sccp_data_ext_unitdata *xudt = (struct sccp_data_ext_unitdata *)msg->l2h; + + /* Fixed Part */ + xua_msg_add_u32(xua, SUA_IEI_PROTO_CLASS, xudt->proto_class); + xua_msg_add_u32(xua, SUA_IEI_S7_HOP_CTR, xudt->hop_counter); + /* Variable Part */ + if (!sccp_ptr_part_consistent(msg, &xudt->variable_called)) + return NULL; + sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, msg, &xudt->variable_called); + if (!sccp_ptr_part_consistent(msg, &xudt->variable_calling)) + return NULL; + sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, msg, &xudt->variable_calling); + if (!sccp_ptr_part_consistent(msg, &xudt->variable_data)) + return NULL; + sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, msg, &xudt->variable_data); + /* Optional Part */ + return sccp_to_xua_opt(msg, &xudt->optional_start, xua); + +} + +static int sua_to_sccp_xudt(struct msgb *msg, struct xua_msg *xua) +{ + struct sccp_data_ext_unitdata *xudt; + xudt = (struct sccp_data_ext_unitdata *) msgb_put(msg, sizeof(*xudt)); + + /* Fixed Part */ + xudt->type = SCCP_MSG_TYPE_XUDT; + xudt->proto_class = xua_msg_get_u32(xua, SUA_IEI_PROTO_CLASS); + xudt->hop_counter = xua_msg_get_u32(xua, SUA_IEI_S7_HOP_CTR); + /* Variable Part */ + sccp_add_var_addr(msg, &xudt->variable_called, xua, SUA_IEI_DEST_ADDR); + sccp_add_var_addr(msg, &xudt->variable_calling, xua, SUA_IEI_SRC_ADDR); + sccp_add_variable_part(msg, &xudt->variable_data, xua, SUA_IEI_DATA); + /* Optional Part */ + return xua_ies_to_sccp_opts(msg, &xudt->optional_start, xudt->type, xua); +} + +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_udts(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_unitdata_service *udts; @@ -1237,9 +1284,16 @@ } +static int sua_to_sccp_xudts(struct msgb *msg, struct xua_msg *xua); + static int sua_to_sccp_udts(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_unitdata_service *udts; + + /* Use XUDTS if we have a hop counter */ + if (xua_msg_find_tag(xua, SUA_IEI_S7_HOP_CTR)) + return sua_to_sccp_xudts(msg, xua); + udts = (struct sccp_data_unitdata_service *) msgb_put(msg, sizeof(*udts)); /* Fixed Part */ @@ -1253,6 +1307,46 @@ } /*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ +static struct xua_msg *sccp_to_xua_xudts(struct msgb *msg, struct xua_msg *xua) +{ + struct sccp_data_ext_unitdata_service *xudts; + xudts = (struct sccp_data_ext_unitdata_service *)msg->l2h; + + /* Fixed Part */ + xua_msg_add_u32(xua, SUA_IEI_CAUSE, SUA_CAUSE_T_RETURN | xudts->return_cause); + xua_msg_add_u32(xua, SUA_IEI_S7_HOP_CTR, xudts->hop_counter); + /* Variable Part */ + if (!sccp_ptr_part_consistent(msg, &xudts->variable_called)) + return NULL; + sccp_addr_to_sua_ptr(xua, SUA_IEI_DEST_ADDR, msg, &xudts->variable_called); + if (!sccp_ptr_part_consistent(msg, &xudts->variable_calling)) + return NULL; + sccp_addr_to_sua_ptr(xua, SUA_IEI_SRC_ADDR, msg, &xudts->variable_calling); + if (!sccp_ptr_part_consistent(msg, &xudts->variable_data)) + return NULL; + sccp_data_to_sua_ptr(xua, SUA_IEI_DATA, msg, &xudts->variable_data); + /* Optional Part */ + return sccp_to_xua_opt(msg, &xudts->optional_start, xua); +} + +static int sua_to_sccp_xudts(struct msgb *msg, struct xua_msg *xua) +{ + struct sccp_data_ext_unitdata_service *xudts; + xudts = (struct sccp_data_ext_unitdata_service *) msgb_put(msg, sizeof(*xudts)); + + /* Fixed Part */ + xudts->type = SCCP_MSG_TYPE_XUDTS; + xudts->return_cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE) & 0xff; + xudts->hop_counter = xua_msg_get_u32(xua, SUA_IEI_S7_HOP_CTR); + /* Variable Part */ + sccp_add_var_addr(msg, &xudts->variable_called, xua, SUA_IEI_DEST_ADDR); + sccp_add_var_addr(msg, &xudts->variable_calling, xua, SUA_IEI_SRC_ADDR); + sccp_add_variable_part(msg, &xudts->variable_data, xua, SUA_IEI_DATA); + /* Optional Part */ + return xua_ies_to_sccp_opts(msg, &xudts->optional_start, xudts->type, xua); +} + +/*! \returns \ref xua in case of success, NULL on error (xua not freed!) */ static struct xua_msg *sccp_to_xua_it(struct msgb *msg, struct xua_msg *xua) { struct sccp_data_it *it = (struct sccp_data_it *)msg->l2h; @@ -1376,6 +1470,16 @@ if (!sccp_to_xua_err(msg, xua)) goto malformed; return xua; + case SCCP_MSG_TYPE_XUDT: + xua->hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDT); + if (!sccp_to_xua_xudt(msg, xua)) + goto malformed; + return xua; + case SCCP_MSG_TYPE_XUDTS: + xua->hdr = XUA_HDR(SUA_MSGC_CL, SUA_CL_CLDR); + if (!sccp_to_xua_xudts(msg, xua)) + goto malformed; + return xua; /* Unsupported Message Types */ case SCCP_MSG_TYPE_DT2: case SCCP_MSG_TYPE_AK: @@ -1383,8 +1487,6 @@ case SCCP_MSG_TYPE_EA: case SCCP_MSG_TYPE_RSR: case SCCP_MSG_TYPE_RSC: - case SCCP_MSG_TYPE_XUDT: - case SCCP_MSG_TYPE_XUDTS: case SCCP_MSG_TYPE_LUDT: case SCCP_MSG_TYPE_LUDTS: LOGP(DLSUA, LOGL_ERROR, "Unsupported SCCP message %s\n", -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/25962 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic5b9486f1aeb4bb90cfe702a7ce996f5d82ded2c Gerrit-Change-Number: 25962 Gerrit-PatchSet: 3 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:02:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 27 Oct 2021 12:02:37 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20296 ) Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... Patch Set 16: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 16 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 12:02:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:02:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 27 Oct 2021 12:02:44 +0000 Subject: Change in libosmocore[master]: logging: Avoid memcpy from stack to msgb in _file_output() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20305 ) Change subject: logging: Avoid memcpy from stack to msgb in _file_output() ...................................................................... Patch Set 13: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 Gerrit-Change-Number: 20305 Gerrit-PatchSet: 13 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 12:02:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:02:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 27 Oct 2021 12:02:48 +0000 Subject: Change in libosmocore[master]: logging: Attempt a synchronous, non-blocking write first (file, stderr) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20317 ) Change subject: logging: Attempt a synchronous, non-blocking write first (file, stderr) ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I08469a7e4be9bc5bbd39140457bb582f4a0b1703 Gerrit-Change-Number: 20317 Gerrit-PatchSet: 11 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 12:02:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:02:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 27 Oct 2021 12:02:50 +0000 Subject: Change in libosmocore[master]: logging: Change stderr + file target to use non-blocking write In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20296 ) Change subject: logging: Change stderr + file target to use non-blocking write ...................................................................... logging: Change stderr + file target to use non-blocking write So far, we used blocking, buffered fwrite() to write to stderr and file targets. This causes problems if there are [slow] consumers causing delays, such as gnome-terminal (when the program is started interactively) or systemd/journald (where we observe 64..128ms blocks on stderr). This patch introduces stderr/file based logging via write_queue and osmo_select_main(), i.e. switch from glibc-buffered, blocking to internally buffered, non-blocking writes. * when osmo_stderr_target is created via application.c, we create it in blocking stream mode for backwards compatibility, particularly for [smaller] programs that don't use osmo_select_main() * when the VTY code encounters 'log stderr' or 'log file FILENAME', we switch that respective target to non-blocking write-queue mode, as this means the application is in fact using osmo_select_main() * The config file can now state 'log stderr blocking-io' or 'log file FILENAME blocking-io' to explicitly enforce using blocking stream based I/O * The application can at any time use API functions to switch either way Closes: OS#4311 Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da --- M include/osmocom/core/logging.h M src/logging.c M src/vty/logging_vty.c M tests/logging/logging_vty_test.c 4 files changed, 313 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 343f976..a554adc 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -297,8 +297,11 @@ union { struct { + /* direct, blocking output via stdio */ FILE *out; const char *fname; + /* indirect output via write_queue and osmo_select_main() */ + struct osmo_wqueue *wqueue; } tgt_file; struct { @@ -408,6 +411,8 @@ struct log_target *log_target_create_systemd(bool raw); void log_target_systemd_set_raw(struct log_target *target, bool raw); int log_target_file_reopen(struct log_target *tgt); +int log_target_file_switch_to_stream(struct log_target *tgt); +int log_target_file_switch_to_wqueue(struct log_target *tgt); int log_targets_reopen(void); void log_add_target(struct log_target *target); diff --git a/src/logging.c b/src/logging.c index 1d139d5..5c6b993 100644 --- a/src/logging.c +++ b/src/logging.c @@ -35,6 +35,7 @@ #include #include #include +#include #ifdef HAVE_STRINGS_H #include @@ -57,6 +58,9 @@ #include #include +#include +#include +#include #include #include @@ -65,12 +69,17 @@ #include #include #include +#include +#include #include /* for LOGGING_STR. */ /* maximum length of the log string of a single log event (typically line) */ #define MAX_LOG_SIZE 4096 +/* maximum number of log statements we queue in file/stderr target write queue */ +#define LOG_WQUEUE_LEN 1024 + osmo_static_assert(_LOG_CTX_COUNT <= ARRAY_SIZE(((struct log_context*)NULL)->ctx), enum_logging_ctx_items_fit_in_struct_log_context); osmo_static_assert(_LOG_FLT_COUNT <= ARRAY_SIZE(((struct log_target*)NULL)->filter_data), @@ -904,11 +913,32 @@ } #if (!EMBEDDED) +static void _file_output_stream(struct log_target *target, unsigned int level, + const char *log) +{ + OSMO_ASSERT(target->tgt_file.out); + fputs(log, target->tgt_file.out); + fflush(target->tgt_file.out); +} + +/* output via non-blocking write_queue, doing internal buffering */ static void _file_output(struct log_target *target, unsigned int level, const char *log) { - fprintf(target->tgt_file.out, "%s", log); - fflush(target->tgt_file.out); + int len = strlen(log); + struct msgb *msg; + + OSMO_ASSERT(target->tgt_file.wqueue); + msg = msgb_alloc_c(target->tgt_file.wqueue, len, "log_file_msg"); + if (!msg) + return; + + /* we simply enqueue the log message to a write queue here, to avoid any blocking + * writes on the output file. The write queue will tell us once the file is writable + * and call _file_wq_write_cb() */ + memcpy(msg->data, log, len); + msgb_put(msg, len); + osmo_wqueue_enqueue_quiet(target->tgt_file.wqueue, msg); } #endif @@ -972,7 +1002,7 @@ target->type = LOG_TGT_TYPE_STDERR; target->tgt_file.out = stderr; - target->output = _file_output; + target->output = _file_output_stream; return target; #else return NULL; @@ -980,11 +1010,28 @@ } #if (!EMBEDDED) -/*! Create a new file-based log target +/* write-queue tells us we should write another msgb (log line) to the output fd */ +static int _file_wq_write_cb(struct osmo_fd *ofd, struct msgb *msg) +{ + int rc; + + rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); + if (rc < 0) + return rc; + if (rc != msgb_length(msg)) { + /* pull the number of bytes we have already written */ + msgb_pull(msg, rc); + /* ask write_queue to re-insert the msgb at the head of the queue */ + return -EAGAIN; + } + return 0; +} + +/*! Create a new file-based log target using buffered, blocking stream output * \param[in] fname File name of the new log file * \returns Log target in case of success, NULL otherwise */ -struct log_target *log_target_create_file(const char *fname) +struct log_target *log_target_create_file_stream(const char *fname) { struct log_target *target; @@ -998,9 +1045,193 @@ log_target_destroy(target); return NULL; } + target->output = _file_output_stream; + target->tgt_file.fname = talloc_strdup(target, fname); + return target; +} + +/*! switch from non-blocking/write-queue to blocking + buffered stream output + * \param[in] target log target which we should switch + * \return 0 on success; 1 if already switched before; negative on error */ +int log_target_file_switch_to_stream(struct log_target *target) +{ + struct osmo_wqueue *wq; + const char *name; + + if (!target) + return -ENODEV; + + /* this only works for file/stderr targets */ + switch (target->type) { + case LOG_TGT_TYPE_FILE: + name = target->tgt_file.fname; + break; + case LOG_TGT_TYPE_STDERR: + name = "stderr"; + break; + default: + return -EINVAL; + } + + if (target->tgt_file.out) { + /* target has already been switched over */ + return 1; + } + + LOGP(DLGLOBAL, LOGL_INFO, "Switching log target '%s' to blocking stream I/O\n", name); + + wq = target->tgt_file.wqueue; + OSMO_ASSERT(wq); + + /* re-open output as stream */ + if (target->type == LOG_TGT_TYPE_STDERR) + target->tgt_file.out = stderr; + else + target->tgt_file.out = fopen(target->tgt_file.fname, "a"); + if (!target->tgt_file.out) { + LOGP(DLGLOBAL, LOGL_ERROR, "Cannot open log target '%s' as blocking stream I/O: %s\n", + name, strerror(errno)); + return -EIO; + } + + /* synchronously write anything left in the queue */ + while (!llist_empty(&wq->msg_queue)) { + struct msgb *msg = msgb_dequeue(&wq->msg_queue); + fwrite(msgb_data(msg), msgb_length(msg), 1, target->tgt_file.out); + msgb_free(msg); + } + + /* now that everything succeeded, we can finally close the old output fd */ + if (target->type == LOG_TGT_TYPE_FILE) { + osmo_fd_unregister(&wq->bfd); + close(wq->bfd.fd); + } + + /* release the queue itself */ + talloc_free(wq); + target->tgt_file.wqueue = NULL; + target->output = _file_output_stream; + target->raw_output = NULL; + + return 0; +} + +/*! switch from blocking + buffered file output to non-blocking write-queue based output. + * \param[in] target log target which we should switch + * \return 0 on success; 1 if already switched before; negative on error */ +int log_target_file_switch_to_wqueue(struct log_target *target) +{ + struct osmo_wqueue *wq; + const char *name; + int rc; + + if (!target) + return -ENODEV; + + /* this only works for file/stderr targets */ + switch (target->type) { + case LOG_TGT_TYPE_FILE: + name = target->tgt_file.fname; + break; + case LOG_TGT_TYPE_STDERR: + name = "stderr"; + break; + default: + return -EINVAL; + } + + if (!target->tgt_file.out) { + /* target has already been switched over */ + return 1; + } + + LOGP(DLGLOBAL, LOGL_INFO, "Switching log target '%s' to non-blocking I/O\n", name); + + /* we create a ~640kB sized talloc pool within the write-queue to ensure individual + * log lines (stored as msgbs) will not put result in malloc() calls, and also to + * reduce the OOM probability within logging, as the pool is already allocated */ + wq = talloc_pooled_object(target, struct osmo_wqueue, LOG_WQUEUE_LEN, + LOG_WQUEUE_LEN*(sizeof(struct msgb)+512)); + if (!wq) + return -ENOMEM; + osmo_wqueue_init(wq, LOG_WQUEUE_LEN); + + fflush(target->tgt_file.out); + if (target->type == LOG_TGT_TYPE_FILE) { + rc = open(target->tgt_file.fname, O_WRONLY|O_APPEND|O_CREAT|O_NONBLOCK, 0660); + if (rc < 0) { + LOGP(DLGLOBAL, LOGL_ERROR, "Cannot open log target '%s' as non-blocking I/O: %s\n", + name, strerror(errno)); + talloc_free(wq); + return -errno; + } + } else { + rc = STDERR_FILENO; + } + wq->bfd.fd = rc; + wq->bfd.when = OSMO_FD_WRITE; + wq->write_cb = _file_wq_write_cb; + + rc = osmo_fd_register(&wq->bfd); + if (rc < 0) { + talloc_free(wq); + return -EIO; + } + target->tgt_file.wqueue = wq; target->output = _file_output; + /* now that everything succeeded, we can finally close the old output stream */ + if (target->type == LOG_TGT_TYPE_FILE) + fclose(target->tgt_file.out); + target->tgt_file.out = NULL; + + return 0; +} + +/*! Create a new file-based log target using non-blocking write_queue + * \param[in] fname File name of the new log file + * \returns Log target in case of success, NULL otherwise + */ +struct log_target *log_target_create_file(const char *fname) +{ + struct log_target *target; + struct osmo_wqueue *wq; + int rc; + + target = log_target_create(); + if (!target) + return NULL; + + target->type = LOG_TGT_TYPE_FILE; + /* we create a ~640kB sized talloc pool within the write-queue to ensure individual + * log lines (stored as msgbs) will not put result in malloc() calls, and also to + * reduce the OOM probability within logging, as the pool is already allocated */ + wq = talloc_pooled_object(target, struct osmo_wqueue, LOG_WQUEUE_LEN, + LOG_WQUEUE_LEN*(sizeof(struct msgb)+512)); + if (!wq) { + log_target_destroy(target); + return NULL; + } + osmo_wqueue_init(wq, LOG_WQUEUE_LEN); + wq->bfd.fd = open(fname, O_WRONLY|O_APPEND|O_CREAT|O_NONBLOCK, 0660); + if (wq->bfd.fd < 0) { + talloc_free(wq); + log_target_destroy(target); + return NULL; + } + wq->bfd.when = OSMO_FD_WRITE; + wq->write_cb = _file_wq_write_cb; + + rc = osmo_fd_register(&wq->bfd); + if (rc < 0) { + talloc_free(wq); + log_target_destroy(target); + return NULL; + } + + target->tgt_file.wqueue = wq; + target->output = _file_output; target->tgt_file.fname = talloc_strdup(target, fname); return target; @@ -1040,17 +1271,33 @@ * \param[in] target log target to unregister, close and delete */ void log_target_destroy(struct log_target *target) { - /* just in case, to make sure we don't have any references */ log_del_target(target); #if (!EMBEDDED) + struct osmo_wqueue *wq; switch (target->type) { case LOG_TGT_TYPE_FILE: - if (target->tgt_file.out == NULL) - break; - fclose(target->tgt_file.out); - target->tgt_file.out = NULL; + case LOG_TGT_TYPE_STDERR: + if (target->tgt_file.out) { + if (target->type == LOG_TGT_TYPE_FILE) + fclose(target->tgt_file.out); + target->tgt_file.out = NULL; + } + wq = target->tgt_file.wqueue; + if (wq) { + if (wq->bfd.fd >= 0) { + if (target->type == LOG_TGT_TYPE_FILE) + close(wq->bfd.fd); + wq->bfd.fd = -1; + } + osmo_fd_unregister(&wq->bfd); + osmo_wqueue_clear(wq); + talloc_free(wq); + target->tgt_file.wqueue = NULL; + } + talloc_free((void *)target->tgt_file.fname); + target->tgt_file.fname = NULL; break; #ifdef HAVE_SYSLOG_H case LOG_TGT_TYPE_SYSLOG: @@ -1071,13 +1318,33 @@ * \returns 0 in case of success; negative otherwise */ int log_target_file_reopen(struct log_target *target) { - fclose(target->tgt_file.out); + struct osmo_wqueue *wq; + int rc; - target->tgt_file.out = fopen(target->tgt_file.fname, "a"); - if (!target->tgt_file.out) - return -errno; + OSMO_ASSERT(target->type == LOG_TGT_TYPE_FILE || target->type == LOG_TGT_TYPE_STDERR); + OSMO_ASSERT(target->tgt_file.out || target->tgt_file.wqueue); - /* we assume target->output already to be set */ + if (target->tgt_file.out) { + fclose(target->tgt_file.out); + target->tgt_file.out = fopen(target->tgt_file.fname, "a"); + if (!target->tgt_file.out) + return -errno; + } else { + wq = target->tgt_file.wqueue; + osmo_fd_unregister(&wq->bfd); + if (wq->bfd.fd >= 0) { + close(wq->bfd.fd); + wq->bfd.fd = -1; + } + + rc = open(target->tgt_file.fname, O_WRONLY|O_APPEND|O_CREAT|O_NONBLOCK, 0660); + if (rc < 0) + return -errno; + wq->bfd.fd = rc; + rc = osmo_fd_register(&wq->bfd); + if (rc < 0) + return rc; + } return 0; } diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c index 3b131c2..d33fe5e 100644 --- a/src/vty/logging_vty.c +++ b/src/vty/logging_vty.c @@ -835,8 +835,9 @@ } DEFUN(cfg_log_stderr, cfg_log_stderr_cmd, - "log stderr", - LOG_STR "Logging via STDERR of the process\n") + "log stderr [blocking-io]", + LOG_STR "Logging via STDERR of the process\n" + "Use blocking, synchronous I/O\n") { struct log_target *tgt; @@ -852,6 +853,11 @@ log_add_target(tgt); } + if (argc > 0 && !strcmp(argv[0], "blocking-io")) + log_target_file_switch_to_stream(tgt); + else + log_target_file_switch_to_wqueue(tgt); + vty->index = tgt; vty->node = CFG_LOG_NODE; @@ -878,8 +884,9 @@ } DEFUN(cfg_log_file, cfg_log_file_cmd, - "log file .FILENAME", - LOG_STR "Logging to text file\n" "Filename\n") + "log file FILENAME [blocking-io]", + LOG_STR "Logging to text file\n" "Filename\n" + "Use blocking, synchronous I/O\n") { const char *fname = argv[0]; struct log_target *tgt; @@ -896,6 +903,11 @@ log_add_target(tgt); } + if (argc > 1 && !strcmp(argv[1], "blocking-io")) + log_target_file_switch_to_stream(tgt); + else + log_target_file_switch_to_wqueue(tgt); + vty->index = tgt; vty->node = CFG_LOG_NODE; @@ -904,7 +916,7 @@ DEFUN(cfg_no_log_file, cfg_no_log_file_cmd, - "no log file .FILENAME", + "no log file FILENAME", NO_STR LOG_STR "Logging to text file\n" "Filename\n") { const char *fname = argv[0]; @@ -979,7 +991,10 @@ return 1; break; case LOG_TGT_TYPE_STDERR: - vty_out(vty, "log stderr%s", VTY_NEWLINE); + if (tgt->tgt_file.wqueue) + vty_out(vty, "log stderr%s", VTY_NEWLINE); + else + vty_out(vty, "log stderr blocking-io%s", VTY_NEWLINE); break; case LOG_TGT_TYPE_SYSLOG: #ifdef HAVE_SYSLOG_H @@ -990,7 +1005,10 @@ #endif break; case LOG_TGT_TYPE_FILE: - vty_out(vty, "log file %s%s", tgt->tgt_file.fname, VTY_NEWLINE); + if (tgt->tgt_file.wqueue) + vty_out(vty, "log file %s%s", tgt->tgt_file.fname, VTY_NEWLINE); + else + vty_out(vty, "log file %s blocking-io%s", tgt->tgt_file.fname, VTY_NEWLINE); break; case LOG_TGT_TYPE_STRRB: vty_out(vty, "log alarms %zu%s", diff --git a/tests/logging/logging_vty_test.c b/tests/logging/logging_vty_test.c index e7019f6..078555e 100644 --- a/tests/logging/logging_vty_test.c +++ b/tests/logging/logging_vty_test.c @@ -254,6 +254,7 @@ log_set_print_category_hex(osmo_stderr_target, 0); log_set_print_level(osmo_stderr_target, 1); log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_target_file_switch_to_wqueue(osmo_stderr_target); if (cmdline_config.config_file) { rc = vty_read_config_file(cmdline_config.config_file, NULL); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20296 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia58fd78535c41b3da3aeb7733aadc785ace610da Gerrit-Change-Number: 20296 Gerrit-PatchSet: 16 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:02:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 27 Oct 2021 12:02:50 +0000 Subject: Change in libosmocore[master]: logging: Avoid memcpy from stack to msgb in _file_output() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20305 ) Change subject: logging: Avoid memcpy from stack to msgb in _file_output() ...................................................................... logging: Avoid memcpy from stack to msgb in _file_output() For file and stderr output, the existing code always generates the log string on a stack buffer, and then (in case of non-blocking write via write_queue) copies it over to a msgb. Let's optimize this by turning _file_output() into a raw_output callback which first allocates the msgb and then format-prints directly to that msgb instaed of stack + memcpy. This has the disadvantage that we don't know how long the buffer has to be in order to print the entire string to it. As a result we always have to allocate a 4k-sized buffer (plus msgb overhead). The write_queue length for log file output has been decreased from 1024 entries to 156 entries in order to stay within the same memory requirements for each log target memory pool (about 648 kBytes). Related: OS#4311 Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 --- M src/logging.c 1 file changed, 43 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/src/logging.c b/src/logging.c index 5c6b993..087a271 100644 --- a/src/logging.c +++ b/src/logging.c @@ -78,7 +78,7 @@ #define MAX_LOG_SIZE 4096 /* maximum number of log statements we queue in file/stderr target write queue */ -#define LOG_WQUEUE_LEN 1024 +#define LOG_WQUEUE_LEN 156 osmo_static_assert(_LOG_CTX_COUNT <= ARRAY_SIZE(((struct log_context*)NULL)->ctx), enum_logging_ctx_items_fit_in_struct_log_context); @@ -449,12 +449,23 @@ return bn + 1; } -static void _output(struct log_target *target, unsigned int subsys, - unsigned int level, const char *file, int line, int cont, - const char *format, va_list ap) +/*! main output formatting function for log lines. + * \param[out] buf caller-allocated output buffer for the generated string + * \param[in] buf_len number of bytes available in buf + * \param[in] target log target for which the string is to be formatted + * \param[in] subsys Log sub-system number + * \param[in] level Log level + * \param[in] file name of source code file generating the log + * \param[in] line line source code line number within 'file' generating the log + * \param[in] cont is this a continuation (true) or not (false) + * \param[in] format format string + * \param[in] ap variable argument list for format + * \returns number of bytes written to out */ +static int _output_buf(char *buf, int buf_len, struct log_target *target, unsigned int subsys, + unsigned int level, const char *file, int line, int cont, + const char *format, va_list ap) { - char buf[MAX_LOG_SIZE]; - int ret, len = 0, offset = 0, rem = sizeof(buf); + int ret, len = 0, offset = 0, rem = buf_len; const char *c_subsys = NULL; /* are we using color */ @@ -588,8 +599,21 @@ OSMO_SNPRINTF_RET(ret, rem, offset, len); } err: - buf[sizeof(buf)-1] = '\0'; - target->output(target, level, buf); + buf[buf_len-1] = '\0'; + return len; +} + +/* Format the log line for given target; use a stack buffer and call target->output */ +static void _output(struct log_target *target, unsigned int subsys, + unsigned int level, const char *file, int line, int cont, + const char *format, va_list ap) +{ + char buf[MAX_LOG_SIZE]; + int rc; + + rc = _output_buf(buf, sizeof(buf), target, subsys, level, file, line, cont, format, ap); + if (rc > 0) + target->output(target, level, buf); } /* Catch internal logging category indexes as well as out-of-bounds indexes. @@ -922,22 +946,22 @@ } /* output via non-blocking write_queue, doing internal buffering */ -static void _file_output(struct log_target *target, unsigned int level, - const char *log) +static void _file_raw_output(struct log_target *target, int subsys, unsigned int level, const char *file, + int line, int cont, const char *format, va_list ap) { - int len = strlen(log); struct msgb *msg; + int rc; OSMO_ASSERT(target->tgt_file.wqueue); - msg = msgb_alloc_c(target->tgt_file.wqueue, len, "log_file_msg"); + msg = msgb_alloc_c(target->tgt_file.wqueue, MAX_LOG_SIZE, "log_file_msg"); if (!msg) return; /* we simply enqueue the log message to a write queue here, to avoid any blocking * writes on the output file. The write queue will tell us once the file is writable * and call _file_wq_write_cb() */ - memcpy(msg->data, log, len); - msgb_put(msg, len); + rc = _output_buf((char *)msgb_data(msg), msgb_tailroom(msg), target, subsys, level, file, line, cont, format, ap); + msgb_put(msg, rc); osmo_wqueue_enqueue_quiet(target->tgt_file.wqueue, msg); } #endif @@ -1152,7 +1176,7 @@ * log lines (stored as msgbs) will not put result in malloc() calls, and also to * reduce the OOM probability within logging, as the pool is already allocated */ wq = talloc_pooled_object(target, struct osmo_wqueue, LOG_WQUEUE_LEN, - LOG_WQUEUE_LEN*(sizeof(struct msgb)+512)); + LOG_WQUEUE_LEN*(sizeof(struct msgb)+MAX_LOG_SIZE)); if (!wq) return -ENOMEM; osmo_wqueue_init(wq, LOG_WQUEUE_LEN); @@ -1179,7 +1203,8 @@ return -EIO; } target->tgt_file.wqueue = wq; - target->output = _file_output; + target->raw_output = _file_raw_output; + target->output = NULL; /* now that everything succeeded, we can finally close the old output stream */ if (target->type == LOG_TGT_TYPE_FILE) @@ -1208,7 +1233,7 @@ * log lines (stored as msgbs) will not put result in malloc() calls, and also to * reduce the OOM probability within logging, as the pool is already allocated */ wq = talloc_pooled_object(target, struct osmo_wqueue, LOG_WQUEUE_LEN, - LOG_WQUEUE_LEN*(sizeof(struct msgb)+512)); + LOG_WQUEUE_LEN*(sizeof(struct msgb)+MAX_LOG_SIZE)); if (!wq) { log_target_destroy(target); return NULL; @@ -1231,7 +1256,7 @@ } target->tgt_file.wqueue = wq; - target->output = _file_output; + target->raw_output = _file_raw_output; target->tgt_file.fname = talloc_strdup(target, fname); return target; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20305 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0d10b0199576d2e7ff6421a6dba19ae5ffafd946 Gerrit-Change-Number: 20305 Gerrit-PatchSet: 13 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:02:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 27 Oct 2021 12:02:51 +0000 Subject: Change in libosmocore[master]: logging: Attempt a synchronous, non-blocking write first (file, stderr) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/20317 ) Change subject: logging: Attempt a synchronous, non-blocking write first (file, stderr) ...................................................................... logging: Attempt a synchronous, non-blocking write first (file, stderr) In the old days, we performed synchronous, blocking writes to the log file or stderr. This was replaced by code that turned all log file/stderr writes into non-blocking writes behind a write_queue. This patch now introduces a further optimization: If we currently don't have any log messages pending in the write queue, we are not back-logged and assume we have a fair chance of writing the log message right now, synchronously. So we try that first, and only enqueue the log message if the write fails (no bytes or insufficient number of bytes written). This way we should get the best of both worlds: No delay/re-ordering (and lower select syscall load) for the "normal" case (benefits of the old synchronous writes) while at the same time never risking to block on log output. Related: OS#4311 Change-Id: I08469a7e4be9bc5bbd39140457bb582f4a0b1703 --- M src/logging.c 1 file changed, 30 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve diff --git a/src/logging.c b/src/logging.c index 087a271..00d75c3 100644 --- a/src/logging.c +++ b/src/logging.c @@ -937,6 +937,24 @@ } #if (!EMBEDDED) +/* write-queue tells us we should write another msgb (log line) to the output fd */ +static int _file_wq_write_cb(struct osmo_fd *ofd, struct msgb *msg) +{ + int rc; + + rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); + if (rc < 0) + return rc; + if (rc != msgb_length(msg)) { + /* pull the number of bytes we have already written */ + msgb_pull(msg, rc); + /* ask write_queue to re-insert the msgb at the head of the queue */ + return -EAGAIN; + } + return 0; +} + +/* output via buffered, blocking stdio streams */ static void _file_output_stream(struct log_target *target, unsigned int level, const char *log) { @@ -962,6 +980,18 @@ * and call _file_wq_write_cb() */ rc = _output_buf((char *)msgb_data(msg), msgb_tailroom(msg), target, subsys, level, file, line, cont, format, ap); msgb_put(msg, rc); + + /* attempt a synchronous, non-blocking write, if the write queue is empty */ + if (target->tgt_file.wqueue->current_length == 0) { + rc = _file_wq_write_cb(&target->tgt_file.wqueue->bfd, msg); + if (rc == 0) { + /* the write was complete, we can exit early */ + msgb_free(msg); + return; + } + } + /* if we reach here, either we already had elements in the write_queue, or the synchronous write + * failed: enqueue the message to the write_queue (backlog) */ osmo_wqueue_enqueue_quiet(target->tgt_file.wqueue, msg); } #endif @@ -1034,23 +1064,6 @@ } #if (!EMBEDDED) -/* write-queue tells us we should write another msgb (log line) to the output fd */ -static int _file_wq_write_cb(struct osmo_fd *ofd, struct msgb *msg) -{ - int rc; - - rc = write(ofd->fd, msgb_data(msg), msgb_length(msg)); - if (rc < 0) - return rc; - if (rc != msgb_length(msg)) { - /* pull the number of bytes we have already written */ - msgb_pull(msg, rc); - /* ask write_queue to re-insert the msgb at the head of the queue */ - return -EAGAIN; - } - return 0; -} - /*! Create a new file-based log target using buffered, blocking stream output * \param[in] fname File name of the new log file * \returns Log target in case of success, NULL otherwise -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/20317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I08469a7e4be9bc5bbd39140457bb582f4a0b1703 Gerrit-Change-Number: 20317 Gerrit-PatchSet: 11 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:10:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 27 Oct 2021 12:10:29 +0000 Subject: Change in simtrace2[master]: add initial testing scripts for a hw-driven ci - flash every image an... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/25967 ) Change subject: add initial testing scripts for a hw-driven ci - flash every image and test ...................................................................... Patch Set 1: some general comments: 1) occupying all of "test" might be a bit over-raching as we may very well have other tests at some point, so maybe a sub-directory like tests/firmware-fash-ci or whatever name you can come up with makes more sense 2) matching on all of the detailed stdout of the various programs of course introduces a lot of dependency on very specific versions of all the host OS utilities. This will likely require a lot of updtes when we do an OS upgrae 3) sniffing the ATR alone is not sufficient, as the ATR is always transmitted at an exceptionally slow speed. We should definitely have some kind of simple APDU exchange afterwards. At the very least something like "00a40904023f00" (SELECT MF) should be done. This then happens after PPS and hence at a higher speed [if cards supporting higher speeds are used, like sysmoUSIM/ISIM and not some magic sim that only does 9600 bps]. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/25967 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I88bc32334f23e6fd702e0cbcb1b1510029909b20 Gerrit-Change-Number: 25967 Gerrit-PatchSet: 1 Gerrit-Owner: roh Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Wed, 27 Oct 2021 12:10:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:11:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 27 Oct 2021 12:11:53 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25829 ) Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Comment-Date: Wed, 27 Oct 2021 12:11:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:12:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 27 Oct 2021 12:12:32 +0000 Subject: Change in osmo-cbc[master]: varaible for atoi() result shouild be signed integer In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/25931 ) Change subject: varaible for atoi() result shouild be signed integer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/25931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I650fce5bd64752823ee57d8b528d2b371fada857 Gerrit-Change-Number: 25931 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Wed, 27 Oct 2021 12:12:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:12:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 27 Oct 2021 12:12:34 +0000 Subject: Change in osmo-cbc[master]: varaible for atoi() result shouild be signed integer In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/25931 ) Change subject: varaible for atoi() result shouild be signed integer ...................................................................... varaible for atoi() result shouild be signed integer ... otherwise we won't detect < 0 cases. Fixes: CID#240731 Change-Id: I650fce5bd64752823ee57d8b528d2b371fada857 --- M src/rest_api.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/rest_api.c b/src/rest_api.c index c70d096..52bf25e 100644 --- a/src/rest_api.c +++ b/src/rest_api.c @@ -602,7 +602,7 @@ { const char *message_id_str = u_map_get(req->map_url, "message_id"); struct rest_it_op *riop = talloc_zero(g_cbc, struct rest_it_op); - uint16_t message_id; + int message_id; int status = 404; int rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/25931 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I650fce5bd64752823ee57d8b528d2b371fada857 Gerrit-Change-Number: 25931 Gerrit-PatchSet: 1 Gerrit-Owner: laforge Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:13:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Wed, 27 Oct 2021 12:13:13 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25959 ) Change subject: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I5666a6dc1ec9e56fe133642fb0054e913265c081 Gerrit-Change-Number: 25959 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 12:13:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:20:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 12:20:16 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 ) Change subject: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iee37eef2012ce2c2e2f0a0db4c26abb75a947d84 Gerrit-Change-Number: 25938 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 12:20:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:20:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 12:20:19 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 ) Change subject: bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used ...................................................................... bsc: Introduce test TC_dyn_ts_sdcch8_all_subslots_used Related: OS#5278 Related: SYS#5309 Change-Id: Iee37eef2012ce2c2e2f0a0db4c26abb75a947d84 --- M bsc/BSC_Tests.ttcn 1 file changed, 79 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index cebd634..ee4dac2 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1672,6 +1672,37 @@ return dt; } +/* Like f_est_dchan(), but for the first lchan of a dynamic timeslot: first ACK the deactivation of PDCH. */ +function f_est_dchan_dyn(OCT1 ra, GsmFrameNumber fn, octetstring l3) +runs on test_CT return DchanTuple { + var BSSAP_N_CONNECT_ind rx_c_ind; + var DchanTuple dt; + + /* Send CHAN RQD */ + var RSL_Message rx_rsl; + f_ipa_tx(0, ts_RSL_CHAN_RQD(ra, fn)); + + /* The dyn TS first deactivates PDCH */ + rx_rsl := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL), T3101_MAX); + dt.rsl_chan_nr := rx_rsl.ies[0].body.chan_nr; + f_ipa_tx(0, ts_RSL_RF_CHAN_REL_ACK(dt.rsl_chan_nr)); + + rx_rsl := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV)); + dt.rsl_chan_nr := rx_rsl.ies[0].body.chan_nr; + + /* Now activates the signalling channel */ + f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(dt.rsl_chan_nr, fn+10)); + rx_rsl := f_exp_ipa_rx(0, tr_RSL_IMM_ASSIGN(0)); + + f_ipa_tx(0, ts_RSL_EST_IND(dt.rsl_chan_nr, valueof(ts_RslLinkID_DCCH(0)), l3)); + + BSSAP.receive(tr_BSSAP_CONNECT_ind(?, ?, tr_BSSMAP_ComplL3(l3))) -> value rx_c_ind; + dt.sccp_conn_id := rx_c_ind.connectionId; + BSSAP.send(ts_BSSAP_CONNECT_res(dt.sccp_conn_id)); + + return dt; +} + /* expect RF CAN REL from BTS, acknowledge it and clear the MSC side */ private function f_exp_chan_rel_and_clear(DchanTuple dt, integer bts_nr := 0) runs on test_CT { var RSL_Message rx_rsl; @@ -7241,6 +7272,53 @@ f_shutdown_helper(); } +/* Validate all 8 subslots of a dynamics TS configured as SDCCH8 are used */ +testcase TC_dyn_ts_sdcch8_all_subslots_used() runs on test_CT { + var ASP_RSL_Unitdata rsl_ud; + var integer i; + var integer chreq_total, chreq_nochan; + + f_init_vty(); + for (i := 1; i < 8; i := i + 1) { + if (i == 2) { + f_ts_set_chcomb(0, 0, i, "TCH/F_TCH/H_SDCCH8_PDCH"); + } else { + f_ts_set_chcomb(0, 0, i, "PDCH"); + } + } + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); + + f_init(1); + + /* The dyn TS want to activate PDCH mode, ACK that. */ + var RslChannelNr chan_nr; + chan_nr := valueof(t_RslChanNr_PDCH(2)); + f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?)); + f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2342)); + + f_sleep(1.0); + + /* Exhaust all dedicated SDCCH lchans. + /* GSM 44.018 Table 9.1.8.2: + * RA = '13'O -> Establishment cause = 0001xxxx (MS dual rate capable and asks for "SDCCH"). + */ + for (i := 0; i < NUM_SDCCH_PER_BTS; i := i+1) { + f_est_dchan('13'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + } + + /* Only the dyn TS is still available. Its first lchan gets converted to SDCCH8 */ + f_est_dchan_dyn('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + /* Also occupy the seven other SDCCH of the dyn TS */ + for (i := 0; i < 7; i := i+1) { + f_est_dchan('33'O, NUM_SDCCH_PER_BTS + i, '00010203040506'O); + } + + /* clean up config */ + f_ts_reset_chcomb(0); + + f_shutdown_helper(); +} + /* Test Osmocom dyn TS SDCCH8 activation / deactivation: If activating dyn TS as SDCCH8 would end up in having no free TCH, then BSC should decide to activate it as TCH directly instead. SYS#5309. */ @@ -10517,6 +10595,7 @@ execute( TC_dyn_pdch_osmo_act_nack() ); if (mp_enable_dyn_sdcch8_test) { execute( TC_dyn_ts_sdcch8_act_deact() ); + execute( TC_dyn_ts_sdcch8_all_subslots_used() ); execute( TC_dyn_ts_sdcch8_tch_call_act_deact() ); execute( TC_dyn_ts_sdcch8_act_nack() ); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25938 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iee37eef2012ce2c2e2f0a0db4c26abb75a947d84 Gerrit-Change-Number: 25938 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:20:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 12:20:42 +0000 Subject: Change in osmo-bsc[master]: constify lchan_state_is() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25971 ) Change subject: constify lchan_state_is() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I523cbf04e77f43924c3f09094d56f815d3de640d Gerrit-Change-Number: 25971 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 12:20:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:23:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 12:23:41 +0000 Subject: Change in osmo-ttcn3-hacks[master]: bsc: add TC_ratectr_all_available_allocated and _dyn In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25969 ) Change subject: bsc: add TC_ratectr_all_available_allocated and _dyn ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25969 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib3997a827c9cc43d1361bb0cf3bfab9f6d91bf82 Gerrit-Change-Number: 25969 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 12:23:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:39:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 12:39:10 +0000 Subject: Change in osmo-bsc[master]: refactor lchan counting In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25972 ) Change subject: refactor lchan counting ...................................................................... Patch Set 1: Code-Review-1 (8 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/include/osmocom/bsc/gsm_data.h at 1439 PS1, Line 1439: CHAN_COUNTS2_N is this simply to flag the end? please document so, since it's a bit confusing as this is an enum enumerating types of counting ;) https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/include/osmocom/bsc/gsm_data.h at 1442 PS1, Line 1442: extern const struct value_string chan_count2_strs[]; Lots of new infra, sounds like all this can be moved to a new header file. https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/abis_rsl.c at 1961 PS1, Line 1961: chan_counts_t bts_counts; we don't tend to use *_t types in osmocom (see kernel programming style guide). If it's a struct, describe it as a struct. https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/abis_rsl.c at 1974 PS1, Line 1974: free_tchf = bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F]; I'd rather prefer getters here, this way the array can be kept internal to its own module and no need for other modules to know how counting ocurrs. Moreover, some comment here describing what you fetch here with all those enums is welcome. https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/bts.c File src/osmo-bsc/bts.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/bts.c at 728 PS1, Line 728: chan_counts_t trx_counts; same, no *_t types, only for basic type typedefs. https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/bts_trx.c File src/osmo-bsc/bts_trx.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/bts_trx.c at 327 PS1, Line 327: void trx_count_lchans(chan_counts_t ret, const struct gsm_bts_trx *trx) All this could go into a new counts.c file, to have all this logic in one place. Alternatively, pass trx as first param as in object-oriented, since also the function starts with trx_* https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/gsm_data.c File src/osmo-bsc/gsm_data.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/gsm_data.c at 650 PS1, Line 650: * TODO: include possible VAMOS secondary lchans? */ what about this TODO? https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/handover_decision_2.c File src/osmo-bsc/handover_decision_2.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/handover_decision_2.c at 997 PS1, Line 997: c->current.free_tchf = bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F]; same, use getters (be it static inline or whatever) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2fb48c549186db812b1e9d6b735a92e80f27b8d3 Gerrit-Change-Number: 25972 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 12:39:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:52:55 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 27 Oct 2021 12:52:55 +0000 Subject: Change in osmo-bts[master]: l1sap: Avoid re-(de)activating already (de)active lchans In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25965 ) Change subject: l1sap: Avoid re-(de)activating already (de)active lchans ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I093e4d4e23b527b10bf5d6ff538460626c30a8f8 Gerrit-Change-Number: 25965 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Comment-Date: Wed, 27 Oct 2021 12:52:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:53:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 12:53:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: add TC_meas_res_speech_{tchf, tchh}_sapi3() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25968 ) Change subject: BTS_Tests: add TC_meas_res_speech_{tchf,tchh}_sapi3() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7d17d6e5f413f2de78db944f23ad731b81ad24cf Gerrit-Change-Number: 25968 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 12:53:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:54:25 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 12:54:25 +0000 Subject: Change in osmo-bsc[master]: neighbor_ident: add comment about Neighbor Address Resolution Service In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25977 ) Change subject: neighbor_ident: add comment about Neighbor Address Resolution Service ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iec86f72548bfc54a2c86dadec69dd1c64813d852 Gerrit-Change-Number: 25977 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 12:54:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:55:04 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 27 Oct 2021 12:55:04 +0000 Subject: Change in osmo-bts[master]: scheduler: Avoid crash upon call to trx_sched_set_lchan if l1ts is un... In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25966 ) Change subject: scheduler: Avoid crash upon call to trx_sched_set_lchan if l1ts is uninitialized ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/25966/3/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/25966/3/src/common/scheduler.c at 1089 PS3, Line 1089: LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "%s lchan with uninitialized scheduler structure\n", Add "Not " before the string so the message is more clear? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I93af7c3dcf0e34e9317eec0ee183dbf18b8d2f3b Gerrit-Change-Number: 25966 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: daniel Gerrit-Comment-Date: Wed, 27 Oct 2021 12:55:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:55:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 12:55:41 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25829 ) Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 12:55:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:56:37 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 12:56:37 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25829 ) Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25829/2/src/osmo-bsc/bsc_ctrl_commands.c File src/osmo-bsc/bsc_ctrl_commands.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25829/2/src/osmo-bsc/bsc_ctrl_commands.c at 670 PS2, Line 670: static int get_bts_resend_si(struct ctrl_cmd *cmd, void *data) Don't you need to fill some sort of response value somehwere? I'd expect lower layers in the protocol to have to submit something back in GET responses. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 12:56:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:57:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 12:57:26 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25959 ) Change subject: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I5666a6dc1ec9e56fe133642fb0054e913265c081 Gerrit-Change-Number: 25959 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 12:57:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:58:14 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 12:58:14 +0000 Subject: Change in osmo-iuh[master]: Update generated .c/.h after using asn1c -R param In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25960 ) Change subject: Update generated .c/.h after using asn1c -R param ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ib7a03973d43828f47ff59b561d9ddce43186f8af Gerrit-Change-Number: 25960 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 12:58:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:58:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 12:58:16 +0000 Subject: Change in osmo-iuh[master]: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25959 ) Change subject: src/*/Makefile.am: Use asn1c -R to avoid generating runtime code ...................................................................... src/*/Makefile.am: Use asn1c -R to avoid generating runtime code Change-Id: I5666a6dc1ec9e56fe133642fb0054e913265c081 --- M src/hnbap/Makefile.am M src/ranap/Makefile.am M src/rua/Makefile.am M src/sabp/Makefile.am 4 files changed, 5 insertions(+), 13 deletions(-) Approvals: pespin: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am index 7835bcd..79c0ac4 100644 --- a/src/hnbap/Makefile.am +++ b/src/hnbap/Makefile.am @@ -243,9 +243,7 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - asn1c -gen-PER -fnative-types $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn -# remove the local copy of the runtime code - -rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.* + asn1c -R -gen-PER -fnative-types $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/hnbap $(ASN_MODULE_INC) # Finally copy *.c from buildir to srcdir: diff --git a/src/ranap/Makefile.am b/src/ranap/Makefile.am index 4ba3a79..d5dc4fc 100644 --- a/src/ranap/Makefile.am +++ b/src/ranap/Makefile.am @@ -1169,10 +1169,8 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - ASN1C_PREFIX="RANAP_" asn1c -gen-PER $(top_srcdir)/asn1/ranap/RANAP-CommonDataTypes.asn $(top_srcdir)/asn1/ranap/RANAP-Constants.asn $(top_srcdir)/asn1/ranap/RANAP-IEs.asn $(top_srcdir)/asn1/ranap/RANAP-PDU.asn - @rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* NULL.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.* -# some fixups in erroneous code that asn1c generates - sed -i '6i#include ' RANAP_ChosenEncryptionAlgorithm.h RANAP_ChosenIntegrityProtectionAlgorithm.h RANAP_IMSI.h RANAP_PLMNidentity.h RANAP_RAB-ReleaseFailedList.c RANAP_RAB-ReleaseList.c RANAP_RAB-SetupOrModifyList.c RANAP_ResetResourceList.c RANAP_ResetResourceAckList.c + ASN1C_PREFIX="RANAP_" asn1c -R -gen-PER $(top_srcdir)/asn1/ranap/RANAP-CommonDataTypes.asn $(top_srcdir)/asn1/ranap/RANAP-Constants.asn $(top_srcdir)/asn1/ranap/RANAP-IEs.asn $(top_srcdir)/asn1/ranap/RANAP-PDU.asn + sed -i '7i#include ' RANAP_ChosenEncryptionAlgorithm.h RANAP_ChosenIntegrityProtectionAlgorithm.h RANAP_IMSI.h RANAP_PLMNidentity.h RANAP_RAB-ReleaseFailedList.c RANAP_RAB-ReleaseList.c RANAP_RAB-SetupOrModifyList.c RANAP_ResetResourceList.c RANAP_ResetResourceAckList.c sed -i 's/Member/MemberA/' RANAP_LA-LIST.[ch] sed -i 's/Member/MemberB/' RANAP_RABParametersList.[ch] sed -i 's/Member/MemberC/' RANAP_AuthorisedPLMNs.[ch] diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am index c848639..493a466 100644 --- a/src/rua/Makefile.am +++ b/src/rua/Makefile.am @@ -81,9 +81,7 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - ASN1C_PREFIX="RUA_" asn1c -gen-PER $(top_srcdir)/asn1/rua/RUA-CommonDataTypes.asn $(top_srcdir)/asn1/rua/RUA-Constants.asn $(top_srcdir)/asn1/rua/RUA-IEs.asn $(top_srcdir)/asn1/rua/RUA-PDU.asn -# remove the local copy of the runtime code - @rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.* + ASN1C_PREFIX="RUA_" asn1c -R -gen-PER $(top_srcdir)/asn1/rua/RUA-CommonDataTypes.asn $(top_srcdir)/asn1/rua/RUA-Constants.asn $(top_srcdir)/asn1/rua/RUA-IEs.asn $(top_srcdir)/asn1/rua/RUA-PDU.asn # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/rua $(ASN_MODULE_INC) # Finally copy *.c from buildir to srcdir: diff --git a/src/sabp/Makefile.am b/src/sabp/Makefile.am index 5e1b557..faace13 100644 --- a/src/sabp/Makefile.am +++ b/src/sabp/Makefile.am @@ -135,9 +135,7 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - ASN1C_PREFIX="SABP_" asn1c -gen-PER $(top_srcdir)/asn1/sabp/SABP-CommonDataTypes.asn $(top_srcdir)/asn1/sabp/SABP-Constants.asn $(top_srcdir)/asn1/sabp/SABP-IEs.asn $(top_srcdir)/asn1/sabp/SABP-PDU.asn -# remove the local copy of the runtime code - @rm ANY.* INTEGER.* NativeEnumerated.* NativeInteger.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.* + ASN1C_PREFIX="SABP_" asn1c -R -gen-PER $(top_srcdir)/asn1/sabp/SABP-CommonDataTypes.asn $(top_srcdir)/asn1/sabp/SABP-Constants.asn $(top_srcdir)/asn1/sabp/SABP-IEs.asn $(top_srcdir)/asn1/sabp/SABP-PDU.asn # change include style to `#include ' sed -i 's/Member/MemberA/' SABP_MessageStructure.[ch] sed -i 's/Member/MemberB/' SABP_Criticality-Diagnostics.[ch] -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25959 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I5666a6dc1ec9e56fe133642fb0054e913265c081 Gerrit-Change-Number: 25959 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 12:58:17 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 12:58:17 +0000 Subject: Change in osmo-iuh[master]: Update generated .c/.h after using asn1c -R param In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25960 ) Change subject: Update generated .c/.h after using asn1c -R param ...................................................................... Update generated .c/.h after using asn1c -R param Change-Id: Ib7a03973d43828f47ff59b561d9ddce43186f8af --- M include/osmocom/hnbap/Access-stratum-release-indicator.h M include/osmocom/hnbap/AccessResult.h M include/osmocom/hnbap/AdditionalNeighbourInfoList.h M include/osmocom/hnbap/AltitudeAndDirection.h M include/osmocom/hnbap/BackoffTimer.h M include/osmocom/hnbap/BindingID.h M include/osmocom/hnbap/CELL-FACHMobilitySupport.h M include/osmocom/hnbap/CGI.h M include/osmocom/hnbap/CI.h M include/osmocom/hnbap/CN-DomainIndicator.h M include/osmocom/hnbap/CSG-Capability.h M include/osmocom/hnbap/CSG-ID.h M include/osmocom/hnbap/CSGMembershipStatus.h M include/osmocom/hnbap/CSGMembershipUpdate.h M include/osmocom/hnbap/Cause.h M include/osmocom/hnbap/CauseMisc.h M include/osmocom/hnbap/CauseProtocol.h M include/osmocom/hnbap/CauseRadioNetwork.h M include/osmocom/hnbap/CauseTransport.h M include/osmocom/hnbap/CellIdentity.h M include/osmocom/hnbap/ConfigurationInformation.h M include/osmocom/hnbap/Context-ID.h M include/osmocom/hnbap/Criticality.h M include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h M include/osmocom/hnbap/CriticalityDiagnostics.h M include/osmocom/hnbap/ESN.h M include/osmocom/hnbap/ErrorIndication.h M include/osmocom/hnbap/GTP-TEI.h M include/osmocom/hnbap/GeographicalCoordinates.h M include/osmocom/hnbap/GeographicalLocation.h M include/osmocom/hnbap/HNB-Cell-Access-Mode.h M include/osmocom/hnbap/HNB-Cell-Identifier.h M include/osmocom/hnbap/HNB-GWResponse.h M include/osmocom/hnbap/HNB-Identity-Info.h M include/osmocom/hnbap/HNB-Identity.h M include/osmocom/hnbap/HNB-Location-Information.h M include/osmocom/hnbap/HNB-RNL-Identity.h M include/osmocom/hnbap/HNBAP-PDU.h M include/osmocom/hnbap/HNBCapacity.h M include/osmocom/hnbap/HNBConfigInfo.h M include/osmocom/hnbap/HNBConfigTransferRequest.h M include/osmocom/hnbap/HNBConfigTransferResponse.h M include/osmocom/hnbap/HNBConfigurationInformationMissing.h M include/osmocom/hnbap/HNBConfigurationInformationProvided.h M include/osmocom/hnbap/HNBDe-Register.h M include/osmocom/hnbap/HNBRegisterAccept.h M include/osmocom/hnbap/HNBRegisterReject.h M include/osmocom/hnbap/HNBRegisterRequest.h M include/osmocom/hnbap/IE-Extensions.h M include/osmocom/hnbap/IE.h M include/osmocom/hnbap/IMEI.h M include/osmocom/hnbap/IMSI.h M include/osmocom/hnbap/IMSIDS41.h M include/osmocom/hnbap/IMSIESN.h M include/osmocom/hnbap/IP-Address.h M include/osmocom/hnbap/InitiatingMessage.h M include/osmocom/hnbap/Ipv4Address.h M include/osmocom/hnbap/Ipv6Address.h M include/osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h M include/osmocom/hnbap/LAC.h M include/osmocom/hnbap/LAI.h M include/osmocom/hnbap/MacroCellID.h M include/osmocom/hnbap/MacroCoverageInformation.h M include/osmocom/hnbap/MuxPortNumber.h M include/osmocom/hnbap/NeighbourCellIdentityList.h M include/osmocom/hnbap/NeighbourIdentity.h M include/osmocom/hnbap/NeighbourInfoList.h M include/osmocom/hnbap/NeighbourInfoRequestItem.h M include/osmocom/hnbap/NeighbourInfoRequestList.h M include/osmocom/hnbap/PLMNidentity.h M include/osmocom/hnbap/PSC.h M include/osmocom/hnbap/PTMSI.h M include/osmocom/hnbap/PTMSIRAI.h M include/osmocom/hnbap/Presence.h M include/osmocom/hnbap/PrivateIE-ID.h M include/osmocom/hnbap/PrivateMessage.h M include/osmocom/hnbap/ProcedureCode.h M include/osmocom/hnbap/ProtocolIE-ID.h M include/osmocom/hnbap/RAB-ID.h M include/osmocom/hnbap/RABList.h M include/osmocom/hnbap/RABListItem.h M include/osmocom/hnbap/RAC.h M include/osmocom/hnbap/RAI.h M include/osmocom/hnbap/RNC-ID.h M include/osmocom/hnbap/Registration-Cause.h M include/osmocom/hnbap/RelocationComplete.h M include/osmocom/hnbap/S-RNTIPrefix.h M include/osmocom/hnbap/SAC.h M include/osmocom/hnbap/SuccessfulOutcome.h M include/osmocom/hnbap/TMSIDS41.h M include/osmocom/hnbap/TMSILAI.h M include/osmocom/hnbap/TNLUpdateFailure.h M include/osmocom/hnbap/TNLUpdateRequest.h M include/osmocom/hnbap/TNLUpdateResponse.h M include/osmocom/hnbap/TransportInfo.h M include/osmocom/hnbap/TransportLayerAddress.h M include/osmocom/hnbap/TriggeringMessage.h M include/osmocom/hnbap/Tunnel-Information.h M include/osmocom/hnbap/TypeOfError.h M include/osmocom/hnbap/U-RNTI.h M include/osmocom/hnbap/U-RNTIQueryRequest.h M include/osmocom/hnbap/U-RNTIQueryResponse.h M include/osmocom/hnbap/UDP-Port-Number.h M include/osmocom/hnbap/UE-Capabilities.h M include/osmocom/hnbap/UE-Identity.h M include/osmocom/hnbap/UEDe-Register.h M include/osmocom/hnbap/UERegisterAccept.h M include/osmocom/hnbap/UERegisterReject.h M include/osmocom/hnbap/UERegisterRequest.h M include/osmocom/hnbap/URAIdentity.h M include/osmocom/hnbap/URAIdentityList.h M include/osmocom/hnbap/UTRANCellID.h M include/osmocom/hnbap/UnknownU-RNTIIndication.h M include/osmocom/hnbap/UnsuccessfulOutcome.h M include/osmocom/hnbap/Update-cause.h M include/osmocom/ranap/RANAP_APN.h M include/osmocom/ranap/RANAP_AccuracyFulfilmentIndicator.h M include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameters.h M include/osmocom/ranap/RANAP_AlternativeRABConfigurationRequest.h M include/osmocom/ranap/RANAP_AreaIdentity.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameters.h M include/osmocom/ranap/RANAP_AuthorisedPLMNs.h M include/osmocom/ranap/RANAP_AuthorisedSNAs.h M include/osmocom/ranap/RANAP_BindingID.h M include/osmocom/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.h M include/osmocom/ranap/RANAP_CGI.h M include/osmocom/ranap/RANAP_CI.h M include/osmocom/ranap/RANAP_CN-DeactivateTrace.h M include/osmocom/ranap/RANAP_CN-DomainIndicator.h M include/osmocom/ranap/RANAP_CN-ID.h M include/osmocom/ranap/RANAP_CN-InvokeTrace.h M include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h M include/osmocom/ranap/RANAP_CSFB-Information.h M include/osmocom/ranap/RANAP_CSG-Id-List.h M include/osmocom/ranap/RANAP_CSG-Id.h M include/osmocom/ranap/RANAP_CSG-Membership-Status.h M include/osmocom/ranap/RANAP_Cause.h M include/osmocom/ranap/RANAP_CauseMisc.h M include/osmocom/ranap/RANAP_CauseNAS.h M include/osmocom/ranap/RANAP_CauseNon-Standard.h M include/osmocom/ranap/RANAP_CauseProtocol.h M include/osmocom/ranap/RANAP_CauseRadioNetwork.h M include/osmocom/ranap/RANAP_CauseRadioNetworkExtension.h M include/osmocom/ranap/RANAP_CauseTransmissionNetwork.h M include/osmocom/ranap/RANAP_Cell-Access-Mode.h M include/osmocom/ranap/RANAP_Cell-Capacity-Class-Value.h M include/osmocom/ranap/RANAP_Cell-Id.h M include/osmocom/ranap/RANAP_CellBased.h M include/osmocom/ranap/RANAP_CellIdList.h M include/osmocom/ranap/RANAP_CellLoadInformation.h M include/osmocom/ranap/RANAP_CellLoadInformationGroup.h M include/osmocom/ranap/RANAP_CellType.h M include/osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h M include/osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h M include/osmocom/ranap/RANAP_ClassmarkInformation2.h M include/osmocom/ranap/RANAP_ClassmarkInformation3.h M include/osmocom/ranap/RANAP_ClientType.h M include/osmocom/ranap/RANAP_CommonID.h M include/osmocom/ranap/RANAP_Correlation-ID.h M include/osmocom/ranap/RANAP_Criticality.h M include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h M include/osmocom/ranap/RANAP_CriticalityDiagnostics.h M include/osmocom/ranap/RANAP_D-RNTI.h M include/osmocom/ranap/RANAP_DCH-ID.h M include/osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_DL-N-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_DRX-CycleLengthCoefficient.h M include/osmocom/ranap/RANAP_DSCH-ID.h M include/osmocom/ranap/RANAP_DataPDUType.h M include/osmocom/ranap/RANAP_DataVolumeList.h M include/osmocom/ranap/RANAP_DataVolumeReference.h M include/osmocom/ranap/RANAP_DataVolumeReport.h M include/osmocom/ranap/RANAP_DataVolumeReportList.h M include/osmocom/ranap/RANAP_DataVolumeReportRequest.h M include/osmocom/ranap/RANAP_DataVolumeReportingIndication.h M include/osmocom/ranap/RANAP_DeliveryOfErroneousSDU.h M include/osmocom/ranap/RANAP_DeliveryOrder.h M include/osmocom/ranap/RANAP_DeltaRAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_DirectInformationTransfer.h M include/osmocom/ranap/RANAP_DirectReportingIndicator.h M include/osmocom/ranap/RANAP_DirectTransfer-IE-ContainerList.h M include/osmocom/ranap/RANAP_DirectTransfer.h M include/osmocom/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h M include/osmocom/ranap/RANAP_E-DCH-MAC-d-Flow-ID.h M include/osmocom/ranap/RANAP_E-UTRAN-Service-Handover.h M include/osmocom/ranap/RANAP_EARFCN-Extended.h M include/osmocom/ranap/RANAP_ENB-ID.h M include/osmocom/ranap/RANAP_EUTRANFrequencies.h M include/osmocom/ranap/RANAP_EncryptionAlgorithm.h M include/osmocom/ranap/RANAP_EncryptionInformation.h M include/osmocom/ranap/RANAP_EncryptionKey.h M include/osmocom/ranap/RANAP_End-Of-CSFB.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteConfirm.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteFailure.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteRequest.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteResponse.h M include/osmocom/ranap/RANAP_EquipmentsToBeTraced.h M include/osmocom/ranap/RANAP_ErrorIndication.h M include/osmocom/ranap/RANAP_Event.h M include/osmocom/ranap/RANAP_Event1F-Parameters.h M include/osmocom/ranap/RANAP_Event1I-Parameters.h M include/osmocom/ranap/RANAP_ExtendedGuaranteedBitrate.h M include/osmocom/ranap/RANAP_ExtendedMaxBitrate.h M include/osmocom/ranap/RANAP_ExtendedRNC-ID.h M include/osmocom/ranap/RANAP_ForwardSRNS-Context.h M include/osmocom/ranap/RANAP_ForwardingIndication.h M include/osmocom/ranap/RANAP_FrameSequenceNumber.h M include/osmocom/ranap/RANAP_FrequenceLayerConvergenceFlag.h M include/osmocom/ranap/RANAP_GA-AltitudeAndDirection.h M include/osmocom/ranap/RANAP_GA-EllipsoidArc.h M include/osmocom/ranap/RANAP_GA-Point.h M include/osmocom/ranap/RANAP_GA-PointWithAltitude.h M include/osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h M include/osmocom/ranap/RANAP_GA-PointWithUnCertainty.h M include/osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h M include/osmocom/ranap/RANAP_GA-Polygon.h M include/osmocom/ranap/RANAP_GA-UncertaintyEllipse.h M include/osmocom/ranap/RANAP_GANSS-PositioningDataSet.h M include/osmocom/ranap/RANAP_GANSS-PositioningMethodAndUsage.h M include/osmocom/ranap/RANAP_GERAN-BSC-Container.h M include/osmocom/ranap/RANAP_GERAN-Cell-ID.h M include/osmocom/ranap/RANAP_GERAN-Classmark.h M include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h M include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h M include/osmocom/ranap/RANAP_GTP-TEI.h M include/osmocom/ranap/RANAP_GeographicalArea.h M include/osmocom/ranap/RANAP_GeographicalCoordinates.h M include/osmocom/ranap/RANAP_GlobalCN-ID.h M include/osmocom/ranap/RANAP_GlobalRNC-ID.h M include/osmocom/ranap/RANAP_GuaranteedBitrate.h M include/osmocom/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.h M include/osmocom/ranap/RANAP_HigherBitratesThan16MbpsFlag.h M include/osmocom/ranap/RANAP_HorizontalSpeedAndBearing.h M include/osmocom/ranap/RANAP_HorizontalVelocity.h M include/osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h M include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h M include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h M include/osmocom/ranap/RANAP_IE-Extensions.h M include/osmocom/ranap/RANAP_IE.h M include/osmocom/ranap/RANAP_IMEI.h M include/osmocom/ranap/RANAP_IMEIGroup.h M include/osmocom/ranap/RANAP_IMEIList.h M include/osmocom/ranap/RANAP_IMEISV.h M include/osmocom/ranap/RANAP_IMEISVGroup.h M include/osmocom/ranap/RANAP_IMEISVList.h M include/osmocom/ranap/RANAP_IMSI.h M include/osmocom/ranap/RANAP_IPMulticastAddress.h M include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h M include/osmocom/ranap/RANAP_IRATmeasurementParameters.h M include/osmocom/ranap/RANAP_ImmediateMDT.h M include/osmocom/ranap/RANAP_IncludeVelocity.h M include/osmocom/ranap/RANAP_InformationExchangeID.h M include/osmocom/ranap/RANAP_InformationExchangeType.h M include/osmocom/ranap/RANAP_InformationRequestType.h M include/osmocom/ranap/RANAP_InformationRequested.h M include/osmocom/ranap/RANAP_InformationTransferConfirmation.h M include/osmocom/ranap/RANAP_InformationTransferFailure.h M include/osmocom/ranap/RANAP_InformationTransferID.h M include/osmocom/ranap/RANAP_InformationTransferIndication.h M include/osmocom/ranap/RANAP_InformationTransferType.h M include/osmocom/ranap/RANAP_InitialUE-Message.h M include/osmocom/ranap/RANAP_InitiatingMessage.h M include/osmocom/ranap/RANAP_IntegrityProtectionAlgorithm.h M include/osmocom/ranap/RANAP_IntegrityProtectionInformation.h M include/osmocom/ranap/RANAP_IntegrityProtectionKey.h M include/osmocom/ranap/RANAP_InterSystemInformation-TransparentContainer.h M include/osmocom/ranap/RANAP_InterSystemInformationTransferType.h M include/osmocom/ranap/RANAP_InterfacesToTraceItem.h M include/osmocom/ranap/RANAP_Iu-ReleaseCommand.h M include/osmocom/ranap/RANAP_Iu-ReleaseComplete.h M include/osmocom/ranap/RANAP_Iu-ReleaseRequest.h M include/osmocom/ranap/RANAP_IuSigConId-IE-ContainerList.h M include/osmocom/ranap/RANAP_IuSignallingConnectionIdentifier.h M include/osmocom/ranap/RANAP_IuTransportAssociation.h M include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h M include/osmocom/ranap/RANAP_KeyStatus.h M include/osmocom/ranap/RANAP_L3-Information.h M include/osmocom/ranap/RANAP_LA-LIST.h M include/osmocom/ranap/RANAP_LABased.h M include/osmocom/ranap/RANAP_LAC.h M include/osmocom/ranap/RANAP_LAI-List.h M include/osmocom/ranap/RANAP_LAI.h M include/osmocom/ranap/RANAP_LAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_LHN-ID.h M include/osmocom/ranap/RANAP_LastKnownServiceArea.h M include/osmocom/ranap/RANAP_LastVisitedUTRANCell-Item.h M include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h M include/osmocom/ranap/RANAP_Links-to-log.h M include/osmocom/ranap/RANAP_ListOF-SNAs.h M include/osmocom/ranap/RANAP_ListOfInterfacesToTrace.h M include/osmocom/ranap/RANAP_LoadValue.h M include/osmocom/ranap/RANAP_LocationRelatedDataFailure.h M include/osmocom/ranap/RANAP_LocationRelatedDataRequest.h M include/osmocom/ranap/RANAP_LocationRelatedDataRequestType.h M include/osmocom/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.h M include/osmocom/ranap/RANAP_LocationRelatedDataResponse.h M include/osmocom/ranap/RANAP_LocationReport.h M include/osmocom/ranap/RANAP_LocationReportingControl.h M include/osmocom/ranap/RANAP_LocationReportingTransferInformation.h M include/osmocom/ranap/RANAP_LoggedMDT.h M include/osmocom/ranap/RANAP_LoggingDuration.h M include/osmocom/ranap/RANAP_LoggingInterval.h M include/osmocom/ranap/RANAP_M1Report.h M include/osmocom/ranap/RANAP_M2Report.h M include/osmocom/ranap/RANAP_M4-Collection-Parameters.h M include/osmocom/ranap/RANAP_M4-Period.h M include/osmocom/ranap/RANAP_M4-Threshold.h M include/osmocom/ranap/RANAP_M4Report.h M include/osmocom/ranap/RANAP_M5-Period.h M include/osmocom/ranap/RANAP_M5Report.h M include/osmocom/ranap/RANAP_M6-Period.h M include/osmocom/ranap/RANAP_M6Report.h M include/osmocom/ranap/RANAP_M7-Period.h M include/osmocom/ranap/RANAP_M7Report.h M include/osmocom/ranap/RANAP_MBMS-PTP-RAB-ID.h M include/osmocom/ranap/RANAP_MBMSBearerServiceType.h M include/osmocom/ranap/RANAP_MBMSCNDe-Registration.h M include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationRequest.h M include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationResponse.h M include/osmocom/ranap/RANAP_MBMSCountingInformation.h M include/osmocom/ranap/RANAP_MBMSHCIndicator.h M include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h M include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h M include/osmocom/ranap/RANAP_MBMSLinkingInformation.h M include/osmocom/ranap/RANAP_MBMSRABEstablishmentIndication.h M include/osmocom/ranap/RANAP_MBMSRABRelease.h M include/osmocom/ranap/RANAP_MBMSRABReleaseFailure.h M include/osmocom/ranap/RANAP_MBMSRABReleaseRequest.h M include/osmocom/ranap/RANAP_MBMSRegistrationFailure.h M include/osmocom/ranap/RANAP_MBMSRegistrationRequest.h M include/osmocom/ranap/RANAP_MBMSRegistrationRequestType.h M include/osmocom/ranap/RANAP_MBMSRegistrationResponse.h M include/osmocom/ranap/RANAP_MBMSServiceArea.h M include/osmocom/ranap/RANAP_MBMSSessionDuration.h M include/osmocom/ranap/RANAP_MBMSSessionIdentity.h M include/osmocom/ranap/RANAP_MBMSSessionRepetitionNumber.h M include/osmocom/ranap/RANAP_MBMSSessionStart.h M include/osmocom/ranap/RANAP_MBMSSessionStartFailure.h M include/osmocom/ranap/RANAP_MBMSSessionStartResponse.h M include/osmocom/ranap/RANAP_MBMSSessionStop.h M include/osmocom/ranap/RANAP_MBMSSessionStopResponse.h M include/osmocom/ranap/RANAP_MBMSSessionUpdate.h M include/osmocom/ranap/RANAP_MBMSSessionUpdateFailure.h M include/osmocom/ranap/RANAP_MBMSSessionUpdateResponse.h M include/osmocom/ranap/RANAP_MBMSSynchronisationInformation.h M include/osmocom/ranap/RANAP_MBMSUELinkingRequest.h M include/osmocom/ranap/RANAP_MBMSUELinkingResponse.h M include/osmocom/ranap/RANAP_MDT-Activation.h M include/osmocom/ranap/RANAP_MDT-Configuration.h M include/osmocom/ranap/RANAP_MDT-PLMN-List.h M include/osmocom/ranap/RANAP_MDT-Report-Parameters.h M include/osmocom/ranap/RANAP_MDTAreaScope.h M include/osmocom/ranap/RANAP_MDTMode.h M include/osmocom/ranap/RANAP_MSISDN.h M include/osmocom/ranap/RANAP_Management-Based-MDT-Allowed.h M include/osmocom/ranap/RANAP_MaxBitrate.h M include/osmocom/ranap/RANAP_MaxSDU-Size.h M include/osmocom/ranap/RANAP_MeasBand.h M include/osmocom/ranap/RANAP_MeasurementQuantity.h M include/osmocom/ranap/RANAP_MeasurementsToActivate.h M include/osmocom/ranap/RANAP_MessageStructure.h M include/osmocom/ranap/RANAP_NAS-PDU.h M include/osmocom/ranap/RANAP_NAS-SequenceNumber.h M include/osmocom/ranap/RANAP_NAS-SynchronisationIndicator.h M include/osmocom/ranap/RANAP_NRTLoadInformationValue.h M include/osmocom/ranap/RANAP_NewBSS-To-OldBSS-Information.h M include/osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_NonSearchingIndication.h M include/osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_NumberOfIuInstances.h M include/osmocom/ranap/RANAP_NumberOfSteps.h M include/osmocom/ranap/RANAP_OMC-ID.h M include/osmocom/ranap/RANAP_Offload-RAB-Parameters-APN.h M include/osmocom/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.h M include/osmocom/ranap/RANAP_Offload-RAB-Parameters.h M include/osmocom/ranap/RANAP_OldBSS-ToNewBSS-Information.h M include/osmocom/ranap/RANAP_Out-Of-UTRAN.h M include/osmocom/ranap/RANAP_Outcome.h M include/osmocom/ranap/RANAP_Overload.h M include/osmocom/ranap/RANAP_P-TMSI.h M include/osmocom/ranap/RANAP_PDP-Type-extension.h M include/osmocom/ranap/RANAP_PDP-Type.h M include/osmocom/ranap/RANAP_PDP-TypeInformation-extension.h M include/osmocom/ranap/RANAP_PDP-TypeInformation.h M include/osmocom/ranap/RANAP_PDUType14FrameSequenceNumber.h M include/osmocom/ranap/RANAP_PLMNidentity.h M include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h M include/osmocom/ranap/RANAP_Paging.h M include/osmocom/ranap/RANAP_PagingAreaID.h M include/osmocom/ranap/RANAP_PagingCause.h M include/osmocom/ranap/RANAP_PeriodicLocationInfo.h M include/osmocom/ranap/RANAP_PeriodicReportingIndicator.h M include/osmocom/ranap/RANAP_PermanentNAS-UE-ID.h M include/osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h M include/osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h M include/osmocom/ranap/RANAP_Port-Number.h M include/osmocom/ranap/RANAP_PositionData.h M include/osmocom/ranap/RANAP_PositionDataSpecificToGERANIuMode.h M include/osmocom/ranap/RANAP_PositioningDataDiscriminator.h M include/osmocom/ranap/RANAP_PositioningDataSet.h M include/osmocom/ranap/RANAP_PositioningMethodAndUsage.h M include/osmocom/ranap/RANAP_PositioningPriority.h M include/osmocom/ranap/RANAP_Pre-emptionCapability.h M include/osmocom/ranap/RANAP_Pre-emptionVulnerability.h M include/osmocom/ranap/RANAP_Presence.h M include/osmocom/ranap/RANAP_Priority-Class-Indicator.h M include/osmocom/ranap/RANAP_PriorityLevel.h M include/osmocom/ranap/RANAP_PrivateIE-ID.h M include/osmocom/ranap/RANAP_PrivateMessage.h M include/osmocom/ranap/RANAP_ProcedureCode.h M include/osmocom/ranap/RANAP_ProtocolError-IE-ContainerList.h M include/osmocom/ranap/RANAP_ProtocolExtensionContainer.h M include/osmocom/ranap/RANAP_ProtocolExtensionField.h M include/osmocom/ranap/RANAP_ProtocolExtensionID.h M include/osmocom/ranap/RANAP_ProtocolIE-Container.h M include/osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h M include/osmocom/ranap/RANAP_ProtocolIE-FieldPair.h M include/osmocom/ranap/RANAP_ProtocolIE-ID.h M include/osmocom/ranap/RANAP_ProvidedData.h M include/osmocom/ranap/RANAP_QueuingAllowed.h M include/osmocom/ranap/RANAP_RAB-AssignmentRequest.h M include/osmocom/ranap/RANAP_RAB-AssignmentResponse.h M include/osmocom/ranap/RANAP_RAB-AsymmetryIndicator.h M include/osmocom/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h M include/osmocom/ranap/RANAP_RAB-ContextItem.h M include/osmocom/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h M include/osmocom/ranap/RANAP_RAB-ContextList.h M include/osmocom/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h M include/osmocom/ranap/RANAP_RAB-DataForwardingItem.h M include/osmocom/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h M include/osmocom/ranap/RANAP_RAB-DataForwardingList.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportList.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestItem.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestList.h M include/osmocom/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-FailedItem.h M include/osmocom/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-FailedList.h M include/osmocom/ranap/RANAP_RAB-ID.h M include/osmocom/ranap/RANAP_RAB-IE-ContainerList.h M include/osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h M include/osmocom/ranap/RANAP_RAB-ModifyItem.h M include/osmocom/ranap/RANAP_RAB-ModifyList.h M include/osmocom/ranap/RANAP_RAB-ModifyRequest.h M include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameters.h M include/osmocom/ranap/RANAP_RAB-QueuedItem.h M include/osmocom/ranap/RANAP_RAB-QueuedList.h M include/osmocom/ranap/RANAP_RAB-ReleaseFailedList.h M include/osmocom/ranap/RANAP_RAB-ReleaseItem.h M include/osmocom/ranap/RANAP_RAB-ReleaseList.h M include/osmocom/ranap/RANAP_RAB-ReleaseRequest.h M include/osmocom/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h M include/osmocom/ranap/RANAP_RAB-ReleasedItem.h M include/osmocom/ranap/RANAP_RAB-ReleasedList-IuRelComp.h M include/osmocom/ranap/RANAP_RAB-ReleasedList.h M include/osmocom/ranap/RANAP_RAB-RelocationReleaseItem.h M include/osmocom/ranap/RANAP_RAB-RelocationReleaseList.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReq.h M include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReqAck.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-SetupList-RelocReq.h M include/osmocom/ranap/RANAP_RAB-SetupList-RelocReqAck.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifiedList.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemFirst.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemSecond.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifyList.h M include/osmocom/ranap/RANAP_RAB-SubflowCombinationBitRate.h M include/osmocom/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-TrCH-Mapping.h M include/osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h M include/osmocom/ranap/RANAP_RABDataVolumeReport.h M include/osmocom/ranap/RANAP_RABParametersList.h M include/osmocom/ranap/RANAP_RABased.h M include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferItem.h M include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferList.h M include/osmocom/ranap/RANAP_RABs-failed-to-reportItem.h M include/osmocom/ranap/RANAP_RABs-failed-to-reportList.h M include/osmocom/ranap/RANAP_RAC.h M include/osmocom/ranap/RANAP_RAI-List.h M include/osmocom/ranap/RANAP_RAI.h M include/osmocom/ranap/RANAP_RAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h M include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h M include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h M include/osmocom/ranap/RANAP_RANAP-PDU.h M include/osmocom/ranap/RANAP_RANAP-RelocationInformation.h M include/osmocom/ranap/RANAP_RAT-Type.h M include/osmocom/ranap/RANAP_RAofIdleModeUEs.h M include/osmocom/ranap/RANAP_RIM-Transfer.h M include/osmocom/ranap/RANAP_RIMInformation.h M include/osmocom/ranap/RANAP_RIMRoutingAddress.h M include/osmocom/ranap/RANAP_RNC-ID.h M include/osmocom/ranap/RANAP_RNCTraceInformation.h M include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h M include/osmocom/ranap/RANAP_RRC-Container.h M include/osmocom/ranap/RANAP_RSRQ-Extension.h M include/osmocom/ranap/RANAP_RSRQ-Type.h M include/osmocom/ranap/RANAP_RSRVCC-HO-Indication.h M include/osmocom/ranap/RANAP_RSRVCC-Information.h M include/osmocom/ranap/RANAP_RSRVCC-Operation-Possible.h M include/osmocom/ranap/RANAP_RTLoadValue.h M include/osmocom/ranap/RANAP_RateControlAllowed.h M include/osmocom/ranap/RANAP_RedirectAttemptFlag.h M include/osmocom/ranap/RANAP_RedirectionCompleted.h M include/osmocom/ranap/RANAP_RedirectionIndication.h M include/osmocom/ranap/RANAP_RejectCauseValue.h M include/osmocom/ranap/RANAP_RelocationCancel.h M include/osmocom/ranap/RANAP_RelocationCancelAcknowledge.h M include/osmocom/ranap/RANAP_RelocationCommand.h M include/osmocom/ranap/RANAP_RelocationComplete.h M include/osmocom/ranap/RANAP_RelocationDetect.h M include/osmocom/ranap/RANAP_RelocationFailure.h M include/osmocom/ranap/RANAP_RelocationPreparationFailure.h M include/osmocom/ranap/RANAP_RelocationRequest.h M include/osmocom/ranap/RANAP_RelocationRequestAcknowledge.h M include/osmocom/ranap/RANAP_RelocationRequired.h M include/osmocom/ranap/RANAP_RelocationRequirement.h M include/osmocom/ranap/RANAP_RelocationType.h M include/osmocom/ranap/RANAP_RepetitionNumber0.h M include/osmocom/ranap/RANAP_RepetitionNumber1.h M include/osmocom/ranap/RANAP_ReportAmount.h M include/osmocom/ranap/RANAP_ReportArea.h M include/osmocom/ranap/RANAP_ReportChangeOfSAI.h M include/osmocom/ranap/RANAP_ReportInterval.h M include/osmocom/ranap/RANAP_RequestType.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h M include/osmocom/ranap/RANAP_RequestedGANSSAssistanceData.h M include/osmocom/ranap/RANAP_RequestedGPSAssistanceData.h M include/osmocom/ranap/RANAP_RequestedLocationRelatedDataType.h M include/osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h M include/osmocom/ranap/RANAP_RequestedMulticastServiceList.h M include/osmocom/ranap/RANAP_Reset.h M include/osmocom/ranap/RANAP_ResetAcknowledge.h M include/osmocom/ranap/RANAP_ResetResource.h M include/osmocom/ranap/RANAP_ResetResourceAckItem.h M include/osmocom/ranap/RANAP_ResetResourceAckList.h M include/osmocom/ranap/RANAP_ResetResourceAcknowledge.h M include/osmocom/ranap/RANAP_ResetResourceItem.h M include/osmocom/ranap/RANAP_ResetResourceList.h M include/osmocom/ranap/RANAP_ResidualBitErrorRatio.h M include/osmocom/ranap/RANAP_ResponseTime.h M include/osmocom/ranap/RANAP_SAC.h M include/osmocom/ranap/RANAP_SAI.h M include/osmocom/ranap/RANAP_SAPI.h M include/osmocom/ranap/RANAP_SDU-ErrorRatio.h M include/osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h M include/osmocom/ranap/RANAP_SDU-FormatInformationParameters.h M include/osmocom/ranap/RANAP_SDU-ParameterItem.h M include/osmocom/ranap/RANAP_SDU-Parameters.h M include/osmocom/ranap/RANAP_SNA-Access-Information.h M include/osmocom/ranap/RANAP_SNAC.h M include/osmocom/ranap/RANAP_SRB-ID.h M include/osmocom/ranap/RANAP_SRB-TrCH-Mapping.h M include/osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h M include/osmocom/ranap/RANAP_SRNS-ContextRequest.h M include/osmocom/ranap/RANAP_SRNS-ContextResponse.h M include/osmocom/ranap/RANAP_SRNS-DataForwardCommand.h M include/osmocom/ranap/RANAP_SRVCC-CSKeysRequest.h M include/osmocom/ranap/RANAP_SRVCC-CSKeysResponse.h M include/osmocom/ranap/RANAP_SRVCC-HO-Indication.h M include/osmocom/ranap/RANAP_SRVCC-Information.h M include/osmocom/ranap/RANAP_SRVCC-Operation-Possible.h M include/osmocom/ranap/RANAP_SecurityModeCommand.h M include/osmocom/ranap/RANAP_SecurityModeComplete.h M include/osmocom/ranap/RANAP_SecurityModeReject.h M include/osmocom/ranap/RANAP_Service-Handover.h M include/osmocom/ranap/RANAP_Session-Re-establishment-Indicator.h M include/osmocom/ranap/RANAP_SessionUpdateID.h M include/osmocom/ranap/RANAP_Shared-Network-Information.h M include/osmocom/ranap/RANAP_SignallingIndication.h M include/osmocom/ranap/RANAP_Source-ToTarget-TransparentContainer.h M include/osmocom/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.h M include/osmocom/ranap/RANAP_SourceCellID.h M include/osmocom/ranap/RANAP_SourceID.h M include/osmocom/ranap/RANAP_SourceRNC-ID.h M include/osmocom/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h M include/osmocom/ranap/RANAP_SourceStatisticsDescriptor.h M include/osmocom/ranap/RANAP_SourceUTRANCellID.h M include/osmocom/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.h M include/osmocom/ranap/RANAP_SubflowSDU-Size.h M include/osmocom/ranap/RANAP_SubscriberProfileIDforRFP.h M include/osmocom/ranap/RANAP_SuccessfulOutcome.h M include/osmocom/ranap/RANAP_SupportedBitrate.h M include/osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h M include/osmocom/ranap/RANAP_TAC.h M include/osmocom/ranap/RANAP_TAI.h M include/osmocom/ranap/RANAP_TBCD-STRING.h M include/osmocom/ranap/RANAP_TMGI.h M include/osmocom/ranap/RANAP_TMSI.h M include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h M include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h M include/osmocom/ranap/RANAP_Target-ToSource-TransparentContainer.h M include/osmocom/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.h M include/osmocom/ranap/RANAP_TargetCellId.h M include/osmocom/ranap/RANAP_TargetENB-ID.h M include/osmocom/ranap/RANAP_TargetID.h M include/osmocom/ranap/RANAP_TargetRNC-ID.h M include/osmocom/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h M include/osmocom/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.h M include/osmocom/ranap/RANAP_TemporaryUE-ID.h M include/osmocom/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.h M include/osmocom/ranap/RANAP_Time-UE-StayedInCell.h M include/osmocom/ranap/RANAP_TimeToMBMSDataTransfer.h M include/osmocom/ranap/RANAP_TimingDifferenceULDL.h M include/osmocom/ranap/RANAP_TrCH-ID-List.h M include/osmocom/ranap/RANAP_TrCH-ID.h M include/osmocom/ranap/RANAP_TraceDepth.h M include/osmocom/ranap/RANAP_TraceInformation.h M include/osmocom/ranap/RANAP_TracePropagationParameters.h M include/osmocom/ranap/RANAP_TraceRecordingSessionInformation.h M include/osmocom/ranap/RANAP_TraceRecordingSessionReference.h M include/osmocom/ranap/RANAP_TraceReference.h M include/osmocom/ranap/RANAP_TraceType.h M include/osmocom/ranap/RANAP_TrafficClass.h M include/osmocom/ranap/RANAP_TrafficHandlingPriority.h M include/osmocom/ranap/RANAP_TransferDelay.h M include/osmocom/ranap/RANAP_TransportLayerAddress.h M include/osmocom/ranap/RANAP_TransportLayerInformation.h M include/osmocom/ranap/RANAP_TriggerID.h M include/osmocom/ranap/RANAP_TriggeringMessage.h M include/osmocom/ranap/RANAP_TunnelInformation.h M include/osmocom/ranap/RANAP_TypeOfError.h M include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h M include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.h M include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRateUplink.h M include/osmocom/ranap/RANAP_UE-History-Information.h M include/osmocom/ranap/RANAP_UE-ID.h M include/osmocom/ranap/RANAP_UESBI-Iu.h M include/osmocom/ranap/RANAP_UESBI-IuA.h M include/osmocom/ranap/RANAP_UESBI-IuB.h M include/osmocom/ranap/RANAP_UESpecificInformationIndication.h M include/osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_UL-N-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_UP-ModeVersions.h M include/osmocom/ranap/RANAP_UPInformation.h M include/osmocom/ranap/RANAP_UPInitialisationFrame.h M include/osmocom/ranap/RANAP_USCH-ID.h M include/osmocom/ranap/RANAP_UTRAN-CellID.h M include/osmocom/ranap/RANAP_UeRadioCapabilityMatchRequest.h M include/osmocom/ranap/RANAP_UeRadioCapabilityMatchResponse.h M include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h M include/osmocom/ranap/RANAP_UnsuccessfulOutcome.h M include/osmocom/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h M include/osmocom/ranap/RANAP_UplinkInformationExchangeFailure.h M include/osmocom/ranap/RANAP_UplinkInformationExchangeRequest.h M include/osmocom/ranap/RANAP_UplinkInformationExchangeResponse.h M include/osmocom/ranap/RANAP_UserPlaneInformation.h M include/osmocom/ranap/RANAP_UserPlaneMode.h M include/osmocom/ranap/RANAP_VelocityEstimate.h M include/osmocom/ranap/RANAP_VerticalAccuracyCode.h M include/osmocom/ranap/RANAP_VerticalSpeedDirection.h M include/osmocom/ranap/RANAP_VerticalVelocity.h M include/osmocom/ranap/RANAP_VoiceSupportMatchIndicator.h M include/osmocom/rua/RUA_Ansi-41-IDNNS.h M include/osmocom/rua/RUA_CN-DomainIndicator.h M include/osmocom/rua/RUA_CSGMembershipStatus.h M include/osmocom/rua/RUA_Cause.h M include/osmocom/rua/RUA_CauseMisc.h M include/osmocom/rua/RUA_CauseProtocol.h M include/osmocom/rua/RUA_CauseRadioNetwork.h M include/osmocom/rua/RUA_CauseTransport.h M include/osmocom/rua/RUA_Connect.h M include/osmocom/rua/RUA_ConnectionlessTransfer.h M include/osmocom/rua/RUA_Context-ID.h M include/osmocom/rua/RUA_Criticality.h M include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h M include/osmocom/rua/RUA_CriticalityDiagnostics.h M include/osmocom/rua/RUA_DirectTransfer.h M include/osmocom/rua/RUA_Disconnect.h M include/osmocom/rua/RUA_ErrorIndication.h M include/osmocom/rua/RUA_Establishment-Cause.h M include/osmocom/rua/RUA_Gsm-map-IDNNS.h M include/osmocom/rua/RUA_IE-Extensions.h M include/osmocom/rua/RUA_IE.h M include/osmocom/rua/RUA_InitiatingMessage.h M include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h M include/osmocom/rua/RUA_Presence.h M include/osmocom/rua/RUA_PrivateIE-ID.h M include/osmocom/rua/RUA_PrivateMessage.h M include/osmocom/rua/RUA_ProcedureCode.h M include/osmocom/rua/RUA_ProtocolIE-ID.h M include/osmocom/rua/RUA_RANAP-Message.h M include/osmocom/rua/RUA_RUA-PDU.h M include/osmocom/rua/RUA_RoutingParameter.h M include/osmocom/rua/RUA_SuccessfulOutcome.h M include/osmocom/rua/RUA_TriggeringMessage.h M include/osmocom/rua/RUA_TypeOfError.h M include/osmocom/rua/RUA_UnsuccessfulOutcome.h M include/osmocom/sabp/SABP_Available-Bandwidth.h M include/osmocom/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.h M include/osmocom/sabp/SABP_Broadcast-Message-Content.h M include/osmocom/sabp/SABP_Category.h M include/osmocom/sabp/SABP_Cause.h M include/osmocom/sabp/SABP_Criticality-Diagnostics.h M include/osmocom/sabp/SABP_Criticality.h M include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h M include/osmocom/sabp/SABP_Data-Coding-Scheme.h M include/osmocom/sabp/SABP_Error-Indication.h M include/osmocom/sabp/SABP_Failure-List-Item.h M include/osmocom/sabp/SABP_Failure-List.h M include/osmocom/sabp/SABP_Failure.h M include/osmocom/sabp/SABP_IE-Extensions.h M include/osmocom/sabp/SABP_IE.h M include/osmocom/sabp/SABP_InitiatingMessage.h M include/osmocom/sabp/SABP_Kill-Complete.h M include/osmocom/sabp/SABP_Kill-Failure.h M include/osmocom/sabp/SABP_Kill.h M include/osmocom/sabp/SABP_Load-Query-Complete.h M include/osmocom/sabp/SABP_Load-Query-Failure.h M include/osmocom/sabp/SABP_Load-Query.h M include/osmocom/sabp/SABP_Message-Identifier.h M include/osmocom/sabp/SABP_Message-Status-Query-Complete.h M include/osmocom/sabp/SABP_Message-Status-Query-Failure.h M include/osmocom/sabp/SABP_Message-Status-Query.h M include/osmocom/sabp/SABP_MessageStructure.h M include/osmocom/sabp/SABP_New-Serial-Number.h M include/osmocom/sabp/SABP_Number-Of-Broadcasts-Completed-Info.h M include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.h M include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List.h M include/osmocom/sabp/SABP_Number-of-Broadcasts-Requested.h M include/osmocom/sabp/SABP_Old-Serial-Number.h M include/osmocom/sabp/SABP_Paging-ETWS-Indicator.h M include/osmocom/sabp/SABP_Presence.h M include/osmocom/sabp/SABP_ProcedureCode.h M include/osmocom/sabp/SABP_ProtocolExtensionID.h M include/osmocom/sabp/SABP_ProtocolIE-ID.h M include/osmocom/sabp/SABP_Radio-Resource-Loading-List-Item.h M include/osmocom/sabp/SABP_Radio-Resource-Loading-List.h M include/osmocom/sabp/SABP_Recovery-Indication.h M include/osmocom/sabp/SABP_Repetition-Period.h M include/osmocom/sabp/SABP_RepetitionNumber0.h M include/osmocom/sabp/SABP_RepetitionNumber1.h M include/osmocom/sabp/SABP_Reset-Complete.h M include/osmocom/sabp/SABP_Reset-Failure.h M include/osmocom/sabp/SABP_Reset.h M include/osmocom/sabp/SABP_Restart.h M include/osmocom/sabp/SABP_SABP-PDU.h M include/osmocom/sabp/SABP_Serial-Number.h M include/osmocom/sabp/SABP_Service-Area-Identifier.h M include/osmocom/sabp/SABP_Service-Areas-List.h M include/osmocom/sabp/SABP_SuccessfulOutcome.h M include/osmocom/sabp/SABP_TriggeringMessage.h M include/osmocom/sabp/SABP_TypeOfError.h M include/osmocom/sabp/SABP_UnsuccessfulOutcome.h M include/osmocom/sabp/SABP_Warning-Type.h M include/osmocom/sabp/SABP_WarningSecurityInfo.h M include/osmocom/sabp/SABP_Write-Replace-Complete.h M include/osmocom/sabp/SABP_Write-Replace-Failure.h M include/osmocom/sabp/SABP_Write-Replace.h M src/hnbap/Access-stratum-release-indicator.c M src/hnbap/AccessResult.c M src/hnbap/AdditionalNeighbourInfoList.c M src/hnbap/AltitudeAndDirection.c M src/hnbap/BackoffTimer.c M src/hnbap/BindingID.c M src/hnbap/CELL-FACHMobilitySupport.c M src/hnbap/CGI.c M src/hnbap/CI.c M src/hnbap/CN-DomainIndicator.c M src/hnbap/CSG-Capability.c M src/hnbap/CSG-ID.c M src/hnbap/CSGMembershipStatus.c M src/hnbap/CSGMembershipUpdate.c M src/hnbap/Cause.c M src/hnbap/CauseMisc.c M src/hnbap/CauseProtocol.c M src/hnbap/CauseRadioNetwork.c M src/hnbap/CauseTransport.c M src/hnbap/CellIdentity.c M src/hnbap/ConfigurationInformation.c M src/hnbap/Context-ID.c M src/hnbap/Criticality.c M src/hnbap/CriticalityDiagnostics-IE-List.c M src/hnbap/CriticalityDiagnostics.c M src/hnbap/ESN.c M src/hnbap/ErrorIndication.c M src/hnbap/GTP-TEI.c M src/hnbap/GeographicalCoordinates.c M src/hnbap/GeographicalLocation.c M src/hnbap/HNB-Cell-Access-Mode.c M src/hnbap/HNB-Cell-Identifier.c M src/hnbap/HNB-GWResponse.c M src/hnbap/HNB-Identity-Info.c M src/hnbap/HNB-Identity.c M src/hnbap/HNB-Location-Information.c M src/hnbap/HNB-RNL-Identity.c M src/hnbap/HNBAP-PDU.c M src/hnbap/HNBCapacity.c M src/hnbap/HNBConfigInfo.c M src/hnbap/HNBConfigTransferRequest.c M src/hnbap/HNBConfigTransferResponse.c M src/hnbap/HNBConfigurationInformationMissing.c M src/hnbap/HNBConfigurationInformationProvided.c M src/hnbap/HNBDe-Register.c M src/hnbap/HNBRegisterAccept.c M src/hnbap/HNBRegisterReject.c M src/hnbap/HNBRegisterRequest.c M src/hnbap/IE-Extensions.c M src/hnbap/IE.c M src/hnbap/IMEI.c M src/hnbap/IMSI.c M src/hnbap/IMSIDS41.c M src/hnbap/IMSIESN.c M src/hnbap/IP-Address.c M src/hnbap/InitiatingMessage.c M src/hnbap/Ipv4Address.c M src/hnbap/Ipv6Address.c M src/hnbap/Iurh-Signalling-TNL-AddressList.c M src/hnbap/LAC.c M src/hnbap/LAI.c M src/hnbap/MacroCellID.c M src/hnbap/MacroCoverageInformation.c M src/hnbap/MuxPortNumber.c M src/hnbap/NeighbourCellIdentityList.c M src/hnbap/NeighbourIdentity.c M src/hnbap/NeighbourInfoList.c M src/hnbap/NeighbourInfoRequestItem.c M src/hnbap/NeighbourInfoRequestList.c M src/hnbap/PLMNidentity.c M src/hnbap/PSC.c M src/hnbap/PTMSI.c M src/hnbap/PTMSIRAI.c M src/hnbap/Presence.c M src/hnbap/PrivateIE-ID.c M src/hnbap/PrivateMessage.c M src/hnbap/ProcedureCode.c M src/hnbap/ProtocolIE-ID.c M src/hnbap/RAB-ID.c M src/hnbap/RABList.c M src/hnbap/RABListItem.c M src/hnbap/RAC.c M src/hnbap/RAI.c M src/hnbap/RNC-ID.c M src/hnbap/Registration-Cause.c M src/hnbap/RelocationComplete.c M src/hnbap/S-RNTIPrefix.c M src/hnbap/SAC.c M src/hnbap/SuccessfulOutcome.c M src/hnbap/TMSIDS41.c M src/hnbap/TMSILAI.c M src/hnbap/TNLUpdateFailure.c M src/hnbap/TNLUpdateRequest.c M src/hnbap/TNLUpdateResponse.c M src/hnbap/TransportInfo.c M src/hnbap/TransportLayerAddress.c M src/hnbap/TriggeringMessage.c M src/hnbap/Tunnel-Information.c M src/hnbap/TypeOfError.c M src/hnbap/U-RNTI.c M src/hnbap/U-RNTIQueryRequest.c M src/hnbap/U-RNTIQueryResponse.c M src/hnbap/UDP-Port-Number.c M src/hnbap/UE-Capabilities.c M src/hnbap/UE-Identity.c M src/hnbap/UEDe-Register.c M src/hnbap/UERegisterAccept.c M src/hnbap/UERegisterReject.c M src/hnbap/UERegisterRequest.c M src/hnbap/URAIdentity.c M src/hnbap/URAIdentityList.c M src/hnbap/UTRANCellID.c M src/hnbap/UnknownU-RNTIIndication.c M src/hnbap/UnsuccessfulOutcome.c M src/hnbap/Update-cause.c M src/ranap/RANAP_APN.c M src/ranap/RANAP_AccuracyFulfilmentIndicator.c M src/ranap/RANAP_AllocationOrRetentionPriority.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.c M src/ranap/RANAP_Alt-RAB-Parameters.c M src/ranap/RANAP_AlternativeRABConfigurationRequest.c M src/ranap/RANAP_AreaIdentity.c M src/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameters.c M src/ranap/RANAP_AuthorisedPLMNs.c M src/ranap/RANAP_AuthorisedSNAs.c M src/ranap/RANAP_BindingID.c M src/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.c M src/ranap/RANAP_CGI.c M src/ranap/RANAP_CI.c M src/ranap/RANAP_CN-DeactivateTrace.c M src/ranap/RANAP_CN-DomainIndicator.c M src/ranap/RANAP_CN-ID.c M src/ranap/RANAP_CN-InvokeTrace.c M src/ranap/RANAP_CNMBMSLinkingInformation.c M src/ranap/RANAP_CSFB-Information.c M src/ranap/RANAP_CSG-Id-List.c M src/ranap/RANAP_CSG-Id.c M src/ranap/RANAP_CSG-Membership-Status.c M src/ranap/RANAP_Cause.c M src/ranap/RANAP_CauseMisc.c M src/ranap/RANAP_CauseNAS.c M src/ranap/RANAP_CauseNon-Standard.c M src/ranap/RANAP_CauseProtocol.c M src/ranap/RANAP_CauseRadioNetwork.c M src/ranap/RANAP_CauseRadioNetworkExtension.c M src/ranap/RANAP_CauseTransmissionNetwork.c M src/ranap/RANAP_Cell-Access-Mode.c M src/ranap/RANAP_Cell-Capacity-Class-Value.c M src/ranap/RANAP_Cell-Id.c M src/ranap/RANAP_CellBased.c M src/ranap/RANAP_CellIdList.c M src/ranap/RANAP_CellLoadInformation.c M src/ranap/RANAP_CellLoadInformationGroup.c M src/ranap/RANAP_CellType.c M src/ranap/RANAP_ChosenEncryptionAlgorithm.c M src/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.c M src/ranap/RANAP_ClassmarkInformation2.c M src/ranap/RANAP_ClassmarkInformation3.c M src/ranap/RANAP_ClientType.c M src/ranap/RANAP_CommonID.c M src/ranap/RANAP_Correlation-ID.c M src/ranap/RANAP_Criticality.c M src/ranap/RANAP_CriticalityDiagnostics-IE-List.c M src/ranap/RANAP_CriticalityDiagnostics.c M src/ranap/RANAP_D-RNTI.c M src/ranap/RANAP_DCH-ID.c M src/ranap/RANAP_DL-GTP-PDU-SequenceNumber.c M src/ranap/RANAP_DL-N-PDU-SequenceNumber.c M src/ranap/RANAP_DRX-CycleLengthCoefficient.c M src/ranap/RANAP_DSCH-ID.c M src/ranap/RANAP_DataPDUType.c M src/ranap/RANAP_DataVolumeList.c M src/ranap/RANAP_DataVolumeReference.c M src/ranap/RANAP_DataVolumeReport.c M src/ranap/RANAP_DataVolumeReportList.c M src/ranap/RANAP_DataVolumeReportRequest.c M src/ranap/RANAP_DataVolumeReportingIndication.c M src/ranap/RANAP_DeliveryOfErroneousSDU.c M src/ranap/RANAP_DeliveryOrder.c M src/ranap/RANAP_DeltaRAListofIdleModeUEs.c M src/ranap/RANAP_DirectInformationTransfer.c M src/ranap/RANAP_DirectReportingIndicator.c M src/ranap/RANAP_DirectTransfer-IE-ContainerList.c M src/ranap/RANAP_DirectTransfer.c M src/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.c M src/ranap/RANAP_E-DCH-MAC-d-Flow-ID.c M src/ranap/RANAP_E-UTRAN-Service-Handover.c M src/ranap/RANAP_EARFCN-Extended.c M src/ranap/RANAP_ENB-ID.c M src/ranap/RANAP_EUTRANFrequencies.c M src/ranap/RANAP_EncryptionAlgorithm.c M src/ranap/RANAP_EncryptionInformation.c M src/ranap/RANAP_EncryptionKey.c M src/ranap/RANAP_End-Of-CSFB.c M src/ranap/RANAP_EnhancedRelocationCompleteConfirm.c M src/ranap/RANAP_EnhancedRelocationCompleteFailure.c M src/ranap/RANAP_EnhancedRelocationCompleteRequest.c M src/ranap/RANAP_EnhancedRelocationCompleteResponse.c M src/ranap/RANAP_EquipmentsToBeTraced.c M src/ranap/RANAP_ErrorIndication.c M src/ranap/RANAP_Event.c M src/ranap/RANAP_Event1F-Parameters.c M src/ranap/RANAP_Event1I-Parameters.c M src/ranap/RANAP_ExtendedGuaranteedBitrate.c M src/ranap/RANAP_ExtendedMaxBitrate.c M src/ranap/RANAP_ExtendedRNC-ID.c M src/ranap/RANAP_ForwardSRNS-Context.c M src/ranap/RANAP_ForwardingIndication.c M src/ranap/RANAP_FrameSequenceNumber.c M src/ranap/RANAP_FrequenceLayerConvergenceFlag.c M src/ranap/RANAP_GA-AltitudeAndDirection.c M src/ranap/RANAP_GA-EllipsoidArc.c M src/ranap/RANAP_GA-Point.c M src/ranap/RANAP_GA-PointWithAltitude.c M src/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.c M src/ranap/RANAP_GA-PointWithUnCertainty.c M src/ranap/RANAP_GA-PointWithUnCertaintyEllipse.c M src/ranap/RANAP_GA-Polygon.c M src/ranap/RANAP_GA-UncertaintyEllipse.c M src/ranap/RANAP_GANSS-PositioningDataSet.c M src/ranap/RANAP_GANSS-PositioningMethodAndUsage.c M src/ranap/RANAP_GERAN-BSC-Container.c M src/ranap/RANAP_GERAN-Cell-ID.c M src/ranap/RANAP_GERAN-Classmark.c M src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.c M src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.c M src/ranap/RANAP_GTP-TEI.c M src/ranap/RANAP_GeographicalArea.c M src/ranap/RANAP_GeographicalCoordinates.c M src/ranap/RANAP_GlobalCN-ID.c M src/ranap/RANAP_GlobalRNC-ID.c M src/ranap/RANAP_GuaranteedBitrate.c M src/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.c M src/ranap/RANAP_HigherBitratesThan16MbpsFlag.c M src/ranap/RANAP_HorizontalSpeedAndBearing.c M src/ranap/RANAP_HorizontalVelocity.c M src/ranap/RANAP_HorizontalVelocityWithUncertainty.c M src/ranap/RANAP_HorizontalWithVerticalVelocity.c M src/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.c M src/ranap/RANAP_IE-Extensions.c M src/ranap/RANAP_IE.c M src/ranap/RANAP_IMEI.c M src/ranap/RANAP_IMEIGroup.c M src/ranap/RANAP_IMEIList.c M src/ranap/RANAP_IMEISV.c M src/ranap/RANAP_IMEISVGroup.c M src/ranap/RANAP_IMEISVList.c M src/ranap/RANAP_IMSI.c M src/ranap/RANAP_IPMulticastAddress.c M src/ranap/RANAP_IRAT-Measurement-Configuration.c M src/ranap/RANAP_IRATmeasurementParameters.c M src/ranap/RANAP_ImmediateMDT.c M src/ranap/RANAP_IncludeVelocity.c M src/ranap/RANAP_InformationExchangeID.c M src/ranap/RANAP_InformationExchangeType.c M src/ranap/RANAP_InformationRequestType.c M src/ranap/RANAP_InformationRequested.c M src/ranap/RANAP_InformationTransferConfirmation.c M src/ranap/RANAP_InformationTransferFailure.c M src/ranap/RANAP_InformationTransferID.c M src/ranap/RANAP_InformationTransferIndication.c M src/ranap/RANAP_InformationTransferType.c M src/ranap/RANAP_InitialUE-Message.c M src/ranap/RANAP_InitiatingMessage.c M src/ranap/RANAP_IntegrityProtectionAlgorithm.c M src/ranap/RANAP_IntegrityProtectionInformation.c M src/ranap/RANAP_IntegrityProtectionKey.c M src/ranap/RANAP_InterSystemInformation-TransparentContainer.c M src/ranap/RANAP_InterSystemInformationTransferType.c M src/ranap/RANAP_InterfacesToTraceItem.c M src/ranap/RANAP_Iu-ReleaseCommand.c M src/ranap/RANAP_Iu-ReleaseComplete.c M src/ranap/RANAP_Iu-ReleaseRequest.c M src/ranap/RANAP_IuSigConId-IE-ContainerList.c M src/ranap/RANAP_IuSignallingConnectionIdentifier.c M src/ranap/RANAP_IuTransportAssociation.c M src/ranap/RANAP_JoinedMBMSBearerService-IEs.c M src/ranap/RANAP_KeyStatus.c M src/ranap/RANAP_L3-Information.c M src/ranap/RANAP_LA-LIST.c M src/ranap/RANAP_LABased.c M src/ranap/RANAP_LAC.c M src/ranap/RANAP_LAI-List.c M src/ranap/RANAP_LAI.c M src/ranap/RANAP_LAListofIdleModeUEs.c M src/ranap/RANAP_LHN-ID.c M src/ranap/RANAP_LastKnownServiceArea.c M src/ranap/RANAP_LastVisitedUTRANCell-Item.c M src/ranap/RANAP_LeftMBMSBearerService-IEs.c M src/ranap/RANAP_Links-to-log.c M src/ranap/RANAP_ListOF-SNAs.c M src/ranap/RANAP_ListOfInterfacesToTrace.c M src/ranap/RANAP_LoadValue.c M src/ranap/RANAP_LocationRelatedDataFailure.c M src/ranap/RANAP_LocationRelatedDataRequest.c M src/ranap/RANAP_LocationRelatedDataRequestType.c M src/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.c M src/ranap/RANAP_LocationRelatedDataResponse.c M src/ranap/RANAP_LocationReport.c M src/ranap/RANAP_LocationReportingControl.c M src/ranap/RANAP_LocationReportingTransferInformation.c M src/ranap/RANAP_LoggedMDT.c M src/ranap/RANAP_LoggingDuration.c M src/ranap/RANAP_LoggingInterval.c M src/ranap/RANAP_M1Report.c M src/ranap/RANAP_M2Report.c M src/ranap/RANAP_M4-Collection-Parameters.c M src/ranap/RANAP_M4-Period.c M src/ranap/RANAP_M4-Threshold.c M src/ranap/RANAP_M4Report.c M src/ranap/RANAP_M5-Period.c M src/ranap/RANAP_M5Report.c M src/ranap/RANAP_M6-Period.c M src/ranap/RANAP_M6Report.c M src/ranap/RANAP_M7-Period.c M src/ranap/RANAP_M7Report.c M src/ranap/RANAP_MBMS-PTP-RAB-ID.c M src/ranap/RANAP_MBMSBearerServiceType.c M src/ranap/RANAP_MBMSCNDe-Registration.c M src/ranap/RANAP_MBMSCNDe-RegistrationRequest.c M src/ranap/RANAP_MBMSCNDe-RegistrationResponse.c M src/ranap/RANAP_MBMSCountingInformation.c M src/ranap/RANAP_MBMSHCIndicator.c M src/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.c M src/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.c M src/ranap/RANAP_MBMSLinkingInformation.c M src/ranap/RANAP_MBMSRABEstablishmentIndication.c M src/ranap/RANAP_MBMSRABRelease.c M src/ranap/RANAP_MBMSRABReleaseFailure.c M src/ranap/RANAP_MBMSRABReleaseRequest.c M src/ranap/RANAP_MBMSRegistrationFailure.c M src/ranap/RANAP_MBMSRegistrationRequest.c M src/ranap/RANAP_MBMSRegistrationRequestType.c M src/ranap/RANAP_MBMSRegistrationResponse.c M src/ranap/RANAP_MBMSServiceArea.c M src/ranap/RANAP_MBMSSessionDuration.c M src/ranap/RANAP_MBMSSessionIdentity.c M src/ranap/RANAP_MBMSSessionRepetitionNumber.c M src/ranap/RANAP_MBMSSessionStart.c M src/ranap/RANAP_MBMSSessionStartFailure.c M src/ranap/RANAP_MBMSSessionStartResponse.c M src/ranap/RANAP_MBMSSessionStop.c M src/ranap/RANAP_MBMSSessionStopResponse.c M src/ranap/RANAP_MBMSSessionUpdate.c M src/ranap/RANAP_MBMSSessionUpdateFailure.c M src/ranap/RANAP_MBMSSessionUpdateResponse.c M src/ranap/RANAP_MBMSSynchronisationInformation.c M src/ranap/RANAP_MBMSUELinkingRequest.c M src/ranap/RANAP_MBMSUELinkingResponse.c M src/ranap/RANAP_MDT-Activation.c M src/ranap/RANAP_MDT-Configuration.c M src/ranap/RANAP_MDT-PLMN-List.c M src/ranap/RANAP_MDT-Report-Parameters.c M src/ranap/RANAP_MDTAreaScope.c M src/ranap/RANAP_MDTMode.c M src/ranap/RANAP_MSISDN.c M src/ranap/RANAP_Management-Based-MDT-Allowed.c M src/ranap/RANAP_MaxBitrate.c M src/ranap/RANAP_MaxSDU-Size.c M src/ranap/RANAP_MeasBand.c M src/ranap/RANAP_MeasurementQuantity.c M src/ranap/RANAP_MeasurementsToActivate.c M src/ranap/RANAP_MessageStructure.c M src/ranap/RANAP_NAS-PDU.c M src/ranap/RANAP_NAS-SequenceNumber.c M src/ranap/RANAP_NAS-SynchronisationIndicator.c M src/ranap/RANAP_NRTLoadInformationValue.c M src/ranap/RANAP_NewBSS-To-OldBSS-Information.c M src/ranap/RANAP_NewRAListofIdleModeUEs.c M src/ranap/RANAP_NonSearchingIndication.c M src/ranap/RANAP_NotEmptyRAListofIdleModeUEs.c M src/ranap/RANAP_NumberOfIuInstances.c M src/ranap/RANAP_NumberOfSteps.c M src/ranap/RANAP_OMC-ID.c M src/ranap/RANAP_Offload-RAB-Parameters-APN.c M src/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.c M src/ranap/RANAP_Offload-RAB-Parameters.c M src/ranap/RANAP_OldBSS-ToNewBSS-Information.c M src/ranap/RANAP_Out-Of-UTRAN.c M src/ranap/RANAP_Outcome.c M src/ranap/RANAP_Overload.c M src/ranap/RANAP_P-TMSI.c M src/ranap/RANAP_PDP-Type-extension.c M src/ranap/RANAP_PDP-Type.c M src/ranap/RANAP_PDP-TypeInformation-extension.c M src/ranap/RANAP_PDP-TypeInformation.c M src/ranap/RANAP_PDUType14FrameSequenceNumber.c M src/ranap/RANAP_PLMNidentity.c M src/ranap/RANAP_PLMNs-in-shared-network.c M src/ranap/RANAP_Paging.c M src/ranap/RANAP_PagingAreaID.c M src/ranap/RANAP_PagingCause.c M src/ranap/RANAP_PeriodicLocationInfo.c M src/ranap/RANAP_PeriodicReportingIndicator.c M src/ranap/RANAP_PermanentNAS-UE-ID.c M src/ranap/RANAP_PermittedEncryptionAlgorithms.c M src/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.c M src/ranap/RANAP_Port-Number.c M src/ranap/RANAP_PositionData.c M src/ranap/RANAP_PositionDataSpecificToGERANIuMode.c M src/ranap/RANAP_PositioningDataDiscriminator.c M src/ranap/RANAP_PositioningDataSet.c M src/ranap/RANAP_PositioningMethodAndUsage.c M src/ranap/RANAP_PositioningPriority.c M src/ranap/RANAP_Pre-emptionCapability.c M src/ranap/RANAP_Pre-emptionVulnerability.c M src/ranap/RANAP_Presence.c M src/ranap/RANAP_Priority-Class-Indicator.c M src/ranap/RANAP_PriorityLevel.c M src/ranap/RANAP_PrivateIE-ID.c M src/ranap/RANAP_PrivateMessage.c M src/ranap/RANAP_ProcedureCode.c M src/ranap/RANAP_ProtocolError-IE-ContainerList.c M src/ranap/RANAP_ProtocolExtensionContainer.c M src/ranap/RANAP_ProtocolExtensionField.c M src/ranap/RANAP_ProtocolExtensionID.c M src/ranap/RANAP_ProtocolIE-Container.c M src/ranap/RANAP_ProtocolIE-ContainerPair.c M src/ranap/RANAP_ProtocolIE-FieldPair.c M src/ranap/RANAP_ProtocolIE-ID.c M src/ranap/RANAP_ProvidedData.c M src/ranap/RANAP_QueuingAllowed.c M src/ranap/RANAP_RAB-AssignmentRequest.c M src/ranap/RANAP_RAB-AssignmentResponse.c M src/ranap/RANAP_RAB-AsymmetryIndicator.c M src/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.c M src/ranap/RANAP_RAB-ContextItem.c M src/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.c M src/ranap/RANAP_RAB-ContextList.c M src/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.c M src/ranap/RANAP_RAB-DataForwardingItem.c M src/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.c M src/ranap/RANAP_RAB-DataForwardingList.c M src/ranap/RANAP_RAB-DataVolumeReportItem.c M src/ranap/RANAP_RAB-DataVolumeReportList.c M src/ranap/RANAP_RAB-DataVolumeReportRequestItem.c M src/ranap/RANAP_RAB-DataVolumeReportRequestList.c M src/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-FailedItem.c M src/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-FailedList.c M src/ranap/RANAP_RAB-ID.c M src/ranap/RANAP_RAB-IE-ContainerList.c M src/ranap/RANAP_RAB-IE-ContainerPairList.c M src/ranap/RANAP_RAB-ModifyItem.c M src/ranap/RANAP_RAB-ModifyList.c M src/ranap/RANAP_RAB-ModifyRequest.c M src/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_RAB-Parameters.c M src/ranap/RANAP_RAB-QueuedItem.c M src/ranap/RANAP_RAB-QueuedList.c M src/ranap/RANAP_RAB-ReleaseFailedList.c M src/ranap/RANAP_RAB-ReleaseItem.c M src/ranap/RANAP_RAB-ReleaseList.c M src/ranap/RANAP_RAB-ReleaseRequest.c M src/ranap/RANAP_RAB-ReleasedItem-IuRelComp.c M src/ranap/RANAP_RAB-ReleasedItem.c M src/ranap/RANAP_RAB-ReleasedList-IuRelComp.c M src/ranap/RANAP_RAB-ReleasedList.c M src/ranap/RANAP_RAB-RelocationReleaseItem.c M src/ranap/RANAP_RAB-RelocationReleaseList.c M src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.c M src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.c M src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-SetupItem-RelocReq.c M src/ranap/RANAP_RAB-SetupItem-RelocReqAck.c M src/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.c M src/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.c M src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-SetupList-RelocReq.c M src/ranap/RANAP_RAB-SetupList-RelocReqAck.c M src/ranap/RANAP_RAB-SetupOrModifiedItem.c M src/ranap/RANAP_RAB-SetupOrModifiedList.c M src/ranap/RANAP_RAB-SetupOrModifyItemFirst.c M src/ranap/RANAP_RAB-SetupOrModifyItemSecond.c M src/ranap/RANAP_RAB-SetupOrModifyList.c M src/ranap/RANAP_RAB-SubflowCombinationBitRate.c M src/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-TrCH-Mapping.c M src/ranap/RANAP_RAB-TrCH-MappingItem.c M src/ranap/RANAP_RABDataVolumeReport.c M src/ranap/RANAP_RABParametersList.c M src/ranap/RANAP_RABased.c M src/ranap/RANAP_RABs-ContextFailedtoTransferItem.c M src/ranap/RANAP_RABs-ContextFailedtoTransferList.c M src/ranap/RANAP_RABs-failed-to-reportItem.c M src/ranap/RANAP_RABs-failed-to-reportList.c M src/ranap/RANAP_RAC.c M src/ranap/RANAP_RAI-List.c M src/ranap/RANAP_RAI.c M src/ranap/RANAP_RAListofIdleModeUEs.c M src/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.c M src/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.c M src/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.c M src/ranap/RANAP_RANAP-PDU.c M src/ranap/RANAP_RANAP-RelocationInformation.c M src/ranap/RANAP_RAT-Type.c M src/ranap/RANAP_RAofIdleModeUEs.c M src/ranap/RANAP_RIM-Transfer.c M src/ranap/RANAP_RIMInformation.c M src/ranap/RANAP_RIMRoutingAddress.c M src/ranap/RANAP_RNC-ID.c M src/ranap/RANAP_RNCTraceInformation.c M src/ranap/RANAP_RNSAPRelocationParameters.c M src/ranap/RANAP_RRC-Container.c M src/ranap/RANAP_RSRQ-Extension.c M src/ranap/RANAP_RSRQ-Type.c M src/ranap/RANAP_RSRVCC-HO-Indication.c M src/ranap/RANAP_RSRVCC-Information.c M src/ranap/RANAP_RSRVCC-Operation-Possible.c M src/ranap/RANAP_RTLoadValue.c M src/ranap/RANAP_RateControlAllowed.c M src/ranap/RANAP_RedirectAttemptFlag.c M src/ranap/RANAP_RedirectionCompleted.c M src/ranap/RANAP_RedirectionIndication.c M src/ranap/RANAP_RejectCauseValue.c M src/ranap/RANAP_RelocationCancel.c M src/ranap/RANAP_RelocationCancelAcknowledge.c M src/ranap/RANAP_RelocationCommand.c M src/ranap/RANAP_RelocationComplete.c M src/ranap/RANAP_RelocationDetect.c M src/ranap/RANAP_RelocationFailure.c M src/ranap/RANAP_RelocationPreparationFailure.c M src/ranap/RANAP_RelocationRequest.c M src/ranap/RANAP_RelocationRequestAcknowledge.c M src/ranap/RANAP_RelocationRequired.c M src/ranap/RANAP_RelocationRequirement.c M src/ranap/RANAP_RelocationType.c M src/ranap/RANAP_RepetitionNumber0.c M src/ranap/RANAP_RepetitionNumber1.c M src/ranap/RANAP_ReportAmount.c M src/ranap/RANAP_ReportArea.c M src/ranap/RANAP_ReportChangeOfSAI.c M src/ranap/RANAP_ReportInterval.c M src/ranap/RANAP_RequestType.c M src/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-Values.c M src/ranap/RANAP_RequestedGANSSAssistanceData.c M src/ranap/RANAP_RequestedGPSAssistanceData.c M src/ranap/RANAP_RequestedLocationRelatedDataType.c M src/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.c M src/ranap/RANAP_RequestedMulticastServiceList.c M src/ranap/RANAP_Reset.c M src/ranap/RANAP_ResetAcknowledge.c M src/ranap/RANAP_ResetResource.c M src/ranap/RANAP_ResetResourceAckItem.c M src/ranap/RANAP_ResetResourceAckList.c M src/ranap/RANAP_ResetResourceAcknowledge.c M src/ranap/RANAP_ResetResourceItem.c M src/ranap/RANAP_ResetResourceList.c M src/ranap/RANAP_ResidualBitErrorRatio.c M src/ranap/RANAP_ResponseTime.c M src/ranap/RANAP_SAC.c M src/ranap/RANAP_SAI.c M src/ranap/RANAP_SAPI.c M src/ranap/RANAP_SDU-ErrorRatio.c M src/ranap/RANAP_SDU-FormatInformationParameterItem.c M src/ranap/RANAP_SDU-FormatInformationParameters.c M src/ranap/RANAP_SDU-ParameterItem.c M src/ranap/RANAP_SDU-Parameters.c M src/ranap/RANAP_SNA-Access-Information.c M src/ranap/RANAP_SNAC.c M src/ranap/RANAP_SRB-ID.c M src/ranap/RANAP_SRB-TrCH-Mapping.c M src/ranap/RANAP_SRB-TrCH-MappingItem.c M src/ranap/RANAP_SRNS-ContextRequest.c M src/ranap/RANAP_SRNS-ContextResponse.c M src/ranap/RANAP_SRNS-DataForwardCommand.c M src/ranap/RANAP_SRVCC-CSKeysRequest.c M src/ranap/RANAP_SRVCC-CSKeysResponse.c M src/ranap/RANAP_SRVCC-HO-Indication.c M src/ranap/RANAP_SRVCC-Information.c M src/ranap/RANAP_SRVCC-Operation-Possible.c M src/ranap/RANAP_SecurityModeCommand.c M src/ranap/RANAP_SecurityModeComplete.c M src/ranap/RANAP_SecurityModeReject.c M src/ranap/RANAP_Service-Handover.c M src/ranap/RANAP_Session-Re-establishment-Indicator.c M src/ranap/RANAP_SessionUpdateID.c M src/ranap/RANAP_Shared-Network-Information.c M src/ranap/RANAP_SignallingIndication.c M src/ranap/RANAP_Source-ToTarget-TransparentContainer.c M src/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.c M src/ranap/RANAP_SourceCellID.c M src/ranap/RANAP_SourceID.c M src/ranap/RANAP_SourceRNC-ID.c M src/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.c M src/ranap/RANAP_SourceStatisticsDescriptor.c M src/ranap/RANAP_SourceUTRANCellID.c M src/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.c M src/ranap/RANAP_SubflowSDU-Size.c M src/ranap/RANAP_SubscriberProfileIDforRFP.c M src/ranap/RANAP_SuccessfulOutcome.c M src/ranap/RANAP_SupportedBitrate.c M src/ranap/RANAP_SupportedRAB-ParameterBitrateList.c M src/ranap/RANAP_TAC.c M src/ranap/RANAP_TAI.c M src/ranap/RANAP_TBCD-STRING.c M src/ranap/RANAP_TMGI.c M src/ranap/RANAP_TMSI.c M src/ranap/RANAP_TNLInformationEnhRelInfoReq.c M src/ranap/RANAP_TNLInformationEnhRelInfoRes.c M src/ranap/RANAP_Target-ToSource-TransparentContainer.c M src/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.c M src/ranap/RANAP_TargetCellId.c M src/ranap/RANAP_TargetENB-ID.c M src/ranap/RANAP_TargetID.c M src/ranap/RANAP_TargetRNC-ID.c M src/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.c M src/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.c M src/ranap/RANAP_TemporaryUE-ID.c M src/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.c M src/ranap/RANAP_Time-UE-StayedInCell.c M src/ranap/RANAP_TimeToMBMSDataTransfer.c M src/ranap/RANAP_TimingDifferenceULDL.c M src/ranap/RANAP_TrCH-ID-List.c M src/ranap/RANAP_TrCH-ID.c M src/ranap/RANAP_TraceDepth.c M src/ranap/RANAP_TraceInformation.c M src/ranap/RANAP_TracePropagationParameters.c M src/ranap/RANAP_TraceRecordingSessionInformation.c M src/ranap/RANAP_TraceRecordingSessionReference.c M src/ranap/RANAP_TraceReference.c M src/ranap/RANAP_TraceType.c M src/ranap/RANAP_TrafficClass.c M src/ranap/RANAP_TrafficHandlingPriority.c M src/ranap/RANAP_TransferDelay.c M src/ranap/RANAP_TransportLayerAddress.c M src/ranap/RANAP_TransportLayerInformation.c M src/ranap/RANAP_TriggerID.c M src/ranap/RANAP_TriggeringMessage.c M src/ranap/RANAP_TunnelInformation.c M src/ranap/RANAP_TypeOfError.c M src/ranap/RANAP_UE-AggregateMaximumBitRate.c M src/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.c M src/ranap/RANAP_UE-AggregateMaximumBitRateUplink.c M src/ranap/RANAP_UE-History-Information.c M src/ranap/RANAP_UE-ID.c M src/ranap/RANAP_UESBI-Iu.c M src/ranap/RANAP_UESBI-IuA.c M src/ranap/RANAP_UESBI-IuB.c M src/ranap/RANAP_UESpecificInformationIndication.c M src/ranap/RANAP_UL-GTP-PDU-SequenceNumber.c M src/ranap/RANAP_UL-N-PDU-SequenceNumber.c M src/ranap/RANAP_UP-ModeVersions.c M src/ranap/RANAP_UPInformation.c M src/ranap/RANAP_UPInitialisationFrame.c M src/ranap/RANAP_USCH-ID.c M src/ranap/RANAP_UTRAN-CellID.c M src/ranap/RANAP_UeRadioCapabilityMatchRequest.c M src/ranap/RANAP_UeRadioCapabilityMatchResponse.c M src/ranap/RANAP_UnsuccessfulLinking-IEs.c M src/ranap/RANAP_UnsuccessfulOutcome.c M src/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.c M src/ranap/RANAP_UplinkInformationExchangeFailure.c M src/ranap/RANAP_UplinkInformationExchangeRequest.c M src/ranap/RANAP_UplinkInformationExchangeResponse.c M src/ranap/RANAP_UserPlaneInformation.c M src/ranap/RANAP_UserPlaneMode.c M src/ranap/RANAP_VelocityEstimate.c M src/ranap/RANAP_VerticalAccuracyCode.c M src/ranap/RANAP_VerticalSpeedDirection.c M src/ranap/RANAP_VerticalVelocity.c M src/ranap/RANAP_VoiceSupportMatchIndicator.c M src/rua/RUA_Ansi-41-IDNNS.c M src/rua/RUA_CN-DomainIndicator.c M src/rua/RUA_CSGMembershipStatus.c M src/rua/RUA_Cause.c M src/rua/RUA_CauseMisc.c M src/rua/RUA_CauseProtocol.c M src/rua/RUA_CauseRadioNetwork.c M src/rua/RUA_CauseTransport.c M src/rua/RUA_Connect.c M src/rua/RUA_ConnectionlessTransfer.c M src/rua/RUA_Context-ID.c M src/rua/RUA_Criticality.c M src/rua/RUA_CriticalityDiagnostics-IE-List.c M src/rua/RUA_CriticalityDiagnostics.c M src/rua/RUA_DirectTransfer.c M src/rua/RUA_Disconnect.c M src/rua/RUA_ErrorIndication.c M src/rua/RUA_Establishment-Cause.c M src/rua/RUA_Gsm-map-IDNNS.c M src/rua/RUA_IE-Extensions.c M src/rua/RUA_IE.c M src/rua/RUA_InitiatingMessage.c M src/rua/RUA_IntraDomainNasNodeSelector.c M src/rua/RUA_Presence.c M src/rua/RUA_PrivateIE-ID.c M src/rua/RUA_PrivateMessage.c M src/rua/RUA_ProcedureCode.c M src/rua/RUA_ProtocolIE-ID.c M src/rua/RUA_RANAP-Message.c M src/rua/RUA_RUA-PDU.c M src/rua/RUA_RoutingParameter.c M src/rua/RUA_SuccessfulOutcome.c M src/rua/RUA_TriggeringMessage.c M src/rua/RUA_TypeOfError.c M src/rua/RUA_UnsuccessfulOutcome.c M src/sabp/SABP_Available-Bandwidth.c M src/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.c M src/sabp/SABP_Broadcast-Message-Content.c M src/sabp/SABP_Category.c M src/sabp/SABP_Cause.c M src/sabp/SABP_Criticality-Diagnostics.c M src/sabp/SABP_Criticality.c M src/sabp/SABP_CriticalityDiagnostics-IE-List.c M src/sabp/SABP_Data-Coding-Scheme.c M src/sabp/SABP_Error-Indication.c M src/sabp/SABP_Failure-List-Item.c M src/sabp/SABP_Failure-List.c M src/sabp/SABP_Failure.c M src/sabp/SABP_IE-Extensions.c M src/sabp/SABP_IE.c M src/sabp/SABP_InitiatingMessage.c M src/sabp/SABP_Kill-Complete.c M src/sabp/SABP_Kill-Failure.c M src/sabp/SABP_Kill.c M src/sabp/SABP_Load-Query-Complete.c M src/sabp/SABP_Load-Query-Failure.c M src/sabp/SABP_Load-Query.c M src/sabp/SABP_Message-Identifier.c M src/sabp/SABP_Message-Status-Query-Complete.c M src/sabp/SABP_Message-Status-Query-Failure.c M src/sabp/SABP_Message-Status-Query.c M src/sabp/SABP_MessageStructure.c M src/sabp/SABP_New-Serial-Number.c M src/sabp/SABP_Number-Of-Broadcasts-Completed-Info.c M src/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.c M src/sabp/SABP_Number-of-Broadcasts-Completed-List.c M src/sabp/SABP_Number-of-Broadcasts-Requested.c M src/sabp/SABP_Old-Serial-Number.c M src/sabp/SABP_Paging-ETWS-Indicator.c M src/sabp/SABP_Presence.c M src/sabp/SABP_ProcedureCode.c M src/sabp/SABP_ProtocolExtensionID.c M src/sabp/SABP_ProtocolIE-ID.c M src/sabp/SABP_Radio-Resource-Loading-List-Item.c M src/sabp/SABP_Radio-Resource-Loading-List.c M src/sabp/SABP_Recovery-Indication.c M src/sabp/SABP_Repetition-Period.c M src/sabp/SABP_RepetitionNumber0.c M src/sabp/SABP_RepetitionNumber1.c M src/sabp/SABP_Reset-Complete.c M src/sabp/SABP_Reset-Failure.c M src/sabp/SABP_Reset.c M src/sabp/SABP_Restart.c M src/sabp/SABP_SABP-PDU.c M src/sabp/SABP_Serial-Number.c M src/sabp/SABP_Service-Area-Identifier.c M src/sabp/SABP_Service-Areas-List.c M src/sabp/SABP_SuccessfulOutcome.c M src/sabp/SABP_TriggeringMessage.c M src/sabp/SABP_TypeOfError.c M src/sabp/SABP_UnsuccessfulOutcome.c M src/sabp/SABP_Warning-Type.c M src/sabp/SABP_WarningSecurityInfo.c M src/sabp/SABP_Write-Replace-Complete.c M src/sabp/SABP_Write-Replace-Failure.c M src/sabp/SABP_Write-Replace.c 1,580 files changed, 1,580 insertions(+), 230 deletions(-) Approvals: pespin: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25960 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ib7a03973d43828f47ff59b561d9ddce43186f8af Gerrit-Change-Number: 25960 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 13:00:14 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 13:00:14 +0000 Subject: Change in osmo-bts[master]: l1sap: Avoid re-(de)activating already (de)active lchans In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25965 ) Change subject: l1sap: Avoid re-(de)activating already (de)active lchans ...................................................................... l1sap: Avoid re-(de)activating already (de)active lchans This avoids triggering all sorts of unexpected paths where one tries to release an already released lchan, etc. This can happen for instance if BTS shuts down due to BSC link going down, and hence resets all lchans, announcing it to the PCU. Then the PCU may try to deactivate the channel sending act_req (disable), but the BTS already unilaterally dropped the channels. That code path seems to trigger some crash, probably because something in lchan has been freed. Related: SYS#4971 Change-Id: I093e4d4e23b527b10bf5d6ff538460626c30a8f8 --- M src/common/l1sap.c 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/src/common/l1sap.c b/src/common/l1sap.c index c89b2c3..f1d1575 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1961,6 +1961,12 @@ struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr); int rc; + if (lchan->state == LCHAN_S_ACTIVE) { + LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Trying to activate already active channel %s\n", + rsl_chan_nr_str(chan_nr)); + return -1; + } + LOGPLCHAN(lchan, DL1C, LOGL_INFO, "Activating channel %s\n", rsl_chan_nr_str(chan_nr)); lchan->s = trx->bts->radio_link_timeout.current; @@ -1994,6 +2000,13 @@ int l1sap_chan_rel(struct gsm_bts_trx *trx, uint8_t chan_nr) { struct gsm_lchan *lchan = get_lchan_by_chan_nr(trx, chan_nr); + + if (lchan->state == LCHAN_S_NONE) { + LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "Trying to deactivate already deactivated channel %s\n", + rsl_chan_nr_str(chan_nr)); + return -1; + } + LOGPLCHAN(lchan, DL1C, LOGL_INFO, "Deactivating channel %s\n", rsl_chan_nr_str(chan_nr)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25965 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I093e4d4e23b527b10bf5d6ff538460626c30a8f8 Gerrit-Change-Number: 25965 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 13:00:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 13:00:15 +0000 Subject: Change in osmo-bts[master]: scheduler: Avoid crash upon call to trx_sched_set_lchan if l1ts is un... In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25966 ) Change subject: scheduler: Avoid crash upon call to trx_sched_set_lchan if l1ts is uninitialized ...................................................................... scheduler: Avoid crash upon call to trx_sched_set_lchan if l1ts is uninitialized It could happen if for instance l1 code called trx_sched_clean() when closing the phy, and after that some code called (erroneously) trx_sched_set_lchan(). Let's make sure we don't allow other modules to crash the process when using this function. Related: SYS#4971 Change-Id: I93af7c3dcf0e34e9317eec0ee183dbf18b8d2f3b --- M src/common/scheduler.c 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/common/scheduler.c b/src/common/scheduler.c index c068ea0..0388445 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -1085,6 +1085,12 @@ bool found = false; int i; + if (!l1ts) { + LOGPLCHAN(lchan, DL1C, LOGL_ERROR, "%s lchan with uninitialized scheduler structure\n", + (active) ? "Activating" : "Deactivating"); + return -EINVAL; + } + /* VAMOS: convert Osmocom specific channel number to a generic one, * otherwise we won't match anything in trx_chan_desc[]. */ if (lchan->ts->vamos.is_shadow) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25966 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I93af7c3dcf0e34e9317eec0ee183dbf18b8d2f3b Gerrit-Change-Number: 25966 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: daniel Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 13:34:56 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 27 Oct 2021 13:34:56 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25829 ) Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25829/2/src/osmo-bsc/bsc_ctrl_commands.c File src/osmo-bsc/bsc_ctrl_commands.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25829/2/src/osmo-bsc/bsc_ctrl_commands.c at 670 PS2, Line 670: static int get_bts_resend_si(struct ctrl_cmd *cmd, void *data) > Don't you need to fill some sort of response value somehwere? I'd expect lower layers in the protoco [?] I think yes, but it worked without - probably there was a warning in the log text though. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 13:34:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 13:46:54 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 13:46:54 +0000 Subject: Change in osmo-sip-connector[master]: sip: fix memory leak (x_gcr) in send_invite() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25978 ) Change subject: sip: fix memory leak (x_gcr) in send_invite() ...................................................................... sip: fix memory leak (x_gcr) in send_invite() Change-Id: I6a2e5e15061010f6e62d0f3b0acd2c040dbe3249 Fixes: Id40d7e0fed9356f801b3627c118150055e7232b1 Related: OS#5164 --- M src/sip.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/78/25978/1 diff --git a/src/sip.c b/src/sip.c index 684ef74..0e88716 100644 --- a/src/sip.c +++ b/src/sip.c @@ -692,6 +692,7 @@ talloc_free(from); talloc_free(to); talloc_free(sdp); + talloc_free(x_gcr); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6a2e5e15061010f6e62d0f3b0acd2c040dbe3249 Gerrit-Change-Number: 25978 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 13:46:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 13:46:56 +0000 Subject: Change in osmo-sip-connector[master]: sip: use osmo_{enc, dec}_gcr() from libosmocore References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25979 ) Change subject: sip: use osmo_{enc,dec}_gcr() from libosmocore ...................................................................... sip: use osmo_{enc,dec}_gcr() from libosmocore Change-Id: I46fa46fc79494d337f2f4657215b91c39207eea4 Depends: I06babb959fdc82f4e82d92260131d60c98b0abd2 Fixes: Id40d7e0fed9356f801b3627c118150055e7232b1 Related: OS#5164 --- M src/call.h M src/mncc.c M src/sip.c 3 files changed, 34 insertions(+), 63 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/79/25979/1 diff --git a/src/call.h b/src/call.h index 8360711..a835f71 100644 --- a/src/call.h +++ b/src/call.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -31,7 +32,10 @@ const char *source; const char *dest; + + /* Global Call Reference */ struct osmo_gcr_parsed gcr; + bool gcr_present; }; enum { diff --git a/src/mncc.c b/src/mncc.c index fc99400..c8bf4bd 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -544,6 +544,7 @@ leg->state = MNCC_CC_INITIAL; leg->dir = MNCC_DIR_MO; leg->base.call->gcr = data->gcr; + leg->base.call->gcr_present = true; memcpy(&leg->called, called, sizeof(leg->called)); memcpy(&leg->calling, &data->calling, sizeof(leg->calling)); memcpy(&leg->imsi, data->imsi, sizeof(leg->imsi)); @@ -899,7 +900,8 @@ mncc.fields |= MNCC_F_CALLING; mncc.calling.plan = GSM48_NPI_ISDN_E164; - mncc.gcr = call->gcr; + if (call->gcr_present) + mncc.gcr = call->gcr; if (call->source && call->source[0] == '+') { mncc.calling.type = GSM48_TON_INTERNATIONAL; diff --git a/src/sip.c b/src/sip.c index 0e88716..9124752 100644 --- a/src/sip.c +++ b/src/sip.c @@ -107,34 +107,6 @@ nua_ack(leg->nua_handle, TAG_END()); } -int _osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len) -{ - uint16_t parsed = 1; /* account for length byte right away */ - - if (len < 13) - return -EBADMSG; - - gcr->net_len = elem[0]; - if (gcr->net_len < 3 || gcr->net_len > 5) - return -EINVAL; - - memcpy(gcr->net, elem + parsed, gcr->net_len); - /* +1 for ignored Node ID length field */ - parsed += (gcr->net_len + 1); - - gcr->node = osmo_load16be(elem + parsed); - parsed += 2; - - if (elem[parsed] != 5) /* see Table B 2.1.9.2 */ - return -ENOENT; - - parsed++; - - memcpy(gcr->cr, elem + parsed, 5); - - return parsed + 5; -} - static void new_call(struct sip_agent *agent, nua_handle_t *nh, const sip_t *sip) { @@ -142,15 +114,16 @@ struct sip_call_leg *leg; const char *from = NULL, *to = NULL; char ip_addr[INET6_ADDRSTRLEN]; - uint8_t gcr_back[28] = { 0 }; - + bool xgcr_hdr_present = false; + uint8_t xgcr_hdr[28] = { 0 }; LOGP(DSIP, LOGL_INFO, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh); sip_unknown_t *unknown_header = sip->sip_unknown; while (unknown_header != NULL) { if (!strcmp("X-Global-Call-Ref", unknown_header->un_name)) { - osmo_hexparse(unknown_header->un_value, gcr_back, sizeof(gcr_back)); + osmo_hexparse(unknown_header->un_value, xgcr_hdr, sizeof(xgcr_hdr)); + xgcr_hdr_present = true; break; } unknown_header = unknown_header->un_next; @@ -171,7 +144,16 @@ return; } - _osmo_dec_gcr(&call->gcr, gcr_back, sizeof(gcr_back)); + /* Decode Decode the Global Call Reference (if present) */ + if (xgcr_hdr_present) { + if (osmo_dec_gcr(&call->gcr, xgcr_hdr, sizeof(xgcr_hdr)) < 0) { + LOGP(DSIP, LOGL_ERROR, "Failed to parse X-Global-Call-Ref.\n"); + nua_respond(nh, SIP_406_NOT_ACCEPTABLE, TAG_END()); + nua_handle_destroy(nh); + return; + } + call->gcr_present = true; + } if (sip->sip_to) to = sip->sip_to->a_url->url_user; @@ -632,38 +614,10 @@ leg->state = SIP_CC_CONNECTED; } -/*! Encode Global Call Reference. */ -uint8_t _osmo_enc_gcr(uint8_t *buf, const struct osmo_gcr_parsed *g) -{ - uint8_t tmp[2]; - - if (!g) - return 0; - - if (g->net_len < 3 || g->net_len > 5) - return 0; - - buf = lv_put(buf, g->net_len, g->net); - osmo_store16be(g->node, &tmp); - buf = lv_put(buf, 2, tmp); - buf = lv_put(buf, 5, g->cr); - - /* Length: LV(Net) + LV(Node) + LV(CRef) - see 3GPP TS ?3.2.2.115 */ - return (g->net_len + 1) + (2 + 1) + (5 + 1); -} - static int send_invite(struct sip_agent *agent, struct sip_call_leg *leg, const char *calling_num, const char *called_num) { struct call_leg *other = leg->base.call->initial; - char gcr_hex[30]; - uint8_t data[15]; - - gcr_hex[0] = '\0'; - data[0] = '\0'; - uint8_t len = _osmo_enc_gcr(data, &leg->base.call->gcr); - if (len) - osmo_strlcpy(gcr_hex, osmo_hexdump_nospc(data, len*2+1), len*2+1); char *from = talloc_asprintf(leg, "sip:%s@%s:%d", calling_num, @@ -675,7 +629,18 @@ agent->app->sip.remote_port); char *sdp = sdp_create_file(leg, other, sdp_sendrecv); - char *x_gcr = talloc_asprintf(leg, "X-Global-Call-Ref: %s", gcr_hex); + /* Encode the Global Call Reference (if present) */ + char *x_gcr = NULL; + + if (leg->base.call->gcr_present) { + struct msgb *msg = msgb_alloc(16, "SIP GCR"); + + if (msg != NULL && osmo_enc_gcr(msg, &leg->base.call->gcr) > 0) + x_gcr = talloc_asprintf(leg, "X-Global-Call-Ref: %s", msgb_hexdump(msg)); + else + LOGP(DSIP, LOGL_ERROR, "Failed to encode GCR for leg(%p)\n", leg); + msgb_free(msg); + } leg->state = SIP_CC_INITIAL; leg->dir = SIP_DIR_MT; @@ -684,7 +649,7 @@ SIPTAG_TO_STR(to), NUTAG_MEDIA_ENABLE(0), SIPTAG_CONTENT_TYPE_STR("application/sdp"), - SIPTAG_HEADER_STR(x_gcr), + TAG_IF(x_gcr, SIPTAG_HEADER_STR(x_gcr)), SIPTAG_PAYLOAD_STR(sdp), TAG_END()); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I46fa46fc79494d337f2f4657215b91c39207eea4 Gerrit-Change-Number: 25979 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 13:46:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 13:46:56 +0000 Subject: Change in osmo-sip-connector[master]: mncc: rework passing GCR over the MNCC interface References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25980 ) Change subject: mncc: rework passing GCR over the MNCC interface ...................................................................... mncc: rework passing GCR over the MNCC interface Change-Id: Iaff46732948f8f5d03e42f17c35cbac8a80af49b Fixes: Id40d7e0fed9356f801b3627c118150055e7232b1 Related: OS#5164, OS#5282 --- M src/mncc.c M src/mncc_protocol.h 2 files changed, 31 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/80/25980/1 diff --git a/src/mncc.c b/src/mncc.c index c8bf4bd..ea8f020 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -485,6 +485,7 @@ const struct gsm_mncc_number *called; struct call *call; struct mncc_call_leg *leg; + struct osmo_gcr_parsed gcr; if (rc < sizeof(*data)) { LOGP(DMNCC, LOGL_ERROR, "gsm_mncc of wrong size %d vs. %zu\n", @@ -525,6 +526,16 @@ return; } + /* Decode the Global Call Reference (if present) */ + if (data->fields & MNCC_F_GCR) { + if (osmo_dec_gcr(&gcr, data->gcr, sizeof(data->gcr)) < 0) { + LOGP(DMNCC, LOGL_ERROR, + "MNCC leg(%u) failed to parse GCR\n", data->callref); + mncc_send(conn, MNCC_REJ_REQ, data->callref); + return; + } + } + /* Create an RTP port and then allocate a call */ call = call_mncc_create(); if (!call) { @@ -543,12 +554,15 @@ leg->conn = conn; leg->state = MNCC_CC_INITIAL; leg->dir = MNCC_DIR_MO; - leg->base.call->gcr = data->gcr; - leg->base.call->gcr_present = true; memcpy(&leg->called, called, sizeof(leg->called)); memcpy(&leg->calling, &data->calling, sizeof(leg->calling)); memcpy(&leg->imsi, data->imsi, sizeof(leg->imsi)); + if (data->fields & MNCC_F_GCR) { + leg->base.call->gcr_present = true; + leg->base.call->gcr = gcr; + } + LOGP(DMNCC, LOGL_INFO, "Created call(%u) with MNCC leg(%u) IMSI(%.16s)\n", call->id, leg->callref, data->imsi); @@ -873,6 +887,7 @@ { struct mncc_call_leg *leg; struct gsm_mncc mncc = { 0, }; + struct msgb *msg; int rc; leg = talloc_zero(call, struct mncc_call_leg); @@ -900,8 +915,6 @@ mncc.fields |= MNCC_F_CALLING; mncc.calling.plan = GSM48_NPI_ISDN_E164; - if (call->gcr_present) - mncc.gcr = call->gcr; if (call->source && call->source[0] == '+') { mncc.calling.type = GSM48_TON_INTERNATIONAL; @@ -920,6 +933,16 @@ OSMO_STRLCPY_ARRAY(mncc.called.number, call->dest); } + /* Encode the Global Call Reference (if present) */ + if (call->gcr_present) { + msg = msgb_alloc(sizeof(mncc.gcr), "MNCC GCR"); + if (msg == NULL || (rc = osmo_enc_gcr(msg, &call->gcr)) == 0) + LOGP(DMNCC, LOGL_ERROR, "MNCC leg(%u) failed to encode GCR\n", call->id); + else + memcpy(&mncc.gcr, msg->data, rc); + msgb_free(msg); + } + /* * TODO/FIXME: * - Determine/request channel based on offered audio codecs diff --git a/src/mncc_protocol.h b/src/mncc_protocol.h index 11969ee..cd592ad 100644 --- a/src/mncc_protocol.h +++ b/src/mncc_protocol.h @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -124,6 +123,7 @@ #define MNCC_F_CCCAP 0x0800 #define MNCC_F_KEYPAD 0x1000 #define MNCC_F_SIGNAL 0x2000 +#define MNCC_F_GCR 0x4000 struct gsm_mncc { /* context based information */ @@ -160,7 +160,9 @@ unsigned char lchan_type; unsigned char lchan_mode; - struct osmo_gcr_parsed gcr; + + /* Global Call Reference (encoded as per 3GPP TS 29.205) */ + uint8_t gcr[16]; /* A buffer to contain SDP ('\0' terminated) */ char sdp[1024]; -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Iaff46732948f8f5d03e42f17c35cbac8a80af49b Gerrit-Change-Number: 25980 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 13:47:01 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 13:47:01 +0000 Subject: Change in libosmocore[master]: Revert "Prevent GCR encoder/decoder functions from being used directly" References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/25981 ) Change subject: Revert "Prevent GCR encoder/decoder functions from being used directly" ...................................................................... Revert "Prevent GCR encoder/decoder functions from being used directly" We need this API for communicating GCR over the MNCC and SIP. Change-Id: I06babb959fdc82f4e82d92260131d60c98b0abd2 Related: OS#5164 --- M include/osmocom/gsm/gsm29205.h 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/81/25981/1 diff --git a/include/osmocom/gsm/gsm29205.h b/include/osmocom/gsm/gsm29205.h index 9575456..f93e34a 100644 --- a/include/osmocom/gsm/gsm29205.h +++ b/include/osmocom/gsm/gsm29205.h @@ -37,6 +37,6 @@ uint8_t cr[5]; /** Call Reference ID */ }; -uint8_t osmo_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g) OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; -int osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len) OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; +uint8_t osmo_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g); +int osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len); bool osmo_gcr_eq(const struct osmo_gcr_parsed *gcr1, const struct osmo_gcr_parsed *gcr2); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I06babb959fdc82f4e82d92260131d60c98b0abd2 Gerrit-Change-Number: 25981 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 13:49:38 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 27 Oct 2021 13:49:38 +0000 Subject: Change in osmo-bsc[master]: heighbor_ident: add/del neighbor cells via ctrl interface In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25976 ) Change subject: heighbor_ident: add/del neighbor cells via ctrl interface ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I343a40e18fa9b91e6c381912c0426a002841e079 Gerrit-Change-Number: 25976 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Wed, 27 Oct 2021 13:49:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 13:52:43 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 13:52:43 +0000 Subject: Change in osmo-sip-connector[master]: mncc: rework passing GCR over the MNCC interface In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25980 to look at the new patch set (#2). Change subject: mncc: rework passing GCR over the MNCC interface ...................................................................... mncc: rework passing GCR over the MNCC interface Using *unpacked* 'struct osmo_gcr_parsed' in the MNCC PDUs makes the protocol even more complicated than it currently is, and moreover complicates implementing MNCCv8 in the ttcn3-sip-test. Replace 'struct osmo_gcr_parsed' in 'struct gsm_mncc' with a fixed-length buffer, which is supposed to hold the Global Call Reference encoded as per 3GPP TS 29.205. Check / indicate presence of GCR using the MNCC_F_GCR flag. Change-Id: Iaff46732948f8f5d03e42f17c35cbac8a80af49b Fixes: Id40d7e0fed9356f801b3627c118150055e7232b1 Related: OS#5164, OS#5282 --- M src/mncc.c M src/mncc_protocol.h 2 files changed, 31 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/80/25980/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25980 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Iaff46732948f8f5d03e42f17c35cbac8a80af49b Gerrit-Change-Number: 25980 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 13:53:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 13:53:00 +0000 Subject: Change in osmo-bsc[master]: add time_cc API: cumlative counter for time, reported as rate_ctr In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25973 ) Change subject: add time_cc API: cumlative counter for time, reported as rate_ctr ...................................................................... Patch Set 1: (1 comment) I'm really lacking some perspective/documentation on the exact use of this. I mean, how is someone expected to consume this information and how is it displayed? through VTY rate_ctr show? https://gerrit.osmocom.org/c/osmo-bsc/+/25973/1/include/osmocom/bsc/time_cc.h File include/osmocom/bsc/time_cc.h: https://gerrit.osmocom.org/c/osmo-bsc/+/25973/1/include/osmocom/bsc/time_cc.h at 129 PS1, Line 129: struct time_cc { Maybe add an API to allocate/initialize a structure for this. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icdd36f27cb54b2e1b940c9e6404ba9dd3692a310 Gerrit-Change-Number: 25973 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 13:53:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 13:54:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 13:54:28 +0000 Subject: Change in osmo-bsc[master]: implement all_allocated:{sdcch, tch} rate counters In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25974 ) Change subject: implement all_allocated:{sdcch,tch} rate counters ...................................................................... Patch Set 1: Please share an example on how this would look like from user point of view, I'm totally lost here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8b06e435a224c8708cd6c67e97ee5413718fc1ed Gerrit-Change-Number: 25974 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 13:54:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 13:55:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 13:55:11 +0000 Subject: Change in osmo-sip-connector[master]: sip: fix memory leak (x_gcr) in send_invite() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25978 ) Change subject: sip: fix memory leak (x_gcr) in send_invite() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6a2e5e15061010f6e62d0f3b0acd2c040dbe3249 Gerrit-Change-Number: 25978 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 13:55:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 13:56:32 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 13:56:32 +0000 Subject: Change in osmo-sip-connector[master]: sip: use osmo_{enc, dec}_gcr() from libosmocore In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25979 ) Change subject: sip: use osmo_{enc,dec}_gcr() from libosmocore ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I46fa46fc79494d337f2f4657215b91c39207eea4 Gerrit-Change-Number: 25979 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 13:56:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 13:57:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 13:57:16 +0000 Subject: Change in libosmocore[master]: Revert "Prevent GCR encoder/decoder functions from being used directly" In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25981 ) Change subject: Revert "Prevent GCR encoder/decoder functions from being used directly" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I06babb959fdc82f4e82d92260131d60c98b0abd2 Gerrit-Change-Number: 25981 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 13:57:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 14:04:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 14:04:43 +0000 Subject: Change in osmo-bsc[master]: heighbor_ident: add/del neighbor cells via ctrl interface In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25976 ) Change subject: heighbor_ident: add/del neighbor cells via ctrl interface ...................................................................... Patch Set 3: (4 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25976/3/doc/manuals/chapters/control.adoc File doc/manuals/chapters/control.adoc: https://gerrit.osmocom.org/c/osmo-bsc/+/25976/3/doc/manuals/chapters/control.adoc at 124 PS3, Line 124: FIXME: add variables defined in src/ctrl/control_if.c? This FIXME probably needs to be kept at the end. https://gerrit.osmocom.org/c/osmo-bsc/+/25976/3/src/osmo-bsc/neighbor_ident_ctrl.c File src/osmo-bsc/neighbor_ident_ctrl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25976/3/src/osmo-bsc/neighbor_ident_ctrl.c at 28 PS3, Line 28: #include why are these vty headers needed here? https://gerrit.osmocom.org/c/osmo-bsc/+/25976/3/src/osmo-bsc/neighbor_ident_ctrl.c at 121 PS3, Line 121: CTRL_CMD_DEFINE_WO(neighbor_bts_add, "neighbor-bts add"); Please add some documentation here on the expected format regarding params, etc. for each command. https://gerrit.osmocom.org/c/osmo-bsc/+/25976/3/tests/ctrl_test_runner.py File tests/ctrl_test_runner.py: https://gerrit.osmocom.org/c/osmo-bsc/+/25976/3/tests/ctrl_test_runner.py at 655 PS3, Line 655: r = self.do_set('bts.0.neighbor-cgi.add', '001-01-100-200-123-4') This kind of stuff is what you need to add as a comment before definining each CTRL command, explaining what each param is. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I343a40e18fa9b91e6c381912c0426a002841e079 Gerrit-Change-Number: 25976 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 14:04:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 14:08:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 14:08:35 +0000 Subject: Change in osmo-msc[master]: mncc: rework passing GCR over the MNCC interface References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/25982 ) Change subject: mncc: rework passing GCR over the MNCC interface ...................................................................... mncc: rework passing GCR over the MNCC interface Using *unpacked* 'struct osmo_gcr_parsed' in the MNCC PDUs makes the protocol even more complicated than it currently is, and moreover complicates implementing MNCCv8 in the ttcn3-sip-test. Replace 'struct osmo_gcr_parsed' in 'struct gsm_mncc' with a fixed-length buffer, which is supposed to hold the Global Call Reference encoded as per 3GPP TS 29.205. Indicate presence of GCR using the MNCC_F_GCR flag. Change-Id: I259b6d7e4cbe26159b9b496356fc7c1c27d54521 Fixes: I705c860e51637b4537cad65a330ecbaaca96dd5b Related: OS#5164, OS#5282 --- M include/osmocom/msc/mncc.h M src/libmsc/gsm_04_08_cc.c 2 files changed, 15 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/25982/1 diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h index 5002227..d4d3f96 100644 --- a/include/osmocom/msc/mncc.h +++ b/include/osmocom/msc/mncc.h @@ -26,7 +26,6 @@ #include #include -#include #include #include @@ -161,7 +160,10 @@ unsigned char lchan_type; unsigned char lchan_mode; - struct osmo_gcr_parsed gcr; + + /* Global Call Reference (encoded as per 3GPP TS 29.205) */ + uint8_t gcr[16]; + /* A buffer to contain SDP ('\0' terminated) */ char sdp[1024]; }; diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index d6a2864..42f6bf0 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -517,8 +517,17 @@ trans->cc.lcls = trans_lcls_compose(trans, true); /* Pass the LCLS GCR on to the MT call leg via MNCC */ - if (trans->cc.lcls) - setup.gcr = trans->cc.lcls->gcr; + if (trans->cc.lcls) { + struct msgb *_msg = msgb_alloc(sizeof(setup.gcr), "MNCC GCR"); + const struct osmo_gcr_parsed gcr = &trans->cc.lcls->gcr; + int rc; + + if (msg == NULL || (rc = osmo_enc_gcr(msg, gcr)) == 0) + LOG_TRANS(trans, LOGL_ERROR, "Failed to encode GCR\n"); + else + memcpy(&setup.gcr[0], msg->data, rc); + msgb_free(msg); + } tlv_parse(&tp, &gsm48_att_tlvdef, gh->data, payload_len, 0, 0); /* emergency setup is identified by msg_type */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I259b6d7e4cbe26159b9b496356fc7c1c27d54521 Gerrit-Change-Number: 25982 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 14:10:50 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 27 Oct 2021 14:10:50 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Add comment, improve log message in gbproxy_tlli_from_status... References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25983 ) Change subject: gbproxy: Add comment, improve log message in gbproxy_tlli_from_status_pdu ...................................................................... gbproxy: Add comment, improve log message in gbproxy_tlli_from_status_pdu Change-Id: Idcd2742f451ba5ae79f62395e033924782336cac --- M src/gb_proxy.c 1 file changed, 6 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/83/25983/1 diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 1e8bc96..5c2d5bb 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -997,6 +997,7 @@ struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *)pdu_data; struct tlv_parsed tp_inner[2]; + /* TODO: Parse partial messages as well */ rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp_inner, ARRAY_SIZE(tp_inner), bgph->pdu_type, bgph->data, pdu_len - sizeof(*bgph), 0, 0, DGPRS, log_pfx); @@ -1111,16 +1112,19 @@ struct gbproxy_sgsn *sgsn; /* Check if the status needs to be terminated locally */ uint8_t cause = *TLVP_VAL(&tp[0], BSSGP_IE_CAUSE); + if (cause == BSSGP_CAUSE_UNKNOWN_BVCI || cause == BSSGP_CAUSE_BVCI_BLOCKED) { /* Log and handle locally */ ptp_bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); - LOGP(DGPRS, LOGL_ERROR, "%s Rx STATUS with cause %s for PtP-BVC %05u\n", log_pfx, + LOGPNSE(nse, LOGL_ERROR, "Rx STATUS cause=0x%02x(%s) for PtP-BVC %05u\n", cause, bssgp_cause_str(cause), ptp_bvci); /* FIXME: Remove/block our BVC if present? */ break; } - LOGP(DGPRS, LOGL_INFO, "Forwarding STATUS with cause %s\n", bssgp_cause_str(cause)); + LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s) ", cause, + bssgp_cause_str(cause)); + if (gbproxy_tlli_from_status_pdu(msg, tp, &tlli, log_pfx) == 0) sgsn = gbproxy_select_sgsn(nse->cfg, &tlli); else -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Idcd2742f451ba5ae79f62395e033924782336cac Gerrit-Change-Number: 25983 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 14:10:52 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 27 Oct 2021 14:10:52 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Improve STATUS handling from SGSN References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25984 ) Change subject: gbproxy: Improve STATUS handling from SGSN ...................................................................... gbproxy: Improve STATUS handling from SGSN STATUS with cause bvci blocked or unknown should not be forwarded Related: OS#4892 Change-Id: I0ab88634fe2eab5299ff4587fcef4177ce5b4831 --- M src/gb_proxy.c 1 file changed, 33 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/84/25984/1 diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 5c2d5bb..f92585a 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -1380,7 +1380,6 @@ uint16_t bvci; char log_pfx[32]; int rc = 0; - int cause; int i; bool paging_bc = false; @@ -1475,20 +1474,41 @@ rc = gbprox_rx_paging(nse, msg, pdut_name, &tp[0], ns_bvci, paging_bc); break; case BSSGP_PDUT_STATUS: - /* Some exception has occurred */ - cause = *TLVP_VAL(&tp[0], BSSGP_IE_CAUSE); - LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s) ", cause, + { + struct gbproxy_nse *nse_peer; + uint32_t tlli; + + /* Check if the status needs to be terminated locally */ + uint8_t cause = *TLVP_VAL(&tp[0], BSSGP_IE_CAUSE); + + if (cause == BSSGP_CAUSE_UNKNOWN_BVCI || cause == BSSGP_CAUSE_BVCI_BLOCKED) { + /* Log and handle locally, BVCI should be present for these causes */ + if (!TLVP_PRESENT(&tp[0], BSSGP_IE_BVCI)) { + LOGPNSE(nse, LOGL_ERROR, "Rx STATUS cause=0x%02x(%s), but BVCI is missing\n", cause, + bssgp_cause_str(cause)); + break; + } + uint16_t ptp_bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); + LOGPNSE(nse, LOGL_ERROR, "Rx STATUS cause=0x%02x(%s) for PtP-BVC %05u\n", cause, + bssgp_cause_str(cause), ptp_bvci); + /* FIXME: Remove/block the other BSS/SGSN BVCs if present? */ + break; + } + + LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s)\n", cause, bssgp_cause_str(cause)); - if (TLVP_PRES_LEN(&tp[0], BSSGP_IE_BVCI, 2)) { - bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); - LOGPC(DGPRS, LOGL_NOTICE, "BVCI=%05u\n", bvci); - sgsn_bvc = gbproxy_bvc_by_bvci(nse, bvci); - /* don't send STATUS in response to STATUS if !bvc */ - if (sgsn_bvc && sgsn_bvc->cell && sgsn_bvc->cell->bss_bvc) - rc = gbprox_relay2peer(msg, sgsn_bvc->cell->bss_bvc, ns_bvci); - } else - LOGPC(DGPRS, LOGL_NOTICE, "\n"); + + if (gbproxy_tlli_from_status_pdu(msg, tp, &tlli, log_pfx) == 0) { + nse_peer = gbproxy_nse_by_tlli(cfg, tlli); + if (nse_peer) + return gbprox_relay2nse(msg, nse_peer, 0); + } + + LOGPNSE(nse, LOGL_ERROR, "Unable to handle STATUS cause=0x%02x(%s)\n", cause, + bssgp_cause_str(cause)); + break; + } /* those only exist in the SGSN -> BSS direction */ case BSSGP_PDUT_SUSPEND_ACK: case BSSGP_PDUT_SUSPEND_NACK: -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0ab88634fe2eab5299ff4587fcef4177ce5b4831 Gerrit-Change-Number: 25984 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 14:10:52 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 27 Oct 2021 14:10:52 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Route DL STATUS with BVCI on SIG-BVC References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985 ) Change subject: gbproxy: Route DL STATUS with BVCI on SIG-BVC ...................................................................... gbproxy: Route DL STATUS with BVCI on SIG-BVC Fixes TTCN3 gbproxy test TC_status_sig_dl_bvci Related: OS#4892 Change-Id: I5928cebea7f39d6648f95dfa1a46437de202f723 --- M src/gb_proxy.c 1 file changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/85/25985/1 diff --git a/src/gb_proxy.c b/src/gb_proxy.c index f92585a..4c45adb 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -1018,6 +1018,30 @@ return 0; } +static int gbproxy_bvci_from_status_pdu(struct msgb *msg, struct tlv_parsed *tp, uint16_t *bvci, char *log_pfx) +{ + int rc; + int pdu_len = TLVP_LEN(&tp[0], BSSGP_IE_PDU_IN_ERROR); + const uint8_t *pdu_data = TLVP_VAL(&tp[0], BSSGP_IE_PDU_IN_ERROR); + struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *)pdu_data; + struct tlv_parsed tp_inner[2]; + + /* TODO: Parse partial messages as well */ + rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp_inner, ARRAY_SIZE(tp_inner), bgph->pdu_type, bgph->data, + pdu_len - sizeof(*bgph), 0, 0, DGPRS, log_pfx); + + if (rc < 0) + return rc; + + if (TLVP_PRESENT(&tp_inner[0], BSSGP_IE_BVCI)) { + *bvci = ntohs(tlvp_val16_unal(&tp_inner[0], BSSGP_IE_BVCI)); + } else { + return -ENOENT; + } + + return 0; +} + /* Receive an incoming signalling message from a BSS-side NS-VC */ static int gbprox_rx_sig_from_bss(struct gbproxy_nse *nse, struct msgb *msg, uint16_t ns_bvci) { @@ -1498,6 +1522,19 @@ LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s)\n", cause, bssgp_cause_str(cause)); + + if (gbproxy_bvci_from_status_pdu(msg, tp, &bvci, log_pfx) == 0) { + if (bvci != 0) { + struct gbproxy_cell *cell = gbproxy_cell_by_bvci(cfg, bvci); + + /* TODO: Log */ + if ((!cell || !cell->bss_bvc || !cell->bss_bvc->nse)) + break; + + return gbprox_relay2nse(msg, cell->bss_bvc->nse, 0); + } + } + if (gbproxy_tlli_from_status_pdu(msg, tp, &tlli, log_pfx) == 0) { nse_peer = gbproxy_nse_by_tlli(cfg, tlli); if (nse_peer) -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5928cebea7f39d6648f95dfa1a46437de202f723 Gerrit-Change-Number: 25985 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 14:12:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 14:12:43 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Add comment, improve log message in gbproxy_tlli_from_status... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25983 ) Change subject: gbproxy: Add comment, improve log message in gbproxy_tlli_from_status_pdu ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Idcd2742f451ba5ae79f62395e033924782336cac Gerrit-Change-Number: 25983 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 27 Oct 2021 14:12:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 14:15:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 14:15:28 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Improve STATUS handling from SGSN In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25984 ) Change subject: gbproxy: Improve STATUS handling from SGSN ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0ab88634fe2eab5299ff4587fcef4177ce5b4831 Gerrit-Change-Number: 25984 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 14:15:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 14:16:29 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Wed, 27 Oct 2021 14:16:29 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Improve STATUS handling from SGSN In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25984 ) Change subject: gbproxy: Improve STATUS handling from SGSN ...................................................................... Patch Set 1: Code-Review-1 This one is not ready yet -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0ab88634fe2eab5299ff4587fcef4177ce5b4831 Gerrit-Change-Number: 25984 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 14:16:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 14:18:08 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 14:18:08 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Route DL STATUS with BVCI on SIG-BVC In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985 ) Change subject: gbproxy: Route DL STATUS with BVCI on SIG-BVC ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985/1/src/gb_proxy.c File src/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985/1/src/gb_proxy.c at 1021 PS1, Line 1021: static int gbproxy_bvci_from_status_pdu(struct msgb *msg, struct tlv_parsed *tp, uint16_t *bvci, char *log_pfx) Some small func description would be helpful here. BTW, "msg" is not used here? https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985/1/src/gb_proxy.c at 1527 PS1, Line 1527: if (bvci != 0) { You can add this check inline with the other if: if ((gbproxy_bvci_from_status_pdu(msg, tp, &bvci, log_pfx) == 0) && (bvci != 0)) { https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985/1/src/gb_proxy.c at 1530 PS1, Line 1530: /* TODO: Log */ Please add the log right now :) -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5928cebea7f39d6648f95dfa1a46437de202f723 Gerrit-Change-Number: 25985 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 14:18:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 14:35:23 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 14:35:23 +0000 Subject: Change in osmo-iuh[master]: hnbap: Drop no longer existing asn1c param -fnative-types References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25986 ) Change subject: hnbap: Drop no longer existing asn1c param -fnative-types ...................................................................... hnbap: Drop no longer existing asn1c param -fnative-types This is an option enabled by default and not existent as cmdline param since asn1c 0.9.26. For some reason, when dropping it, asn1c generates different description comment section on related files. In any case, this makes hnbap look like other libraries which already got this param removed and hence also generateds code looks the same. Change-Id: Iccf81539a5045416185e619d24c3d542204437e6 --- M include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h M include/osmocom/hnbap/HNBAP_AccessResult.h M include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h M include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h M include/osmocom/hnbap/HNBAP_BackoffTimer.h M include/osmocom/hnbap/HNBAP_BindingID.h M include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h M include/osmocom/hnbap/HNBAP_CGI.h M include/osmocom/hnbap/HNBAP_CI.h M include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h M include/osmocom/hnbap/HNBAP_CSG-Capability.h M include/osmocom/hnbap/HNBAP_CSG-ID.h M include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h M include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h M include/osmocom/hnbap/HNBAP_Cause.h M include/osmocom/hnbap/HNBAP_CauseMisc.h M include/osmocom/hnbap/HNBAP_CauseProtocol.h M include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h M include/osmocom/hnbap/HNBAP_CauseTransport.h M include/osmocom/hnbap/HNBAP_CellIdentity.h M include/osmocom/hnbap/HNBAP_ConfigurationInformation.h M include/osmocom/hnbap/HNBAP_Context-ID.h M include/osmocom/hnbap/HNBAP_Criticality.h M include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h M include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h M include/osmocom/hnbap/HNBAP_ESN.h M include/osmocom/hnbap/HNBAP_ErrorIndication.h M include/osmocom/hnbap/HNBAP_GTP-TEI.h M include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h M include/osmocom/hnbap/HNBAP_GeographicalLocation.h M include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h M include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h M include/osmocom/hnbap/HNBAP_HNB-GWResponse.h M include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h M include/osmocom/hnbap/HNBAP_HNB-Identity.h M include/osmocom/hnbap/HNBAP_HNB-Location-Information.h M include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h M include/osmocom/hnbap/HNBAP_HNBAP-PDU.h M include/osmocom/hnbap/HNBAP_HNBCapacity.h M include/osmocom/hnbap/HNBAP_HNBConfigInfo.h M include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h M include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h M include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h M include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h M include/osmocom/hnbap/HNBAP_HNBDe-Register.h M include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h M include/osmocom/hnbap/HNBAP_HNBRegisterReject.h M include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h M include/osmocom/hnbap/HNBAP_IE-Extensions.h M include/osmocom/hnbap/HNBAP_IE.h M include/osmocom/hnbap/HNBAP_IMEI.h M include/osmocom/hnbap/HNBAP_IMSI.h M include/osmocom/hnbap/HNBAP_IMSIDS41.h M include/osmocom/hnbap/HNBAP_IMSIESN.h M include/osmocom/hnbap/HNBAP_IP-Address.h M include/osmocom/hnbap/HNBAP_InitiatingMessage.h M include/osmocom/hnbap/HNBAP_Ipv4Address.h M include/osmocom/hnbap/HNBAP_Ipv6Address.h M include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h M include/osmocom/hnbap/HNBAP_LAC.h M include/osmocom/hnbap/HNBAP_LAI.h M include/osmocom/hnbap/HNBAP_MacroCellID.h M include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h M include/osmocom/hnbap/HNBAP_MuxPortNumber.h M include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h M include/osmocom/hnbap/HNBAP_NeighbourIdentity.h M include/osmocom/hnbap/HNBAP_NeighbourInfoList.h M include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h M include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h M include/osmocom/hnbap/HNBAP_PLMNidentity.h M include/osmocom/hnbap/HNBAP_PSC.h M include/osmocom/hnbap/HNBAP_PTMSI.h M include/osmocom/hnbap/HNBAP_PTMSIRAI.h M include/osmocom/hnbap/HNBAP_Presence.h M include/osmocom/hnbap/HNBAP_PrivateIE-ID.h M include/osmocom/hnbap/HNBAP_PrivateMessage.h M include/osmocom/hnbap/HNBAP_ProcedureCode.h M include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h M include/osmocom/hnbap/HNBAP_RAB-ID.h M include/osmocom/hnbap/HNBAP_RABList.h M include/osmocom/hnbap/HNBAP_RABListItem.h M include/osmocom/hnbap/HNBAP_RAC.h M include/osmocom/hnbap/HNBAP_RAI.h M include/osmocom/hnbap/HNBAP_RNC-ID.h M include/osmocom/hnbap/HNBAP_Registration-Cause.h M include/osmocom/hnbap/HNBAP_RelocationComplete.h M include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h M include/osmocom/hnbap/HNBAP_SAC.h M include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h M include/osmocom/hnbap/HNBAP_TMSIDS41.h M include/osmocom/hnbap/HNBAP_TMSILAI.h M include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h M include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h M include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h M include/osmocom/hnbap/HNBAP_TransportInfo.h M include/osmocom/hnbap/HNBAP_TransportLayerAddress.h M include/osmocom/hnbap/HNBAP_TriggeringMessage.h M include/osmocom/hnbap/HNBAP_Tunnel-Information.h M include/osmocom/hnbap/HNBAP_TypeOfError.h M include/osmocom/hnbap/HNBAP_U-RNTI.h M include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h M include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h M include/osmocom/hnbap/HNBAP_UDP-Port-Number.h M include/osmocom/hnbap/HNBAP_UE-Capabilities.h M include/osmocom/hnbap/HNBAP_UE-Identity.h M include/osmocom/hnbap/HNBAP_UEDe-Register.h M include/osmocom/hnbap/HNBAP_UERegisterAccept.h M include/osmocom/hnbap/HNBAP_UERegisterReject.h M include/osmocom/hnbap/HNBAP_UERegisterRequest.h M include/osmocom/hnbap/HNBAP_URAIdentity.h M include/osmocom/hnbap/HNBAP_URAIdentityList.h M include/osmocom/hnbap/HNBAP_UTRANCellID.h M include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h M include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h M include/osmocom/hnbap/HNBAP_Update-cause.h M src/hnbap/HNBAP_Access-stratum-release-indicator.c M src/hnbap/HNBAP_AccessResult.c M src/hnbap/HNBAP_AdditionalNeighbourInfoList.c M src/hnbap/HNBAP_AltitudeAndDirection.c M src/hnbap/HNBAP_BackoffTimer.c M src/hnbap/HNBAP_BindingID.c M src/hnbap/HNBAP_CELL-FACHMobilitySupport.c M src/hnbap/HNBAP_CGI.c M src/hnbap/HNBAP_CI.c M src/hnbap/HNBAP_CN-DomainIndicator.c M src/hnbap/HNBAP_CSG-Capability.c M src/hnbap/HNBAP_CSG-ID.c M src/hnbap/HNBAP_CSGMembershipStatus.c M src/hnbap/HNBAP_CSGMembershipUpdate.c M src/hnbap/HNBAP_Cause.c M src/hnbap/HNBAP_CauseMisc.c M src/hnbap/HNBAP_CauseProtocol.c M src/hnbap/HNBAP_CauseRadioNetwork.c M src/hnbap/HNBAP_CauseTransport.c M src/hnbap/HNBAP_CellIdentity.c M src/hnbap/HNBAP_ConfigurationInformation.c M src/hnbap/HNBAP_Context-ID.c M src/hnbap/HNBAP_Criticality.c M src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c M src/hnbap/HNBAP_CriticalityDiagnostics.c M src/hnbap/HNBAP_ESN.c M src/hnbap/HNBAP_ErrorIndication.c M src/hnbap/HNBAP_GTP-TEI.c M src/hnbap/HNBAP_GeographicalCoordinates.c M src/hnbap/HNBAP_GeographicalLocation.c M src/hnbap/HNBAP_HNB-Cell-Access-Mode.c M src/hnbap/HNBAP_HNB-Cell-Identifier.c M src/hnbap/HNBAP_HNB-GWResponse.c M src/hnbap/HNBAP_HNB-Identity-Info.c M src/hnbap/HNBAP_HNB-Identity.c M src/hnbap/HNBAP_HNB-Location-Information.c M src/hnbap/HNBAP_HNB-RNL-Identity.c M src/hnbap/HNBAP_HNBAP-PDU.c M src/hnbap/HNBAP_HNBCapacity.c M src/hnbap/HNBAP_HNBConfigInfo.c M src/hnbap/HNBAP_HNBConfigTransferRequest.c M src/hnbap/HNBAP_HNBConfigTransferResponse.c M src/hnbap/HNBAP_HNBConfigurationInformationMissing.c M src/hnbap/HNBAP_HNBConfigurationInformationProvided.c M src/hnbap/HNBAP_HNBDe-Register.c M src/hnbap/HNBAP_HNBRegisterAccept.c M src/hnbap/HNBAP_HNBRegisterReject.c M src/hnbap/HNBAP_HNBRegisterRequest.c M src/hnbap/HNBAP_IE-Extensions.c M src/hnbap/HNBAP_IE.c M src/hnbap/HNBAP_IMEI.c M src/hnbap/HNBAP_IMSI.c M src/hnbap/HNBAP_IMSIDS41.c M src/hnbap/HNBAP_IMSIESN.c M src/hnbap/HNBAP_IP-Address.c M src/hnbap/HNBAP_InitiatingMessage.c M src/hnbap/HNBAP_Ipv4Address.c M src/hnbap/HNBAP_Ipv6Address.c M src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c M src/hnbap/HNBAP_LAC.c M src/hnbap/HNBAP_LAI.c M src/hnbap/HNBAP_MacroCellID.c M src/hnbap/HNBAP_MacroCoverageInformation.c M src/hnbap/HNBAP_MuxPortNumber.c M src/hnbap/HNBAP_NeighbourCellIdentityList.c M src/hnbap/HNBAP_NeighbourIdentity.c M src/hnbap/HNBAP_NeighbourInfoList.c M src/hnbap/HNBAP_NeighbourInfoRequestItem.c M src/hnbap/HNBAP_NeighbourInfoRequestList.c M src/hnbap/HNBAP_PLMNidentity.c M src/hnbap/HNBAP_PSC.c M src/hnbap/HNBAP_PTMSI.c M src/hnbap/HNBAP_PTMSIRAI.c M src/hnbap/HNBAP_Presence.c M src/hnbap/HNBAP_PrivateIE-ID.c M src/hnbap/HNBAP_PrivateMessage.c M src/hnbap/HNBAP_ProcedureCode.c M src/hnbap/HNBAP_ProtocolIE-ID.c M src/hnbap/HNBAP_RAB-ID.c M src/hnbap/HNBAP_RABList.c M src/hnbap/HNBAP_RABListItem.c M src/hnbap/HNBAP_RAC.c M src/hnbap/HNBAP_RAI.c M src/hnbap/HNBAP_RNC-ID.c M src/hnbap/HNBAP_Registration-Cause.c M src/hnbap/HNBAP_RelocationComplete.c M src/hnbap/HNBAP_S-RNTIPrefix.c M src/hnbap/HNBAP_SAC.c M src/hnbap/HNBAP_SuccessfulOutcome.c M src/hnbap/HNBAP_TMSIDS41.c M src/hnbap/HNBAP_TMSILAI.c M src/hnbap/HNBAP_TNLUpdateFailure.c M src/hnbap/HNBAP_TNLUpdateRequest.c M src/hnbap/HNBAP_TNLUpdateResponse.c M src/hnbap/HNBAP_TransportInfo.c M src/hnbap/HNBAP_TransportLayerAddress.c M src/hnbap/HNBAP_TriggeringMessage.c M src/hnbap/HNBAP_Tunnel-Information.c M src/hnbap/HNBAP_TypeOfError.c M src/hnbap/HNBAP_U-RNTI.c M src/hnbap/HNBAP_U-RNTIQueryRequest.c M src/hnbap/HNBAP_U-RNTIQueryResponse.c M src/hnbap/HNBAP_UDP-Port-Number.c M src/hnbap/HNBAP_UE-Capabilities.c M src/hnbap/HNBAP_UE-Identity.c M src/hnbap/HNBAP_UEDe-Register.c M src/hnbap/HNBAP_UERegisterAccept.c M src/hnbap/HNBAP_UERegisterReject.c M src/hnbap/HNBAP_UERegisterRequest.c M src/hnbap/HNBAP_URAIdentity.c M src/hnbap/HNBAP_URAIdentityList.c M src/hnbap/HNBAP_UTRANCellID.c M src/hnbap/HNBAP_UnknownU-RNTIIndication.c M src/hnbap/HNBAP_UnsuccessfulOutcome.c M src/hnbap/HNBAP_Update-cause.c M src/hnbap/Makefile.am 231 files changed, 231 insertions(+), 231 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/86/25986/1 diff --git a/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h b/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h index 8722417..1aba84e 100644 --- a/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h +++ b/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Access_stratum_release_indicator_H_ diff --git a/include/osmocom/hnbap/HNBAP_AccessResult.h b/include/osmocom/hnbap/HNBAP_AccessResult.h index fdd9763..3d71d2d 100644 --- a/include/osmocom/hnbap/HNBAP_AccessResult.h +++ b/include/osmocom/hnbap/HNBAP_AccessResult.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_AccessResult_H_ diff --git a/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h b/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h index fbafb53..be2dd1f 100644 --- a/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h +++ b/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_AdditionalNeighbourInfoList_H_ diff --git a/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h b/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h index 20a7d58..5b406d8 100644 --- a/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h +++ b/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_AltitudeAndDirection_H_ diff --git a/include/osmocom/hnbap/HNBAP_BackoffTimer.h b/include/osmocom/hnbap/HNBAP_BackoffTimer.h index 033e4e0..03f64c9 100644 --- a/include/osmocom/hnbap/HNBAP_BackoffTimer.h +++ b/include/osmocom/hnbap/HNBAP_BackoffTimer.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_BackoffTimer_H_ diff --git a/include/osmocom/hnbap/HNBAP_BindingID.h b/include/osmocom/hnbap/HNBAP_BindingID.h index cf057bc..b5cdebc 100644 --- a/include/osmocom/hnbap/HNBAP_BindingID.h +++ b/include/osmocom/hnbap/HNBAP_BindingID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_BindingID_H_ diff --git a/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h b/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h index 71e26c1..864f6ce 100644 --- a/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h +++ b/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CELL_FACHMobilitySupport_H_ diff --git a/include/osmocom/hnbap/HNBAP_CGI.h b/include/osmocom/hnbap/HNBAP_CGI.h index 2e7c13a..657aff8 100644 --- a/include/osmocom/hnbap/HNBAP_CGI.h +++ b/include/osmocom/hnbap/HNBAP_CGI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CGI_H_ diff --git a/include/osmocom/hnbap/HNBAP_CI.h b/include/osmocom/hnbap/HNBAP_CI.h index ee0f6a2..637c9bd 100644 --- a/include/osmocom/hnbap/HNBAP_CI.h +++ b/include/osmocom/hnbap/HNBAP_CI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CI_H_ diff --git a/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h b/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h index 8bdc971..5128d5b 100644 --- a/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h +++ b/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CN_DomainIndicator_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSG-Capability.h b/include/osmocom/hnbap/HNBAP_CSG-Capability.h index a04ef21..57d6ee2 100644 --- a/include/osmocom/hnbap/HNBAP_CSG-Capability.h +++ b/include/osmocom/hnbap/HNBAP_CSG-Capability.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CSG_Capability_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSG-ID.h b/include/osmocom/hnbap/HNBAP_CSG-ID.h index 7ef09fa..d76f078 100644 --- a/include/osmocom/hnbap/HNBAP_CSG-ID.h +++ b/include/osmocom/hnbap/HNBAP_CSG-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CSG_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h b/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h index 94bfe3e..d83bd14 100644 --- a/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h +++ b/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CSGMembershipStatus_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h b/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h index 65331f1..035b331 100644 --- a/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h +++ b/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CSGMembershipUpdate_H_ diff --git a/include/osmocom/hnbap/HNBAP_Cause.h b/include/osmocom/hnbap/HNBAP_Cause.h index 8291d0b..e385b5f 100644 --- a/include/osmocom/hnbap/HNBAP_Cause.h +++ b/include/osmocom/hnbap/HNBAP_Cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Cause_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseMisc.h b/include/osmocom/hnbap/HNBAP_CauseMisc.h index a2d0e36..c53cafe 100644 --- a/include/osmocom/hnbap/HNBAP_CauseMisc.h +++ b/include/osmocom/hnbap/HNBAP_CauseMisc.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CauseMisc_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseProtocol.h b/include/osmocom/hnbap/HNBAP_CauseProtocol.h index 6650668..3416b47 100644 --- a/include/osmocom/hnbap/HNBAP_CauseProtocol.h +++ b/include/osmocom/hnbap/HNBAP_CauseProtocol.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CauseProtocol_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h b/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h index 1b19fe4..895ac69 100644 --- a/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h +++ b/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CauseRadioNetwork_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseTransport.h b/include/osmocom/hnbap/HNBAP_CauseTransport.h index 4d90428..d2e486e 100644 --- a/include/osmocom/hnbap/HNBAP_CauseTransport.h +++ b/include/osmocom/hnbap/HNBAP_CauseTransport.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CauseTransport_H_ diff --git a/include/osmocom/hnbap/HNBAP_CellIdentity.h b/include/osmocom/hnbap/HNBAP_CellIdentity.h index 7b17938..1b76f6b 100644 --- a/include/osmocom/hnbap/HNBAP_CellIdentity.h +++ b/include/osmocom/hnbap/HNBAP_CellIdentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CellIdentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h b/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h index 0f89163..7720b23 100644 --- a/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h +++ b/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_ConfigurationInformation_H_ diff --git a/include/osmocom/hnbap/HNBAP_Context-ID.h b/include/osmocom/hnbap/HNBAP_Context-ID.h index 64612ba..570e8cb 100644 --- a/include/osmocom/hnbap/HNBAP_Context-ID.h +++ b/include/osmocom/hnbap/HNBAP_Context-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Context_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_Criticality.h b/include/osmocom/hnbap/HNBAP_Criticality.h index 5081ab2..cbc4c01 100644 --- a/include/osmocom/hnbap/HNBAP_Criticality.h +++ b/include/osmocom/hnbap/HNBAP_Criticality.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Criticality_H_ diff --git a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h index ef7da79..db82056 100644 --- a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h +++ b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CriticalityDiagnostics_IE_List_H_ diff --git a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h index c64f89b..34d798d 100644 --- a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h +++ b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CriticalityDiagnostics_H_ diff --git a/include/osmocom/hnbap/HNBAP_ESN.h b/include/osmocom/hnbap/HNBAP_ESN.h index 349fcf1..b1353ea 100644 --- a/include/osmocom/hnbap/HNBAP_ESN.h +++ b/include/osmocom/hnbap/HNBAP_ESN.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_ESN_H_ diff --git a/include/osmocom/hnbap/HNBAP_ErrorIndication.h b/include/osmocom/hnbap/HNBAP_ErrorIndication.h index 9fffa55..889cf08 100644 --- a/include/osmocom/hnbap/HNBAP_ErrorIndication.h +++ b/include/osmocom/hnbap/HNBAP_ErrorIndication.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_ErrorIndication_H_ diff --git a/include/osmocom/hnbap/HNBAP_GTP-TEI.h b/include/osmocom/hnbap/HNBAP_GTP-TEI.h index 56ee322..214964d 100644 --- a/include/osmocom/hnbap/HNBAP_GTP-TEI.h +++ b/include/osmocom/hnbap/HNBAP_GTP-TEI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_GTP_TEI_H_ diff --git a/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h b/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h index 1a8e237..6cdfdec 100644 --- a/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h +++ b/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_GeographicalCoordinates_H_ diff --git a/include/osmocom/hnbap/HNBAP_GeographicalLocation.h b/include/osmocom/hnbap/HNBAP_GeographicalLocation.h index a672cef..6311d85 100644 --- a/include/osmocom/hnbap/HNBAP_GeographicalLocation.h +++ b/include/osmocom/hnbap/HNBAP_GeographicalLocation.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_GeographicalLocation_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h b/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h index 9fa4304..2a6e05a 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNB_Cell_Access_Mode_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h b/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h index 5aa67ee..14d2850 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNB_Cell_Identifier_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h b/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h index b2835bb..cadd7e3 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h +++ b/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNB_GWResponse_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h b/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h index b160d0c..25606bd 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNB_Identity_Info_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Identity.h b/include/osmocom/hnbap/HNBAP_HNB-Identity.h index f127c54..ca28950 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Identity.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Identity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNB_Identity_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h b/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h index 79be0f2..f8a3769 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNB_Location_Information_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h b/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h index b2739ae..642e8e6 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h +++ b/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNB_RNL_Identity_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h b/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h index 91df4bc..48dac94 100644 --- a/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h +++ b/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBAP_PDU_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBCapacity.h b/include/osmocom/hnbap/HNBAP_HNBCapacity.h index fadb4fe..39e4f29 100644 --- a/include/osmocom/hnbap/HNBAP_HNBCapacity.h +++ b/include/osmocom/hnbap/HNBAP_HNBCapacity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBCapacity_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h b/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h index 4f73ed1..f0b6dc2 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBConfigInfo_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h b/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h index cc52dae..8ce6ca7 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBConfigTransferRequest_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h b/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h index 4ad79b6..81ec650 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBConfigTransferResponse_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h index dcc1001..42bafdb 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBConfigurationInformationMissing_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h index 012a595..2750038 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBConfigurationInformationProvided_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBDe-Register.h b/include/osmocom/hnbap/HNBAP_HNBDe-Register.h index a669e52..79d7bbe 100644 --- a/include/osmocom/hnbap/HNBAP_HNBDe-Register.h +++ b/include/osmocom/hnbap/HNBAP_HNBDe-Register.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBDe_Register_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h b/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h index 1b87860..83a48f8 100644 --- a/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h +++ b/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBRegisterAccept_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h b/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h index 5c8ff8c..2b203db 100644 --- a/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h +++ b/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBRegisterReject_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h b/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h index b1a99d6..1431432 100644 --- a/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h +++ b/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBRegisterRequest_H_ diff --git a/include/osmocom/hnbap/HNBAP_IE-Extensions.h b/include/osmocom/hnbap/HNBAP_IE-Extensions.h index 34d481c..81ffb00 100644 --- a/include/osmocom/hnbap/HNBAP_IE-Extensions.h +++ b/include/osmocom/hnbap/HNBAP_IE-Extensions.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_IE_Extensions_H_ diff --git a/include/osmocom/hnbap/HNBAP_IE.h b/include/osmocom/hnbap/HNBAP_IE.h index 8029014..1abae50 100644 --- a/include/osmocom/hnbap/HNBAP_IE.h +++ b/include/osmocom/hnbap/HNBAP_IE.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_IE_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMEI.h b/include/osmocom/hnbap/HNBAP_IMEI.h index d541529..ff082a8 100644 --- a/include/osmocom/hnbap/HNBAP_IMEI.h +++ b/include/osmocom/hnbap/HNBAP_IMEI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_IMEI_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMSI.h b/include/osmocom/hnbap/HNBAP_IMSI.h index f71e390..98970ed 100644 --- a/include/osmocom/hnbap/HNBAP_IMSI.h +++ b/include/osmocom/hnbap/HNBAP_IMSI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_IMSI_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMSIDS41.h b/include/osmocom/hnbap/HNBAP_IMSIDS41.h index 7b3c2f4..94f35b9 100644 --- a/include/osmocom/hnbap/HNBAP_IMSIDS41.h +++ b/include/osmocom/hnbap/HNBAP_IMSIDS41.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_IMSIDS41_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMSIESN.h b/include/osmocom/hnbap/HNBAP_IMSIESN.h index 9671bd8..2178336 100644 --- a/include/osmocom/hnbap/HNBAP_IMSIESN.h +++ b/include/osmocom/hnbap/HNBAP_IMSIESN.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_IMSIESN_H_ diff --git a/include/osmocom/hnbap/HNBAP_IP-Address.h b/include/osmocom/hnbap/HNBAP_IP-Address.h index 1c4775d..8e6d119 100644 --- a/include/osmocom/hnbap/HNBAP_IP-Address.h +++ b/include/osmocom/hnbap/HNBAP_IP-Address.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_IP_Address_H_ diff --git a/include/osmocom/hnbap/HNBAP_InitiatingMessage.h b/include/osmocom/hnbap/HNBAP_InitiatingMessage.h index 9427640..1a7e6e3 100644 --- a/include/osmocom/hnbap/HNBAP_InitiatingMessage.h +++ b/include/osmocom/hnbap/HNBAP_InitiatingMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_InitiatingMessage_H_ diff --git a/include/osmocom/hnbap/HNBAP_Ipv4Address.h b/include/osmocom/hnbap/HNBAP_Ipv4Address.h index 94d9df4..eecb57a 100644 --- a/include/osmocom/hnbap/HNBAP_Ipv4Address.h +++ b/include/osmocom/hnbap/HNBAP_Ipv4Address.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Ipv4Address_H_ diff --git a/include/osmocom/hnbap/HNBAP_Ipv6Address.h b/include/osmocom/hnbap/HNBAP_Ipv6Address.h index 7bdbee3..319ee82 100644 --- a/include/osmocom/hnbap/HNBAP_Ipv6Address.h +++ b/include/osmocom/hnbap/HNBAP_Ipv6Address.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Ipv6Address_H_ diff --git a/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h b/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h index d64224f..f3e5f24 100644 --- a/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h +++ b/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * >From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Iurh_Signalling_TNL_AddressList_H_ diff --git a/include/osmocom/hnbap/HNBAP_LAC.h b/include/osmocom/hnbap/HNBAP_LAC.h index 5c9b0a1..66369cf 100644 --- a/include/osmocom/hnbap/HNBAP_LAC.h +++ b/include/osmocom/hnbap/HNBAP_LAC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_LAC_H_ diff --git a/include/osmocom/hnbap/HNBAP_LAI.h b/include/osmocom/hnbap/HNBAP_LAI.h index f1ec681..bc44334 100644 --- a/include/osmocom/hnbap/HNBAP_LAI.h +++ b/include/osmocom/hnbap/HNBAP_LAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_LAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_MacroCellID.h b/include/osmocom/hnbap/HNBAP_MacroCellID.h index 4d3730b..808e4cc 100644 --- a/include/osmocom/hnbap/HNBAP_MacroCellID.h +++ b/include/osmocom/hnbap/HNBAP_MacroCellID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_MacroCellID_H_ diff --git a/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h b/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h index 5396d74..8c58db7 100644 --- a/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h +++ b/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_MacroCoverageInformation_H_ diff --git a/include/osmocom/hnbap/HNBAP_MuxPortNumber.h b/include/osmocom/hnbap/HNBAP_MuxPortNumber.h index f8c1941..126423b 100644 --- a/include/osmocom/hnbap/HNBAP_MuxPortNumber.h +++ b/include/osmocom/hnbap/HNBAP_MuxPortNumber.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_MuxPortNumber_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h b/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h index b6b3c94..7b045bd 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_NeighbourCellIdentityList_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h b/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h index 7720cb0..a05d5c6 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_NeighbourIdentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h b/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h index ef0d1ad..c3ac952 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_NeighbourInfoList_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h index aa98850..babc581 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_NeighbourInfoRequestItem_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h index b0866c4..8ce71b4 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_NeighbourInfoRequestList_H_ diff --git a/include/osmocom/hnbap/HNBAP_PLMNidentity.h b/include/osmocom/hnbap/HNBAP_PLMNidentity.h index c6f52e9..eaae7fd 100644 --- a/include/osmocom/hnbap/HNBAP_PLMNidentity.h +++ b/include/osmocom/hnbap/HNBAP_PLMNidentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_PLMNidentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_PSC.h b/include/osmocom/hnbap/HNBAP_PSC.h index aad7859..a399947 100644 --- a/include/osmocom/hnbap/HNBAP_PSC.h +++ b/include/osmocom/hnbap/HNBAP_PSC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_PSC_H_ diff --git a/include/osmocom/hnbap/HNBAP_PTMSI.h b/include/osmocom/hnbap/HNBAP_PTMSI.h index b616e34..70a9d21 100644 --- a/include/osmocom/hnbap/HNBAP_PTMSI.h +++ b/include/osmocom/hnbap/HNBAP_PTMSI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_PTMSI_H_ diff --git a/include/osmocom/hnbap/HNBAP_PTMSIRAI.h b/include/osmocom/hnbap/HNBAP_PTMSIRAI.h index fed74f2..45396e0 100644 --- a/include/osmocom/hnbap/HNBAP_PTMSIRAI.h +++ b/include/osmocom/hnbap/HNBAP_PTMSIRAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_PTMSIRAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_Presence.h b/include/osmocom/hnbap/HNBAP_Presence.h index ca38181..60ec1f9 100644 --- a/include/osmocom/hnbap/HNBAP_Presence.h +++ b/include/osmocom/hnbap/HNBAP_Presence.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Presence_H_ diff --git a/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h b/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h index dd77956..78857d0 100644 --- a/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h +++ b/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_PrivateIE_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_PrivateMessage.h b/include/osmocom/hnbap/HNBAP_PrivateMessage.h index ecc092f..ee7faa4 100644 --- a/include/osmocom/hnbap/HNBAP_PrivateMessage.h +++ b/include/osmocom/hnbap/HNBAP_PrivateMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_PrivateMessage_H_ diff --git a/include/osmocom/hnbap/HNBAP_ProcedureCode.h b/include/osmocom/hnbap/HNBAP_ProcedureCode.h index fc6b2e8..84e1d41 100644 --- a/include/osmocom/hnbap/HNBAP_ProcedureCode.h +++ b/include/osmocom/hnbap/HNBAP_ProcedureCode.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_ProcedureCode_H_ diff --git a/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h b/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h index be1efe6..4ca0627 100644 --- a/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h +++ b/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_ProtocolIE_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_RAB-ID.h b/include/osmocom/hnbap/HNBAP_RAB-ID.h index 96612c0..45422f4 100644 --- a/include/osmocom/hnbap/HNBAP_RAB-ID.h +++ b/include/osmocom/hnbap/HNBAP_RAB-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_RAB_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_RABList.h b/include/osmocom/hnbap/HNBAP_RABList.h index 76d7a1a..50741e0 100644 --- a/include/osmocom/hnbap/HNBAP_RABList.h +++ b/include/osmocom/hnbap/HNBAP_RABList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_RABList_H_ diff --git a/include/osmocom/hnbap/HNBAP_RABListItem.h b/include/osmocom/hnbap/HNBAP_RABListItem.h index 11cc414..a041d25 100644 --- a/include/osmocom/hnbap/HNBAP_RABListItem.h +++ b/include/osmocom/hnbap/HNBAP_RABListItem.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_RABListItem_H_ diff --git a/include/osmocom/hnbap/HNBAP_RAC.h b/include/osmocom/hnbap/HNBAP_RAC.h index e1bae72..20534f8 100644 --- a/include/osmocom/hnbap/HNBAP_RAC.h +++ b/include/osmocom/hnbap/HNBAP_RAC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_RAC_H_ diff --git a/include/osmocom/hnbap/HNBAP_RAI.h b/include/osmocom/hnbap/HNBAP_RAI.h index eab28b0..0cc6985 100644 --- a/include/osmocom/hnbap/HNBAP_RAI.h +++ b/include/osmocom/hnbap/HNBAP_RAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_RAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_RNC-ID.h b/include/osmocom/hnbap/HNBAP_RNC-ID.h index d4c62a6..36c6644 100644 --- a/include/osmocom/hnbap/HNBAP_RNC-ID.h +++ b/include/osmocom/hnbap/HNBAP_RNC-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_RNC_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_Registration-Cause.h b/include/osmocom/hnbap/HNBAP_Registration-Cause.h index 9a5af41..8fc58bd 100644 --- a/include/osmocom/hnbap/HNBAP_Registration-Cause.h +++ b/include/osmocom/hnbap/HNBAP_Registration-Cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Registration_Cause_H_ diff --git a/include/osmocom/hnbap/HNBAP_RelocationComplete.h b/include/osmocom/hnbap/HNBAP_RelocationComplete.h index f61dbe7..8ab1e5a 100644 --- a/include/osmocom/hnbap/HNBAP_RelocationComplete.h +++ b/include/osmocom/hnbap/HNBAP_RelocationComplete.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_RelocationComplete_H_ diff --git a/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h b/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h index 6979520..a315b9a 100644 --- a/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h +++ b/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_S_RNTIPrefix_H_ diff --git a/include/osmocom/hnbap/HNBAP_SAC.h b/include/osmocom/hnbap/HNBAP_SAC.h index 98696ef..6b4bf11 100644 --- a/include/osmocom/hnbap/HNBAP_SAC.h +++ b/include/osmocom/hnbap/HNBAP_SAC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_SAC_H_ diff --git a/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h b/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h index 64f7b5d..97ddd2e 100644 --- a/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h +++ b/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_SuccessfulOutcome_H_ diff --git a/include/osmocom/hnbap/HNBAP_TMSIDS41.h b/include/osmocom/hnbap/HNBAP_TMSIDS41.h index 8f10577..ec40e84 100644 --- a/include/osmocom/hnbap/HNBAP_TMSIDS41.h +++ b/include/osmocom/hnbap/HNBAP_TMSIDS41.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TMSIDS41_H_ diff --git a/include/osmocom/hnbap/HNBAP_TMSILAI.h b/include/osmocom/hnbap/HNBAP_TMSILAI.h index 83f697c..de4101a 100644 --- a/include/osmocom/hnbap/HNBAP_TMSILAI.h +++ b/include/osmocom/hnbap/HNBAP_TMSILAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TMSILAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h b/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h index 44af731..73313fb 100644 --- a/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h +++ b/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TNLUpdateFailure_H_ diff --git a/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h b/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h index 61d77f6..11b1a36 100644 --- a/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h +++ b/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TNLUpdateRequest_H_ diff --git a/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h b/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h index 62b5e05..8aac76b 100644 --- a/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h +++ b/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TNLUpdateResponse_H_ diff --git a/include/osmocom/hnbap/HNBAP_TransportInfo.h b/include/osmocom/hnbap/HNBAP_TransportInfo.h index b20e0d6..8f0a5eb 100644 --- a/include/osmocom/hnbap/HNBAP_TransportInfo.h +++ b/include/osmocom/hnbap/HNBAP_TransportInfo.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TransportInfo_H_ diff --git a/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h b/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h index f66f2dc..4edd7b8 100644 --- a/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h +++ b/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TransportLayerAddress_H_ diff --git a/include/osmocom/hnbap/HNBAP_TriggeringMessage.h b/include/osmocom/hnbap/HNBAP_TriggeringMessage.h index 0d349ab..859dc12 100644 --- a/include/osmocom/hnbap/HNBAP_TriggeringMessage.h +++ b/include/osmocom/hnbap/HNBAP_TriggeringMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TriggeringMessage_H_ diff --git a/include/osmocom/hnbap/HNBAP_Tunnel-Information.h b/include/osmocom/hnbap/HNBAP_Tunnel-Information.h index f2ae37a..470420d 100644 --- a/include/osmocom/hnbap/HNBAP_Tunnel-Information.h +++ b/include/osmocom/hnbap/HNBAP_Tunnel-Information.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Tunnel_Information_H_ diff --git a/include/osmocom/hnbap/HNBAP_TypeOfError.h b/include/osmocom/hnbap/HNBAP_TypeOfError.h index c97e761..04771a3 100644 --- a/include/osmocom/hnbap/HNBAP_TypeOfError.h +++ b/include/osmocom/hnbap/HNBAP_TypeOfError.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TypeOfError_H_ diff --git a/include/osmocom/hnbap/HNBAP_U-RNTI.h b/include/osmocom/hnbap/HNBAP_U-RNTI.h index 41ff48e..cf506b0 100644 --- a/include/osmocom/hnbap/HNBAP_U-RNTI.h +++ b/include/osmocom/hnbap/HNBAP_U-RNTI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_U_RNTI_H_ diff --git a/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h b/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h index 38fe28a..8714c55 100644 --- a/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h +++ b/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_U_RNTIQueryRequest_H_ diff --git a/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h b/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h index 9cc4f9a..2696f9b 100644 --- a/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h +++ b/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_U_RNTIQueryResponse_H_ diff --git a/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h b/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h index ecde6e3..9a8b675 100644 --- a/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h +++ b/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UDP_Port_Number_H_ diff --git a/include/osmocom/hnbap/HNBAP_UE-Capabilities.h b/include/osmocom/hnbap/HNBAP_UE-Capabilities.h index 86caf2e..38551d6 100644 --- a/include/osmocom/hnbap/HNBAP_UE-Capabilities.h +++ b/include/osmocom/hnbap/HNBAP_UE-Capabilities.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UE_Capabilities_H_ diff --git a/include/osmocom/hnbap/HNBAP_UE-Identity.h b/include/osmocom/hnbap/HNBAP_UE-Identity.h index ed2f3e0..8e63603 100644 --- a/include/osmocom/hnbap/HNBAP_UE-Identity.h +++ b/include/osmocom/hnbap/HNBAP_UE-Identity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UE_Identity_H_ diff --git a/include/osmocom/hnbap/HNBAP_UEDe-Register.h b/include/osmocom/hnbap/HNBAP_UEDe-Register.h index d67a461..5a0e298 100644 --- a/include/osmocom/hnbap/HNBAP_UEDe-Register.h +++ b/include/osmocom/hnbap/HNBAP_UEDe-Register.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UEDe_Register_H_ diff --git a/include/osmocom/hnbap/HNBAP_UERegisterAccept.h b/include/osmocom/hnbap/HNBAP_UERegisterAccept.h index bc7f077..8d2bec1 100644 --- a/include/osmocom/hnbap/HNBAP_UERegisterAccept.h +++ b/include/osmocom/hnbap/HNBAP_UERegisterAccept.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UERegisterAccept_H_ diff --git a/include/osmocom/hnbap/HNBAP_UERegisterReject.h b/include/osmocom/hnbap/HNBAP_UERegisterReject.h index 3c5e8ed..c30ffbe 100644 --- a/include/osmocom/hnbap/HNBAP_UERegisterReject.h +++ b/include/osmocom/hnbap/HNBAP_UERegisterReject.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UERegisterReject_H_ diff --git a/include/osmocom/hnbap/HNBAP_UERegisterRequest.h b/include/osmocom/hnbap/HNBAP_UERegisterRequest.h index 4f5ecc5..46778c8 100644 --- a/include/osmocom/hnbap/HNBAP_UERegisterRequest.h +++ b/include/osmocom/hnbap/HNBAP_UERegisterRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UERegisterRequest_H_ diff --git a/include/osmocom/hnbap/HNBAP_URAIdentity.h b/include/osmocom/hnbap/HNBAP_URAIdentity.h index c3514ab..6d4d582 100644 --- a/include/osmocom/hnbap/HNBAP_URAIdentity.h +++ b/include/osmocom/hnbap/HNBAP_URAIdentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_URAIdentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_URAIdentityList.h b/include/osmocom/hnbap/HNBAP_URAIdentityList.h index 3f4732a..b676efa 100644 --- a/include/osmocom/hnbap/HNBAP_URAIdentityList.h +++ b/include/osmocom/hnbap/HNBAP_URAIdentityList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_URAIdentityList_H_ diff --git a/include/osmocom/hnbap/HNBAP_UTRANCellID.h b/include/osmocom/hnbap/HNBAP_UTRANCellID.h index a75e4b5..d5105b3 100644 --- a/include/osmocom/hnbap/HNBAP_UTRANCellID.h +++ b/include/osmocom/hnbap/HNBAP_UTRANCellID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UTRANCellID_H_ diff --git a/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h b/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h index 89d7533..9f285f9 100644 --- a/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h +++ b/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UnknownU_RNTIIndication_H_ diff --git a/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h b/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h index ee74b17..b3d2a7e 100644 --- a/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h +++ b/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UnsuccessfulOutcome_H_ diff --git a/include/osmocom/hnbap/HNBAP_Update-cause.h b/include/osmocom/hnbap/HNBAP_Update-cause.h index 0f8141d..601a34e 100644 --- a/include/osmocom/hnbap/HNBAP_Update-cause.h +++ b/include/osmocom/hnbap/HNBAP_Update-cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Update_cause_H_ diff --git a/src/hnbap/HNBAP_Access-stratum-release-indicator.c b/src/hnbap/HNBAP_Access-stratum-release-indicator.c index b94711d..fec27b8 100644 --- a/src/hnbap/HNBAP_Access-stratum-release-indicator.c +++ b/src/hnbap/HNBAP_Access-stratum-release-indicator.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_AccessResult.c b/src/hnbap/HNBAP_AccessResult.c index a8e7ee6..ef2d6db 100644 --- a/src/hnbap/HNBAP_AccessResult.c +++ b/src/hnbap/HNBAP_AccessResult.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c b/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c index 229f6e8..d19a303 100644 --- a/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c +++ b/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_AltitudeAndDirection.c b/src/hnbap/HNBAP_AltitudeAndDirection.c index 9b5558a..9995f74 100644 --- a/src/hnbap/HNBAP_AltitudeAndDirection.c +++ b/src/hnbap/HNBAP_AltitudeAndDirection.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_BackoffTimer.c b/src/hnbap/HNBAP_BackoffTimer.c index 059b2e5..097ce18 100644 --- a/src/hnbap/HNBAP_BackoffTimer.c +++ b/src/hnbap/HNBAP_BackoffTimer.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_BindingID.c b/src/hnbap/HNBAP_BindingID.c index 3635f35..105a6f8 100644 --- a/src/hnbap/HNBAP_BindingID.c +++ b/src/hnbap/HNBAP_BindingID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c b/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c index 96d5f30..a25797b 100644 --- a/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c +++ b/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CGI.c b/src/hnbap/HNBAP_CGI.c index 06b3732..fbf96b6 100644 --- a/src/hnbap/HNBAP_CGI.c +++ b/src/hnbap/HNBAP_CGI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CI.c b/src/hnbap/HNBAP_CI.c index 4143b8b..c4d20ea 100644 --- a/src/hnbap/HNBAP_CI.c +++ b/src/hnbap/HNBAP_CI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CN-DomainIndicator.c b/src/hnbap/HNBAP_CN-DomainIndicator.c index 3d556a2..158957d 100644 --- a/src/hnbap/HNBAP_CN-DomainIndicator.c +++ b/src/hnbap/HNBAP_CN-DomainIndicator.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CSG-Capability.c b/src/hnbap/HNBAP_CSG-Capability.c index 1e8548e..5bf3426 100644 --- a/src/hnbap/HNBAP_CSG-Capability.c +++ b/src/hnbap/HNBAP_CSG-Capability.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CSG-ID.c b/src/hnbap/HNBAP_CSG-ID.c index 7cbc3da..2000f51 100644 --- a/src/hnbap/HNBAP_CSG-ID.c +++ b/src/hnbap/HNBAP_CSG-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CSGMembershipStatus.c b/src/hnbap/HNBAP_CSGMembershipStatus.c index fc8132c..b49e7a8 100644 --- a/src/hnbap/HNBAP_CSGMembershipStatus.c +++ b/src/hnbap/HNBAP_CSGMembershipStatus.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CSGMembershipUpdate.c b/src/hnbap/HNBAP_CSGMembershipUpdate.c index 76dbeb4..1febe4f 100644 --- a/src/hnbap/HNBAP_CSGMembershipUpdate.c +++ b/src/hnbap/HNBAP_CSGMembershipUpdate.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Cause.c b/src/hnbap/HNBAP_Cause.c index 3e24ed6..e0db859 100644 --- a/src/hnbap/HNBAP_Cause.c +++ b/src/hnbap/HNBAP_Cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CauseMisc.c b/src/hnbap/HNBAP_CauseMisc.c index 08fd61d..a3c5752 100644 --- a/src/hnbap/HNBAP_CauseMisc.c +++ b/src/hnbap/HNBAP_CauseMisc.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CauseProtocol.c b/src/hnbap/HNBAP_CauseProtocol.c index 61e3a68..8893481 100644 --- a/src/hnbap/HNBAP_CauseProtocol.c +++ b/src/hnbap/HNBAP_CauseProtocol.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CauseRadioNetwork.c b/src/hnbap/HNBAP_CauseRadioNetwork.c index c12376b..2418a72 100644 --- a/src/hnbap/HNBAP_CauseRadioNetwork.c +++ b/src/hnbap/HNBAP_CauseRadioNetwork.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CauseTransport.c b/src/hnbap/HNBAP_CauseTransport.c index 0f14b33..6c37c66 100644 --- a/src/hnbap/HNBAP_CauseTransport.c +++ b/src/hnbap/HNBAP_CauseTransport.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CellIdentity.c b/src/hnbap/HNBAP_CellIdentity.c index 17f2f9d..3465697 100644 --- a/src/hnbap/HNBAP_CellIdentity.c +++ b/src/hnbap/HNBAP_CellIdentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_ConfigurationInformation.c b/src/hnbap/HNBAP_ConfigurationInformation.c index a8c9f71..6cf24b1 100644 --- a/src/hnbap/HNBAP_ConfigurationInformation.c +++ b/src/hnbap/HNBAP_ConfigurationInformation.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Context-ID.c b/src/hnbap/HNBAP_Context-ID.c index 8611b05..4d2a2b9 100644 --- a/src/hnbap/HNBAP_Context-ID.c +++ b/src/hnbap/HNBAP_Context-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Criticality.c b/src/hnbap/HNBAP_Criticality.c index 2c58963..de6fe43 100644 --- a/src/hnbap/HNBAP_Criticality.c +++ b/src/hnbap/HNBAP_Criticality.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c b/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c index 0c5be8c..f5aff57 100644 --- a/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c +++ b/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CriticalityDiagnostics.c b/src/hnbap/HNBAP_CriticalityDiagnostics.c index a243ce4..5760e92 100644 --- a/src/hnbap/HNBAP_CriticalityDiagnostics.c +++ b/src/hnbap/HNBAP_CriticalityDiagnostics.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_ESN.c b/src/hnbap/HNBAP_ESN.c index c08c2af..d17f2ca 100644 --- a/src/hnbap/HNBAP_ESN.c +++ b/src/hnbap/HNBAP_ESN.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_ErrorIndication.c b/src/hnbap/HNBAP_ErrorIndication.c index dc70c9b..4babda2 100644 --- a/src/hnbap/HNBAP_ErrorIndication.c +++ b/src/hnbap/HNBAP_ErrorIndication.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_GTP-TEI.c b/src/hnbap/HNBAP_GTP-TEI.c index f8a08be..7d4b292 100644 --- a/src/hnbap/HNBAP_GTP-TEI.c +++ b/src/hnbap/HNBAP_GTP-TEI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_GeographicalCoordinates.c b/src/hnbap/HNBAP_GeographicalCoordinates.c index 1176be9..9607ebf 100644 --- a/src/hnbap/HNBAP_GeographicalCoordinates.c +++ b/src/hnbap/HNBAP_GeographicalCoordinates.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_GeographicalLocation.c b/src/hnbap/HNBAP_GeographicalLocation.c index bf002c0..6daa15a 100644 --- a/src/hnbap/HNBAP_GeographicalLocation.c +++ b/src/hnbap/HNBAP_GeographicalLocation.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c b/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c index adeef7d..5154bdf 100644 --- a/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c +++ b/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNB-Cell-Identifier.c b/src/hnbap/HNBAP_HNB-Cell-Identifier.c index e4e4ec1..cf2b620 100644 --- a/src/hnbap/HNBAP_HNB-Cell-Identifier.c +++ b/src/hnbap/HNBAP_HNB-Cell-Identifier.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNB-GWResponse.c b/src/hnbap/HNBAP_HNB-GWResponse.c index 84cf113..e48cada 100644 --- a/src/hnbap/HNBAP_HNB-GWResponse.c +++ b/src/hnbap/HNBAP_HNB-GWResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNB-Identity-Info.c b/src/hnbap/HNBAP_HNB-Identity-Info.c index 1adedba..1ac5789 100644 --- a/src/hnbap/HNBAP_HNB-Identity-Info.c +++ b/src/hnbap/HNBAP_HNB-Identity-Info.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNB-Identity.c b/src/hnbap/HNBAP_HNB-Identity.c index 6b59f7e..217b714 100644 --- a/src/hnbap/HNBAP_HNB-Identity.c +++ b/src/hnbap/HNBAP_HNB-Identity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNB-Location-Information.c b/src/hnbap/HNBAP_HNB-Location-Information.c index 42cee00..178ac0f 100644 --- a/src/hnbap/HNBAP_HNB-Location-Information.c +++ b/src/hnbap/HNBAP_HNB-Location-Information.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNB-RNL-Identity.c b/src/hnbap/HNBAP_HNB-RNL-Identity.c index 5c4cfb3..09d3c52 100644 --- a/src/hnbap/HNBAP_HNB-RNL-Identity.c +++ b/src/hnbap/HNBAP_HNB-RNL-Identity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBAP-PDU.c b/src/hnbap/HNBAP_HNBAP-PDU.c index c753d1c..2adb422 100644 --- a/src/hnbap/HNBAP_HNBAP-PDU.c +++ b/src/hnbap/HNBAP_HNBAP-PDU.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBCapacity.c b/src/hnbap/HNBAP_HNBCapacity.c index 617867c..3f9da47 100644 --- a/src/hnbap/HNBAP_HNBCapacity.c +++ b/src/hnbap/HNBAP_HNBCapacity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigInfo.c b/src/hnbap/HNBAP_HNBConfigInfo.c index 94b6cdf..402363d 100644 --- a/src/hnbap/HNBAP_HNBConfigInfo.c +++ b/src/hnbap/HNBAP_HNBConfigInfo.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigTransferRequest.c b/src/hnbap/HNBAP_HNBConfigTransferRequest.c index 7ed25d8..ff2b20f 100644 --- a/src/hnbap/HNBAP_HNBConfigTransferRequest.c +++ b/src/hnbap/HNBAP_HNBConfigTransferRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigTransferResponse.c b/src/hnbap/HNBAP_HNBConfigTransferResponse.c index ed63331..00e2d1f 100644 --- a/src/hnbap/HNBAP_HNBConfigTransferResponse.c +++ b/src/hnbap/HNBAP_HNBConfigTransferResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c b/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c index f189406..27e12fa 100644 --- a/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c +++ b/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c b/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c index 0af2a45..db68725 100644 --- a/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c +++ b/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * >From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBDe-Register.c b/src/hnbap/HNBAP_HNBDe-Register.c index a2ab5e8..d2ef818 100644 --- a/src/hnbap/HNBAP_HNBDe-Register.c +++ b/src/hnbap/HNBAP_HNBDe-Register.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBRegisterAccept.c b/src/hnbap/HNBAP_HNBRegisterAccept.c index d1d9c90..4b1afa0 100644 --- a/src/hnbap/HNBAP_HNBRegisterAccept.c +++ b/src/hnbap/HNBAP_HNBRegisterAccept.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBRegisterReject.c b/src/hnbap/HNBAP_HNBRegisterReject.c index 3a6a9da..ecab1d1 100644 --- a/src/hnbap/HNBAP_HNBRegisterReject.c +++ b/src/hnbap/HNBAP_HNBRegisterReject.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBRegisterRequest.c b/src/hnbap/HNBAP_HNBRegisterRequest.c index 076aca5..3bf2278 100644 --- a/src/hnbap/HNBAP_HNBRegisterRequest.c +++ b/src/hnbap/HNBAP_HNBRegisterRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_IE-Extensions.c b/src/hnbap/HNBAP_IE-Extensions.c index a619037..603b933 100644 --- a/src/hnbap/HNBAP_IE-Extensions.c +++ b/src/hnbap/HNBAP_IE-Extensions.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_IE.c b/src/hnbap/HNBAP_IE.c index ce153c7..c57f924 100644 --- a/src/hnbap/HNBAP_IE.c +++ b/src/hnbap/HNBAP_IE.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_IMEI.c b/src/hnbap/HNBAP_IMEI.c index 0a513e5..b3c4406 100644 --- a/src/hnbap/HNBAP_IMEI.c +++ b/src/hnbap/HNBAP_IMEI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_IMSI.c b/src/hnbap/HNBAP_IMSI.c index 58421b8..9a3c757 100644 --- a/src/hnbap/HNBAP_IMSI.c +++ b/src/hnbap/HNBAP_IMSI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_IMSIDS41.c b/src/hnbap/HNBAP_IMSIDS41.c index 4171f72..10a7807 100644 --- a/src/hnbap/HNBAP_IMSIDS41.c +++ b/src/hnbap/HNBAP_IMSIDS41.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_IMSIESN.c b/src/hnbap/HNBAP_IMSIESN.c index a2379a8..1b9d9a6 100644 --- a/src/hnbap/HNBAP_IMSIESN.c +++ b/src/hnbap/HNBAP_IMSIESN.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_IP-Address.c b/src/hnbap/HNBAP_IP-Address.c index 8d86f45..6bc9d7f 100644 --- a/src/hnbap/HNBAP_IP-Address.c +++ b/src/hnbap/HNBAP_IP-Address.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_InitiatingMessage.c b/src/hnbap/HNBAP_InitiatingMessage.c index afea0ce..1b87f7d 100644 --- a/src/hnbap/HNBAP_InitiatingMessage.c +++ b/src/hnbap/HNBAP_InitiatingMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Ipv4Address.c b/src/hnbap/HNBAP_Ipv4Address.c index 78492db..f325ead 100644 --- a/src/hnbap/HNBAP_Ipv4Address.c +++ b/src/hnbap/HNBAP_Ipv4Address.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Ipv6Address.c b/src/hnbap/HNBAP_Ipv6Address.c index 9f0e34b..b0c9176 100644 --- a/src/hnbap/HNBAP_Ipv6Address.c +++ b/src/hnbap/HNBAP_Ipv6Address.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c b/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c index b618d52..79b4dad 100644 --- a/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c +++ b/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_LAC.c b/src/hnbap/HNBAP_LAC.c index 5e1229e..8f3d9f5 100644 --- a/src/hnbap/HNBAP_LAC.c +++ b/src/hnbap/HNBAP_LAC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_LAI.c b/src/hnbap/HNBAP_LAI.c index 2be18c8..bcfddde 100644 --- a/src/hnbap/HNBAP_LAI.c +++ b/src/hnbap/HNBAP_LAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_MacroCellID.c b/src/hnbap/HNBAP_MacroCellID.c index 1ede6cf..568e56a 100644 --- a/src/hnbap/HNBAP_MacroCellID.c +++ b/src/hnbap/HNBAP_MacroCellID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_MacroCoverageInformation.c b/src/hnbap/HNBAP_MacroCoverageInformation.c index e397ce5..83ae67b 100644 --- a/src/hnbap/HNBAP_MacroCoverageInformation.c +++ b/src/hnbap/HNBAP_MacroCoverageInformation.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_MuxPortNumber.c b/src/hnbap/HNBAP_MuxPortNumber.c index 6de4326..4c7ca42 100644 --- a/src/hnbap/HNBAP_MuxPortNumber.c +++ b/src/hnbap/HNBAP_MuxPortNumber.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_NeighbourCellIdentityList.c b/src/hnbap/HNBAP_NeighbourCellIdentityList.c index 5823068..e0f912c 100644 --- a/src/hnbap/HNBAP_NeighbourCellIdentityList.c +++ b/src/hnbap/HNBAP_NeighbourCellIdentityList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_NeighbourIdentity.c b/src/hnbap/HNBAP_NeighbourIdentity.c index 6a7b9f1..2e69f01 100644 --- a/src/hnbap/HNBAP_NeighbourIdentity.c +++ b/src/hnbap/HNBAP_NeighbourIdentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_NeighbourInfoList.c b/src/hnbap/HNBAP_NeighbourInfoList.c index 2646b0a..458a142 100644 --- a/src/hnbap/HNBAP_NeighbourInfoList.c +++ b/src/hnbap/HNBAP_NeighbourInfoList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_NeighbourInfoRequestItem.c b/src/hnbap/HNBAP_NeighbourInfoRequestItem.c index 3e7f416..42cd579 100644 --- a/src/hnbap/HNBAP_NeighbourInfoRequestItem.c +++ b/src/hnbap/HNBAP_NeighbourInfoRequestItem.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_NeighbourInfoRequestList.c b/src/hnbap/HNBAP_NeighbourInfoRequestList.c index 6a45cb3..738d5c2 100644 --- a/src/hnbap/HNBAP_NeighbourInfoRequestList.c +++ b/src/hnbap/HNBAP_NeighbourInfoRequestList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_PLMNidentity.c b/src/hnbap/HNBAP_PLMNidentity.c index 90c9095..cb6879b 100644 --- a/src/hnbap/HNBAP_PLMNidentity.c +++ b/src/hnbap/HNBAP_PLMNidentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_PSC.c b/src/hnbap/HNBAP_PSC.c index 1147efb..b696fc0 100644 --- a/src/hnbap/HNBAP_PSC.c +++ b/src/hnbap/HNBAP_PSC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_PTMSI.c b/src/hnbap/HNBAP_PTMSI.c index 273f421..23976ef 100644 --- a/src/hnbap/HNBAP_PTMSI.c +++ b/src/hnbap/HNBAP_PTMSI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_PTMSIRAI.c b/src/hnbap/HNBAP_PTMSIRAI.c index 422225a..dc17dd3 100644 --- a/src/hnbap/HNBAP_PTMSIRAI.c +++ b/src/hnbap/HNBAP_PTMSIRAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Presence.c b/src/hnbap/HNBAP_Presence.c index 550df56..a6e7286 100644 --- a/src/hnbap/HNBAP_Presence.c +++ b/src/hnbap/HNBAP_Presence.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_PrivateIE-ID.c b/src/hnbap/HNBAP_PrivateIE-ID.c index 0df265a..3bf3000 100644 --- a/src/hnbap/HNBAP_PrivateIE-ID.c +++ b/src/hnbap/HNBAP_PrivateIE-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_PrivateMessage.c b/src/hnbap/HNBAP_PrivateMessage.c index 6cc1ace..ebac795 100644 --- a/src/hnbap/HNBAP_PrivateMessage.c +++ b/src/hnbap/HNBAP_PrivateMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_ProcedureCode.c b/src/hnbap/HNBAP_ProcedureCode.c index ff34f8d..c32e9fb 100644 --- a/src/hnbap/HNBAP_ProcedureCode.c +++ b/src/hnbap/HNBAP_ProcedureCode.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_ProtocolIE-ID.c b/src/hnbap/HNBAP_ProtocolIE-ID.c index 2df4268..f4fc953 100644 --- a/src/hnbap/HNBAP_ProtocolIE-ID.c +++ b/src/hnbap/HNBAP_ProtocolIE-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_RAB-ID.c b/src/hnbap/HNBAP_RAB-ID.c index f9f1f3a..4dea280 100644 --- a/src/hnbap/HNBAP_RAB-ID.c +++ b/src/hnbap/HNBAP_RAB-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_RABList.c b/src/hnbap/HNBAP_RABList.c index 7a94a2d..fe478e2 100644 --- a/src/hnbap/HNBAP_RABList.c +++ b/src/hnbap/HNBAP_RABList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_RABListItem.c b/src/hnbap/HNBAP_RABListItem.c index 280fd8c..4fcf4aa 100644 --- a/src/hnbap/HNBAP_RABListItem.c +++ b/src/hnbap/HNBAP_RABListItem.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_RAC.c b/src/hnbap/HNBAP_RAC.c index d1b9947..6a6235c 100644 --- a/src/hnbap/HNBAP_RAC.c +++ b/src/hnbap/HNBAP_RAC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_RAI.c b/src/hnbap/HNBAP_RAI.c index 9f35417..c6bca5b 100644 --- a/src/hnbap/HNBAP_RAI.c +++ b/src/hnbap/HNBAP_RAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * >From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_RNC-ID.c b/src/hnbap/HNBAP_RNC-ID.c index 323944d..57da025 100644 --- a/src/hnbap/HNBAP_RNC-ID.c +++ b/src/hnbap/HNBAP_RNC-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Registration-Cause.c b/src/hnbap/HNBAP_Registration-Cause.c index 6d54bb2..8047241 100644 --- a/src/hnbap/HNBAP_Registration-Cause.c +++ b/src/hnbap/HNBAP_Registration-Cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_RelocationComplete.c b/src/hnbap/HNBAP_RelocationComplete.c index 33136bd..b939e69 100644 --- a/src/hnbap/HNBAP_RelocationComplete.c +++ b/src/hnbap/HNBAP_RelocationComplete.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_S-RNTIPrefix.c b/src/hnbap/HNBAP_S-RNTIPrefix.c index 1170eec..3d5394c 100644 --- a/src/hnbap/HNBAP_S-RNTIPrefix.c +++ b/src/hnbap/HNBAP_S-RNTIPrefix.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_SAC.c b/src/hnbap/HNBAP_SAC.c index ba4e4a9..6c2a1e2 100644 --- a/src/hnbap/HNBAP_SAC.c +++ b/src/hnbap/HNBAP_SAC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_SuccessfulOutcome.c b/src/hnbap/HNBAP_SuccessfulOutcome.c index ff6c35e..5adb2ab 100644 --- a/src/hnbap/HNBAP_SuccessfulOutcome.c +++ b/src/hnbap/HNBAP_SuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TMSIDS41.c b/src/hnbap/HNBAP_TMSIDS41.c index f78bd85..0f2e295 100644 --- a/src/hnbap/HNBAP_TMSIDS41.c +++ b/src/hnbap/HNBAP_TMSIDS41.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TMSILAI.c b/src/hnbap/HNBAP_TMSILAI.c index cd52d58..2fe80eb 100644 --- a/src/hnbap/HNBAP_TMSILAI.c +++ b/src/hnbap/HNBAP_TMSILAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TNLUpdateFailure.c b/src/hnbap/HNBAP_TNLUpdateFailure.c index b344711..0f01084 100644 --- a/src/hnbap/HNBAP_TNLUpdateFailure.c +++ b/src/hnbap/HNBAP_TNLUpdateFailure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TNLUpdateRequest.c b/src/hnbap/HNBAP_TNLUpdateRequest.c index 7ba5125..bdf5c00 100644 --- a/src/hnbap/HNBAP_TNLUpdateRequest.c +++ b/src/hnbap/HNBAP_TNLUpdateRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TNLUpdateResponse.c b/src/hnbap/HNBAP_TNLUpdateResponse.c index 41c26a8..8876313 100644 --- a/src/hnbap/HNBAP_TNLUpdateResponse.c +++ b/src/hnbap/HNBAP_TNLUpdateResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TransportInfo.c b/src/hnbap/HNBAP_TransportInfo.c index aeaf033..9e0f7a3 100644 --- a/src/hnbap/HNBAP_TransportInfo.c +++ b/src/hnbap/HNBAP_TransportInfo.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TransportLayerAddress.c b/src/hnbap/HNBAP_TransportLayerAddress.c index 27c7e92..9cc085f 100644 --- a/src/hnbap/HNBAP_TransportLayerAddress.c +++ b/src/hnbap/HNBAP_TransportLayerAddress.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TriggeringMessage.c b/src/hnbap/HNBAP_TriggeringMessage.c index 590b5d5..4485222 100644 --- a/src/hnbap/HNBAP_TriggeringMessage.c +++ b/src/hnbap/HNBAP_TriggeringMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Tunnel-Information.c b/src/hnbap/HNBAP_Tunnel-Information.c index 6c0d0ac..db3387e 100644 --- a/src/hnbap/HNBAP_Tunnel-Information.c +++ b/src/hnbap/HNBAP_Tunnel-Information.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TypeOfError.c b/src/hnbap/HNBAP_TypeOfError.c index 3adc3c9..2d894f6 100644 --- a/src/hnbap/HNBAP_TypeOfError.c +++ b/src/hnbap/HNBAP_TypeOfError.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_U-RNTI.c b/src/hnbap/HNBAP_U-RNTI.c index 1b02864..438c32a 100644 --- a/src/hnbap/HNBAP_U-RNTI.c +++ b/src/hnbap/HNBAP_U-RNTI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_U-RNTIQueryRequest.c b/src/hnbap/HNBAP_U-RNTIQueryRequest.c index 8e2950c..f10d278 100644 --- a/src/hnbap/HNBAP_U-RNTIQueryRequest.c +++ b/src/hnbap/HNBAP_U-RNTIQueryRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_U-RNTIQueryResponse.c b/src/hnbap/HNBAP_U-RNTIQueryResponse.c index 6f34bcf..eda66b0 100644 --- a/src/hnbap/HNBAP_U-RNTIQueryResponse.c +++ b/src/hnbap/HNBAP_U-RNTIQueryResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UDP-Port-Number.c b/src/hnbap/HNBAP_UDP-Port-Number.c index 447f571..6a5ddb7 100644 --- a/src/hnbap/HNBAP_UDP-Port-Number.c +++ b/src/hnbap/HNBAP_UDP-Port-Number.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UE-Capabilities.c b/src/hnbap/HNBAP_UE-Capabilities.c index 1888d0e..903df3e 100644 --- a/src/hnbap/HNBAP_UE-Capabilities.c +++ b/src/hnbap/HNBAP_UE-Capabilities.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UE-Identity.c b/src/hnbap/HNBAP_UE-Identity.c index 4dfc5a9..8a820cc 100644 --- a/src/hnbap/HNBAP_UE-Identity.c +++ b/src/hnbap/HNBAP_UE-Identity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UEDe-Register.c b/src/hnbap/HNBAP_UEDe-Register.c index 80f6658..2e5d3ed 100644 --- a/src/hnbap/HNBAP_UEDe-Register.c +++ b/src/hnbap/HNBAP_UEDe-Register.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UERegisterAccept.c b/src/hnbap/HNBAP_UERegisterAccept.c index 898613f..02f5d5b 100644 --- a/src/hnbap/HNBAP_UERegisterAccept.c +++ b/src/hnbap/HNBAP_UERegisterAccept.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UERegisterReject.c b/src/hnbap/HNBAP_UERegisterReject.c index 39bd391..aab3e7f 100644 --- a/src/hnbap/HNBAP_UERegisterReject.c +++ b/src/hnbap/HNBAP_UERegisterReject.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UERegisterRequest.c b/src/hnbap/HNBAP_UERegisterRequest.c index 467978f..af2c267 100644 --- a/src/hnbap/HNBAP_UERegisterRequest.c +++ b/src/hnbap/HNBAP_UERegisterRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_URAIdentity.c b/src/hnbap/HNBAP_URAIdentity.c index aba49d8..4f9bff7 100644 --- a/src/hnbap/HNBAP_URAIdentity.c +++ b/src/hnbap/HNBAP_URAIdentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_URAIdentityList.c b/src/hnbap/HNBAP_URAIdentityList.c index cbc80bc..4530743 100644 --- a/src/hnbap/HNBAP_URAIdentityList.c +++ b/src/hnbap/HNBAP_URAIdentityList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UTRANCellID.c b/src/hnbap/HNBAP_UTRANCellID.c index a1c4237..28d69fe 100644 --- a/src/hnbap/HNBAP_UTRANCellID.c +++ b/src/hnbap/HNBAP_UTRANCellID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UnknownU-RNTIIndication.c b/src/hnbap/HNBAP_UnknownU-RNTIIndication.c index 9d82698..188dcbf 100644 --- a/src/hnbap/HNBAP_UnknownU-RNTIIndication.c +++ b/src/hnbap/HNBAP_UnknownU-RNTIIndication.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UnsuccessfulOutcome.c b/src/hnbap/HNBAP_UnsuccessfulOutcome.c index 1fd4503..4b83dda 100644 --- a/src/hnbap/HNBAP_UnsuccessfulOutcome.c +++ b/src/hnbap/HNBAP_UnsuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Update-cause.c b/src/hnbap/HNBAP_Update-cause.c index c1c5868..105e3b6 100644 --- a/src/hnbap/HNBAP_Update-cause.c +++ b/src/hnbap/HNBAP_Update-cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am index fc862d7..53dd609 100644 --- a/src/hnbap/Makefile.am +++ b/src/hnbap/Makefile.am @@ -243,7 +243,7 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - ASN1C_PREFIX="HNBAP_" asn1c -R -gen-PER -fnative-types $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn + ASN1C_PREFIX="HNBAP_" asn1c -R -gen-PER $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/hnbap $(ASN_MODULE_INC) # Finally copy *.c from buildir to srcdir: -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iccf81539a5045416185e619d24c3d542204437e6 Gerrit-Change-Number: 25986 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 14:41:28 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 14:41:28 +0000 Subject: Change in osmo-iuh[master]: hnbap: Drop no longer existing asn1c param -fnative-types In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25986 ) Change subject: hnbap: Drop no longer existing asn1c param -fnative-types ...................................................................... Patch Set 1: Verified+1 linter doesn't apply here. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iccf81539a5045416185e619d24c3d542204437e6 Gerrit-Change-Number: 25986 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 14:41:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 14:41:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 14:41:29 +0000 Subject: Change in osmo-iuh[master]: hnbap: Drop no longer existing asn1c param -fnative-types In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25986 ) Change subject: hnbap: Drop no longer existing asn1c param -fnative-types ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iccf81539a5045416185e619d24c3d542204437e6 Gerrit-Change-Number: 25986 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:12:23 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 15:12:23 +0000 Subject: Change in osmo-bts[master]: l1sap: move false PTCCH/U detection into PDCH branch References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25987 ) Change subject: l1sap: move false PTCCH/U detection into PDCH branch ...................................................................... l1sap: move false PTCCH/U detection into PDCH branch This check is only relevant for PDCH timeslots. Change-Id: I187fef8f3de0b41b502b0b18acfb11c56c5551f0 --- M src/common/l1sap.c 1 file changed, 8 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/87/25987/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 6eb08ba..d9e27b2 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1494,15 +1494,6 @@ DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind chan_nr=%s link_id=0x%02x len=%d\n", rsl_chan_nr_str(chan_nr), link_id, len); - /* Actually, there can be no DATA.ind on PTCCH/U (rather RACH.ind instead), - * but some BTS models with buggy implementation may still be sending them - * to us. Let's keep this for backwards compatibility. */ - if (L1SAP_IS_CHAN_PDCH(chan_nr) && L1SAP_IS_PTCCH(fn)) { - LOGPGT(DL1P, LOGL_NOTICE, &g_time, "There can be no DATA.ind on PTCCH/U. " - "This is probably a bug of the BTS model you're using, please fix!\n"); - return -EINVAL; - } - /* The ph_data_param contained in the l1sap primitive may contain * measurement data. If this data is present, forward it for * processing */ @@ -1525,6 +1516,14 @@ return 1; } + /* There can be no DATA.ind on PTCCH/U (rather RACH.ind instead), but some + * BTS models with buggy implementation may still be sending them to us. */ + if (L1SAP_IS_PTCCH(fn)) { + LOGPGT(DL1P, LOGL_NOTICE, &g_time, "There can be no DATA.ind on PTCCH/U. " + "This is probably a bug of the BTS model you're using, please fix!\n"); + return -EINVAL; + } + /* Drop all data from incomplete UL block */ if (pr_info != PRES_INFO_BOTH) len = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I187fef8f3de0b41b502b0b18acfb11c56c5551f0 Gerrit-Change-Number: 25987 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:12:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 15:12:24 +0000 Subject: Change in osmo-bts[master]: l1sap: use designated initializers in process_l1sap_meas_data() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25988 ) Change subject: l1sap: use designated initializers in process_l1sap_meas_data() ...................................................................... l1sap: use designated initializers in process_l1sap_meas_data() Change-Id: I5169a6c5f6865655dbfebb6b68d5f67941d9cdb1 --- M src/common/l1sap.c 1 file changed, 24 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/88/25988/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index d9e27b2..d02676b 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -705,11 +705,6 @@ struct ph_tch_param *ph_tch_ind; uint8_t chan_nr; uint32_t fn; - uint8_t inv_rssi; - uint8_t is_sub; - int16_t ta_offs_256bits; - uint16_t ber10k; - int16_t ci_cb; const char *ind_name; switch (ind_type) { @@ -718,12 +713,14 @@ info_meas_ind = &l1sap->u.info.u.meas_ind; chan_nr = info_meas_ind->chan_nr; fn = info_meas_ind->fn; - inv_rssi = info_meas_ind->inv_rssi; - is_sub = info_meas_ind->is_sub; - ta_offs_256bits = info_meas_ind->ta_offs_256bits; - ber10k = info_meas_ind->ber10k; - ci_cb = info_meas_ind->c_i_cb; ind_name = "MPH INFO"; + ulm = (struct bts_ul_meas) { + .ta_offs_256bits = info_meas_ind->ta_offs_256bits, + .inv_rssi = info_meas_ind->inv_rssi, + .ber10k = info_meas_ind->ber10k, + .c_i = info_meas_ind->c_i_cb, + .is_sub = info_meas_ind->is_sub, + }; break; case PRIM_TCH: ph_tch_ind = &l1sap->u.tch; @@ -731,12 +728,14 @@ return; chan_nr = ph_tch_ind->chan_nr; fn = ph_tch_ind->fn; - inv_rssi = abs(ph_tch_ind->rssi); - is_sub = ph_tch_ind->is_sub; - ta_offs_256bits = ph_tch_ind->ta_offs_256bits; - ber10k = ph_tch_ind->ber10k; - ci_cb = ph_tch_ind->lqual_cb; ind_name = "TCH"; + ulm = (struct bts_ul_meas) { + .ta_offs_256bits = ph_tch_ind->ta_offs_256bits, + .inv_rssi = abs(ph_tch_ind->rssi), + .ber10k = ph_tch_ind->ber10k, + .c_i = ph_tch_ind->lqual_cb, + .is_sub = ph_tch_ind->is_sub, + }; break; case PRIM_PH_DATA: ph_data_ind = &l1sap->u.data; @@ -744,12 +743,14 @@ return; chan_nr = ph_data_ind->chan_nr; fn = ph_data_ind->fn; - inv_rssi = abs(ph_data_ind->rssi); - is_sub = ph_data_ind->is_sub; - ta_offs_256bits = ph_data_ind->ta_offs_256bits; - ber10k = ph_data_ind->ber10k; - ci_cb = ph_data_ind->lqual_cb; ind_name = "DATA"; + ulm = (struct bts_ul_meas) { + .ta_offs_256bits = ph_data_ind->ta_offs_256bits, + .inv_rssi = abs(ph_data_ind->rssi), + .ber10k = ph_data_ind->ber10k, + .c_i = ph_data_ind->lqual_cb, + .is_sub = ph_data_ind->is_sub, + }; break; default: OSMO_ASSERT(false); @@ -765,23 +766,16 @@ DEBUGPFN(DL1P, fn, "%s %s meas ind, ta_offs_256bits=%d, ber10k=%d, inv_rssi=%u, C/I=%d cB\n", - gsm_lchan_name(lchan), ind_name, ta_offs_256bits, ber10k, - inv_rssi, ci_cb); + gsm_lchan_name(lchan), ind_name, ulm.ta_offs_256bits, + ulm.ber10k, ulm.inv_rssi, ulm.c_i); /* in the GPRS case we are not interested in measurement * processing. The PCU will take care of it */ if (lchan->type == GSM_LCHAN_PDTCH) return; - memset(&ulm, 0, sizeof(ulm)); - ulm.ta_offs_256bits = ta_offs_256bits; - ulm.ber10k = ber10k; - ulm.c_i = ci_cb; - ulm.inv_rssi = inv_rssi; - ulm.is_sub = is_sub; - /* we assume that symbol period is 1 bit: */ - set_ms_to_data(lchan, ta_offs_256bits / 256, true); + set_ms_to_data(lchan, ulm.ta_offs_256bits / 256, true); lchan_meas_process_measurement(lchan, &ulm, fn); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5169a6c5f6865655dbfebb6b68d5f67941d9cdb1 Gerrit-Change-Number: 25988 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:12:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 15:12:24 +0000 Subject: Change in osmo-bts[master]: l1sap: process_l1sap_meas_data() accepts pointer to lchan References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/25989 ) Change subject: l1sap: process_l1sap_meas_data() accepts pointer to lchan ...................................................................... l1sap: process_l1sap_meas_data() accepts pointer to lchan In 2/3 cases when calling process_l1sap_meas_data() we already have a pointer to the logical channel, so let's pass it as the first argument instead of a pointer to the transceiver. This way we avoid calling get_active_lchan_by_chan_nr() two times. In l1sap_ph_data_ind(), call process_l1sap_meas_data() below the conditional branch handling PDCH, so it won't be called for GSM_LCHAN_PDTCH anymore. GPRS specific measurements are handled by the PCU and not of interest for the BSC. Change-Id: I9de67a0b2d2b18923f2c2003b400387a0f1af411 --- M src/common/l1sap.c 1 file changed, 21 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/89/25989/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index d02676b..47ba663 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -694,16 +694,14 @@ } /* measurement information received from bts model */ -static void process_l1sap_meas_data(struct gsm_bts_trx *trx, +static void process_l1sap_meas_data(struct gsm_lchan *lchan, struct osmo_phsap_prim *l1sap, enum osmo_ph_prim ind_type) { struct bts_ul_meas ulm; - struct gsm_lchan *lchan; struct info_meas_ind_param *info_meas_ind; struct ph_data_param *ph_data_ind; struct ph_tch_param *ph_tch_ind; - uint8_t chan_nr; uint32_t fn; const char *ind_name; @@ -711,7 +709,6 @@ case PRIM_MPH_INFO: /* (legacy way, see also OS#2977) */ info_meas_ind = &l1sap->u.info.u.meas_ind; - chan_nr = info_meas_ind->chan_nr; fn = info_meas_ind->fn; ind_name = "MPH INFO"; ulm = (struct bts_ul_meas) { @@ -726,7 +723,6 @@ ph_tch_ind = &l1sap->u.tch; if (ph_tch_ind->rssi == 0) return; - chan_nr = ph_tch_ind->chan_nr; fn = ph_tch_ind->fn; ind_name = "TCH"; ulm = (struct bts_ul_meas) { @@ -741,7 +737,6 @@ ph_data_ind = &l1sap->u.data; if (ph_data_ind->rssi == 0) return; - chan_nr = ph_data_ind->chan_nr; fn = ph_data_ind->fn; ind_name = "DATA"; ulm = (struct bts_ul_meas) { @@ -756,24 +751,11 @@ OSMO_ASSERT(false); } - lchan = get_active_lchan_by_chan_nr(trx, chan_nr); - if (!lchan) { - LOGPFN(DL1P, LOGL_ERROR, fn, - "No lchan for %s MEAS IND (chan_nr=%s)\n", - ind_name, rsl_chan_nr_str(chan_nr)); - return; - } - DEBUGPFN(DL1P, fn, "%s %s meas ind, ta_offs_256bits=%d, ber10k=%d, inv_rssi=%u, C/I=%d cB\n", gsm_lchan_name(lchan), ind_name, ulm.ta_offs_256bits, ulm.ber10k, ulm.inv_rssi, ulm.c_i); - /* in the GPRS case we are not interested in measurement - * processing. The PCU will take care of it */ - if (lchan->type == GSM_LCHAN_PDTCH) - return; - /* we assume that symbol period is 1 bit: */ set_ms_to_data(lchan, ulm.ta_offs_256bits / 256, true); @@ -786,6 +768,8 @@ static int l1sap_mph_info_ind(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap, struct mph_info_param *info) { + const struct info_meas_ind_param *meas_ind; + struct gsm_lchan *lchan; int rc = 0; switch (info->type) { @@ -805,7 +789,17 @@ if (bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB)) OSMO_ASSERT(false); - process_l1sap_meas_data(trx, l1sap, PRIM_MPH_INFO); + meas_ind = &l1sap->u.info.u.meas_ind; + + lchan = get_active_lchan_by_chan_nr(trx, meas_ind->chan_nr); + if (!lchan) { + LOGPFN(DL1P, LOGL_ERROR, meas_ind->fn, + "No lchan for chan_nr=%s\n", + rsl_chan_nr_str(meas_ind->chan_nr)); + return 0; + } + + process_l1sap_meas_data(lchan, l1sap, PRIM_MPH_INFO); break; default: LOGP(DL1P, LOGL_NOTICE, "unknown MPH_INFO ind type %d\n", @@ -1488,12 +1482,6 @@ DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind chan_nr=%s link_id=0x%02x len=%d\n", rsl_chan_nr_str(chan_nr), link_id, len); - /* The ph_data_param contained in the l1sap primitive may contain - * measurement data. If this data is present, forward it for - * processing */ - if (bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB)) - process_l1sap_meas_data(trx, l1sap, PRIM_PH_DATA); - if (ts_is_pdch(&trx->ts[tn])) { lchan = get_lchan_by_chan_nr(trx, chan_nr); if (!lchan) @@ -1535,6 +1523,12 @@ return 0; } + /* The ph_data_param contained in the l1sap primitive may contain + * measurement data. If this data is present, forward it for + * processing */ + if (bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB)) + process_l1sap_meas_data(lchan, l1sap, PRIM_PH_DATA); + if (L1SAP_IS_LINK_SACCH(link_id)) repeated_ul_sacch_active_decision(lchan, data_ind->ber10k); @@ -1618,7 +1612,7 @@ * measurement data. If this data is present, forward it for * processing */ if (bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB)) - process_l1sap_meas_data(trx, l1sap, PRIM_TCH); + process_l1sap_meas_data(lchan, l1sap, PRIM_TCH); msgb_pull_to_l2(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9de67a0b2d2b18923f2c2003b400387a0f1af411 Gerrit-Change-Number: 25989 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:14:24 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:14:24 +0000 Subject: Change in osmo-bts[master]: l1sap: move false PTCCH/U detection into PDCH branch In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25987 ) Change subject: l1sap: move false PTCCH/U detection into PDCH branch ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I187fef8f3de0b41b502b0b18acfb11c56c5551f0 Gerrit-Change-Number: 25987 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 27 Oct 2021 15:14:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:15:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:15:20 +0000 Subject: Change in osmo-bts[master]: l1sap: use designated initializers in process_l1sap_meas_data() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25988 ) Change subject: l1sap: use designated initializers in process_l1sap_meas_data() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5169a6c5f6865655dbfebb6b68d5f67941d9cdb1 Gerrit-Change-Number: 25988 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 27 Oct 2021 15:15:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:17:10 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:17:10 +0000 Subject: Change in osmo-bts[master]: l1sap: process_l1sap_meas_data() accepts pointer to lchan In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25989 ) Change subject: l1sap: process_l1sap_meas_data() accepts pointer to lchan ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9de67a0b2d2b18923f2c2003b400387a0f1af411 Gerrit-Change-Number: 25989 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 27 Oct 2021 15:17:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:17:11 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 15:17:11 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_EncDec: rip out MNCC version 6 support References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25990 ) Change subject: library/MNCC_EncDec: rip out MNCC version 6 support ...................................................................... library/MNCC_EncDec: rip out MNCC version 6 support The latest release of osmo-sip-connector (1.5.0, 23 Feb 2021) does support MNCCv7, so there is no need to maintain MNCCv6 support. Change-Id: Ie45158e805a62e86b9496b46f323b83a74630460 Related: I5448ff931ec33f24f4837a51376f1703fe97683b Related: OS#5282 --- M library/MNCC_EncDec.cc M library/mncc.h 2 files changed, 37 insertions(+), 83 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/90/25990/1 diff --git a/library/MNCC_EncDec.cc b/library/MNCC_EncDec.cc index be5d01a..7d09d0a 100644 --- a/library/MNCC_EncDec.cc +++ b/library/MNCC_EncDec.cc @@ -9,7 +9,7 @@ BOOLEAN set__MNCC__version(INTEGER const& version) { - if (version != 6 && version != 7) + if (version != 7) return false; mncc_sock_version = version; return true; @@ -195,46 +195,27 @@ ret_val = ret_val & in.u().data().data(); break; case MNCC__MsgUnion::ALT_rtp: - switch (mncc_sock_version) { - case 6: - struct gsm_mncc_rtp_mncc6 rtp_old; - memset(&rtp_old, 0, sizeof(rtp_old)); - rtp_old.msg_type = in.msg__type(); - rtp_old.callref = in.u().rtp().callref(); - ttcn_buffer.put_string(in.u().rtp().ip()); - if (!in.u().rtp().is__ipv6()) { - memcpy(&rtp_old.ip, ttcn_buffer.get_data(), sizeof(struct in_addr)); - rtp_old.ip = ntohl(rtp_old.ip); - } /* else: ipv6 not supported in MNCCv6 */ - rtp_old.port = in.u().rtp().rtp__port(); - rtp_old.payload_type = in.u().rtp().payload__type(); - rtp_old.payload_msg_type = in.u().rtp().payload__msg__type(); - ret_val = OCTETSTRING(sizeof(rtp_old), (uint8_t *) &rtp_old); - break; - case 7: - struct gsm_mncc_rtp rtp; - memset(&rtp, 0, sizeof(rtp)); - rtp.msg_type = in.msg__type(); - rtp.callref = in.u().rtp().callref(); - ttcn_buffer.put_string(in.u().rtp().ip()); - if (in.u().rtp().is__ipv6()) { - // if(in.u().rtp().ip().lengthof() != 16) print error - rtp.addr.ss_family = AF_INET6; - memcpy(&((struct sockaddr_in6*)&rtp.addr)->sin6_addr, ttcn_buffer.get_data(), - sizeof(struct in6_addr)); - ((struct sockaddr_in6*)&rtp.addr)->sin6_port = htons(in.u().rtp().rtp__port()); - } else { - // if(in.u().rtp().ip().lengthof() != 4) print error - rtp.addr.ss_family = AF_INET; - memcpy(&((struct sockaddr_in*)&rtp.addr)->sin_addr, ttcn_buffer.get_data(), - sizeof(struct in_addr)); - ((struct sockaddr_in*)&rtp.addr)->sin_port = htons(in.u().rtp().rtp__port()); - } - rtp.payload_type = in.u().rtp().payload__type(); - rtp.payload_msg_type = in.u().rtp().payload__msg__type(); - ret_val = OCTETSTRING(sizeof(rtp), (uint8_t *) &rtp); - break; + struct gsm_mncc_rtp rtp; + memset(&rtp, 0, sizeof(rtp)); + rtp.msg_type = in.msg__type(); + rtp.callref = in.u().rtp().callref(); + ttcn_buffer.put_string(in.u().rtp().ip()); + if (in.u().rtp().is__ipv6()) { + // if(in.u().rtp().ip().lengthof() != 16) print error + rtp.addr.ss_family = AF_INET6; + memcpy(&((struct sockaddr_in6*)&rtp.addr)->sin6_addr, ttcn_buffer.get_data(), + sizeof(struct in6_addr)); + ((struct sockaddr_in6*)&rtp.addr)->sin6_port = htons(in.u().rtp().rtp__port()); + } else { + // if(in.u().rtp().ip().lengthof() != 4) print error + rtp.addr.ss_family = AF_INET; + memcpy(&((struct sockaddr_in*)&rtp.addr)->sin_addr, ttcn_buffer.get_data(), + sizeof(struct in_addr)); + ((struct sockaddr_in*)&rtp.addr)->sin_port = htons(in.u().rtp().rtp__port()); } + rtp.payload_type = in.u().rtp().payload__type(); + rtp.payload_msg_type = in.u().rtp().payload__msg__type(); + ret_val = OCTETSTRING(sizeof(rtp), (uint8_t *) &rtp); break; case MNCC__MsgUnion::ALT_hello: struct gsm_mncc_hello hello; @@ -264,7 +245,6 @@ const struct gsm_data_frame *in_data; MNCC__PDU__Data data; const struct gsm_mncc_rtp *in_rtp; - const struct gsm_mncc_rtp_mncc6 *in_rtp_old; MNCC__PDU__Rtp rtp; MNCC__MsgUnion u; bool is_ipv6; @@ -303,40 +283,26 @@ case MNCC_RTP_CREATE: case MNCC_RTP_CONNECT: case MNCC_RTP_FREE: - switch (mncc_sock_version) { - case 6: - struct in_addr inaddr; - in_rtp_old = (const struct gsm_mncc_rtp_mncc6 *) in_mncc; - inaddr.s_addr = htonl(in_rtp_old->ip); - ip = OCTETSTRING(sizeof(struct in_addr), - (const unsigned char*)&inaddr); - rtp = MNCC__PDU__Rtp(in_rtp_old->callref, false, ip, in_rtp_old->port, in_rtp_old->payload_type, - in_rtp_old->payload_msg_type, in_rtp_old->sdp); - u.rtp() = rtp; - break; - case 7: - in_rtp = (const struct gsm_mncc_rtp *) in_mncc; - switch (in_rtp->addr.ss_family) { - case AF_INET6: - is_ipv6 = true; - port = ntohs(((struct sockaddr_in6*)&in_rtp->addr)->sin6_port); - ip = OCTETSTRING(sizeof(struct in6_addr), - (const unsigned char*)&((struct sockaddr_in6*)&in_rtp->addr)->sin6_addr); + in_rtp = (const struct gsm_mncc_rtp *) in_mncc; + switch (in_rtp->addr.ss_family) { + case AF_INET6: + is_ipv6 = true; + port = ntohs(((struct sockaddr_in6*)&in_rtp->addr)->sin6_port); + ip = OCTETSTRING(sizeof(struct in6_addr), + (const unsigned char*)&((struct sockaddr_in6*)&in_rtp->addr)->sin6_addr); break; - case AF_UNSPEC: //RTP_CREATE and RTP_FREE can contain fully zeroed addr - case AF_INET: - is_ipv6 = false; - port = ntohs(((struct sockaddr_in*)&in_rtp->addr)->sin_port); - ip = OCTETSTRING(sizeof(struct in_addr), - (const unsigned char*)&((struct sockaddr_in*)&in_rtp->addr)->sin_addr); - break; - } - rtp = MNCC__PDU__Rtp(in_rtp->callref, is_ipv6, ip, port, in_rtp->payload_type, - in_rtp->payload_msg_type, in_rtp->sdp); - u.rtp() = rtp; + case AF_UNSPEC: //RTP_CREATE and RTP_FREE can contain fully zeroed addr + case AF_INET: + is_ipv6 = false; + port = ntohs(((struct sockaddr_in*)&in_rtp->addr)->sin_port); + ip = OCTETSTRING(sizeof(struct in_addr), + (const unsigned char*)&((struct sockaddr_in*)&in_rtp->addr)->sin_addr); break; } + rtp = MNCC__PDU__Rtp(in_rtp->callref, is_ipv6, ip, port, in_rtp->payload_type, + in_rtp->payload_msg_type, in_rtp->sdp); + u.rtp() = rtp; break; default: sign.callref() = in_mncc->callref; diff --git a/library/mncc.h b/library/mncc.h index a55d155..1e45c37 100644 --- a/library/mncc.h +++ b/library/mncc.h @@ -292,18 +292,6 @@ uint32_t lchan_type_offset; }; -/* Use this one in MNCCv6 */ -struct gsm_mncc_rtp_mncc6 { - uint32_t msg_type; - uint32_t callref; - uint32_t ip; - uint16_t port; - uint32_t payload_type; - uint32_t payload_msg_type; - - char sdp[1024]; -}; - struct gsm_mncc_rtp { uint32_t msg_type; uint32_t callref; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie45158e805a62e86b9496b46f323b83a74630460 Gerrit-Change-Number: 25990 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:21:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:21:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_EncDec: rip out MNCC version 6 support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25990 ) Change subject: library/MNCC_EncDec: rip out MNCC version 6 support ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie45158e805a62e86b9496b46f323b83a74630460 Gerrit-Change-Number: 25990 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 15:21:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:22:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:22:56 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with ... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25991 ) Change subject: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... hnbap: Use asn1c flag -fcompound-names to avoid name collisions with other libs Change-Id: I1bcbe047d233684647d6ffe9febb14a12c579696 --- M include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h M include/osmocom/hnbap/HNBAP_AccessResult.h M include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h M include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h M include/osmocom/hnbap/HNBAP_BackoffTimer.h M include/osmocom/hnbap/HNBAP_BindingID.h M include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h M include/osmocom/hnbap/HNBAP_CGI.h M include/osmocom/hnbap/HNBAP_CI.h M include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h M include/osmocom/hnbap/HNBAP_CSG-Capability.h M include/osmocom/hnbap/HNBAP_CSG-ID.h M include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h M include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h M include/osmocom/hnbap/HNBAP_Cause.h M include/osmocom/hnbap/HNBAP_CauseMisc.h M include/osmocom/hnbap/HNBAP_CauseProtocol.h M include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h M include/osmocom/hnbap/HNBAP_CauseTransport.h M include/osmocom/hnbap/HNBAP_CellIdentity.h M include/osmocom/hnbap/HNBAP_ConfigurationInformation.h M include/osmocom/hnbap/HNBAP_Context-ID.h M include/osmocom/hnbap/HNBAP_Criticality.h M include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h M include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h M include/osmocom/hnbap/HNBAP_ESN.h M include/osmocom/hnbap/HNBAP_ErrorIndication.h M include/osmocom/hnbap/HNBAP_GTP-TEI.h M include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h M include/osmocom/hnbap/HNBAP_GeographicalLocation.h M include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h M include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h M include/osmocom/hnbap/HNBAP_HNB-GWResponse.h M include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h M include/osmocom/hnbap/HNBAP_HNB-Identity.h M include/osmocom/hnbap/HNBAP_HNB-Location-Information.h M include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h M include/osmocom/hnbap/HNBAP_HNBAP-PDU.h M include/osmocom/hnbap/HNBAP_HNBCapacity.h M include/osmocom/hnbap/HNBAP_HNBConfigInfo.h M include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h M include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h M include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h M include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h M include/osmocom/hnbap/HNBAP_HNBDe-Register.h M include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h M include/osmocom/hnbap/HNBAP_HNBRegisterReject.h M include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h M include/osmocom/hnbap/HNBAP_IE-Extensions.h M include/osmocom/hnbap/HNBAP_IE.h M include/osmocom/hnbap/HNBAP_IMEI.h M include/osmocom/hnbap/HNBAP_IMSI.h M include/osmocom/hnbap/HNBAP_IMSIDS41.h M include/osmocom/hnbap/HNBAP_IMSIESN.h M include/osmocom/hnbap/HNBAP_IP-Address.h M include/osmocom/hnbap/HNBAP_InitiatingMessage.h M include/osmocom/hnbap/HNBAP_Ipv4Address.h M include/osmocom/hnbap/HNBAP_Ipv6Address.h M include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h M include/osmocom/hnbap/HNBAP_LAC.h M include/osmocom/hnbap/HNBAP_LAI.h M include/osmocom/hnbap/HNBAP_MacroCellID.h M include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h M include/osmocom/hnbap/HNBAP_MuxPortNumber.h M include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h M include/osmocom/hnbap/HNBAP_NeighbourIdentity.h M include/osmocom/hnbap/HNBAP_NeighbourInfoList.h M include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h M include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h M include/osmocom/hnbap/HNBAP_PLMNidentity.h M include/osmocom/hnbap/HNBAP_PSC.h M include/osmocom/hnbap/HNBAP_PTMSI.h M include/osmocom/hnbap/HNBAP_PTMSIRAI.h M include/osmocom/hnbap/HNBAP_Presence.h M include/osmocom/hnbap/HNBAP_PrivateIE-ID.h M include/osmocom/hnbap/HNBAP_PrivateMessage.h M include/osmocom/hnbap/HNBAP_ProcedureCode.h M include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h M include/osmocom/hnbap/HNBAP_RAB-ID.h M include/osmocom/hnbap/HNBAP_RABList.h M include/osmocom/hnbap/HNBAP_RABListItem.h M include/osmocom/hnbap/HNBAP_RAC.h M include/osmocom/hnbap/HNBAP_RAI.h M include/osmocom/hnbap/HNBAP_RNC-ID.h M include/osmocom/hnbap/HNBAP_Registration-Cause.h M include/osmocom/hnbap/HNBAP_RelocationComplete.h M include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h M include/osmocom/hnbap/HNBAP_SAC.h M include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h M include/osmocom/hnbap/HNBAP_TMSIDS41.h M include/osmocom/hnbap/HNBAP_TMSILAI.h M include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h M include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h M include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h M include/osmocom/hnbap/HNBAP_TransportInfo.h M include/osmocom/hnbap/HNBAP_TransportLayerAddress.h M include/osmocom/hnbap/HNBAP_TriggeringMessage.h M include/osmocom/hnbap/HNBAP_Tunnel-Information.h M include/osmocom/hnbap/HNBAP_TypeOfError.h M include/osmocom/hnbap/HNBAP_U-RNTI.h M include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h M include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h M include/osmocom/hnbap/HNBAP_UDP-Port-Number.h M include/osmocom/hnbap/HNBAP_UE-Capabilities.h M include/osmocom/hnbap/HNBAP_UE-Identity.h M include/osmocom/hnbap/HNBAP_UEDe-Register.h M include/osmocom/hnbap/HNBAP_UERegisterAccept.h M include/osmocom/hnbap/HNBAP_UERegisterReject.h M include/osmocom/hnbap/HNBAP_UERegisterRequest.h M include/osmocom/hnbap/HNBAP_URAIdentity.h M include/osmocom/hnbap/HNBAP_URAIdentityList.h M include/osmocom/hnbap/HNBAP_UTRANCellID.h M include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h M include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h M include/osmocom/hnbap/HNBAP_Update-cause.h M src/hnbap/HNBAP_Access-stratum-release-indicator.c M src/hnbap/HNBAP_AccessResult.c M src/hnbap/HNBAP_AdditionalNeighbourInfoList.c M src/hnbap/HNBAP_AltitudeAndDirection.c M src/hnbap/HNBAP_BackoffTimer.c M src/hnbap/HNBAP_BindingID.c M src/hnbap/HNBAP_CELL-FACHMobilitySupport.c M src/hnbap/HNBAP_CGI.c M src/hnbap/HNBAP_CI.c M src/hnbap/HNBAP_CN-DomainIndicator.c M src/hnbap/HNBAP_CSG-Capability.c M src/hnbap/HNBAP_CSG-ID.c M src/hnbap/HNBAP_CSGMembershipStatus.c M src/hnbap/HNBAP_CSGMembershipUpdate.c M src/hnbap/HNBAP_Cause.c M src/hnbap/HNBAP_CauseMisc.c M src/hnbap/HNBAP_CauseProtocol.c M src/hnbap/HNBAP_CauseRadioNetwork.c M src/hnbap/HNBAP_CauseTransport.c M src/hnbap/HNBAP_CellIdentity.c M src/hnbap/HNBAP_ConfigurationInformation.c M src/hnbap/HNBAP_Context-ID.c M src/hnbap/HNBAP_Criticality.c M src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c M src/hnbap/HNBAP_CriticalityDiagnostics.c M src/hnbap/HNBAP_ESN.c M src/hnbap/HNBAP_ErrorIndication.c M src/hnbap/HNBAP_GTP-TEI.c M src/hnbap/HNBAP_GeographicalCoordinates.c M src/hnbap/HNBAP_GeographicalLocation.c M src/hnbap/HNBAP_HNB-Cell-Access-Mode.c M src/hnbap/HNBAP_HNB-Cell-Identifier.c M src/hnbap/HNBAP_HNB-GWResponse.c M src/hnbap/HNBAP_HNB-Identity-Info.c M src/hnbap/HNBAP_HNB-Identity.c M src/hnbap/HNBAP_HNB-Location-Information.c M src/hnbap/HNBAP_HNB-RNL-Identity.c M src/hnbap/HNBAP_HNBAP-PDU.c M src/hnbap/HNBAP_HNBCapacity.c M src/hnbap/HNBAP_HNBConfigInfo.c M src/hnbap/HNBAP_HNBConfigTransferRequest.c M src/hnbap/HNBAP_HNBConfigTransferResponse.c M src/hnbap/HNBAP_HNBConfigurationInformationMissing.c M src/hnbap/HNBAP_HNBConfigurationInformationProvided.c M src/hnbap/HNBAP_HNBDe-Register.c M src/hnbap/HNBAP_HNBRegisterAccept.c M src/hnbap/HNBAP_HNBRegisterReject.c M src/hnbap/HNBAP_HNBRegisterRequest.c M src/hnbap/HNBAP_IE-Extensions.c M src/hnbap/HNBAP_IE.c M src/hnbap/HNBAP_IMEI.c M src/hnbap/HNBAP_IMSI.c M src/hnbap/HNBAP_IMSIDS41.c M src/hnbap/HNBAP_IMSIESN.c M src/hnbap/HNBAP_IP-Address.c M src/hnbap/HNBAP_InitiatingMessage.c M src/hnbap/HNBAP_Ipv4Address.c M src/hnbap/HNBAP_Ipv6Address.c M src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c M src/hnbap/HNBAP_LAC.c M src/hnbap/HNBAP_LAI.c M src/hnbap/HNBAP_MacroCellID.c M src/hnbap/HNBAP_MacroCoverageInformation.c M src/hnbap/HNBAP_MuxPortNumber.c M src/hnbap/HNBAP_NeighbourCellIdentityList.c M src/hnbap/HNBAP_NeighbourIdentity.c M src/hnbap/HNBAP_NeighbourInfoList.c M src/hnbap/HNBAP_NeighbourInfoRequestItem.c M src/hnbap/HNBAP_NeighbourInfoRequestList.c M src/hnbap/HNBAP_PLMNidentity.c M src/hnbap/HNBAP_PSC.c M src/hnbap/HNBAP_PTMSI.c M src/hnbap/HNBAP_PTMSIRAI.c M src/hnbap/HNBAP_Presence.c M src/hnbap/HNBAP_PrivateIE-ID.c M src/hnbap/HNBAP_PrivateMessage.c M src/hnbap/HNBAP_ProcedureCode.c M src/hnbap/HNBAP_ProtocolIE-ID.c M src/hnbap/HNBAP_RAB-ID.c M src/hnbap/HNBAP_RABList.c M src/hnbap/HNBAP_RABListItem.c M src/hnbap/HNBAP_RAC.c M src/hnbap/HNBAP_RAI.c M src/hnbap/HNBAP_RNC-ID.c M src/hnbap/HNBAP_Registration-Cause.c M src/hnbap/HNBAP_RelocationComplete.c M src/hnbap/HNBAP_S-RNTIPrefix.c M src/hnbap/HNBAP_SAC.c M src/hnbap/HNBAP_SuccessfulOutcome.c M src/hnbap/HNBAP_TMSIDS41.c M src/hnbap/HNBAP_TMSILAI.c M src/hnbap/HNBAP_TNLUpdateFailure.c M src/hnbap/HNBAP_TNLUpdateRequest.c M src/hnbap/HNBAP_TNLUpdateResponse.c M src/hnbap/HNBAP_TransportInfo.c M src/hnbap/HNBAP_TransportLayerAddress.c M src/hnbap/HNBAP_TriggeringMessage.c M src/hnbap/HNBAP_Tunnel-Information.c M src/hnbap/HNBAP_TypeOfError.c M src/hnbap/HNBAP_U-RNTI.c M src/hnbap/HNBAP_U-RNTIQueryRequest.c M src/hnbap/HNBAP_U-RNTIQueryResponse.c M src/hnbap/HNBAP_UDP-Port-Number.c M src/hnbap/HNBAP_UE-Capabilities.c M src/hnbap/HNBAP_UE-Identity.c M src/hnbap/HNBAP_UEDe-Register.c M src/hnbap/HNBAP_UERegisterAccept.c M src/hnbap/HNBAP_UERegisterReject.c M src/hnbap/HNBAP_UERegisterRequest.c M src/hnbap/HNBAP_URAIdentity.c M src/hnbap/HNBAP_URAIdentityList.c M src/hnbap/HNBAP_UTRANCellID.c M src/hnbap/HNBAP_UnknownU-RNTIIndication.c M src/hnbap/HNBAP_UnsuccessfulOutcome.c M src/hnbap/HNBAP_Update-cause.c M src/hnbap/Makefile.am 231 files changed, 329 insertions(+), 329 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/91/25991/1 diff --git a/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h b/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h index 1aba84e..c52065c 100644 --- a/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h +++ b/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Access_stratum_release_indicator_H_ diff --git a/include/osmocom/hnbap/HNBAP_AccessResult.h b/include/osmocom/hnbap/HNBAP_AccessResult.h index 3d71d2d..06c37fd 100644 --- a/include/osmocom/hnbap/HNBAP_AccessResult.h +++ b/include/osmocom/hnbap/HNBAP_AccessResult.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_AccessResult_H_ diff --git a/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h b/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h index be2dd1f..5b46e95 100644 --- a/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h +++ b/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_AdditionalNeighbourInfoList_H_ diff --git a/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h b/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h index 5b406d8..3bf4401 100644 --- a/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h +++ b/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_AltitudeAndDirection_H_ @@ -21,10 +21,10 @@ #endif /* Dependencies */ -typedef enum directionOfAltitude { - directionOfAltitude_height = 0, - directionOfAltitude_depth = 1 -} e_directionOfAltitude; +typedef enum HNBAP_AltitudeAndDirection__directionOfAltitude { + HNBAP_AltitudeAndDirection__directionOfAltitude_height = 0, + HNBAP_AltitudeAndDirection__directionOfAltitude_depth = 1 +} e_HNBAP_AltitudeAndDirection__directionOfAltitude; /* HNBAP_AltitudeAndDirection */ typedef struct HNBAP_AltitudeAndDirection { diff --git a/include/osmocom/hnbap/HNBAP_BackoffTimer.h b/include/osmocom/hnbap/HNBAP_BackoffTimer.h index 03f64c9..5ee18a0 100644 --- a/include/osmocom/hnbap/HNBAP_BackoffTimer.h +++ b/include/osmocom/hnbap/HNBAP_BackoffTimer.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_BackoffTimer_H_ diff --git a/include/osmocom/hnbap/HNBAP_BindingID.h b/include/osmocom/hnbap/HNBAP_BindingID.h index b5cdebc..c26159d 100644 --- a/include/osmocom/hnbap/HNBAP_BindingID.h +++ b/include/osmocom/hnbap/HNBAP_BindingID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_BindingID_H_ diff --git a/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h b/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h index 864f6ce..dc91cb6 100644 --- a/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h +++ b/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CELL_FACHMobilitySupport_H_ diff --git a/include/osmocom/hnbap/HNBAP_CGI.h b/include/osmocom/hnbap/HNBAP_CGI.h index 657aff8..927257d 100644 --- a/include/osmocom/hnbap/HNBAP_CGI.h +++ b/include/osmocom/hnbap/HNBAP_CGI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CGI_H_ diff --git a/include/osmocom/hnbap/HNBAP_CI.h b/include/osmocom/hnbap/HNBAP_CI.h index 637c9bd..89916cc 100644 --- a/include/osmocom/hnbap/HNBAP_CI.h +++ b/include/osmocom/hnbap/HNBAP_CI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CI_H_ diff --git a/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h b/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h index 5128d5b..765ba2b 100644 --- a/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h +++ b/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CN_DomainIndicator_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSG-Capability.h b/include/osmocom/hnbap/HNBAP_CSG-Capability.h index 57d6ee2..ff10c3d 100644 --- a/include/osmocom/hnbap/HNBAP_CSG-Capability.h +++ b/include/osmocom/hnbap/HNBAP_CSG-Capability.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CSG_Capability_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSG-ID.h b/include/osmocom/hnbap/HNBAP_CSG-ID.h index d76f078..87e476a 100644 --- a/include/osmocom/hnbap/HNBAP_CSG-ID.h +++ b/include/osmocom/hnbap/HNBAP_CSG-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CSG_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h b/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h index d83bd14..25ecacf 100644 --- a/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h +++ b/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CSGMembershipStatus_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h b/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h index 035b331..b6324cf 100644 --- a/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h +++ b/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CSGMembershipUpdate_H_ @@ -23,7 +23,7 @@ /* HNBAP_CSGMembershipUpdate */ typedef struct HNBAP_CSGMembershipUpdate { - struct csgMembershipUpdate_ies { + struct HNBAP_CSGMembershipUpdate__csgMembershipUpdate_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_Cause.h b/include/osmocom/hnbap/HNBAP_Cause.h index e385b5f..eba2cc1 100644 --- a/include/osmocom/hnbap/HNBAP_Cause.h +++ b/include/osmocom/hnbap/HNBAP_Cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Cause_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseMisc.h b/include/osmocom/hnbap/HNBAP_CauseMisc.h index c53cafe..2534318 100644 --- a/include/osmocom/hnbap/HNBAP_CauseMisc.h +++ b/include/osmocom/hnbap/HNBAP_CauseMisc.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CauseMisc_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseProtocol.h b/include/osmocom/hnbap/HNBAP_CauseProtocol.h index 3416b47..0ca1254 100644 --- a/include/osmocom/hnbap/HNBAP_CauseProtocol.h +++ b/include/osmocom/hnbap/HNBAP_CauseProtocol.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CauseProtocol_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h b/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h index 895ac69..5c998ca 100644 --- a/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h +++ b/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CauseRadioNetwork_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseTransport.h b/include/osmocom/hnbap/HNBAP_CauseTransport.h index d2e486e..8dff6b8 100644 --- a/include/osmocom/hnbap/HNBAP_CauseTransport.h +++ b/include/osmocom/hnbap/HNBAP_CauseTransport.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CauseTransport_H_ diff --git a/include/osmocom/hnbap/HNBAP_CellIdentity.h b/include/osmocom/hnbap/HNBAP_CellIdentity.h index 1b76f6b..1a47122 100644 --- a/include/osmocom/hnbap/HNBAP_CellIdentity.h +++ b/include/osmocom/hnbap/HNBAP_CellIdentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CellIdentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h b/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h index 7720b23..d5e2128 100644 --- a/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h +++ b/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_ConfigurationInformation_H_ diff --git a/include/osmocom/hnbap/HNBAP_Context-ID.h b/include/osmocom/hnbap/HNBAP_Context-ID.h index 570e8cb..fce0508 100644 --- a/include/osmocom/hnbap/HNBAP_Context-ID.h +++ b/include/osmocom/hnbap/HNBAP_Context-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Context_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_Criticality.h b/include/osmocom/hnbap/HNBAP_Criticality.h index cbc4c01..45c20a3 100644 --- a/include/osmocom/hnbap/HNBAP_Criticality.h +++ b/include/osmocom/hnbap/HNBAP_Criticality.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Criticality_H_ diff --git a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h index db82056..7759078 100644 --- a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h +++ b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CriticalityDiagnostics_IE_List_H_ @@ -26,7 +26,7 @@ /* HNBAP_CriticalityDiagnostics-IE-List */ typedef struct HNBAP_CriticalityDiagnostics_IE_List { - A_SEQUENCE_OF(struct Member { + A_SEQUENCE_OF(struct HNBAP_CriticalityDiagnostics_IE_List__Member { HNBAP_Criticality_t iECriticality; HNBAP_ProtocolIE_ID_t iE_ID; HNBAP_TypeOfError_t typeOfError; diff --git a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h index 34d798d..f4b7b2a 100644 --- a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h +++ b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CriticalityDiagnostics_H_ diff --git a/include/osmocom/hnbap/HNBAP_ESN.h b/include/osmocom/hnbap/HNBAP_ESN.h index b1353ea..e3e5e5f 100644 --- a/include/osmocom/hnbap/HNBAP_ESN.h +++ b/include/osmocom/hnbap/HNBAP_ESN.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_ESN_H_ diff --git a/include/osmocom/hnbap/HNBAP_ErrorIndication.h b/include/osmocom/hnbap/HNBAP_ErrorIndication.h index 889cf08..b640aa8 100644 --- a/include/osmocom/hnbap/HNBAP_ErrorIndication.h +++ b/include/osmocom/hnbap/HNBAP_ErrorIndication.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_ErrorIndication_H_ @@ -23,7 +23,7 @@ /* HNBAP_ErrorIndication */ typedef struct HNBAP_ErrorIndication { - struct errorIndication_ies { + struct HNBAP_ErrorIndication__errorIndication_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_GTP-TEI.h b/include/osmocom/hnbap/HNBAP_GTP-TEI.h index 214964d..c3b8917 100644 --- a/include/osmocom/hnbap/HNBAP_GTP-TEI.h +++ b/include/osmocom/hnbap/HNBAP_GTP-TEI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_GTP_TEI_H_ diff --git a/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h b/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h index 6cdfdec..3033b7a 100644 --- a/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h +++ b/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_GeographicalCoordinates_H_ @@ -22,10 +22,10 @@ #endif /* Dependencies */ -typedef enum latitudeSign { - latitudeSign_north = 0, - latitudeSign_south = 1 -} e_latitudeSign; +typedef enum HNBAP_GeographicalCoordinates__latitudeSign { + HNBAP_GeographicalCoordinates__latitudeSign_north = 0, + HNBAP_GeographicalCoordinates__latitudeSign_south = 1 +} e_HNBAP_GeographicalCoordinates__latitudeSign; /* HNBAP_GeographicalCoordinates */ typedef struct HNBAP_GeographicalCoordinates { diff --git a/include/osmocom/hnbap/HNBAP_GeographicalLocation.h b/include/osmocom/hnbap/HNBAP_GeographicalLocation.h index 6311d85..9a2a071 100644 --- a/include/osmocom/hnbap/HNBAP_GeographicalLocation.h +++ b/include/osmocom/hnbap/HNBAP_GeographicalLocation.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_GeographicalLocation_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h b/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h index 2a6e05a..9a2529a 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNB_Cell_Access_Mode_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h b/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h index 14d2850..27c0fd9 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNB_Cell_Identifier_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h b/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h index cadd7e3..8afd5e3 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h +++ b/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNB_GWResponse_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h b/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h index 25606bd..bb85a86 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNB_Identity_Info_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Identity.h b/include/osmocom/hnbap/HNBAP_HNB-Identity.h index ca28950..d6038cc 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Identity.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Identity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNB_Identity_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h b/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h index f8a3769..c944e42 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNB_Location_Information_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h b/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h index 642e8e6..591b12d 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h +++ b/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNB_RNL_Identity_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h b/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h index 48dac94..cbfd50f 100644 --- a/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h +++ b/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBAP_PDU_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBCapacity.h b/include/osmocom/hnbap/HNBAP_HNBCapacity.h index 39e4f29..b2e70b1 100644 --- a/include/osmocom/hnbap/HNBAP_HNBCapacity.h +++ b/include/osmocom/hnbap/HNBAP_HNBCapacity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBCapacity_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h b/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h index f0b6dc2..606d113 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBConfigInfo_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h b/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h index 8ce6ca7..23d5413 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBConfigTransferRequest_H_ @@ -23,7 +23,7 @@ /* HNBAP_HNBConfigTransferRequest */ typedef struct HNBAP_HNBConfigTransferRequest { - struct hnbConfigTransferRequest_ies { + struct HNBAP_HNBConfigTransferRequest__hnbConfigTransferRequest_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h b/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h index 81ec650..80dcd1b 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBConfigTransferResponse_H_ @@ -23,7 +23,7 @@ /* HNBAP_HNBConfigTransferResponse */ typedef struct HNBAP_HNBConfigTransferResponse { - struct hnbConfigTransferResponse_ies { + struct HNBAP_HNBConfigTransferResponse__hnbConfigTransferResponse_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h index 42bafdb..f1b28ef 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBConfigurationInformationMissing_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h index 2750038..8c20b74 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBConfigurationInformationProvided_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBDe-Register.h b/include/osmocom/hnbap/HNBAP_HNBDe-Register.h index 79d7bbe..eb69bc5 100644 --- a/include/osmocom/hnbap/HNBAP_HNBDe-Register.h +++ b/include/osmocom/hnbap/HNBAP_HNBDe-Register.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBDe_Register_H_ @@ -23,7 +23,7 @@ /* HNBAP_HNBDe-Register */ typedef struct HNBAP_HNBDe_Register { - struct hnbDe_Register_ies { + struct HNBAP_HNBDe_Register__hnbDe_Register_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h b/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h index 83a48f8..ddacd50 100644 --- a/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h +++ b/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBRegisterAccept_H_ @@ -23,7 +23,7 @@ /* HNBAP_HNBRegisterAccept */ typedef struct HNBAP_HNBRegisterAccept { - struct hnbRegisterAccept_ies { + struct HNBAP_HNBRegisterAccept__hnbRegisterAccept_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h b/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h index 2b203db..38bea56 100644 --- a/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h +++ b/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBRegisterReject_H_ @@ -23,7 +23,7 @@ /* HNBAP_HNBRegisterReject */ typedef struct HNBAP_HNBRegisterReject { - struct hnbRegisterReject_ies { + struct HNBAP_HNBRegisterReject__hnbRegisterReject_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h b/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h index 1431432..724afb1 100644 --- a/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h +++ b/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBRegisterRequest_H_ @@ -23,7 +23,7 @@ /* HNBAP_HNBRegisterRequest */ typedef struct HNBAP_HNBRegisterRequest { - struct hnbRegisterRequest_ies { + struct HNBAP_HNBRegisterRequest__hnbRegisterRequest_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_IE-Extensions.h b/include/osmocom/hnbap/HNBAP_IE-Extensions.h index 81ffb00..0578aca 100644 --- a/include/osmocom/hnbap/HNBAP_IE-Extensions.h +++ b/include/osmocom/hnbap/HNBAP_IE-Extensions.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_IE_Extensions_H_ diff --git a/include/osmocom/hnbap/HNBAP_IE.h b/include/osmocom/hnbap/HNBAP_IE.h index 1abae50..7abd85b 100644 --- a/include/osmocom/hnbap/HNBAP_IE.h +++ b/include/osmocom/hnbap/HNBAP_IE.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_IE_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMEI.h b/include/osmocom/hnbap/HNBAP_IMEI.h index ff082a8..b507526 100644 --- a/include/osmocom/hnbap/HNBAP_IMEI.h +++ b/include/osmocom/hnbap/HNBAP_IMEI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_IMEI_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMSI.h b/include/osmocom/hnbap/HNBAP_IMSI.h index 98970ed..ae439fb 100644 --- a/include/osmocom/hnbap/HNBAP_IMSI.h +++ b/include/osmocom/hnbap/HNBAP_IMSI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_IMSI_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMSIDS41.h b/include/osmocom/hnbap/HNBAP_IMSIDS41.h index 94f35b9..08fcf7a 100644 --- a/include/osmocom/hnbap/HNBAP_IMSIDS41.h +++ b/include/osmocom/hnbap/HNBAP_IMSIDS41.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_IMSIDS41_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMSIESN.h b/include/osmocom/hnbap/HNBAP_IMSIESN.h index 2178336..48edbee 100644 --- a/include/osmocom/hnbap/HNBAP_IMSIESN.h +++ b/include/osmocom/hnbap/HNBAP_IMSIESN.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_IMSIESN_H_ diff --git a/include/osmocom/hnbap/HNBAP_IP-Address.h b/include/osmocom/hnbap/HNBAP_IP-Address.h index 8e6d119..6639f4c 100644 --- a/include/osmocom/hnbap/HNBAP_IP-Address.h +++ b/include/osmocom/hnbap/HNBAP_IP-Address.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_IP_Address_H_ @@ -23,18 +23,18 @@ #endif /* Dependencies */ -typedef enum ipaddress_PR { - ipaddress_PR_NOTHING, /* No components present */ - ipaddress_PR_ipv4info, - ipaddress_PR_ipv6info, +typedef enum HNBAP_IP_Address__ipaddress_PR { + HNBAP_IP_Address__ipaddress_PR_NOTHING, /* No components present */ + HNBAP_IP_Address__ipaddress_PR_ipv4info, + HNBAP_IP_Address__ipaddress_PR_ipv6info, /* Extensions may appear below */ -} ipaddress_PR; +} HNBAP_IP_Address__ipaddress_PR; /* HNBAP_IP-Address */ typedef struct HNBAP_IP_Address { - struct ipaddress { - ipaddress_PR present; + struct HNBAP_IP_Address__ipaddress { + HNBAP_IP_Address__ipaddress_PR present; union HNBAP_IP_Address__ipaddress_u { HNBAP_Ipv4Address_t ipv4info; HNBAP_Ipv6Address_t ipv6info; diff --git a/include/osmocom/hnbap/HNBAP_InitiatingMessage.h b/include/osmocom/hnbap/HNBAP_InitiatingMessage.h index 1a7e6e3..4264666 100644 --- a/include/osmocom/hnbap/HNBAP_InitiatingMessage.h +++ b/include/osmocom/hnbap/HNBAP_InitiatingMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_InitiatingMessage_H_ diff --git a/include/osmocom/hnbap/HNBAP_Ipv4Address.h b/include/osmocom/hnbap/HNBAP_Ipv4Address.h index eecb57a..9fa5f44 100644 --- a/include/osmocom/hnbap/HNBAP_Ipv4Address.h +++ b/include/osmocom/hnbap/HNBAP_Ipv4Address.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Ipv4Address_H_ diff --git a/include/osmocom/hnbap/HNBAP_Ipv6Address.h b/include/osmocom/hnbap/HNBAP_Ipv6Address.h index 319ee82..e7e32c4 100644 --- a/include/osmocom/hnbap/HNBAP_Ipv6Address.h +++ b/include/osmocom/hnbap/HNBAP_Ipv6Address.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Ipv6Address_H_ diff --git a/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h b/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h index f3e5f24..4f96bfa 100644 --- a/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h +++ b/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Iurh_Signalling_TNL_AddressList_H_ diff --git a/include/osmocom/hnbap/HNBAP_LAC.h b/include/osmocom/hnbap/HNBAP_LAC.h index 66369cf..13eecd7 100644 --- a/include/osmocom/hnbap/HNBAP_LAC.h +++ b/include/osmocom/hnbap/HNBAP_LAC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_LAC_H_ diff --git a/include/osmocom/hnbap/HNBAP_LAI.h b/include/osmocom/hnbap/HNBAP_LAI.h index bc44334..e22d54e 100644 --- a/include/osmocom/hnbap/HNBAP_LAI.h +++ b/include/osmocom/hnbap/HNBAP_LAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_LAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_MacroCellID.h b/include/osmocom/hnbap/HNBAP_MacroCellID.h index 808e4cc..b291c9e 100644 --- a/include/osmocom/hnbap/HNBAP_MacroCellID.h +++ b/include/osmocom/hnbap/HNBAP_MacroCellID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_MacroCellID_H_ diff --git a/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h b/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h index 8c58db7..5f223ab 100644 --- a/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h +++ b/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_MacroCoverageInformation_H_ diff --git a/include/osmocom/hnbap/HNBAP_MuxPortNumber.h b/include/osmocom/hnbap/HNBAP_MuxPortNumber.h index 126423b..d703a87 100644 --- a/include/osmocom/hnbap/HNBAP_MuxPortNumber.h +++ b/include/osmocom/hnbap/HNBAP_MuxPortNumber.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_MuxPortNumber_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h b/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h index 7b045bd..1c60b03 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_NeighbourCellIdentityList_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h b/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h index a05d5c6..7047e9f 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_NeighbourIdentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h b/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h index c3ac952..9f86d1d 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_NeighbourInfoList_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h index babc581..263b781 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_NeighbourInfoRequestItem_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h index 8ce71b4..274a1cf 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_NeighbourInfoRequestList_H_ diff --git a/include/osmocom/hnbap/HNBAP_PLMNidentity.h b/include/osmocom/hnbap/HNBAP_PLMNidentity.h index eaae7fd..de48ddd 100644 --- a/include/osmocom/hnbap/HNBAP_PLMNidentity.h +++ b/include/osmocom/hnbap/HNBAP_PLMNidentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_PLMNidentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_PSC.h b/include/osmocom/hnbap/HNBAP_PSC.h index a399947..d2bcff7 100644 --- a/include/osmocom/hnbap/HNBAP_PSC.h +++ b/include/osmocom/hnbap/HNBAP_PSC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_PSC_H_ diff --git a/include/osmocom/hnbap/HNBAP_PTMSI.h b/include/osmocom/hnbap/HNBAP_PTMSI.h index 70a9d21..04e4c4f 100644 --- a/include/osmocom/hnbap/HNBAP_PTMSI.h +++ b/include/osmocom/hnbap/HNBAP_PTMSI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_PTMSI_H_ diff --git a/include/osmocom/hnbap/HNBAP_PTMSIRAI.h b/include/osmocom/hnbap/HNBAP_PTMSIRAI.h index 45396e0..5487dde 100644 --- a/include/osmocom/hnbap/HNBAP_PTMSIRAI.h +++ b/include/osmocom/hnbap/HNBAP_PTMSIRAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_PTMSIRAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_Presence.h b/include/osmocom/hnbap/HNBAP_Presence.h index 60ec1f9..512674f 100644 --- a/include/osmocom/hnbap/HNBAP_Presence.h +++ b/include/osmocom/hnbap/HNBAP_Presence.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Presence_H_ diff --git a/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h b/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h index 78857d0..24a241f 100644 --- a/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h +++ b/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_PrivateIE_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_PrivateMessage.h b/include/osmocom/hnbap/HNBAP_PrivateMessage.h index ee7faa4..4cb81cb 100644 --- a/include/osmocom/hnbap/HNBAP_PrivateMessage.h +++ b/include/osmocom/hnbap/HNBAP_PrivateMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_PrivateMessage_H_ @@ -23,7 +23,7 @@ /* HNBAP_PrivateMessage */ typedef struct HNBAP_PrivateMessage { - struct privateMessage_ies { + struct HNBAP_PrivateMessage__privateMessage_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_ProcedureCode.h b/include/osmocom/hnbap/HNBAP_ProcedureCode.h index 84e1d41..d55bd08 100644 --- a/include/osmocom/hnbap/HNBAP_ProcedureCode.h +++ b/include/osmocom/hnbap/HNBAP_ProcedureCode.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_ProcedureCode_H_ diff --git a/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h b/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h index 4ca0627..4f1e9c4 100644 --- a/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h +++ b/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_ProtocolIE_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_RAB-ID.h b/include/osmocom/hnbap/HNBAP_RAB-ID.h index 45422f4..8fe284a 100644 --- a/include/osmocom/hnbap/HNBAP_RAB-ID.h +++ b/include/osmocom/hnbap/HNBAP_RAB-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_RAB_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_RABList.h b/include/osmocom/hnbap/HNBAP_RABList.h index 50741e0..ae6c86b 100644 --- a/include/osmocom/hnbap/HNBAP_RABList.h +++ b/include/osmocom/hnbap/HNBAP_RABList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_RABList_H_ diff --git a/include/osmocom/hnbap/HNBAP_RABListItem.h b/include/osmocom/hnbap/HNBAP_RABListItem.h index a041d25..97bdcce 100644 --- a/include/osmocom/hnbap/HNBAP_RABListItem.h +++ b/include/osmocom/hnbap/HNBAP_RABListItem.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_RABListItem_H_ diff --git a/include/osmocom/hnbap/HNBAP_RAC.h b/include/osmocom/hnbap/HNBAP_RAC.h index 20534f8..700fe12 100644 --- a/include/osmocom/hnbap/HNBAP_RAC.h +++ b/include/osmocom/hnbap/HNBAP_RAC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_RAC_H_ diff --git a/include/osmocom/hnbap/HNBAP_RAI.h b/include/osmocom/hnbap/HNBAP_RAI.h index 0cc6985..9f0bb07 100644 --- a/include/osmocom/hnbap/HNBAP_RAI.h +++ b/include/osmocom/hnbap/HNBAP_RAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_RAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_RNC-ID.h b/include/osmocom/hnbap/HNBAP_RNC-ID.h index 36c6644..35b58aa 100644 --- a/include/osmocom/hnbap/HNBAP_RNC-ID.h +++ b/include/osmocom/hnbap/HNBAP_RNC-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_RNC_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_Registration-Cause.h b/include/osmocom/hnbap/HNBAP_Registration-Cause.h index 8fc58bd..3de4fde 100644 --- a/include/osmocom/hnbap/HNBAP_Registration-Cause.h +++ b/include/osmocom/hnbap/HNBAP_Registration-Cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Registration_Cause_H_ diff --git a/include/osmocom/hnbap/HNBAP_RelocationComplete.h b/include/osmocom/hnbap/HNBAP_RelocationComplete.h index 8ab1e5a..6c89364 100644 --- a/include/osmocom/hnbap/HNBAP_RelocationComplete.h +++ b/include/osmocom/hnbap/HNBAP_RelocationComplete.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * >From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_RelocationComplete_H_ @@ -23,7 +23,7 @@ /* HNBAP_RelocationComplete */ typedef struct HNBAP_RelocationComplete { - struct relocationComplete_ies { + struct HNBAP_RelocationComplete__relocationComplete_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h b/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h index a315b9a..47bd663 100644 --- a/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h +++ b/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_S_RNTIPrefix_H_ diff --git a/include/osmocom/hnbap/HNBAP_SAC.h b/include/osmocom/hnbap/HNBAP_SAC.h index 6b4bf11..15549a3 100644 --- a/include/osmocom/hnbap/HNBAP_SAC.h +++ b/include/osmocom/hnbap/HNBAP_SAC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_SAC_H_ diff --git a/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h b/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h index 97ddd2e..aa7a937 100644 --- a/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h +++ b/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_SuccessfulOutcome_H_ diff --git a/include/osmocom/hnbap/HNBAP_TMSIDS41.h b/include/osmocom/hnbap/HNBAP_TMSIDS41.h index ec40e84..0f45fce 100644 --- a/include/osmocom/hnbap/HNBAP_TMSIDS41.h +++ b/include/osmocom/hnbap/HNBAP_TMSIDS41.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TMSIDS41_H_ diff --git a/include/osmocom/hnbap/HNBAP_TMSILAI.h b/include/osmocom/hnbap/HNBAP_TMSILAI.h index de4101a..0df3774 100644 --- a/include/osmocom/hnbap/HNBAP_TMSILAI.h +++ b/include/osmocom/hnbap/HNBAP_TMSILAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TMSILAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h b/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h index 73313fb..b662d0c 100644 --- a/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h +++ b/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TNLUpdateFailure_H_ @@ -23,7 +23,7 @@ /* HNBAP_TNLUpdateFailure */ typedef struct HNBAP_TNLUpdateFailure { - struct tnlUpdateFailure_ies { + struct HNBAP_TNLUpdateFailure__tnlUpdateFailure_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h b/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h index 11b1a36..8f43046 100644 --- a/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h +++ b/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TNLUpdateRequest_H_ @@ -23,7 +23,7 @@ /* HNBAP_TNLUpdateRequest */ typedef struct HNBAP_TNLUpdateRequest { - struct tnlUpdateRequest_ies { + struct HNBAP_TNLUpdateRequest__tnlUpdateRequest_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h b/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h index 8aac76b..921ecc4 100644 --- a/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h +++ b/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TNLUpdateResponse_H_ @@ -23,7 +23,7 @@ /* HNBAP_TNLUpdateResponse */ typedef struct HNBAP_TNLUpdateResponse { - struct tnlUpdateResponse_ies { + struct HNBAP_TNLUpdateResponse__tnlUpdateResponse_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_TransportInfo.h b/include/osmocom/hnbap/HNBAP_TransportInfo.h index 8f0a5eb..2b7bf2b 100644 --- a/include/osmocom/hnbap/HNBAP_TransportInfo.h +++ b/include/osmocom/hnbap/HNBAP_TransportInfo.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TransportInfo_H_ @@ -24,19 +24,19 @@ #endif /* Dependencies */ -typedef enum transportAssociation_PR { - transportAssociation_PR_NOTHING, /* No components present */ - transportAssociation_PR_gtp_TEI, - transportAssociation_PR_bindingID, +typedef enum HNBAP_TransportInfo__transportAssociation_PR { + HNBAP_TransportInfo__transportAssociation_PR_NOTHING, /* No components present */ + HNBAP_TransportInfo__transportAssociation_PR_gtp_TEI, + HNBAP_TransportInfo__transportAssociation_PR_bindingID, /* Extensions may appear below */ -} transportAssociation_PR; +} HNBAP_TransportInfo__transportAssociation_PR; /* HNBAP_TransportInfo */ typedef struct HNBAP_TransportInfo { HNBAP_TransportLayerAddress_t transportLayerAddress; - struct transportAssociation { - transportAssociation_PR present; + struct HNBAP_TransportInfo__transportAssociation { + HNBAP_TransportInfo__transportAssociation_PR present; union HNBAP_TransportInfo__transportAssociation_u { HNBAP_GTP_TEI_t gtp_TEI; HNBAP_BindingID_t bindingID; diff --git a/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h b/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h index 4edd7b8..9b2a81a 100644 --- a/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h +++ b/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TransportLayerAddress_H_ diff --git a/include/osmocom/hnbap/HNBAP_TriggeringMessage.h b/include/osmocom/hnbap/HNBAP_TriggeringMessage.h index 859dc12..24dcaec 100644 --- a/include/osmocom/hnbap/HNBAP_TriggeringMessage.h +++ b/include/osmocom/hnbap/HNBAP_TriggeringMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TriggeringMessage_H_ diff --git a/include/osmocom/hnbap/HNBAP_Tunnel-Information.h b/include/osmocom/hnbap/HNBAP_Tunnel-Information.h index 470420d..63eaa37 100644 --- a/include/osmocom/hnbap/HNBAP_Tunnel-Information.h +++ b/include/osmocom/hnbap/HNBAP_Tunnel-Information.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Tunnel_Information_H_ diff --git a/include/osmocom/hnbap/HNBAP_TypeOfError.h b/include/osmocom/hnbap/HNBAP_TypeOfError.h index 04771a3..eba4911 100644 --- a/include/osmocom/hnbap/HNBAP_TypeOfError.h +++ b/include/osmocom/hnbap/HNBAP_TypeOfError.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TypeOfError_H_ diff --git a/include/osmocom/hnbap/HNBAP_U-RNTI.h b/include/osmocom/hnbap/HNBAP_U-RNTI.h index cf506b0..f942e35 100644 --- a/include/osmocom/hnbap/HNBAP_U-RNTI.h +++ b/include/osmocom/hnbap/HNBAP_U-RNTI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_U_RNTI_H_ diff --git a/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h b/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h index 8714c55..c0cbbe8 100644 --- a/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h +++ b/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_U_RNTIQueryRequest_H_ @@ -23,7 +23,7 @@ /* HNBAP_U-RNTIQueryRequest */ typedef struct HNBAP_U_RNTIQueryRequest { - struct u_RNTIQueryRequest_ies { + struct HNBAP_U_RNTIQueryRequest__u_RNTIQueryRequest_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h b/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h index 2696f9b..8c4a2d0 100644 --- a/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h +++ b/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_U_RNTIQueryResponse_H_ @@ -23,7 +23,7 @@ /* HNBAP_U-RNTIQueryResponse */ typedef struct HNBAP_U_RNTIQueryResponse { - struct u_RNTIQueryResponse_ies { + struct HNBAP_U_RNTIQueryResponse__u_RNTIQueryResponse_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h b/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h index 9a8b675..988cedb 100644 --- a/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h +++ b/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UDP_Port_Number_H_ diff --git a/include/osmocom/hnbap/HNBAP_UE-Capabilities.h b/include/osmocom/hnbap/HNBAP_UE-Capabilities.h index 38551d6..5f275a3 100644 --- a/include/osmocom/hnbap/HNBAP_UE-Capabilities.h +++ b/include/osmocom/hnbap/HNBAP_UE-Capabilities.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UE_Capabilities_H_ diff --git a/include/osmocom/hnbap/HNBAP_UE-Identity.h b/include/osmocom/hnbap/HNBAP_UE-Identity.h index 8e63603..3c11a84 100644 --- a/include/osmocom/hnbap/HNBAP_UE-Identity.h +++ b/include/osmocom/hnbap/HNBAP_UE-Identity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UE_Identity_H_ diff --git a/include/osmocom/hnbap/HNBAP_UEDe-Register.h b/include/osmocom/hnbap/HNBAP_UEDe-Register.h index 5a0e298..58009c5 100644 --- a/include/osmocom/hnbap/HNBAP_UEDe-Register.h +++ b/include/osmocom/hnbap/HNBAP_UEDe-Register.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UEDe_Register_H_ @@ -23,7 +23,7 @@ /* HNBAP_UEDe-Register */ typedef struct HNBAP_UEDe_Register { - struct ueDe_Register_ies { + struct HNBAP_UEDe_Register__ueDe_Register_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_UERegisterAccept.h b/include/osmocom/hnbap/HNBAP_UERegisterAccept.h index 8d2bec1..9e5c206 100644 --- a/include/osmocom/hnbap/HNBAP_UERegisterAccept.h +++ b/include/osmocom/hnbap/HNBAP_UERegisterAccept.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UERegisterAccept_H_ @@ -23,7 +23,7 @@ /* HNBAP_UERegisterAccept */ typedef struct HNBAP_UERegisterAccept { - struct ueRegisterAccept_ies { + struct HNBAP_UERegisterAccept__ueRegisterAccept_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_UERegisterReject.h b/include/osmocom/hnbap/HNBAP_UERegisterReject.h index c30ffbe..44ed158 100644 --- a/include/osmocom/hnbap/HNBAP_UERegisterReject.h +++ b/include/osmocom/hnbap/HNBAP_UERegisterReject.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UERegisterReject_H_ @@ -23,7 +23,7 @@ /* HNBAP_UERegisterReject */ typedef struct HNBAP_UERegisterReject { - struct ueRegisterReject_ies { + struct HNBAP_UERegisterReject__ueRegisterReject_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_UERegisterRequest.h b/include/osmocom/hnbap/HNBAP_UERegisterRequest.h index 46778c8..ae82132 100644 --- a/include/osmocom/hnbap/HNBAP_UERegisterRequest.h +++ b/include/osmocom/hnbap/HNBAP_UERegisterRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UERegisterRequest_H_ @@ -23,7 +23,7 @@ /* HNBAP_UERegisterRequest */ typedef struct HNBAP_UERegisterRequest { - struct ueRegisterRequest_ies { + struct HNBAP_UERegisterRequest__ueRegisterRequest_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_URAIdentity.h b/include/osmocom/hnbap/HNBAP_URAIdentity.h index 6d4d582..97a1e12 100644 --- a/include/osmocom/hnbap/HNBAP_URAIdentity.h +++ b/include/osmocom/hnbap/HNBAP_URAIdentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_URAIdentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_URAIdentityList.h b/include/osmocom/hnbap/HNBAP_URAIdentityList.h index b676efa..0b22d29 100644 --- a/include/osmocom/hnbap/HNBAP_URAIdentityList.h +++ b/include/osmocom/hnbap/HNBAP_URAIdentityList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_URAIdentityList_H_ diff --git a/include/osmocom/hnbap/HNBAP_UTRANCellID.h b/include/osmocom/hnbap/HNBAP_UTRANCellID.h index d5105b3..0659034 100644 --- a/include/osmocom/hnbap/HNBAP_UTRANCellID.h +++ b/include/osmocom/hnbap/HNBAP_UTRANCellID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UTRANCellID_H_ diff --git a/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h b/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h index 9f285f9..3951209 100644 --- a/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h +++ b/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UnknownU_RNTIIndication_H_ diff --git a/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h b/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h index b3d2a7e..032936f 100644 --- a/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h +++ b/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UnsuccessfulOutcome_H_ diff --git a/include/osmocom/hnbap/HNBAP_Update-cause.h b/include/osmocom/hnbap/HNBAP_Update-cause.h index 601a34e..ebede3d 100644 --- a/include/osmocom/hnbap/HNBAP_Update-cause.h +++ b/include/osmocom/hnbap/HNBAP_Update-cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Update_cause_H_ diff --git a/src/hnbap/HNBAP_Access-stratum-release-indicator.c b/src/hnbap/HNBAP_Access-stratum-release-indicator.c index fec27b8..747b8d5 100644 --- a/src/hnbap/HNBAP_Access-stratum-release-indicator.c +++ b/src/hnbap/HNBAP_Access-stratum-release-indicator.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_AccessResult.c b/src/hnbap/HNBAP_AccessResult.c index ef2d6db..d473c46 100644 --- a/src/hnbap/HNBAP_AccessResult.c +++ b/src/hnbap/HNBAP_AccessResult.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c b/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c index d19a303..337fbdb 100644 --- a/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c +++ b/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_AltitudeAndDirection.c b/src/hnbap/HNBAP_AltitudeAndDirection.c index 9995f74..893838b 100644 --- a/src/hnbap/HNBAP_AltitudeAndDirection.c +++ b/src/hnbap/HNBAP_AltitudeAndDirection.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_BackoffTimer.c b/src/hnbap/HNBAP_BackoffTimer.c index 097ce18..2e72a5e 100644 --- a/src/hnbap/HNBAP_BackoffTimer.c +++ b/src/hnbap/HNBAP_BackoffTimer.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_BindingID.c b/src/hnbap/HNBAP_BindingID.c index 105a6f8..39137d1 100644 --- a/src/hnbap/HNBAP_BindingID.c +++ b/src/hnbap/HNBAP_BindingID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c b/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c index a25797b..7707cd1 100644 --- a/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c +++ b/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CGI.c b/src/hnbap/HNBAP_CGI.c index fbf96b6..17507cf 100644 --- a/src/hnbap/HNBAP_CGI.c +++ b/src/hnbap/HNBAP_CGI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CI.c b/src/hnbap/HNBAP_CI.c index c4d20ea..a3d4531 100644 --- a/src/hnbap/HNBAP_CI.c +++ b/src/hnbap/HNBAP_CI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CN-DomainIndicator.c b/src/hnbap/HNBAP_CN-DomainIndicator.c index 158957d..1374aca 100644 --- a/src/hnbap/HNBAP_CN-DomainIndicator.c +++ b/src/hnbap/HNBAP_CN-DomainIndicator.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CSG-Capability.c b/src/hnbap/HNBAP_CSG-Capability.c index 5bf3426..b98a8e8 100644 --- a/src/hnbap/HNBAP_CSG-Capability.c +++ b/src/hnbap/HNBAP_CSG-Capability.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CSG-ID.c b/src/hnbap/HNBAP_CSG-ID.c index 2000f51..402f9e3 100644 --- a/src/hnbap/HNBAP_CSG-ID.c +++ b/src/hnbap/HNBAP_CSG-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CSGMembershipStatus.c b/src/hnbap/HNBAP_CSGMembershipStatus.c index b49e7a8..7496570 100644 --- a/src/hnbap/HNBAP_CSGMembershipStatus.c +++ b/src/hnbap/HNBAP_CSGMembershipStatus.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CSGMembershipUpdate.c b/src/hnbap/HNBAP_CSGMembershipUpdate.c index 1febe4f..82a961d 100644 --- a/src/hnbap/HNBAP_CSGMembershipUpdate.c +++ b/src/hnbap/HNBAP_CSGMembershipUpdate.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_csgMembershipUpdate_ies_specs_2 = { - sizeof(struct csgMembershipUpdate_ies), - offsetof(struct csgMembershipUpdate_ies, _asn_ctx), + sizeof(struct HNBAP_CSGMembershipUpdate__csgMembershipUpdate_ies), + offsetof(struct HNBAP_CSGMembershipUpdate__csgMembershipUpdate_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_Cause.c b/src/hnbap/HNBAP_Cause.c index e0db859..7dfb5d6 100644 --- a/src/hnbap/HNBAP_Cause.c +++ b/src/hnbap/HNBAP_Cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CauseMisc.c b/src/hnbap/HNBAP_CauseMisc.c index a3c5752..2c0aeed 100644 --- a/src/hnbap/HNBAP_CauseMisc.c +++ b/src/hnbap/HNBAP_CauseMisc.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CauseProtocol.c b/src/hnbap/HNBAP_CauseProtocol.c index 8893481..d3a8943 100644 --- a/src/hnbap/HNBAP_CauseProtocol.c +++ b/src/hnbap/HNBAP_CauseProtocol.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CauseRadioNetwork.c b/src/hnbap/HNBAP_CauseRadioNetwork.c index 2418a72..f1beead 100644 --- a/src/hnbap/HNBAP_CauseRadioNetwork.c +++ b/src/hnbap/HNBAP_CauseRadioNetwork.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CauseTransport.c b/src/hnbap/HNBAP_CauseTransport.c index 6c37c66..e3b6755 100644 --- a/src/hnbap/HNBAP_CauseTransport.c +++ b/src/hnbap/HNBAP_CauseTransport.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CellIdentity.c b/src/hnbap/HNBAP_CellIdentity.c index 3465697..daf8e5e 100644 --- a/src/hnbap/HNBAP_CellIdentity.c +++ b/src/hnbap/HNBAP_CellIdentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_ConfigurationInformation.c b/src/hnbap/HNBAP_ConfigurationInformation.c index 6cf24b1..13bfe4a 100644 --- a/src/hnbap/HNBAP_ConfigurationInformation.c +++ b/src/hnbap/HNBAP_ConfigurationInformation.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Context-ID.c b/src/hnbap/HNBAP_Context-ID.c index 4d2a2b9..c8606d8 100644 --- a/src/hnbap/HNBAP_Context-ID.c +++ b/src/hnbap/HNBAP_Context-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Criticality.c b/src/hnbap/HNBAP_Criticality.c index de6fe43..2ff443f 100644 --- a/src/hnbap/HNBAP_Criticality.c +++ b/src/hnbap/HNBAP_Criticality.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c b/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c index f5aff57..df98d95 100644 --- a/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c +++ b/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -13,7 +13,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_Member_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct Member, iECriticality), + { ATF_NOFLAGS, 0, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, iECriticality), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_Criticality, @@ -22,7 +22,7 @@ 0, "iECriticality" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, iE_ID), + { ATF_NOFLAGS, 0, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, iE_ID), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_ProtocolIE_ID, @@ -31,7 +31,7 @@ 0, "iE-ID" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, typeOfError), + { ATF_NOFLAGS, 0, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, typeOfError), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_TypeOfError, @@ -40,7 +40,7 @@ 0, "typeOfError" }, - { ATF_POINTER, 1, offsetof(struct Member, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_IE_Extensions, @@ -61,8 +61,8 @@ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { - sizeof(struct Member), - offsetof(struct Member, _asn_ctx), + sizeof(struct HNBAP_CriticalityDiagnostics_IE_List__Member), + offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, _asn_ctx), asn_MAP_Member_tag2el_2, 4, /* Count of tags in the map */ asn_MAP_Member_oms_2, /* Optional members */ diff --git a/src/hnbap/HNBAP_CriticalityDiagnostics.c b/src/hnbap/HNBAP_CriticalityDiagnostics.c index 5760e92..e80b352 100644 --- a/src/hnbap/HNBAP_CriticalityDiagnostics.c +++ b/src/hnbap/HNBAP_CriticalityDiagnostics.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_ESN.c b/src/hnbap/HNBAP_ESN.c index d17f2ca..14107f7 100644 --- a/src/hnbap/HNBAP_ESN.c +++ b/src/hnbap/HNBAP_ESN.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_ErrorIndication.c b/src/hnbap/HNBAP_ErrorIndication.c index 4babda2..7077ab5 100644 --- a/src/hnbap/HNBAP_ErrorIndication.c +++ b/src/hnbap/HNBAP_ErrorIndication.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_errorIndication_ies_specs_2 = { - sizeof(struct errorIndication_ies), - offsetof(struct errorIndication_ies, _asn_ctx), + sizeof(struct HNBAP_ErrorIndication__errorIndication_ies), + offsetof(struct HNBAP_ErrorIndication__errorIndication_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_GTP-TEI.c b/src/hnbap/HNBAP_GTP-TEI.c index 7d4b292..448d611 100644 --- a/src/hnbap/HNBAP_GTP-TEI.c +++ b/src/hnbap/HNBAP_GTP-TEI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_GeographicalCoordinates.c b/src/hnbap/HNBAP_GeographicalCoordinates.c index 9607ebf..286a1f3 100644 --- a/src/hnbap/HNBAP_GeographicalCoordinates.c +++ b/src/hnbap/HNBAP_GeographicalCoordinates.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_GeographicalLocation.c b/src/hnbap/HNBAP_GeographicalLocation.c index 6daa15a..1d7c895 100644 --- a/src/hnbap/HNBAP_GeographicalLocation.c +++ b/src/hnbap/HNBAP_GeographicalLocation.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c b/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c index 5154bdf..4eac481 100644 --- a/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c +++ b/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNB-Cell-Identifier.c b/src/hnbap/HNBAP_HNB-Cell-Identifier.c index cf2b620..43d7165 100644 --- a/src/hnbap/HNBAP_HNB-Cell-Identifier.c +++ b/src/hnbap/HNBAP_HNB-Cell-Identifier.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNB-GWResponse.c b/src/hnbap/HNBAP_HNB-GWResponse.c index e48cada..9df03b5 100644 --- a/src/hnbap/HNBAP_HNB-GWResponse.c +++ b/src/hnbap/HNBAP_HNB-GWResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNB-Identity-Info.c b/src/hnbap/HNBAP_HNB-Identity-Info.c index 1ac5789..a28b2af 100644 --- a/src/hnbap/HNBAP_HNB-Identity-Info.c +++ b/src/hnbap/HNBAP_HNB-Identity-Info.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNB-Identity.c b/src/hnbap/HNBAP_HNB-Identity.c index 217b714..f4eb992 100644 --- a/src/hnbap/HNBAP_HNB-Identity.c +++ b/src/hnbap/HNBAP_HNB-Identity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNB-Location-Information.c b/src/hnbap/HNBAP_HNB-Location-Information.c index 178ac0f..d8ffefb 100644 --- a/src/hnbap/HNBAP_HNB-Location-Information.c +++ b/src/hnbap/HNBAP_HNB-Location-Information.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNB-RNL-Identity.c b/src/hnbap/HNBAP_HNB-RNL-Identity.c index 09d3c52..2e9e705 100644 --- a/src/hnbap/HNBAP_HNB-RNL-Identity.c +++ b/src/hnbap/HNBAP_HNB-RNL-Identity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNBAP-PDU.c b/src/hnbap/HNBAP_HNBAP-PDU.c index 2adb422..d982b93 100644 --- a/src/hnbap/HNBAP_HNBAP-PDU.c +++ b/src/hnbap/HNBAP_HNBAP-PDU.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNBCapacity.c b/src/hnbap/HNBAP_HNBCapacity.c index 3f9da47..e34caf7 100644 --- a/src/hnbap/HNBAP_HNBCapacity.c +++ b/src/hnbap/HNBAP_HNBCapacity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigInfo.c b/src/hnbap/HNBAP_HNBConfigInfo.c index 402363d..ba41f60 100644 --- a/src/hnbap/HNBAP_HNBConfigInfo.c +++ b/src/hnbap/HNBAP_HNBConfigInfo.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigTransferRequest.c b/src/hnbap/HNBAP_HNBConfigTransferRequest.c index ff2b20f..e5db652 100644 --- a/src/hnbap/HNBAP_HNBConfigTransferRequest.c +++ b/src/hnbap/HNBAP_HNBConfigTransferRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_hnbConfigTransferRequest_ies_specs_2 = { - sizeof(struct hnbConfigTransferRequest_ies), - offsetof(struct hnbConfigTransferRequest_ies, _asn_ctx), + sizeof(struct HNBAP_HNBConfigTransferRequest__hnbConfigTransferRequest_ies), + offsetof(struct HNBAP_HNBConfigTransferRequest__hnbConfigTransferRequest_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_HNBConfigTransferResponse.c b/src/hnbap/HNBAP_HNBConfigTransferResponse.c index 00e2d1f..5b73f16 100644 --- a/src/hnbap/HNBAP_HNBConfigTransferResponse.c +++ b/src/hnbap/HNBAP_HNBConfigTransferResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_hnbConfigTransferResponse_ies_specs_2 = { - sizeof(struct hnbConfigTransferResponse_ies), - offsetof(struct hnbConfigTransferResponse_ies, _asn_ctx), + sizeof(struct HNBAP_HNBConfigTransferResponse__hnbConfigTransferResponse_ies), + offsetof(struct HNBAP_HNBConfigTransferResponse__hnbConfigTransferResponse_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c b/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c index 27e12fa..4a8e3e9 100644 --- a/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c +++ b/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c b/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c index db68725..f0988fe 100644 --- a/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c +++ b/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNBDe-Register.c b/src/hnbap/HNBAP_HNBDe-Register.c index d2ef818..313dcd1 100644 --- a/src/hnbap/HNBAP_HNBDe-Register.c +++ b/src/hnbap/HNBAP_HNBDe-Register.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_hnbDe_Register_ies_specs_2 = { - sizeof(struct hnbDe_Register_ies), - offsetof(struct hnbDe_Register_ies, _asn_ctx), + sizeof(struct HNBAP_HNBDe_Register__hnbDe_Register_ies), + offsetof(struct HNBAP_HNBDe_Register__hnbDe_Register_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_HNBRegisterAccept.c b/src/hnbap/HNBAP_HNBRegisterAccept.c index 4b1afa0..dafb29a 100644 --- a/src/hnbap/HNBAP_HNBRegisterAccept.c +++ b/src/hnbap/HNBAP_HNBRegisterAccept.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_hnbRegisterAccept_ies_specs_2 = { - sizeof(struct hnbRegisterAccept_ies), - offsetof(struct hnbRegisterAccept_ies, _asn_ctx), + sizeof(struct HNBAP_HNBRegisterAccept__hnbRegisterAccept_ies), + offsetof(struct HNBAP_HNBRegisterAccept__hnbRegisterAccept_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_HNBRegisterReject.c b/src/hnbap/HNBAP_HNBRegisterReject.c index ecab1d1..e13289f 100644 --- a/src/hnbap/HNBAP_HNBRegisterReject.c +++ b/src/hnbap/HNBAP_HNBRegisterReject.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_hnbRegisterReject_ies_specs_2 = { - sizeof(struct hnbRegisterReject_ies), - offsetof(struct hnbRegisterReject_ies, _asn_ctx), + sizeof(struct HNBAP_HNBRegisterReject__hnbRegisterReject_ies), + offsetof(struct HNBAP_HNBRegisterReject__hnbRegisterReject_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_HNBRegisterRequest.c b/src/hnbap/HNBAP_HNBRegisterRequest.c index 3bf2278..443024f 100644 --- a/src/hnbap/HNBAP_HNBRegisterRequest.c +++ b/src/hnbap/HNBAP_HNBRegisterRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_hnbRegisterRequest_ies_specs_2 = { - sizeof(struct hnbRegisterRequest_ies), - offsetof(struct hnbRegisterRequest_ies, _asn_ctx), + sizeof(struct HNBAP_HNBRegisterRequest__hnbRegisterRequest_ies), + offsetof(struct HNBAP_HNBRegisterRequest__hnbRegisterRequest_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_IE-Extensions.c b/src/hnbap/HNBAP_IE-Extensions.c index 603b933..2cc141b 100644 --- a/src/hnbap/HNBAP_IE-Extensions.c +++ b/src/hnbap/HNBAP_IE-Extensions.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_IE.c b/src/hnbap/HNBAP_IE.c index c57f924..2c9c779 100644 --- a/src/hnbap/HNBAP_IE.c +++ b/src/hnbap/HNBAP_IE.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_IMEI.c b/src/hnbap/HNBAP_IMEI.c index b3c4406..cf13c7b 100644 --- a/src/hnbap/HNBAP_IMEI.c +++ b/src/hnbap/HNBAP_IMEI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_IMSI.c b/src/hnbap/HNBAP_IMSI.c index 9a3c757..bb0c58e 100644 --- a/src/hnbap/HNBAP_IMSI.c +++ b/src/hnbap/HNBAP_IMSI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_IMSIDS41.c b/src/hnbap/HNBAP_IMSIDS41.c index 10a7807..0d82417 100644 --- a/src/hnbap/HNBAP_IMSIDS41.c +++ b/src/hnbap/HNBAP_IMSIDS41.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_IMSIESN.c b/src/hnbap/HNBAP_IMSIESN.c index 1b9d9a6..d0c3e9a 100644 --- a/src/hnbap/HNBAP_IMSIESN.c +++ b/src/hnbap/HNBAP_IMSIESN.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_IP-Address.c b/src/hnbap/HNBAP_IP-Address.c index 6bc9d7f..06bc182 100644 --- a/src/hnbap/HNBAP_IP-Address.c +++ b/src/hnbap/HNBAP_IP-Address.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -13,7 +13,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_ipaddress_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct ipaddress, choice.ipv4info), + { ATF_NOFLAGS, 0, offsetof(struct HNBAP_IP_Address__ipaddress, choice.ipv4info), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_Ipv4Address, @@ -22,7 +22,7 @@ 0, "ipv4info" }, - { ATF_NOFLAGS, 0, offsetof(struct ipaddress, choice.ipv6info), + { ATF_NOFLAGS, 0, offsetof(struct HNBAP_IP_Address__ipaddress, choice.ipv6info), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_Ipv6Address, @@ -37,10 +37,10 @@ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* ipv6info */ }; static asn_CHOICE_specifics_t asn_SPC_ipaddress_specs_2 = { - sizeof(struct ipaddress), - offsetof(struct ipaddress, _asn_ctx), - offsetof(struct ipaddress, present), - sizeof(((struct ipaddress *)0)->present), + sizeof(struct HNBAP_IP_Address__ipaddress), + offsetof(struct HNBAP_IP_Address__ipaddress, _asn_ctx), + offsetof(struct HNBAP_IP_Address__ipaddress, present), + sizeof(((struct HNBAP_IP_Address__ipaddress *)0)->present), asn_MAP_ipaddress_tag2el_2, 2, /* Count of tags in the map */ 0, diff --git a/src/hnbap/HNBAP_InitiatingMessage.c b/src/hnbap/HNBAP_InitiatingMessage.c index 1b87f7d..155eff9 100644 --- a/src/hnbap/HNBAP_InitiatingMessage.c +++ b/src/hnbap/HNBAP_InitiatingMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Ipv4Address.c b/src/hnbap/HNBAP_Ipv4Address.c index f325ead..4481e57 100644 --- a/src/hnbap/HNBAP_Ipv4Address.c +++ b/src/hnbap/HNBAP_Ipv4Address.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Ipv6Address.c b/src/hnbap/HNBAP_Ipv6Address.c index b0c9176..2fad0a5 100644 --- a/src/hnbap/HNBAP_Ipv6Address.c +++ b/src/hnbap/HNBAP_Ipv6Address.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c b/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c index 79b4dad..3b70b99 100644 --- a/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c +++ b/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_LAC.c b/src/hnbap/HNBAP_LAC.c index 8f3d9f5..81bc84a 100644 --- a/src/hnbap/HNBAP_LAC.c +++ b/src/hnbap/HNBAP_LAC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_LAI.c b/src/hnbap/HNBAP_LAI.c index bcfddde..4b0a560 100644 --- a/src/hnbap/HNBAP_LAI.c +++ b/src/hnbap/HNBAP_LAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_MacroCellID.c b/src/hnbap/HNBAP_MacroCellID.c index 568e56a..04cc2ea 100644 --- a/src/hnbap/HNBAP_MacroCellID.c +++ b/src/hnbap/HNBAP_MacroCellID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_MacroCoverageInformation.c b/src/hnbap/HNBAP_MacroCoverageInformation.c index 83ae67b..6284030 100644 --- a/src/hnbap/HNBAP_MacroCoverageInformation.c +++ b/src/hnbap/HNBAP_MacroCoverageInformation.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_MuxPortNumber.c b/src/hnbap/HNBAP_MuxPortNumber.c index 4c7ca42..4619dff 100644 --- a/src/hnbap/HNBAP_MuxPortNumber.c +++ b/src/hnbap/HNBAP_MuxPortNumber.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_NeighbourCellIdentityList.c b/src/hnbap/HNBAP_NeighbourCellIdentityList.c index e0f912c..47165dc 100644 --- a/src/hnbap/HNBAP_NeighbourCellIdentityList.c +++ b/src/hnbap/HNBAP_NeighbourCellIdentityList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_NeighbourIdentity.c b/src/hnbap/HNBAP_NeighbourIdentity.c index 2e69f01..8386ee1 100644 --- a/src/hnbap/HNBAP_NeighbourIdentity.c +++ b/src/hnbap/HNBAP_NeighbourIdentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_NeighbourInfoList.c b/src/hnbap/HNBAP_NeighbourInfoList.c index 458a142..61a4efb 100644 --- a/src/hnbap/HNBAP_NeighbourInfoList.c +++ b/src/hnbap/HNBAP_NeighbourInfoList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_NeighbourInfoRequestItem.c b/src/hnbap/HNBAP_NeighbourInfoRequestItem.c index 42cd579..e556fca 100644 --- a/src/hnbap/HNBAP_NeighbourInfoRequestItem.c +++ b/src/hnbap/HNBAP_NeighbourInfoRequestItem.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_NeighbourInfoRequestList.c b/src/hnbap/HNBAP_NeighbourInfoRequestList.c index 738d5c2..cc700cc 100644 --- a/src/hnbap/HNBAP_NeighbourInfoRequestList.c +++ b/src/hnbap/HNBAP_NeighbourInfoRequestList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_PLMNidentity.c b/src/hnbap/HNBAP_PLMNidentity.c index cb6879b..9ea2254 100644 --- a/src/hnbap/HNBAP_PLMNidentity.c +++ b/src/hnbap/HNBAP_PLMNidentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_PSC.c b/src/hnbap/HNBAP_PSC.c index b696fc0..d8049db 100644 --- a/src/hnbap/HNBAP_PSC.c +++ b/src/hnbap/HNBAP_PSC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_PTMSI.c b/src/hnbap/HNBAP_PTMSI.c index 23976ef..52c380b 100644 --- a/src/hnbap/HNBAP_PTMSI.c +++ b/src/hnbap/HNBAP_PTMSI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_PTMSIRAI.c b/src/hnbap/HNBAP_PTMSIRAI.c index dc17dd3..b18bd34 100644 --- a/src/hnbap/HNBAP_PTMSIRAI.c +++ b/src/hnbap/HNBAP_PTMSIRAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Presence.c b/src/hnbap/HNBAP_Presence.c index a6e7286..3988022 100644 --- a/src/hnbap/HNBAP_Presence.c +++ b/src/hnbap/HNBAP_Presence.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_PrivateIE-ID.c b/src/hnbap/HNBAP_PrivateIE-ID.c index 3bf3000..a514507 100644 --- a/src/hnbap/HNBAP_PrivateIE-ID.c +++ b/src/hnbap/HNBAP_PrivateIE-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_PrivateMessage.c b/src/hnbap/HNBAP_PrivateMessage.c index ebac795..2e703e3 100644 --- a/src/hnbap/HNBAP_PrivateMessage.c +++ b/src/hnbap/HNBAP_PrivateMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_privateMessage_ies_specs_2 = { - sizeof(struct privateMessage_ies), - offsetof(struct privateMessage_ies, _asn_ctx), + sizeof(struct HNBAP_PrivateMessage__privateMessage_ies), + offsetof(struct HNBAP_PrivateMessage__privateMessage_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_ProcedureCode.c b/src/hnbap/HNBAP_ProcedureCode.c index c32e9fb..e2b909d 100644 --- a/src/hnbap/HNBAP_ProcedureCode.c +++ b/src/hnbap/HNBAP_ProcedureCode.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_ProtocolIE-ID.c b/src/hnbap/HNBAP_ProtocolIE-ID.c index f4fc953..e685cb1 100644 --- a/src/hnbap/HNBAP_ProtocolIE-ID.c +++ b/src/hnbap/HNBAP_ProtocolIE-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_RAB-ID.c b/src/hnbap/HNBAP_RAB-ID.c index 4dea280..b66cd9c 100644 --- a/src/hnbap/HNBAP_RAB-ID.c +++ b/src/hnbap/HNBAP_RAB-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_RABList.c b/src/hnbap/HNBAP_RABList.c index fe478e2..e56bdc2 100644 --- a/src/hnbap/HNBAP_RABList.c +++ b/src/hnbap/HNBAP_RABList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_RABListItem.c b/src/hnbap/HNBAP_RABListItem.c index 4fcf4aa..c147214 100644 --- a/src/hnbap/HNBAP_RABListItem.c +++ b/src/hnbap/HNBAP_RABListItem.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_RAC.c b/src/hnbap/HNBAP_RAC.c index 6a6235c..9b210ad 100644 --- a/src/hnbap/HNBAP_RAC.c +++ b/src/hnbap/HNBAP_RAC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_RAI.c b/src/hnbap/HNBAP_RAI.c index c6bca5b..c958051 100644 --- a/src/hnbap/HNBAP_RAI.c +++ b/src/hnbap/HNBAP_RAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_RNC-ID.c b/src/hnbap/HNBAP_RNC-ID.c index 57da025..73a3921 100644 --- a/src/hnbap/HNBAP_RNC-ID.c +++ b/src/hnbap/HNBAP_RNC-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Registration-Cause.c b/src/hnbap/HNBAP_Registration-Cause.c index 8047241..703d5af 100644 --- a/src/hnbap/HNBAP_Registration-Cause.c +++ b/src/hnbap/HNBAP_Registration-Cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_RelocationComplete.c b/src/hnbap/HNBAP_RelocationComplete.c index b939e69..d0655f0 100644 --- a/src/hnbap/HNBAP_RelocationComplete.c +++ b/src/hnbap/HNBAP_RelocationComplete.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_relocationComplete_ies_specs_2 = { - sizeof(struct relocationComplete_ies), - offsetof(struct relocationComplete_ies, _asn_ctx), + sizeof(struct HNBAP_RelocationComplete__relocationComplete_ies), + offsetof(struct HNBAP_RelocationComplete__relocationComplete_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_S-RNTIPrefix.c b/src/hnbap/HNBAP_S-RNTIPrefix.c index 3d5394c..c236fc7 100644 --- a/src/hnbap/HNBAP_S-RNTIPrefix.c +++ b/src/hnbap/HNBAP_S-RNTIPrefix.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_SAC.c b/src/hnbap/HNBAP_SAC.c index 6c2a1e2..0c6fc35 100644 --- a/src/hnbap/HNBAP_SAC.c +++ b/src/hnbap/HNBAP_SAC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_SuccessfulOutcome.c b/src/hnbap/HNBAP_SuccessfulOutcome.c index 5adb2ab..bd3152a 100644 --- a/src/hnbap/HNBAP_SuccessfulOutcome.c +++ b/src/hnbap/HNBAP_SuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_TMSIDS41.c b/src/hnbap/HNBAP_TMSIDS41.c index 0f2e295..7f62cb6 100644 --- a/src/hnbap/HNBAP_TMSIDS41.c +++ b/src/hnbap/HNBAP_TMSIDS41.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_TMSILAI.c b/src/hnbap/HNBAP_TMSILAI.c index 2fe80eb..05ea97b 100644 --- a/src/hnbap/HNBAP_TMSILAI.c +++ b/src/hnbap/HNBAP_TMSILAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_TNLUpdateFailure.c b/src/hnbap/HNBAP_TNLUpdateFailure.c index 0f01084..86b371f 100644 --- a/src/hnbap/HNBAP_TNLUpdateFailure.c +++ b/src/hnbap/HNBAP_TNLUpdateFailure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_tnlUpdateFailure_ies_specs_2 = { - sizeof(struct tnlUpdateFailure_ies), - offsetof(struct tnlUpdateFailure_ies, _asn_ctx), + sizeof(struct HNBAP_TNLUpdateFailure__tnlUpdateFailure_ies), + offsetof(struct HNBAP_TNLUpdateFailure__tnlUpdateFailure_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_TNLUpdateRequest.c b/src/hnbap/HNBAP_TNLUpdateRequest.c index bdf5c00..b0650dd 100644 --- a/src/hnbap/HNBAP_TNLUpdateRequest.c +++ b/src/hnbap/HNBAP_TNLUpdateRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_tnlUpdateRequest_ies_specs_2 = { - sizeof(struct tnlUpdateRequest_ies), - offsetof(struct tnlUpdateRequest_ies, _asn_ctx), + sizeof(struct HNBAP_TNLUpdateRequest__tnlUpdateRequest_ies), + offsetof(struct HNBAP_TNLUpdateRequest__tnlUpdateRequest_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_TNLUpdateResponse.c b/src/hnbap/HNBAP_TNLUpdateResponse.c index 8876313..db9affb 100644 --- a/src/hnbap/HNBAP_TNLUpdateResponse.c +++ b/src/hnbap/HNBAP_TNLUpdateResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_tnlUpdateResponse_ies_specs_2 = { - sizeof(struct tnlUpdateResponse_ies), - offsetof(struct tnlUpdateResponse_ies, _asn_ctx), + sizeof(struct HNBAP_TNLUpdateResponse__tnlUpdateResponse_ies), + offsetof(struct HNBAP_TNLUpdateResponse__tnlUpdateResponse_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_TransportInfo.c b/src/hnbap/HNBAP_TransportInfo.c index 9e0f7a3..2162f9b 100644 --- a/src/hnbap/HNBAP_TransportInfo.c +++ b/src/hnbap/HNBAP_TransportInfo.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -13,7 +13,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_transportAssociation_3[] = { - { ATF_NOFLAGS, 0, offsetof(struct transportAssociation, choice.gtp_TEI), + { ATF_NOFLAGS, 0, offsetof(struct HNBAP_TransportInfo__transportAssociation, choice.gtp_TEI), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_GTP_TEI, @@ -22,7 +22,7 @@ 0, "gtp-TEI" }, - { ATF_NOFLAGS, 0, offsetof(struct transportAssociation, choice.bindingID), + { ATF_NOFLAGS, 0, offsetof(struct HNBAP_TransportInfo__transportAssociation, choice.bindingID), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_BindingID, @@ -37,10 +37,10 @@ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* bindingID */ }; static asn_CHOICE_specifics_t asn_SPC_transportAssociation_specs_3 = { - sizeof(struct transportAssociation), - offsetof(struct transportAssociation, _asn_ctx), - offsetof(struct transportAssociation, present), - sizeof(((struct transportAssociation *)0)->present), + sizeof(struct HNBAP_TransportInfo__transportAssociation), + offsetof(struct HNBAP_TransportInfo__transportAssociation, _asn_ctx), + offsetof(struct HNBAP_TransportInfo__transportAssociation, present), + sizeof(((struct HNBAP_TransportInfo__transportAssociation *)0)->present), asn_MAP_transportAssociation_tag2el_3, 2, /* Count of tags in the map */ 0, diff --git a/src/hnbap/HNBAP_TransportLayerAddress.c b/src/hnbap/HNBAP_TransportLayerAddress.c index 9cc085f..f324e55 100644 --- a/src/hnbap/HNBAP_TransportLayerAddress.c +++ b/src/hnbap/HNBAP_TransportLayerAddress.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_TriggeringMessage.c b/src/hnbap/HNBAP_TriggeringMessage.c index 4485222..d851a6c 100644 --- a/src/hnbap/HNBAP_TriggeringMessage.c +++ b/src/hnbap/HNBAP_TriggeringMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Tunnel-Information.c b/src/hnbap/HNBAP_Tunnel-Information.c index db3387e..5429d9e 100644 --- a/src/hnbap/HNBAP_Tunnel-Information.c +++ b/src/hnbap/HNBAP_Tunnel-Information.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_TypeOfError.c b/src/hnbap/HNBAP_TypeOfError.c index 2d894f6..53dccc3 100644 --- a/src/hnbap/HNBAP_TypeOfError.c +++ b/src/hnbap/HNBAP_TypeOfError.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_U-RNTI.c b/src/hnbap/HNBAP_U-RNTI.c index 438c32a..bb10ac7 100644 --- a/src/hnbap/HNBAP_U-RNTI.c +++ b/src/hnbap/HNBAP_U-RNTI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_U-RNTIQueryRequest.c b/src/hnbap/HNBAP_U-RNTIQueryRequest.c index f10d278..cea48cb 100644 --- a/src/hnbap/HNBAP_U-RNTIQueryRequest.c +++ b/src/hnbap/HNBAP_U-RNTIQueryRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_u_RNTIQueryRequest_ies_specs_2 = { - sizeof(struct u_RNTIQueryRequest_ies), - offsetof(struct u_RNTIQueryRequest_ies, _asn_ctx), + sizeof(struct HNBAP_U_RNTIQueryRequest__u_RNTIQueryRequest_ies), + offsetof(struct HNBAP_U_RNTIQueryRequest__u_RNTIQueryRequest_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_U-RNTIQueryResponse.c b/src/hnbap/HNBAP_U-RNTIQueryResponse.c index eda66b0..98b9bef 100644 --- a/src/hnbap/HNBAP_U-RNTIQueryResponse.c +++ b/src/hnbap/HNBAP_U-RNTIQueryResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_u_RNTIQueryResponse_ies_specs_2 = { - sizeof(struct u_RNTIQueryResponse_ies), - offsetof(struct u_RNTIQueryResponse_ies, _asn_ctx), + sizeof(struct HNBAP_U_RNTIQueryResponse__u_RNTIQueryResponse_ies), + offsetof(struct HNBAP_U_RNTIQueryResponse__u_RNTIQueryResponse_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_UDP-Port-Number.c b/src/hnbap/HNBAP_UDP-Port-Number.c index 6a5ddb7..ccfea53 100644 --- a/src/hnbap/HNBAP_UDP-Port-Number.c +++ b/src/hnbap/HNBAP_UDP-Port-Number.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_UE-Capabilities.c b/src/hnbap/HNBAP_UE-Capabilities.c index 903df3e..1343a9c 100644 --- a/src/hnbap/HNBAP_UE-Capabilities.c +++ b/src/hnbap/HNBAP_UE-Capabilities.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_UE-Identity.c b/src/hnbap/HNBAP_UE-Identity.c index 8a820cc..8160d4e 100644 --- a/src/hnbap/HNBAP_UE-Identity.c +++ b/src/hnbap/HNBAP_UE-Identity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_UEDe-Register.c b/src/hnbap/HNBAP_UEDe-Register.c index 2e5d3ed..5d466f4 100644 --- a/src/hnbap/HNBAP_UEDe-Register.c +++ b/src/hnbap/HNBAP_UEDe-Register.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_ueDe_Register_ies_specs_2 = { - sizeof(struct ueDe_Register_ies), - offsetof(struct ueDe_Register_ies, _asn_ctx), + sizeof(struct HNBAP_UEDe_Register__ueDe_Register_ies), + offsetof(struct HNBAP_UEDe_Register__ueDe_Register_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_UERegisterAccept.c b/src/hnbap/HNBAP_UERegisterAccept.c index 02f5d5b..d7f2fd8 100644 --- a/src/hnbap/HNBAP_UERegisterAccept.c +++ b/src/hnbap/HNBAP_UERegisterAccept.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_ueRegisterAccept_ies_specs_2 = { - sizeof(struct ueRegisterAccept_ies), - offsetof(struct ueRegisterAccept_ies, _asn_ctx), + sizeof(struct HNBAP_UERegisterAccept__ueRegisterAccept_ies), + offsetof(struct HNBAP_UERegisterAccept__ueRegisterAccept_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_UERegisterReject.c b/src/hnbap/HNBAP_UERegisterReject.c index aab3e7f..4969dc9 100644 --- a/src/hnbap/HNBAP_UERegisterReject.c +++ b/src/hnbap/HNBAP_UERegisterReject.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_ueRegisterReject_ies_specs_2 = { - sizeof(struct ueRegisterReject_ies), - offsetof(struct ueRegisterReject_ies, _asn_ctx), + sizeof(struct HNBAP_UERegisterReject__ueRegisterReject_ies), + offsetof(struct HNBAP_UERegisterReject__ueRegisterReject_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_UERegisterRequest.c b/src/hnbap/HNBAP_UERegisterRequest.c index af2c267..95a97f7 100644 --- a/src/hnbap/HNBAP_UERegisterRequest.c +++ b/src/hnbap/HNBAP_UERegisterRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_ueRegisterRequest_ies_specs_2 = { - sizeof(struct ueRegisterRequest_ies), - offsetof(struct ueRegisterRequest_ies, _asn_ctx), + sizeof(struct HNBAP_UERegisterRequest__ueRegisterRequest_ies), + offsetof(struct HNBAP_UERegisterRequest__ueRegisterRequest_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_URAIdentity.c b/src/hnbap/HNBAP_URAIdentity.c index 4f9bff7..3bd347e 100644 --- a/src/hnbap/HNBAP_URAIdentity.c +++ b/src/hnbap/HNBAP_URAIdentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_URAIdentityList.c b/src/hnbap/HNBAP_URAIdentityList.c index 4530743..eaff2e9 100644 --- a/src/hnbap/HNBAP_URAIdentityList.c +++ b/src/hnbap/HNBAP_URAIdentityList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_UTRANCellID.c b/src/hnbap/HNBAP_UTRANCellID.c index 28d69fe..f0a7f6a 100644 --- a/src/hnbap/HNBAP_UTRANCellID.c +++ b/src/hnbap/HNBAP_UTRANCellID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_UnknownU-RNTIIndication.c b/src/hnbap/HNBAP_UnknownU-RNTIIndication.c index 188dcbf..f6c3011 100644 --- a/src/hnbap/HNBAP_UnknownU-RNTIIndication.c +++ b/src/hnbap/HNBAP_UnknownU-RNTIIndication.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_UnsuccessfulOutcome.c b/src/hnbap/HNBAP_UnsuccessfulOutcome.c index 4b83dda..30734ca 100644 --- a/src/hnbap/HNBAP_UnsuccessfulOutcome.c +++ b/src/hnbap/HNBAP_UnsuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Update-cause.c b/src/hnbap/HNBAP_Update-cause.c index 105e3b6..d7acd6c 100644 --- a/src/hnbap/HNBAP_Update-cause.c +++ b/src/hnbap/HNBAP_Update-cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am index 53dd609..15bee55 100644 --- a/src/hnbap/Makefile.am +++ b/src/hnbap/Makefile.am @@ -243,7 +243,7 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - ASN1C_PREFIX="HNBAP_" asn1c -R -gen-PER $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn + ASN1C_PREFIX="HNBAP_" asn1c -R -fcompound-names -gen-PER $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/hnbap $(ASN_MODULE_INC) # Finally copy *.c from buildir to srcdir: -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1bcbe047d233684647d6ffe9febb14a12c579696 Gerrit-Change-Number: 25991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:22:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:22:57 +0000 Subject: Change in osmo-iuh[master]: rua: Use asn1c flag -fcompound-names to avoid name collisions with ot... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25992 ) Change subject: rua: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... rua: Use asn1c flag -fcompound-names to avoid name collisions with other libs Change-Id: Id4e337cdc82c26922b7ca7f0fe8af523e9a0945c --- M include/osmocom/rua/RUA_Ansi-41-IDNNS.h M include/osmocom/rua/RUA_CN-DomainIndicator.h M include/osmocom/rua/RUA_CSGMembershipStatus.h M include/osmocom/rua/RUA_Cause.h M include/osmocom/rua/RUA_CauseMisc.h M include/osmocom/rua/RUA_CauseProtocol.h M include/osmocom/rua/RUA_CauseRadioNetwork.h M include/osmocom/rua/RUA_CauseTransport.h M include/osmocom/rua/RUA_Connect.h M include/osmocom/rua/RUA_ConnectionlessTransfer.h M include/osmocom/rua/RUA_Context-ID.h M include/osmocom/rua/RUA_Criticality.h M include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h M include/osmocom/rua/RUA_CriticalityDiagnostics.h M include/osmocom/rua/RUA_DirectTransfer.h M include/osmocom/rua/RUA_Disconnect.h M include/osmocom/rua/RUA_ErrorIndication.h M include/osmocom/rua/RUA_Establishment-Cause.h M include/osmocom/rua/RUA_Gsm-map-IDNNS.h M include/osmocom/rua/RUA_IE-Extensions.h M include/osmocom/rua/RUA_IE.h M include/osmocom/rua/RUA_InitiatingMessage.h M include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h M include/osmocom/rua/RUA_Presence.h M include/osmocom/rua/RUA_PrivateIE-ID.h M include/osmocom/rua/RUA_PrivateMessage.h M include/osmocom/rua/RUA_ProcedureCode.h M include/osmocom/rua/RUA_ProtocolIE-ID.h M include/osmocom/rua/RUA_RANAP-Message.h M include/osmocom/rua/RUA_RUA-PDU.h M include/osmocom/rua/RUA_RoutingParameter.h M include/osmocom/rua/RUA_SuccessfulOutcome.h M include/osmocom/rua/RUA_TriggeringMessage.h M include/osmocom/rua/RUA_TypeOfError.h M include/osmocom/rua/RUA_UnsuccessfulOutcome.h M src/rua/Makefile.am M src/rua/RUA_Ansi-41-IDNNS.c M src/rua/RUA_CN-DomainIndicator.c M src/rua/RUA_CSGMembershipStatus.c M src/rua/RUA_Cause.c M src/rua/RUA_CauseMisc.c M src/rua/RUA_CauseProtocol.c M src/rua/RUA_CauseRadioNetwork.c M src/rua/RUA_CauseTransport.c M src/rua/RUA_Connect.c M src/rua/RUA_ConnectionlessTransfer.c M src/rua/RUA_Context-ID.c M src/rua/RUA_Criticality.c M src/rua/RUA_CriticalityDiagnostics-IE-List.c M src/rua/RUA_CriticalityDiagnostics.c M src/rua/RUA_DirectTransfer.c M src/rua/RUA_Disconnect.c M src/rua/RUA_ErrorIndication.c M src/rua/RUA_Establishment-Cause.c M src/rua/RUA_Gsm-map-IDNNS.c M src/rua/RUA_IE-Extensions.c M src/rua/RUA_IE.c M src/rua/RUA_InitiatingMessage.c M src/rua/RUA_IntraDomainNasNodeSelector.c M src/rua/RUA_Presence.c M src/rua/RUA_PrivateIE-ID.c M src/rua/RUA_PrivateMessage.c M src/rua/RUA_ProcedureCode.c M src/rua/RUA_ProtocolIE-ID.c M src/rua/RUA_RANAP-Message.c M src/rua/RUA_RUA-PDU.c M src/rua/RUA_RoutingParameter.c M src/rua/RUA_SuccessfulOutcome.c M src/rua/RUA_TriggeringMessage.c M src/rua/RUA_TypeOfError.c M src/rua/RUA_UnsuccessfulOutcome.c 71 files changed, 187 insertions(+), 187 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/92/25992/1 diff --git a/include/osmocom/rua/RUA_Ansi-41-IDNNS.h b/include/osmocom/rua/RUA_Ansi-41-IDNNS.h index 26e5d62..9c78efd 100644 --- a/include/osmocom/rua/RUA_Ansi-41-IDNNS.h +++ b/include/osmocom/rua/RUA_Ansi-41-IDNNS.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Ansi_41_IDNNS_H_ diff --git a/include/osmocom/rua/RUA_CN-DomainIndicator.h b/include/osmocom/rua/RUA_CN-DomainIndicator.h index 507558b..60eadb9 100644 --- a/include/osmocom/rua/RUA_CN-DomainIndicator.h +++ b/include/osmocom/rua/RUA_CN-DomainIndicator.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CN_DomainIndicator_H_ diff --git a/include/osmocom/rua/RUA_CSGMembershipStatus.h b/include/osmocom/rua/RUA_CSGMembershipStatus.h index a4889ca..cc5cbb6 100644 --- a/include/osmocom/rua/RUA_CSGMembershipStatus.h +++ b/include/osmocom/rua/RUA_CSGMembershipStatus.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CSGMembershipStatus_H_ diff --git a/include/osmocom/rua/RUA_Cause.h b/include/osmocom/rua/RUA_Cause.h index 8269f9f..860b7e1 100644 --- a/include/osmocom/rua/RUA_Cause.h +++ b/include/osmocom/rua/RUA_Cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Cause_H_ diff --git a/include/osmocom/rua/RUA_CauseMisc.h b/include/osmocom/rua/RUA_CauseMisc.h index 45ca8db..ffb4fe7 100644 --- a/include/osmocom/rua/RUA_CauseMisc.h +++ b/include/osmocom/rua/RUA_CauseMisc.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * >From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CauseMisc_H_ diff --git a/include/osmocom/rua/RUA_CauseProtocol.h b/include/osmocom/rua/RUA_CauseProtocol.h index b857ce5..661105c 100644 --- a/include/osmocom/rua/RUA_CauseProtocol.h +++ b/include/osmocom/rua/RUA_CauseProtocol.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CauseProtocol_H_ diff --git a/include/osmocom/rua/RUA_CauseRadioNetwork.h b/include/osmocom/rua/RUA_CauseRadioNetwork.h index 6a28791..47a6ebd 100644 --- a/include/osmocom/rua/RUA_CauseRadioNetwork.h +++ b/include/osmocom/rua/RUA_CauseRadioNetwork.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CauseRadioNetwork_H_ diff --git a/include/osmocom/rua/RUA_CauseTransport.h b/include/osmocom/rua/RUA_CauseTransport.h index d46e434..a18cca5 100644 --- a/include/osmocom/rua/RUA_CauseTransport.h +++ b/include/osmocom/rua/RUA_CauseTransport.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CauseTransport_H_ diff --git a/include/osmocom/rua/RUA_Connect.h b/include/osmocom/rua/RUA_Connect.h index 7ea12e3..b006269 100644 --- a/include/osmocom/rua/RUA_Connect.h +++ b/include/osmocom/rua/RUA_Connect.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Connect_H_ @@ -23,7 +23,7 @@ /* RUA_Connect */ typedef struct RUA_Connect { - struct connect_ies { + struct RUA_Connect__connect_ies { A_SEQUENCE_OF(RUA_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_ConnectionlessTransfer.h b/include/osmocom/rua/RUA_ConnectionlessTransfer.h index 65e2078..c14ee5a 100644 --- a/include/osmocom/rua/RUA_ConnectionlessTransfer.h +++ b/include/osmocom/rua/RUA_ConnectionlessTransfer.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_ConnectionlessTransfer_H_ @@ -23,7 +23,7 @@ /* RUA_ConnectionlessTransfer */ typedef struct RUA_ConnectionlessTransfer { - struct connectionlessTransfer_ies { + struct RUA_ConnectionlessTransfer__connectionlessTransfer_ies { A_SEQUENCE_OF(RUA_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_Context-ID.h b/include/osmocom/rua/RUA_Context-ID.h index 45c9489..b96a7bb 100644 --- a/include/osmocom/rua/RUA_Context-ID.h +++ b/include/osmocom/rua/RUA_Context-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Context_ID_H_ diff --git a/include/osmocom/rua/RUA_Criticality.h b/include/osmocom/rua/RUA_Criticality.h index 781dd0c..26a330c 100644 --- a/include/osmocom/rua/RUA_Criticality.h +++ b/include/osmocom/rua/RUA_Criticality.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Criticality_H_ diff --git a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h index ae84738..0f948d3 100644 --- a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h +++ b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CriticalityDiagnostics_IE_List_H_ @@ -26,7 +26,7 @@ /* RUA_CriticalityDiagnostics-IE-List */ typedef struct RUA_CriticalityDiagnostics_IE_List { - A_SEQUENCE_OF(struct Member { + A_SEQUENCE_OF(struct RUA_CriticalityDiagnostics_IE_List__Member { RUA_Criticality_t iECriticality; RUA_ProtocolIE_ID_t iE_ID; RUA_TypeOfError_t typeOfError; diff --git a/include/osmocom/rua/RUA_CriticalityDiagnostics.h b/include/osmocom/rua/RUA_CriticalityDiagnostics.h index 98d2aa4..b4d6d96 100644 --- a/include/osmocom/rua/RUA_CriticalityDiagnostics.h +++ b/include/osmocom/rua/RUA_CriticalityDiagnostics.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CriticalityDiagnostics_H_ diff --git a/include/osmocom/rua/RUA_DirectTransfer.h b/include/osmocom/rua/RUA_DirectTransfer.h index dd72260..8de1593 100644 --- a/include/osmocom/rua/RUA_DirectTransfer.h +++ b/include/osmocom/rua/RUA_DirectTransfer.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_DirectTransfer_H_ @@ -23,7 +23,7 @@ /* RUA_DirectTransfer */ typedef struct RUA_DirectTransfer { - struct directTransfer_ies { + struct RUA_DirectTransfer__directTransfer_ies { A_SEQUENCE_OF(RUA_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_Disconnect.h b/include/osmocom/rua/RUA_Disconnect.h index 2e23cd9..ff24255 100644 --- a/include/osmocom/rua/RUA_Disconnect.h +++ b/include/osmocom/rua/RUA_Disconnect.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Disconnect_H_ @@ -23,7 +23,7 @@ /* RUA_Disconnect */ typedef struct RUA_Disconnect { - struct disconnect_ies { + struct RUA_Disconnect__disconnect_ies { A_SEQUENCE_OF(RUA_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_ErrorIndication.h b/include/osmocom/rua/RUA_ErrorIndication.h index a8e2124..28785f1 100644 --- a/include/osmocom/rua/RUA_ErrorIndication.h +++ b/include/osmocom/rua/RUA_ErrorIndication.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_ErrorIndication_H_ @@ -23,7 +23,7 @@ /* RUA_ErrorIndication */ typedef struct RUA_ErrorIndication { - struct errorIndication_ies { + struct RUA_ErrorIndication__errorIndication_ies { A_SEQUENCE_OF(RUA_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_Establishment-Cause.h b/include/osmocom/rua/RUA_Establishment-Cause.h index 0c855b4..ccc7521 100644 --- a/include/osmocom/rua/RUA_Establishment-Cause.h +++ b/include/osmocom/rua/RUA_Establishment-Cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Establishment_Cause_H_ diff --git a/include/osmocom/rua/RUA_Gsm-map-IDNNS.h b/include/osmocom/rua/RUA_Gsm-map-IDNNS.h index f2939fe..634103c 100644 --- a/include/osmocom/rua/RUA_Gsm-map-IDNNS.h +++ b/include/osmocom/rua/RUA_Gsm-map-IDNNS.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Gsm_map_IDNNS_H_ @@ -22,66 +22,66 @@ #endif /* Dependencies */ -typedef enum routingbasis_PR { - routingbasis_PR_NOTHING, /* No components present */ - routingbasis_PR_localPTMSI, - routingbasis_PR_tMSIofsamePLMN, - routingbasis_PR_tMSIofdifferentPLMN, - routingbasis_PR_iMSIresponsetopaging, - routingbasis_PR_iMSIcauseUEinitiatedEvent, - routingbasis_PR_iMEI, - routingbasis_PR_spare2, - routingbasis_PR_spare1 -} routingbasis_PR; +typedef enum RUA_Gsm_map_IDNNS__routingbasis_PR { + RUA_Gsm_map_IDNNS__routingbasis_PR_NOTHING, /* No components present */ + RUA_Gsm_map_IDNNS__routingbasis_PR_localPTMSI, + RUA_Gsm_map_IDNNS__routingbasis_PR_tMSIofsamePLMN, + RUA_Gsm_map_IDNNS__routingbasis_PR_tMSIofdifferentPLMN, + RUA_Gsm_map_IDNNS__routingbasis_PR_iMSIresponsetopaging, + RUA_Gsm_map_IDNNS__routingbasis_PR_iMSIcauseUEinitiatedEvent, + RUA_Gsm_map_IDNNS__routingbasis_PR_iMEI, + RUA_Gsm_map_IDNNS__routingbasis_PR_spare2, + RUA_Gsm_map_IDNNS__routingbasis_PR_spare1 +} RUA_Gsm_map_IDNNS__routingbasis_PR; /* RUA_Gsm-map-IDNNS */ typedef struct RUA_Gsm_map_IDNNS { - struct routingbasis { - routingbasis_PR present; + struct RUA_Gsm_map_IDNNS__routingbasis { + RUA_Gsm_map_IDNNS__routingbasis_PR present; union RUA_Gsm_map_IDNNS__routingbasis_u { - struct localPTMSI { + struct RUA_Gsm_map_IDNNS__routingbasis__localPTMSI { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } localPTMSI; - struct tMSIofsamePLMN { + struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofsamePLMN { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } tMSIofsamePLMN; - struct tMSIofdifferentPLMN { + struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofdifferentPLMN { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } tMSIofdifferentPLMN; - struct iMSIresponsetopaging { + struct RUA_Gsm_map_IDNNS__routingbasis__iMSIresponsetopaging { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } iMSIresponsetopaging; - struct iMSIcauseUEinitiatedEvent { + struct RUA_Gsm_map_IDNNS__routingbasis__iMSIcauseUEinitiatedEvent { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } iMSIcauseUEinitiatedEvent; - struct iMEI { + struct RUA_Gsm_map_IDNNS__routingbasis__iMEI { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } iMEI; - struct spare2 { + struct RUA_Gsm_map_IDNNS__routingbasis__spare2 { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } spare2; - struct spare1 { + struct RUA_Gsm_map_IDNNS__routingbasis__spare1 { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_IE-Extensions.h b/include/osmocom/rua/RUA_IE-Extensions.h index c92210f..364cbd5 100644 --- a/include/osmocom/rua/RUA_IE-Extensions.h +++ b/include/osmocom/rua/RUA_IE-Extensions.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_IE_Extensions_H_ diff --git a/include/osmocom/rua/RUA_IE.h b/include/osmocom/rua/RUA_IE.h index 509b140..2881366 100644 --- a/include/osmocom/rua/RUA_IE.h +++ b/include/osmocom/rua/RUA_IE.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_IE_H_ diff --git a/include/osmocom/rua/RUA_InitiatingMessage.h b/include/osmocom/rua/RUA_InitiatingMessage.h index d372834..61dd089 100644 --- a/include/osmocom/rua/RUA_InitiatingMessage.h +++ b/include/osmocom/rua/RUA_InitiatingMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_InitiatingMessage_H_ diff --git a/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h b/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h index 186bd8c..78c88e7 100644 --- a/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h +++ b/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_IntraDomainNasNodeSelector_H_ @@ -23,25 +23,25 @@ #endif /* Dependencies */ -typedef enum version_PR { - version_PR_NOTHING, /* No components present */ - version_PR_release99, - version_PR_later -} version_PR; -typedef enum cn_Type_PR { - cn_Type_PR_NOTHING, /* No components present */ - cn_Type_PR_gsm_Map_IDNNS, - cn_Type_PR_ansi_41_IDNNS -} cn_Type_PR; +typedef enum RUA_IntraDomainNasNodeSelector__version_PR { + RUA_IntraDomainNasNodeSelector__version_PR_NOTHING, /* No components present */ + RUA_IntraDomainNasNodeSelector__version_PR_release99, + RUA_IntraDomainNasNodeSelector__version_PR_later +} RUA_IntraDomainNasNodeSelector__version_PR; +typedef enum RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR { + RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR_NOTHING, /* No components present */ + RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR_gsm_Map_IDNNS, + RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR_ansi_41_IDNNS +} RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR; /* RUA_IntraDomainNasNodeSelector */ typedef struct RUA_IntraDomainNasNodeSelector { - struct version { - version_PR present; + struct RUA_IntraDomainNasNodeSelector__version { + RUA_IntraDomainNasNodeSelector__version_PR present; union RUA_IntraDomainNasNodeSelector__version_u { - struct release99 { - struct cn_Type { - cn_Type_PR present; + struct RUA_IntraDomainNasNodeSelector__version__release99 { + struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type { + RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR present; union RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_u { RUA_Gsm_map_IDNNS_t gsm_Map_IDNNS; RUA_Ansi_41_IDNNS_t ansi_41_IDNNS; @@ -54,7 +54,7 @@ /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } release99; - struct later { + struct RUA_IntraDomainNasNodeSelector__version__later { BIT_STRING_t futurecoding; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_Presence.h b/include/osmocom/rua/RUA_Presence.h index d583d7d..b241dae 100644 --- a/include/osmocom/rua/RUA_Presence.h +++ b/include/osmocom/rua/RUA_Presence.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Presence_H_ diff --git a/include/osmocom/rua/RUA_PrivateIE-ID.h b/include/osmocom/rua/RUA_PrivateIE-ID.h index 1aa7d07..602439d 100644 --- a/include/osmocom/rua/RUA_PrivateIE-ID.h +++ b/include/osmocom/rua/RUA_PrivateIE-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_PrivateIE_ID_H_ diff --git a/include/osmocom/rua/RUA_PrivateMessage.h b/include/osmocom/rua/RUA_PrivateMessage.h index fcea8fa..d385bf0 100644 --- a/include/osmocom/rua/RUA_PrivateMessage.h +++ b/include/osmocom/rua/RUA_PrivateMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_PrivateMessage_H_ @@ -23,7 +23,7 @@ /* RUA_PrivateMessage */ typedef struct RUA_PrivateMessage { - struct privateMessage_ies { + struct RUA_PrivateMessage__privateMessage_ies { A_SEQUENCE_OF(RUA_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_ProcedureCode.h b/include/osmocom/rua/RUA_ProcedureCode.h index 63c5974..616a6df 100644 --- a/include/osmocom/rua/RUA_ProcedureCode.h +++ b/include/osmocom/rua/RUA_ProcedureCode.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_ProcedureCode_H_ diff --git a/include/osmocom/rua/RUA_ProtocolIE-ID.h b/include/osmocom/rua/RUA_ProtocolIE-ID.h index 8fc5915..db53b3c 100644 --- a/include/osmocom/rua/RUA_ProtocolIE-ID.h +++ b/include/osmocom/rua/RUA_ProtocolIE-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_ProtocolIE_ID_H_ diff --git a/include/osmocom/rua/RUA_RANAP-Message.h b/include/osmocom/rua/RUA_RANAP-Message.h index b32c301..b5d2ffc 100644 --- a/include/osmocom/rua/RUA_RANAP-Message.h +++ b/include/osmocom/rua/RUA_RANAP-Message.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_RANAP_Message_H_ diff --git a/include/osmocom/rua/RUA_RUA-PDU.h b/include/osmocom/rua/RUA_RUA-PDU.h index 334da5b..77fb655 100644 --- a/include/osmocom/rua/RUA_RUA-PDU.h +++ b/include/osmocom/rua/RUA_RUA-PDU.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_RUA_PDU_H_ diff --git a/include/osmocom/rua/RUA_RoutingParameter.h b/include/osmocom/rua/RUA_RoutingParameter.h index b917f46..9766176 100644 --- a/include/osmocom/rua/RUA_RoutingParameter.h +++ b/include/osmocom/rua/RUA_RoutingParameter.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_RoutingParameter_H_ diff --git a/include/osmocom/rua/RUA_SuccessfulOutcome.h b/include/osmocom/rua/RUA_SuccessfulOutcome.h index fb8924e..b7208f5 100644 --- a/include/osmocom/rua/RUA_SuccessfulOutcome.h +++ b/include/osmocom/rua/RUA_SuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_SuccessfulOutcome_H_ diff --git a/include/osmocom/rua/RUA_TriggeringMessage.h b/include/osmocom/rua/RUA_TriggeringMessage.h index b6dfb8b..c1e017b 100644 --- a/include/osmocom/rua/RUA_TriggeringMessage.h +++ b/include/osmocom/rua/RUA_TriggeringMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_TriggeringMessage_H_ diff --git a/include/osmocom/rua/RUA_TypeOfError.h b/include/osmocom/rua/RUA_TypeOfError.h index 51bdab7..7d6cf41 100644 --- a/include/osmocom/rua/RUA_TypeOfError.h +++ b/include/osmocom/rua/RUA_TypeOfError.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_TypeOfError_H_ diff --git a/include/osmocom/rua/RUA_UnsuccessfulOutcome.h b/include/osmocom/rua/RUA_UnsuccessfulOutcome.h index b7058f9..09e1a13 100644 --- a/include/osmocom/rua/RUA_UnsuccessfulOutcome.h +++ b/include/osmocom/rua/RUA_UnsuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_UnsuccessfulOutcome_H_ diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am index 493a466..8cb2e7d 100644 --- a/src/rua/Makefile.am +++ b/src/rua/Makefile.am @@ -81,7 +81,7 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - ASN1C_PREFIX="RUA_" asn1c -R -gen-PER $(top_srcdir)/asn1/rua/RUA-CommonDataTypes.asn $(top_srcdir)/asn1/rua/RUA-Constants.asn $(top_srcdir)/asn1/rua/RUA-IEs.asn $(top_srcdir)/asn1/rua/RUA-PDU.asn + ASN1C_PREFIX="RUA_" asn1c -R -fcompound-names -gen-PER $(top_srcdir)/asn1/rua/RUA-CommonDataTypes.asn $(top_srcdir)/asn1/rua/RUA-Constants.asn $(top_srcdir)/asn1/rua/RUA-IEs.asn $(top_srcdir)/asn1/rua/RUA-PDU.asn # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/rua $(ASN_MODULE_INC) # Finally copy *.c from buildir to srcdir: diff --git a/src/rua/RUA_Ansi-41-IDNNS.c b/src/rua/RUA_Ansi-41-IDNNS.c index 3f1c77a..a43f85d 100644 --- a/src/rua/RUA_Ansi-41-IDNNS.c +++ b/src/rua/RUA_Ansi-41-IDNNS.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_CN-DomainIndicator.c b/src/rua/RUA_CN-DomainIndicator.c index 503258d..f690d14 100644 --- a/src/rua/RUA_CN-DomainIndicator.c +++ b/src/rua/RUA_CN-DomainIndicator.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_CSGMembershipStatus.c b/src/rua/RUA_CSGMembershipStatus.c index 7cc8c3e..8a32372 100644 --- a/src/rua/RUA_CSGMembershipStatus.c +++ b/src/rua/RUA_CSGMembershipStatus.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_Cause.c b/src/rua/RUA_Cause.c index 4fd0027..ac5548f 100644 --- a/src/rua/RUA_Cause.c +++ b/src/rua/RUA_Cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_CauseMisc.c b/src/rua/RUA_CauseMisc.c index fb9400b..8d66fae 100644 --- a/src/rua/RUA_CauseMisc.c +++ b/src/rua/RUA_CauseMisc.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_CauseProtocol.c b/src/rua/RUA_CauseProtocol.c index 48bcabf..e824c4e 100644 --- a/src/rua/RUA_CauseProtocol.c +++ b/src/rua/RUA_CauseProtocol.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_CauseRadioNetwork.c b/src/rua/RUA_CauseRadioNetwork.c index 9e3a6f6..aa1bd56 100644 --- a/src/rua/RUA_CauseRadioNetwork.c +++ b/src/rua/RUA_CauseRadioNetwork.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_CauseTransport.c b/src/rua/RUA_CauseTransport.c index 5cc4234..b47a014 100644 --- a/src/rua/RUA_CauseTransport.c +++ b/src/rua/RUA_CauseTransport.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_Connect.c b/src/rua/RUA_Connect.c index 291a0f5..94b0a09 100644 --- a/src/rua/RUA_Connect.c +++ b/src/rua/RUA_Connect.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_connect_ies_specs_2 = { - sizeof(struct connect_ies), - offsetof(struct connect_ies, _asn_ctx), + sizeof(struct RUA_Connect__connect_ies), + offsetof(struct RUA_Connect__connect_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/rua/RUA_ConnectionlessTransfer.c b/src/rua/RUA_ConnectionlessTransfer.c index c90e8ba..32b8ff1 100644 --- a/src/rua/RUA_ConnectionlessTransfer.c +++ b/src/rua/RUA_ConnectionlessTransfer.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_connectionlessTransfer_ies_specs_2 = { - sizeof(struct connectionlessTransfer_ies), - offsetof(struct connectionlessTransfer_ies, _asn_ctx), + sizeof(struct RUA_ConnectionlessTransfer__connectionlessTransfer_ies), + offsetof(struct RUA_ConnectionlessTransfer__connectionlessTransfer_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/rua/RUA_Context-ID.c b/src/rua/RUA_Context-ID.c index a0c5c3b..b542bdb 100644 --- a/src/rua/RUA_Context-ID.c +++ b/src/rua/RUA_Context-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_Criticality.c b/src/rua/RUA_Criticality.c index 05d27ad..8b292f5 100644 --- a/src/rua/RUA_Criticality.c +++ b/src/rua/RUA_Criticality.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_CriticalityDiagnostics-IE-List.c b/src/rua/RUA_CriticalityDiagnostics-IE-List.c index bc87f91..43a5179 100644 --- a/src/rua/RUA_CriticalityDiagnostics-IE-List.c +++ b/src/rua/RUA_CriticalityDiagnostics-IE-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -13,7 +13,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_Member_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct Member, iECriticality), + { ATF_NOFLAGS, 0, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, iECriticality), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_Criticality, @@ -22,7 +22,7 @@ 0, "iECriticality" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, iE_ID), + { ATF_NOFLAGS, 0, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, iE_ID), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_ProtocolIE_ID, @@ -31,7 +31,7 @@ 0, "iE-ID" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, typeOfError), + { ATF_NOFLAGS, 0, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, typeOfError), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_TypeOfError, @@ -40,7 +40,7 @@ 0, "typeOfError" }, - { ATF_POINTER, 1, offsetof(struct Member, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_IE_Extensions, @@ -61,8 +61,8 @@ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { - sizeof(struct Member), - offsetof(struct Member, _asn_ctx), + sizeof(struct RUA_CriticalityDiagnostics_IE_List__Member), + offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, _asn_ctx), asn_MAP_Member_tag2el_2, 4, /* Count of tags in the map */ asn_MAP_Member_oms_2, /* Optional members */ diff --git a/src/rua/RUA_CriticalityDiagnostics.c b/src/rua/RUA_CriticalityDiagnostics.c index 58791f5..dae8096 100644 --- a/src/rua/RUA_CriticalityDiagnostics.c +++ b/src/rua/RUA_CriticalityDiagnostics.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_DirectTransfer.c b/src/rua/RUA_DirectTransfer.c index d11cb88..a9c8de1 100644 --- a/src/rua/RUA_DirectTransfer.c +++ b/src/rua/RUA_DirectTransfer.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_directTransfer_ies_specs_2 = { - sizeof(struct directTransfer_ies), - offsetof(struct directTransfer_ies, _asn_ctx), + sizeof(struct RUA_DirectTransfer__directTransfer_ies), + offsetof(struct RUA_DirectTransfer__directTransfer_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/rua/RUA_Disconnect.c b/src/rua/RUA_Disconnect.c index e63be21..6dd5be1 100644 --- a/src/rua/RUA_Disconnect.c +++ b/src/rua/RUA_Disconnect.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_disconnect_ies_specs_2 = { - sizeof(struct disconnect_ies), - offsetof(struct disconnect_ies, _asn_ctx), + sizeof(struct RUA_Disconnect__disconnect_ies), + offsetof(struct RUA_Disconnect__disconnect_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/rua/RUA_ErrorIndication.c b/src/rua/RUA_ErrorIndication.c index 21293b1..564a1fd 100644 --- a/src/rua/RUA_ErrorIndication.c +++ b/src/rua/RUA_ErrorIndication.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_errorIndication_ies_specs_2 = { - sizeof(struct errorIndication_ies), - offsetof(struct errorIndication_ies, _asn_ctx), + sizeof(struct RUA_ErrorIndication__errorIndication_ies), + offsetof(struct RUA_ErrorIndication__errorIndication_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/rua/RUA_Establishment-Cause.c b/src/rua/RUA_Establishment-Cause.c index 0316b03..1f27b56 100644 --- a/src/rua/RUA_Establishment-Cause.c +++ b/src/rua/RUA_Establishment-Cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_Gsm-map-IDNNS.c b/src/rua/RUA_Gsm-map-IDNNS.c index 0c50092..7cdbebb 100644 --- a/src/rua/RUA_Gsm-map-IDNNS.c +++ b/src/rua/RUA_Gsm-map-IDNNS.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -13,7 +13,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_localPTMSI_3[] = { - { ATF_NOFLAGS, 0, offsetof(struct localPTMSI, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__localPTMSI, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -31,8 +31,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_localPTMSI_specs_3 = { - sizeof(struct localPTMSI), - offsetof(struct localPTMSI, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__localPTMSI), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__localPTMSI, _asn_ctx), asn_MAP_localPTMSI_tag2el_3, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -68,7 +68,7 @@ }; static asn_TYPE_member_t asn_MBR_tMSIofsamePLMN_5[] = { - { ATF_NOFLAGS, 0, offsetof(struct tMSIofsamePLMN, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofsamePLMN, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -86,8 +86,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_tMSIofsamePLMN_specs_5 = { - sizeof(struct tMSIofsamePLMN), - offsetof(struct tMSIofsamePLMN, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofsamePLMN), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofsamePLMN, _asn_ctx), asn_MAP_tMSIofsamePLMN_tag2el_5, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -123,7 +123,7 @@ }; static asn_TYPE_member_t asn_MBR_tMSIofdifferentPLMN_7[] = { - { ATF_NOFLAGS, 0, offsetof(struct tMSIofdifferentPLMN, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofdifferentPLMN, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -141,8 +141,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_tMSIofdifferentPLMN_specs_7 = { - sizeof(struct tMSIofdifferentPLMN), - offsetof(struct tMSIofdifferentPLMN, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofdifferentPLMN), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofdifferentPLMN, _asn_ctx), asn_MAP_tMSIofdifferentPLMN_tag2el_7, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -178,7 +178,7 @@ }; static asn_TYPE_member_t asn_MBR_iMSIresponsetopaging_9[] = { - { ATF_NOFLAGS, 0, offsetof(struct iMSIresponsetopaging, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIresponsetopaging, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -196,8 +196,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_iMSIresponsetopaging_specs_9 = { - sizeof(struct iMSIresponsetopaging), - offsetof(struct iMSIresponsetopaging, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIresponsetopaging), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIresponsetopaging, _asn_ctx), asn_MAP_iMSIresponsetopaging_tag2el_9, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -233,7 +233,7 @@ }; static asn_TYPE_member_t asn_MBR_iMSIcauseUEinitiatedEvent_11[] = { - { ATF_NOFLAGS, 0, offsetof(struct iMSIcauseUEinitiatedEvent, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIcauseUEinitiatedEvent, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -251,8 +251,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_iMSIcauseUEinitiatedEvent_specs_11 = { - sizeof(struct iMSIcauseUEinitiatedEvent), - offsetof(struct iMSIcauseUEinitiatedEvent, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIcauseUEinitiatedEvent), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIcauseUEinitiatedEvent, _asn_ctx), asn_MAP_iMSIcauseUEinitiatedEvent_tag2el_11, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -288,7 +288,7 @@ }; static asn_TYPE_member_t asn_MBR_iMEI_13[] = { - { ATF_NOFLAGS, 0, offsetof(struct iMEI, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMEI, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -306,8 +306,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_iMEI_specs_13 = { - sizeof(struct iMEI), - offsetof(struct iMEI, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__iMEI), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMEI, _asn_ctx), asn_MAP_iMEI_tag2el_13, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -343,7 +343,7 @@ }; static asn_TYPE_member_t asn_MBR_spare2_15[] = { - { ATF_NOFLAGS, 0, offsetof(struct spare2, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__spare2, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -361,8 +361,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_spare2_specs_15 = { - sizeof(struct spare2), - offsetof(struct spare2, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__spare2), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__spare2, _asn_ctx), asn_MAP_spare2_tag2el_15, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -398,7 +398,7 @@ }; static asn_TYPE_member_t asn_MBR_spare1_17[] = { - { ATF_NOFLAGS, 0, offsetof(struct spare1, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__spare1, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -416,8 +416,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_spare1_specs_17 = { - sizeof(struct spare1), - offsetof(struct spare1, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__spare1), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__spare1, _asn_ctx), asn_MAP_spare1_tag2el_17, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -453,7 +453,7 @@ }; static asn_TYPE_member_t asn_MBR_routingbasis_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.localPTMSI), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.localPTMSI), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, &asn_DEF_localPTMSI_3, @@ -462,7 +462,7 @@ 0, "localPTMSI" }, - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.tMSIofsamePLMN), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.tMSIofsamePLMN), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, &asn_DEF_tMSIofsamePLMN_5, @@ -471,7 +471,7 @@ 0, "tMSIofsamePLMN" }, - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.tMSIofdifferentPLMN), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.tMSIofdifferentPLMN), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 0, &asn_DEF_tMSIofdifferentPLMN_7, @@ -480,7 +480,7 @@ 0, "tMSIofdifferentPLMN" }, - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.iMSIresponsetopaging), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.iMSIresponsetopaging), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 0, &asn_DEF_iMSIresponsetopaging_9, @@ -489,7 +489,7 @@ 0, "iMSIresponsetopaging" }, - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.iMSIcauseUEinitiatedEvent), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.iMSIcauseUEinitiatedEvent), (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 0, &asn_DEF_iMSIcauseUEinitiatedEvent_11, @@ -498,7 +498,7 @@ 0, "iMSIcauseUEinitiatedEvent" }, - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.iMEI), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.iMEI), (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 0, &asn_DEF_iMEI_13, @@ -507,7 +507,7 @@ 0, "iMEI" }, - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.spare2), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.spare2), (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 0, &asn_DEF_spare2_15, @@ -516,7 +516,7 @@ 0, "spare2" }, - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.spare1), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.spare1), (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 0, &asn_DEF_spare1_17, @@ -537,10 +537,10 @@ { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 7, 0, 0 } /* spare1 */ }; static asn_CHOICE_specifics_t asn_SPC_routingbasis_specs_2 = { - sizeof(struct routingbasis), - offsetof(struct routingbasis, _asn_ctx), - offsetof(struct routingbasis, present), - sizeof(((struct routingbasis *)0)->present), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, _asn_ctx), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, present), + sizeof(((struct RUA_Gsm_map_IDNNS__routingbasis *)0)->present), asn_MAP_routingbasis_tag2el_2, 8, /* Count of tags in the map */ 0, diff --git a/src/rua/RUA_IE-Extensions.c b/src/rua/RUA_IE-Extensions.c index 2bcdc72..a90056f 100644 --- a/src/rua/RUA_IE-Extensions.c +++ b/src/rua/RUA_IE-Extensions.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_IE.c b/src/rua/RUA_IE.c index 73dc0b1..086787f 100644 --- a/src/rua/RUA_IE.c +++ b/src/rua/RUA_IE.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_InitiatingMessage.c b/src/rua/RUA_InitiatingMessage.c index b1278ec..1c6f2e4 100644 --- a/src/rua/RUA_InitiatingMessage.c +++ b/src/rua/RUA_InitiatingMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_IntraDomainNasNodeSelector.c b/src/rua/RUA_IntraDomainNasNodeSelector.c index 0653abb..fef8f2a 100644 --- a/src/rua/RUA_IntraDomainNasNodeSelector.c +++ b/src/rua/RUA_IntraDomainNasNodeSelector.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -54,7 +54,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_cn_Type_4[] = { - { ATF_NOFLAGS, 0, offsetof(struct cn_Type, choice.gsm_Map_IDNNS), + { ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type, choice.gsm_Map_IDNNS), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_Gsm_map_IDNNS, @@ -63,7 +63,7 @@ 0, "gsm-Map-IDNNS" }, - { ATF_NOFLAGS, 0, offsetof(struct cn_Type, choice.ansi_41_IDNNS), + { ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type, choice.ansi_41_IDNNS), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_Ansi_41_IDNNS, @@ -78,10 +78,10 @@ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* ansi-41-IDNNS */ }; static asn_CHOICE_specifics_t asn_SPC_cn_Type_specs_4 = { - sizeof(struct cn_Type), - offsetof(struct cn_Type, _asn_ctx), - offsetof(struct cn_Type, present), - sizeof(((struct cn_Type *)0)->present), + sizeof(struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type), + offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type, _asn_ctx), + offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type, present), + sizeof(((struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type *)0)->present), asn_MAP_cn_Type_tag2el_4, 2, /* Count of tags in the map */ 0, @@ -114,7 +114,7 @@ }; static asn_TYPE_member_t asn_MBR_release99_3[] = { - { ATF_NOFLAGS, 0, offsetof(struct release99, cn_Type), + { ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99, cn_Type), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), +1, /* EXPLICIT tag at current level */ &asn_DEF_cn_Type_4, @@ -132,8 +132,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* cn-Type */ }; static asn_SEQUENCE_specifics_t asn_SPC_release99_specs_3 = { - sizeof(struct release99), - offsetof(struct release99, _asn_ctx), + sizeof(struct RUA_IntraDomainNasNodeSelector__version__release99), + offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99, _asn_ctx), asn_MAP_release99_tag2el_3, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -169,7 +169,7 @@ }; static asn_TYPE_member_t asn_MBR_later_7[] = { - { ATF_NOFLAGS, 0, offsetof(struct later, futurecoding), + { ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version__later, futurecoding), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_BIT_STRING, @@ -187,8 +187,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* futurecoding */ }; static asn_SEQUENCE_specifics_t asn_SPC_later_specs_7 = { - sizeof(struct later), - offsetof(struct later, _asn_ctx), + sizeof(struct RUA_IntraDomainNasNodeSelector__version__later), + offsetof(struct RUA_IntraDomainNasNodeSelector__version__later, _asn_ctx), asn_MAP_later_tag2el_7, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -224,7 +224,7 @@ }; static asn_TYPE_member_t asn_MBR_version_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct version, choice.release99), + { ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version, choice.release99), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, &asn_DEF_release99_3, @@ -233,7 +233,7 @@ 0, "release99" }, - { ATF_NOFLAGS, 0, offsetof(struct version, choice.later), + { ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version, choice.later), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, &asn_DEF_later_7, @@ -248,10 +248,10 @@ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* later */ }; static asn_CHOICE_specifics_t asn_SPC_version_specs_2 = { - sizeof(struct version), - offsetof(struct version, _asn_ctx), - offsetof(struct version, present), - sizeof(((struct version *)0)->present), + sizeof(struct RUA_IntraDomainNasNodeSelector__version), + offsetof(struct RUA_IntraDomainNasNodeSelector__version, _asn_ctx), + offsetof(struct RUA_IntraDomainNasNodeSelector__version, present), + sizeof(((struct RUA_IntraDomainNasNodeSelector__version *)0)->present), asn_MAP_version_tag2el_2, 2, /* Count of tags in the map */ 0, diff --git a/src/rua/RUA_Presence.c b/src/rua/RUA_Presence.c index 581a3ed..6dd6c87 100644 --- a/src/rua/RUA_Presence.c +++ b/src/rua/RUA_Presence.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_PrivateIE-ID.c b/src/rua/RUA_PrivateIE-ID.c index 5947369..acc4b2a 100644 --- a/src/rua/RUA_PrivateIE-ID.c +++ b/src/rua/RUA_PrivateIE-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_PrivateMessage.c b/src/rua/RUA_PrivateMessage.c index efad1bb..dbe38b3 100644 --- a/src/rua/RUA_PrivateMessage.c +++ b/src/rua/RUA_PrivateMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_privateMessage_ies_specs_2 = { - sizeof(struct privateMessage_ies), - offsetof(struct privateMessage_ies, _asn_ctx), + sizeof(struct RUA_PrivateMessage__privateMessage_ies), + offsetof(struct RUA_PrivateMessage__privateMessage_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/rua/RUA_ProcedureCode.c b/src/rua/RUA_ProcedureCode.c index cf7da40..b597e51 100644 --- a/src/rua/RUA_ProcedureCode.c +++ b/src/rua/RUA_ProcedureCode.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_ProtocolIE-ID.c b/src/rua/RUA_ProtocolIE-ID.c index b264e16..3947767 100644 --- a/src/rua/RUA_ProtocolIE-ID.c +++ b/src/rua/RUA_ProtocolIE-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_RANAP-Message.c b/src/rua/RUA_RANAP-Message.c index 9998e84..978d829 100644 --- a/src/rua/RUA_RANAP-Message.c +++ b/src/rua/RUA_RANAP-Message.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_RUA-PDU.c b/src/rua/RUA_RUA-PDU.c index fb6cd28..a026497 100644 --- a/src/rua/RUA_RUA-PDU.c +++ b/src/rua/RUA_RUA-PDU.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_RoutingParameter.c b/src/rua/RUA_RoutingParameter.c index 8e83456..f96a5f0 100644 --- a/src/rua/RUA_RoutingParameter.c +++ b/src/rua/RUA_RoutingParameter.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_SuccessfulOutcome.c b/src/rua/RUA_SuccessfulOutcome.c index 183ed34..3bf39c5 100644 --- a/src/rua/RUA_SuccessfulOutcome.c +++ b/src/rua/RUA_SuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_TriggeringMessage.c b/src/rua/RUA_TriggeringMessage.c index b2e9128..4cfae4c 100644 --- a/src/rua/RUA_TriggeringMessage.c +++ b/src/rua/RUA_TriggeringMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_TypeOfError.c b/src/rua/RUA_TypeOfError.c index a8b081c..84018b3 100644 --- a/src/rua/RUA_TypeOfError.c +++ b/src/rua/RUA_TypeOfError.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_UnsuccessfulOutcome.c b/src/rua/RUA_UnsuccessfulOutcome.c index 5fa5a2e..2e2cca7 100644 --- a/src/rua/RUA_UnsuccessfulOutcome.c +++ b/src/rua/RUA_UnsuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Id4e337cdc82c26922b7ca7f0fe8af523e9a0945c Gerrit-Change-Number: 25992 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:22:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:22:57 +0000 Subject: Change in osmo-iuh[master]: sabp: Use asn1c flag -fcompound-names to avoid name collisions with o... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25993 ) Change subject: sabp: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... sabp: Use asn1c flag -fcompound-names to avoid name collisions with other libs Change-Id: I10ce4a9414768cdcf850feeca4088296e339919f --- M include/osmocom/sabp/SABP_Available-Bandwidth.h M include/osmocom/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.h M include/osmocom/sabp/SABP_Broadcast-Message-Content.h M include/osmocom/sabp/SABP_Category.h M include/osmocom/sabp/SABP_Cause.h M include/osmocom/sabp/SABP_Criticality-Diagnostics.h M include/osmocom/sabp/SABP_Criticality.h M include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h M include/osmocom/sabp/SABP_Data-Coding-Scheme.h M include/osmocom/sabp/SABP_Error-Indication.h M include/osmocom/sabp/SABP_Failure-List-Item.h M include/osmocom/sabp/SABP_Failure-List.h M include/osmocom/sabp/SABP_Failure.h M include/osmocom/sabp/SABP_IE-Extensions.h M include/osmocom/sabp/SABP_IE.h M include/osmocom/sabp/SABP_InitiatingMessage.h M include/osmocom/sabp/SABP_Kill-Complete.h M include/osmocom/sabp/SABP_Kill-Failure.h M include/osmocom/sabp/SABP_Kill.h M include/osmocom/sabp/SABP_Load-Query-Complete.h M include/osmocom/sabp/SABP_Load-Query-Failure.h M include/osmocom/sabp/SABP_Load-Query.h M include/osmocom/sabp/SABP_Message-Identifier.h M include/osmocom/sabp/SABP_Message-Status-Query-Complete.h M include/osmocom/sabp/SABP_Message-Status-Query-Failure.h M include/osmocom/sabp/SABP_Message-Status-Query.h M include/osmocom/sabp/SABP_MessageStructure.h M include/osmocom/sabp/SABP_New-Serial-Number.h M include/osmocom/sabp/SABP_Number-Of-Broadcasts-Completed-Info.h M include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.h M include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List.h M include/osmocom/sabp/SABP_Number-of-Broadcasts-Requested.h M include/osmocom/sabp/SABP_Old-Serial-Number.h M include/osmocom/sabp/SABP_Paging-ETWS-Indicator.h M include/osmocom/sabp/SABP_Presence.h M include/osmocom/sabp/SABP_ProcedureCode.h M include/osmocom/sabp/SABP_ProtocolExtensionID.h M include/osmocom/sabp/SABP_ProtocolIE-ID.h M include/osmocom/sabp/SABP_Radio-Resource-Loading-List-Item.h M include/osmocom/sabp/SABP_Radio-Resource-Loading-List.h M include/osmocom/sabp/SABP_Recovery-Indication.h M include/osmocom/sabp/SABP_Repetition-Period.h M include/osmocom/sabp/SABP_RepetitionNumber0.h M include/osmocom/sabp/SABP_RepetitionNumber1.h M include/osmocom/sabp/SABP_Reset-Complete.h M include/osmocom/sabp/SABP_Reset-Failure.h M include/osmocom/sabp/SABP_Reset.h M include/osmocom/sabp/SABP_Restart.h M include/osmocom/sabp/SABP_SABP-PDU.h M include/osmocom/sabp/SABP_Serial-Number.h M include/osmocom/sabp/SABP_Service-Area-Identifier.h M include/osmocom/sabp/SABP_Service-Areas-List.h M include/osmocom/sabp/SABP_SuccessfulOutcome.h M include/osmocom/sabp/SABP_TriggeringMessage.h M include/osmocom/sabp/SABP_TypeOfError.h M include/osmocom/sabp/SABP_UnsuccessfulOutcome.h M include/osmocom/sabp/SABP_Warning-Type.h M include/osmocom/sabp/SABP_WarningSecurityInfo.h M include/osmocom/sabp/SABP_Write-Replace-Complete.h M include/osmocom/sabp/SABP_Write-Replace-Failure.h M include/osmocom/sabp/SABP_Write-Replace.h M src/sabp/Makefile.am M src/sabp/SABP_Available-Bandwidth.c M src/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.c M src/sabp/SABP_Broadcast-Message-Content.c M src/sabp/SABP_Category.c M src/sabp/SABP_Cause.c M src/sabp/SABP_Criticality-Diagnostics.c M src/sabp/SABP_Criticality.c M src/sabp/SABP_CriticalityDiagnostics-IE-List.c M src/sabp/SABP_Data-Coding-Scheme.c M src/sabp/SABP_Error-Indication.c M src/sabp/SABP_Failure-List-Item.c M src/sabp/SABP_Failure-List.c M src/sabp/SABP_Failure.c M src/sabp/SABP_IE-Extensions.c M src/sabp/SABP_IE.c M src/sabp/SABP_InitiatingMessage.c M src/sabp/SABP_Kill-Complete.c M src/sabp/SABP_Kill-Failure.c M src/sabp/SABP_Kill.c M src/sabp/SABP_Load-Query-Complete.c M src/sabp/SABP_Load-Query-Failure.c M src/sabp/SABP_Load-Query.c M src/sabp/SABP_Message-Identifier.c M src/sabp/SABP_Message-Status-Query-Complete.c M src/sabp/SABP_Message-Status-Query-Failure.c M src/sabp/SABP_Message-Status-Query.c M src/sabp/SABP_MessageStructure.c M src/sabp/SABP_New-Serial-Number.c M src/sabp/SABP_Number-Of-Broadcasts-Completed-Info.c M src/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.c M src/sabp/SABP_Number-of-Broadcasts-Completed-List.c M src/sabp/SABP_Number-of-Broadcasts-Requested.c M src/sabp/SABP_Old-Serial-Number.c M src/sabp/SABP_Paging-ETWS-Indicator.c M src/sabp/SABP_Presence.c M src/sabp/SABP_ProcedureCode.c M src/sabp/SABP_ProtocolExtensionID.c M src/sabp/SABP_ProtocolIE-ID.c M src/sabp/SABP_Radio-Resource-Loading-List-Item.c M src/sabp/SABP_Radio-Resource-Loading-List.c M src/sabp/SABP_Recovery-Indication.c M src/sabp/SABP_Repetition-Period.c M src/sabp/SABP_RepetitionNumber0.c M src/sabp/SABP_RepetitionNumber1.c M src/sabp/SABP_Reset-Complete.c M src/sabp/SABP_Reset-Failure.c M src/sabp/SABP_Reset.c M src/sabp/SABP_Restart.c M src/sabp/SABP_SABP-PDU.c M src/sabp/SABP_Serial-Number.c M src/sabp/SABP_Service-Area-Identifier.c M src/sabp/SABP_Service-Areas-List.c M src/sabp/SABP_SuccessfulOutcome.c M src/sabp/SABP_TriggeringMessage.c M src/sabp/SABP_TypeOfError.c M src/sabp/SABP_UnsuccessfulOutcome.c M src/sabp/SABP_Warning-Type.c M src/sabp/SABP_WarningSecurityInfo.c M src/sabp/SABP_Write-Replace-Complete.c M src/sabp/SABP_Write-Replace-Failure.c M src/sabp/SABP_Write-Replace.c 123 files changed, 207 insertions(+), 210 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/93/25993/1 diff --git a/include/osmocom/sabp/SABP_Available-Bandwidth.h b/include/osmocom/sabp/SABP_Available-Bandwidth.h index f1c9200..b8d2950 100644 --- a/include/osmocom/sabp/SABP_Available-Bandwidth.h +++ b/include/osmocom/sabp/SABP_Available-Bandwidth.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Available_Bandwidth_H_ diff --git a/include/osmocom/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.h b/include/osmocom/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.h index bc653cb..6406f95 100644 --- a/include/osmocom/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.h +++ b/include/osmocom/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Broadcast_Message_Content_Validity_Indicator_H_ diff --git a/include/osmocom/sabp/SABP_Broadcast-Message-Content.h b/include/osmocom/sabp/SABP_Broadcast-Message-Content.h index 1e09bda..b5400a2 100644 --- a/include/osmocom/sabp/SABP_Broadcast-Message-Content.h +++ b/include/osmocom/sabp/SABP_Broadcast-Message-Content.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Broadcast_Message_Content_H_ diff --git a/include/osmocom/sabp/SABP_Category.h b/include/osmocom/sabp/SABP_Category.h index b7746d3..278e2cd 100644 --- a/include/osmocom/sabp/SABP_Category.h +++ b/include/osmocom/sabp/SABP_Category.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Category_H_ diff --git a/include/osmocom/sabp/SABP_Cause.h b/include/osmocom/sabp/SABP_Cause.h index c1e8db2..5c15c82 100644 --- a/include/osmocom/sabp/SABP_Cause.h +++ b/include/osmocom/sabp/SABP_Cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Cause_H_ diff --git a/include/osmocom/sabp/SABP_Criticality-Diagnostics.h b/include/osmocom/sabp/SABP_Criticality-Diagnostics.h index 4cf2ee3..0bc4074 100644 --- a/include/osmocom/sabp/SABP_Criticality-Diagnostics.h +++ b/include/osmocom/sabp/SABP_Criticality-Diagnostics.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Criticality_Diagnostics_H_ diff --git a/include/osmocom/sabp/SABP_Criticality.h b/include/osmocom/sabp/SABP_Criticality.h index 1d53c78..eaf8db6 100644 --- a/include/osmocom/sabp/SABP_Criticality.h +++ b/include/osmocom/sabp/SABP_Criticality.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Criticality_H_ diff --git a/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h b/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h index 066c0de..c454fd0 100644 --- a/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h +++ b/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_CriticalityDiagnostics_IE_List_H_ @@ -26,7 +26,7 @@ /* SABP_CriticalityDiagnostics-IE-List */ typedef struct SABP_CriticalityDiagnostics_IE_List { - A_SEQUENCE_OF(struct Member { + A_SEQUENCE_OF(struct SABP_CriticalityDiagnostics_IE_List__Member { SABP_Criticality_t iECriticality; SABP_ProtocolIE_ID_t iE_ID; SABP_RepetitionNumber0_t *repetitionNumber /* OPTIONAL */; diff --git a/include/osmocom/sabp/SABP_Data-Coding-Scheme.h b/include/osmocom/sabp/SABP_Data-Coding-Scheme.h index 377e969..909155f 100644 --- a/include/osmocom/sabp/SABP_Data-Coding-Scheme.h +++ b/include/osmocom/sabp/SABP_Data-Coding-Scheme.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Data_Coding_Scheme_H_ diff --git a/include/osmocom/sabp/SABP_Error-Indication.h b/include/osmocom/sabp/SABP_Error-Indication.h index 9b4018d..21ecc59 100644 --- a/include/osmocom/sabp/SABP_Error-Indication.h +++ b/include/osmocom/sabp/SABP_Error-Indication.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Error_Indication_H_ @@ -23,7 +23,7 @@ /* SABP_Error-Indication */ typedef struct SABP_Error_Indication { - struct error_Indication_ies { + struct SABP_Error_Indication__error_Indication_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Failure-List-Item.h b/include/osmocom/sabp/SABP_Failure-List-Item.h index e3f1ea1..dec3bf6 100644 --- a/include/osmocom/sabp/SABP_Failure-List-Item.h +++ b/include/osmocom/sabp/SABP_Failure-List-Item.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Failure_List_Item_H_ diff --git a/include/osmocom/sabp/SABP_Failure-List.h b/include/osmocom/sabp/SABP_Failure-List.h index 70a710f..26f8326 100644 --- a/include/osmocom/sabp/SABP_Failure-List.h +++ b/include/osmocom/sabp/SABP_Failure-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Failure_List_H_ diff --git a/include/osmocom/sabp/SABP_Failure.h b/include/osmocom/sabp/SABP_Failure.h index 5574143..e9b4f92 100644 --- a/include/osmocom/sabp/SABP_Failure.h +++ b/include/osmocom/sabp/SABP_Failure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Failure_H_ @@ -23,7 +23,7 @@ /* SABP_Failure */ typedef struct SABP_Failure { - struct failure_ies { + struct SABP_Failure__failure_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_IE-Extensions.h b/include/osmocom/sabp/SABP_IE-Extensions.h index 46f4b5e..b87c308 100644 --- a/include/osmocom/sabp/SABP_IE-Extensions.h +++ b/include/osmocom/sabp/SABP_IE-Extensions.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_IE_Extensions_H_ diff --git a/include/osmocom/sabp/SABP_IE.h b/include/osmocom/sabp/SABP_IE.h index e32ab2f..13c2537 100644 --- a/include/osmocom/sabp/SABP_IE.h +++ b/include/osmocom/sabp/SABP_IE.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_IE_H_ diff --git a/include/osmocom/sabp/SABP_InitiatingMessage.h b/include/osmocom/sabp/SABP_InitiatingMessage.h index 94c76f9..0da1b3a 100644 --- a/include/osmocom/sabp/SABP_InitiatingMessage.h +++ b/include/osmocom/sabp/SABP_InitiatingMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_InitiatingMessage_H_ diff --git a/include/osmocom/sabp/SABP_Kill-Complete.h b/include/osmocom/sabp/SABP_Kill-Complete.h index 8a44d10..6a1dce7 100644 --- a/include/osmocom/sabp/SABP_Kill-Complete.h +++ b/include/osmocom/sabp/SABP_Kill-Complete.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Kill_Complete_H_ @@ -23,7 +23,7 @@ /* SABP_Kill-Complete */ typedef struct SABP_Kill_Complete { - struct kill_Complete_ies { + struct SABP_Kill_Complete__kill_Complete_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Kill-Failure.h b/include/osmocom/sabp/SABP_Kill-Failure.h index 8e11918..59a71ae 100644 --- a/include/osmocom/sabp/SABP_Kill-Failure.h +++ b/include/osmocom/sabp/SABP_Kill-Failure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Kill_Failure_H_ @@ -23,7 +23,7 @@ /* SABP_Kill-Failure */ typedef struct SABP_Kill_Failure { - struct kill_Failure_ies { + struct SABP_Kill_Failure__kill_Failure_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Kill.h b/include/osmocom/sabp/SABP_Kill.h index cbd69bc..bc52825 100644 --- a/include/osmocom/sabp/SABP_Kill.h +++ b/include/osmocom/sabp/SABP_Kill.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Kill_H_ @@ -23,7 +23,7 @@ /* SABP_Kill */ typedef struct SABP_Kill { - struct kill_ies { + struct SABP_Kill__kill_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Load-Query-Complete.h b/include/osmocom/sabp/SABP_Load-Query-Complete.h index 6fc6c0e..4c034e7 100644 --- a/include/osmocom/sabp/SABP_Load-Query-Complete.h +++ b/include/osmocom/sabp/SABP_Load-Query-Complete.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Load_Query_Complete_H_ @@ -23,7 +23,7 @@ /* SABP_Load-Query-Complete */ typedef struct SABP_Load_Query_Complete { - struct load_Query_Complete_ies { + struct SABP_Load_Query_Complete__load_Query_Complete_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Load-Query-Failure.h b/include/osmocom/sabp/SABP_Load-Query-Failure.h index 892b89c..7697843 100644 --- a/include/osmocom/sabp/SABP_Load-Query-Failure.h +++ b/include/osmocom/sabp/SABP_Load-Query-Failure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Load_Query_Failure_H_ @@ -23,7 +23,7 @@ /* SABP_Load-Query-Failure */ typedef struct SABP_Load_Query_Failure { - struct load_Query_Failure_ies { + struct SABP_Load_Query_Failure__load_Query_Failure_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Load-Query.h b/include/osmocom/sabp/SABP_Load-Query.h index e510b43..3d49c65 100644 --- a/include/osmocom/sabp/SABP_Load-Query.h +++ b/include/osmocom/sabp/SABP_Load-Query.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Load_Query_H_ @@ -23,7 +23,7 @@ /* SABP_Load-Query */ typedef struct SABP_Load_Query { - struct load_Query_ies { + struct SABP_Load_Query__load_Query_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Message-Identifier.h b/include/osmocom/sabp/SABP_Message-Identifier.h index c3c8256..e6d64d0 100644 --- a/include/osmocom/sabp/SABP_Message-Identifier.h +++ b/include/osmocom/sabp/SABP_Message-Identifier.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Message_Identifier_H_ diff --git a/include/osmocom/sabp/SABP_Message-Status-Query-Complete.h b/include/osmocom/sabp/SABP_Message-Status-Query-Complete.h index b64c30f..1b6b564 100644 --- a/include/osmocom/sabp/SABP_Message-Status-Query-Complete.h +++ b/include/osmocom/sabp/SABP_Message-Status-Query-Complete.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Message_Status_Query_Complete_H_ @@ -23,7 +23,7 @@ /* SABP_Message-Status-Query-Complete */ typedef struct SABP_Message_Status_Query_Complete { - struct message_Status_Query_Complete_ies { + struct SABP_Message_Status_Query_Complete__message_Status_Query_Complete_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Message-Status-Query-Failure.h b/include/osmocom/sabp/SABP_Message-Status-Query-Failure.h index 655f7a1..bf2ade5 100644 --- a/include/osmocom/sabp/SABP_Message-Status-Query-Failure.h +++ b/include/osmocom/sabp/SABP_Message-Status-Query-Failure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * >From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Message_Status_Query_Failure_H_ @@ -23,7 +23,7 @@ /* SABP_Message-Status-Query-Failure */ typedef struct SABP_Message_Status_Query_Failure { - struct message_Status_Query_Failure_ies { + struct SABP_Message_Status_Query_Failure__message_Status_Query_Failure_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Message-Status-Query.h b/include/osmocom/sabp/SABP_Message-Status-Query.h index 4f53dda..be9f68e 100644 --- a/include/osmocom/sabp/SABP_Message-Status-Query.h +++ b/include/osmocom/sabp/SABP_Message-Status-Query.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Message_Status_Query_H_ @@ -23,7 +23,7 @@ /* SABP_Message-Status-Query */ typedef struct SABP_Message_Status_Query { - struct message_Status_Query_ies { + struct SABP_Message_Status_Query__message_Status_Query_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_MessageStructure.h b/include/osmocom/sabp/SABP_MessageStructure.h index 08b3d0d..ce3819f 100644 --- a/include/osmocom/sabp/SABP_MessageStructure.h +++ b/include/osmocom/sabp/SABP_MessageStructure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_MessageStructure_H_ @@ -25,7 +25,7 @@ /* SABP_MessageStructure */ typedef struct SABP_MessageStructure { - A_SEQUENCE_OF(struct MemberA { + A_SEQUENCE_OF(struct SABP_MessageStructure__Member { SABP_ProtocolIE_ID_t iE_ID; SABP_RepetitionNumber1_t *repetitionNumber /* OPTIONAL */; SABP_IE_Extensions_t *iE_Extensions /* OPTIONAL */; diff --git a/include/osmocom/sabp/SABP_New-Serial-Number.h b/include/osmocom/sabp/SABP_New-Serial-Number.h index 70b150d..2f17a3d 100644 --- a/include/osmocom/sabp/SABP_New-Serial-Number.h +++ b/include/osmocom/sabp/SABP_New-Serial-Number.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_New_Serial_Number_H_ diff --git a/include/osmocom/sabp/SABP_Number-Of-Broadcasts-Completed-Info.h b/include/osmocom/sabp/SABP_Number-Of-Broadcasts-Completed-Info.h index 4e4c464..15eaf19 100644 --- a/include/osmocom/sabp/SABP_Number-Of-Broadcasts-Completed-Info.h +++ b/include/osmocom/sabp/SABP_Number-Of-Broadcasts-Completed-Info.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Number_Of_Broadcasts_Completed_Info_H_ diff --git a/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.h b/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.h index 7d70ce5..76c66b6 100644 --- a/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.h +++ b/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Number_of_Broadcasts_Completed_List_Item_H_ diff --git a/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List.h b/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List.h index aae0caa..479821d 100644 --- a/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List.h +++ b/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Number_of_Broadcasts_Completed_List_H_ diff --git a/include/osmocom/sabp/SABP_Number-of-Broadcasts-Requested.h b/include/osmocom/sabp/SABP_Number-of-Broadcasts-Requested.h index 51b7880..aea577a 100644 --- a/include/osmocom/sabp/SABP_Number-of-Broadcasts-Requested.h +++ b/include/osmocom/sabp/SABP_Number-of-Broadcasts-Requested.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Number_of_Broadcasts_Requested_H_ diff --git a/include/osmocom/sabp/SABP_Old-Serial-Number.h b/include/osmocom/sabp/SABP_Old-Serial-Number.h index 751816c..860fc17 100644 --- a/include/osmocom/sabp/SABP_Old-Serial-Number.h +++ b/include/osmocom/sabp/SABP_Old-Serial-Number.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Old_Serial_Number_H_ diff --git a/include/osmocom/sabp/SABP_Paging-ETWS-Indicator.h b/include/osmocom/sabp/SABP_Paging-ETWS-Indicator.h index e0c3421..d8e7c74 100644 --- a/include/osmocom/sabp/SABP_Paging-ETWS-Indicator.h +++ b/include/osmocom/sabp/SABP_Paging-ETWS-Indicator.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Paging_ETWS_Indicator_H_ diff --git a/include/osmocom/sabp/SABP_Presence.h b/include/osmocom/sabp/SABP_Presence.h index ee73dae..f3270eb 100644 --- a/include/osmocom/sabp/SABP_Presence.h +++ b/include/osmocom/sabp/SABP_Presence.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Presence_H_ diff --git a/include/osmocom/sabp/SABP_ProcedureCode.h b/include/osmocom/sabp/SABP_ProcedureCode.h index b820876..bf114fe 100644 --- a/include/osmocom/sabp/SABP_ProcedureCode.h +++ b/include/osmocom/sabp/SABP_ProcedureCode.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_ProcedureCode_H_ diff --git a/include/osmocom/sabp/SABP_ProtocolExtensionID.h b/include/osmocom/sabp/SABP_ProtocolExtensionID.h index bc27bec..cce30ab 100644 --- a/include/osmocom/sabp/SABP_ProtocolExtensionID.h +++ b/include/osmocom/sabp/SABP_ProtocolExtensionID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_ProtocolExtensionID_H_ diff --git a/include/osmocom/sabp/SABP_ProtocolIE-ID.h b/include/osmocom/sabp/SABP_ProtocolIE-ID.h index e2eaf57..511eccb 100644 --- a/include/osmocom/sabp/SABP_ProtocolIE-ID.h +++ b/include/osmocom/sabp/SABP_ProtocolIE-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_ProtocolIE_ID_H_ diff --git a/include/osmocom/sabp/SABP_Radio-Resource-Loading-List-Item.h b/include/osmocom/sabp/SABP_Radio-Resource-Loading-List-Item.h index 9a62bed..3185c31 100644 --- a/include/osmocom/sabp/SABP_Radio-Resource-Loading-List-Item.h +++ b/include/osmocom/sabp/SABP_Radio-Resource-Loading-List-Item.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Radio_Resource_Loading_List_Item_H_ diff --git a/include/osmocom/sabp/SABP_Radio-Resource-Loading-List.h b/include/osmocom/sabp/SABP_Radio-Resource-Loading-List.h index d80fd78..5ff26a0 100644 --- a/include/osmocom/sabp/SABP_Radio-Resource-Loading-List.h +++ b/include/osmocom/sabp/SABP_Radio-Resource-Loading-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Radio_Resource_Loading_List_H_ diff --git a/include/osmocom/sabp/SABP_Recovery-Indication.h b/include/osmocom/sabp/SABP_Recovery-Indication.h index 0deb5a0..69608da 100644 --- a/include/osmocom/sabp/SABP_Recovery-Indication.h +++ b/include/osmocom/sabp/SABP_Recovery-Indication.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Recovery_Indication_H_ diff --git a/include/osmocom/sabp/SABP_Repetition-Period.h b/include/osmocom/sabp/SABP_Repetition-Period.h index 8eece01..9b9576f 100644 --- a/include/osmocom/sabp/SABP_Repetition-Period.h +++ b/include/osmocom/sabp/SABP_Repetition-Period.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Repetition_Period_H_ diff --git a/include/osmocom/sabp/SABP_RepetitionNumber0.h b/include/osmocom/sabp/SABP_RepetitionNumber0.h index 373356a..dcc8adf 100644 --- a/include/osmocom/sabp/SABP_RepetitionNumber0.h +++ b/include/osmocom/sabp/SABP_RepetitionNumber0.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_RepetitionNumber0_H_ diff --git a/include/osmocom/sabp/SABP_RepetitionNumber1.h b/include/osmocom/sabp/SABP_RepetitionNumber1.h index 01ba46a..e2e6f92 100644 --- a/include/osmocom/sabp/SABP_RepetitionNumber1.h +++ b/include/osmocom/sabp/SABP_RepetitionNumber1.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_RepetitionNumber1_H_ diff --git a/include/osmocom/sabp/SABP_Reset-Complete.h b/include/osmocom/sabp/SABP_Reset-Complete.h index edab63e..8870e38 100644 --- a/include/osmocom/sabp/SABP_Reset-Complete.h +++ b/include/osmocom/sabp/SABP_Reset-Complete.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Reset_Complete_H_ @@ -23,7 +23,7 @@ /* SABP_Reset-Complete */ typedef struct SABP_Reset_Complete { - struct reset_Complete_ies { + struct SABP_Reset_Complete__reset_Complete_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Reset-Failure.h b/include/osmocom/sabp/SABP_Reset-Failure.h index a6b6b29..899a118 100644 --- a/include/osmocom/sabp/SABP_Reset-Failure.h +++ b/include/osmocom/sabp/SABP_Reset-Failure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Reset_Failure_H_ @@ -23,7 +23,7 @@ /* SABP_Reset-Failure */ typedef struct SABP_Reset_Failure { - struct reset_Failure_ies { + struct SABP_Reset_Failure__reset_Failure_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Reset.h b/include/osmocom/sabp/SABP_Reset.h index 37cb0ff..4916a2b 100644 --- a/include/osmocom/sabp/SABP_Reset.h +++ b/include/osmocom/sabp/SABP_Reset.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Reset_H_ @@ -23,7 +23,7 @@ /* SABP_Reset */ typedef struct SABP_Reset { - struct reset_ies { + struct SABP_Reset__reset_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Restart.h b/include/osmocom/sabp/SABP_Restart.h index 2756a14..de5e9bb 100644 --- a/include/osmocom/sabp/SABP_Restart.h +++ b/include/osmocom/sabp/SABP_Restart.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Restart_H_ @@ -23,7 +23,7 @@ /* SABP_Restart */ typedef struct SABP_Restart { - struct restart_ies { + struct SABP_Restart__restart_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_SABP-PDU.h b/include/osmocom/sabp/SABP_SABP-PDU.h index 4cebd44..b7c93f9 100644 --- a/include/osmocom/sabp/SABP_SABP-PDU.h +++ b/include/osmocom/sabp/SABP_SABP-PDU.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_SABP_PDU_H_ diff --git a/include/osmocom/sabp/SABP_Serial-Number.h b/include/osmocom/sabp/SABP_Serial-Number.h index 4b9867c..ed34f55 100644 --- a/include/osmocom/sabp/SABP_Serial-Number.h +++ b/include/osmocom/sabp/SABP_Serial-Number.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Serial_Number_H_ diff --git a/include/osmocom/sabp/SABP_Service-Area-Identifier.h b/include/osmocom/sabp/SABP_Service-Area-Identifier.h index 31139bd..ea0934f 100644 --- a/include/osmocom/sabp/SABP_Service-Area-Identifier.h +++ b/include/osmocom/sabp/SABP_Service-Area-Identifier.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Service_Area_Identifier_H_ diff --git a/include/osmocom/sabp/SABP_Service-Areas-List.h b/include/osmocom/sabp/SABP_Service-Areas-List.h index ed5837a..34a07d6 100644 --- a/include/osmocom/sabp/SABP_Service-Areas-List.h +++ b/include/osmocom/sabp/SABP_Service-Areas-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Service_Areas_List_H_ diff --git a/include/osmocom/sabp/SABP_SuccessfulOutcome.h b/include/osmocom/sabp/SABP_SuccessfulOutcome.h index 8463a75..1e72de4 100644 --- a/include/osmocom/sabp/SABP_SuccessfulOutcome.h +++ b/include/osmocom/sabp/SABP_SuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_SuccessfulOutcome_H_ diff --git a/include/osmocom/sabp/SABP_TriggeringMessage.h b/include/osmocom/sabp/SABP_TriggeringMessage.h index c54d4bf..134ba69 100644 --- a/include/osmocom/sabp/SABP_TriggeringMessage.h +++ b/include/osmocom/sabp/SABP_TriggeringMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_TriggeringMessage_H_ diff --git a/include/osmocom/sabp/SABP_TypeOfError.h b/include/osmocom/sabp/SABP_TypeOfError.h index 28e556d..2c50d97 100644 --- a/include/osmocom/sabp/SABP_TypeOfError.h +++ b/include/osmocom/sabp/SABP_TypeOfError.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_TypeOfError_H_ diff --git a/include/osmocom/sabp/SABP_UnsuccessfulOutcome.h b/include/osmocom/sabp/SABP_UnsuccessfulOutcome.h index f7ef604..b4fe2c0 100644 --- a/include/osmocom/sabp/SABP_UnsuccessfulOutcome.h +++ b/include/osmocom/sabp/SABP_UnsuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_UnsuccessfulOutcome_H_ diff --git a/include/osmocom/sabp/SABP_Warning-Type.h b/include/osmocom/sabp/SABP_Warning-Type.h index bbd520b..96b7ef3 100644 --- a/include/osmocom/sabp/SABP_Warning-Type.h +++ b/include/osmocom/sabp/SABP_Warning-Type.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Warning_Type_H_ diff --git a/include/osmocom/sabp/SABP_WarningSecurityInfo.h b/include/osmocom/sabp/SABP_WarningSecurityInfo.h index 395c67b..4409492 100644 --- a/include/osmocom/sabp/SABP_WarningSecurityInfo.h +++ b/include/osmocom/sabp/SABP_WarningSecurityInfo.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_WarningSecurityInfo_H_ diff --git a/include/osmocom/sabp/SABP_Write-Replace-Complete.h b/include/osmocom/sabp/SABP_Write-Replace-Complete.h index e9c6b49..a9a8451 100644 --- a/include/osmocom/sabp/SABP_Write-Replace-Complete.h +++ b/include/osmocom/sabp/SABP_Write-Replace-Complete.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Write_Replace_Complete_H_ @@ -23,7 +23,7 @@ /* SABP_Write-Replace-Complete */ typedef struct SABP_Write_Replace_Complete { - struct write_Replace_Complete_ies { + struct SABP_Write_Replace_Complete__write_Replace_Complete_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Write-Replace-Failure.h b/include/osmocom/sabp/SABP_Write-Replace-Failure.h index 5a7a394..9bd3d6e 100644 --- a/include/osmocom/sabp/SABP_Write-Replace-Failure.h +++ b/include/osmocom/sabp/SABP_Write-Replace-Failure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Write_Replace_Failure_H_ @@ -23,7 +23,7 @@ /* SABP_Write-Replace-Failure */ typedef struct SABP_Write_Replace_Failure { - struct write_Replace_Failure_ies { + struct SABP_Write_Replace_Failure__write_Replace_Failure_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Write-Replace.h b/include/osmocom/sabp/SABP_Write-Replace.h index 33d9b04..f1b41eb 100644 --- a/include/osmocom/sabp/SABP_Write-Replace.h +++ b/include/osmocom/sabp/SABP_Write-Replace.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Write_Replace_H_ @@ -23,7 +23,7 @@ /* SABP_Write-Replace */ typedef struct SABP_Write_Replace { - struct write_Replace_ies { + struct SABP_Write_Replace__write_Replace_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/src/sabp/Makefile.am b/src/sabp/Makefile.am index faace13..0665db4 100644 --- a/src/sabp/Makefile.am +++ b/src/sabp/Makefile.am @@ -135,10 +135,7 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - ASN1C_PREFIX="SABP_" asn1c -R -gen-PER $(top_srcdir)/asn1/sabp/SABP-CommonDataTypes.asn $(top_srcdir)/asn1/sabp/SABP-Constants.asn $(top_srcdir)/asn1/sabp/SABP-IEs.asn $(top_srcdir)/asn1/sabp/SABP-PDU.asn -# change include style to `#include ' - sed -i 's/Member/MemberA/' SABP_MessageStructure.[ch] - sed -i 's/Member/MemberB/' SABP_Criticality-Diagnostics.[ch] + ASN1C_PREFIX="SABP_" asn1c -R -fcompound-names -gen-PER $(top_srcdir)/asn1/sabp/SABP-CommonDataTypes.asn $(top_srcdir)/asn1/sabp/SABP-Constants.asn $(top_srcdir)/asn1/sabp/SABP-IEs.asn $(top_srcdir)/asn1/sabp/SABP-PDU.asn # add missing includes sed -i '/#include "SABP_Serial-Number.h"/a #include ' SABP_Old-Serial-Number.h SABP_New-Serial-Number.h # change include style to `#include ' diff --git a/src/sabp/SABP_Available-Bandwidth.c b/src/sabp/SABP_Available-Bandwidth.c index e382a4f..8fb6bc4 100644 --- a/src/sabp/SABP_Available-Bandwidth.c +++ b/src/sabp/SABP_Available-Bandwidth.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.c b/src/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.c index c747aa5..1573bbc 100644 --- a/src/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.c +++ b/src/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Broadcast-Message-Content.c b/src/sabp/SABP_Broadcast-Message-Content.c index 83c6539..56f18aa 100644 --- a/src/sabp/SABP_Broadcast-Message-Content.c +++ b/src/sabp/SABP_Broadcast-Message-Content.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Category.c b/src/sabp/SABP_Category.c index d1ba3c8..b683cea 100644 --- a/src/sabp/SABP_Category.c +++ b/src/sabp/SABP_Category.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Cause.c b/src/sabp/SABP_Cause.c index 1e131c6..97e5391 100644 --- a/src/sabp/SABP_Cause.c +++ b/src/sabp/SABP_Cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Criticality-Diagnostics.c b/src/sabp/SABP_Criticality-Diagnostics.c index 9991966..bb29c4d 100644 --- a/src/sabp/SABP_Criticality-Diagnostics.c +++ b/src/sabp/SABP_Criticality-Diagnostics.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Criticality.c b/src/sabp/SABP_Criticality.c index e921697..d4d61e8 100644 --- a/src/sabp/SABP_Criticality.c +++ b/src/sabp/SABP_Criticality.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_CriticalityDiagnostics-IE-List.c b/src/sabp/SABP_CriticalityDiagnostics-IE-List.c index bfaddee..8c4c2f3 100644 --- a/src/sabp/SABP_CriticalityDiagnostics-IE-List.c +++ b/src/sabp/SABP_CriticalityDiagnostics-IE-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -13,7 +13,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_Member_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct Member, iECriticality), + { ATF_NOFLAGS, 0, offsetof(struct SABP_CriticalityDiagnostics_IE_List__Member, iECriticality), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_Criticality, @@ -22,7 +22,7 @@ 0, "iECriticality" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, iE_ID), + { ATF_NOFLAGS, 0, offsetof(struct SABP_CriticalityDiagnostics_IE_List__Member, iE_ID), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_ProtocolIE_ID, @@ -31,7 +31,7 @@ 0, "iE-ID" }, - { ATF_POINTER, 2, offsetof(struct Member, repetitionNumber), + { ATF_POINTER, 2, offsetof(struct SABP_CriticalityDiagnostics_IE_List__Member, repetitionNumber), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_RepetitionNumber0, @@ -40,7 +40,7 @@ 0, "repetitionNumber" }, - { ATF_POINTER, 1, offsetof(struct Member, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct SABP_CriticalityDiagnostics_IE_List__Member, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_IE_Extensions, @@ -61,8 +61,8 @@ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { - sizeof(struct Member), - offsetof(struct Member, _asn_ctx), + sizeof(struct SABP_CriticalityDiagnostics_IE_List__Member), + offsetof(struct SABP_CriticalityDiagnostics_IE_List__Member, _asn_ctx), asn_MAP_Member_tag2el_2, 4, /* Count of tags in the map */ asn_MAP_Member_oms_2, /* Optional members */ diff --git a/src/sabp/SABP_Data-Coding-Scheme.c b/src/sabp/SABP_Data-Coding-Scheme.c index 58f2ff8..d03ae62 100644 --- a/src/sabp/SABP_Data-Coding-Scheme.c +++ b/src/sabp/SABP_Data-Coding-Scheme.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Error-Indication.c b/src/sabp/SABP_Error-Indication.c index 93e171b..8ffb00b 100644 --- a/src/sabp/SABP_Error-Indication.c +++ b/src/sabp/SABP_Error-Indication.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_error_Indication_ies_specs_2 = { - sizeof(struct error_Indication_ies), - offsetof(struct error_Indication_ies, _asn_ctx), + sizeof(struct SABP_Error_Indication__error_Indication_ies), + offsetof(struct SABP_Error_Indication__error_Indication_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Failure-List-Item.c b/src/sabp/SABP_Failure-List-Item.c index 20e2c6c..eb22f59 100644 --- a/src/sabp/SABP_Failure-List-Item.c +++ b/src/sabp/SABP_Failure-List-Item.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Failure-List.c b/src/sabp/SABP_Failure-List.c index 33be93a..d9a1707 100644 --- a/src/sabp/SABP_Failure-List.c +++ b/src/sabp/SABP_Failure-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Failure.c b/src/sabp/SABP_Failure.c index b636e59..a35d8c1 100644 --- a/src/sabp/SABP_Failure.c +++ b/src/sabp/SABP_Failure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_failure_ies_specs_2 = { - sizeof(struct failure_ies), - offsetof(struct failure_ies, _asn_ctx), + sizeof(struct SABP_Failure__failure_ies), + offsetof(struct SABP_Failure__failure_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_IE-Extensions.c b/src/sabp/SABP_IE-Extensions.c index 5f4c7af..8ba550a 100644 --- a/src/sabp/SABP_IE-Extensions.c +++ b/src/sabp/SABP_IE-Extensions.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_IE.c b/src/sabp/SABP_IE.c index 44f6bd8..dfe7a5e 100644 --- a/src/sabp/SABP_IE.c +++ b/src/sabp/SABP_IE.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_InitiatingMessage.c b/src/sabp/SABP_InitiatingMessage.c index 210fa39..33f89ce 100644 --- a/src/sabp/SABP_InitiatingMessage.c +++ b/src/sabp/SABP_InitiatingMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Kill-Complete.c b/src/sabp/SABP_Kill-Complete.c index 3c8a4b4..991f40a 100644 --- a/src/sabp/SABP_Kill-Complete.c +++ b/src/sabp/SABP_Kill-Complete.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_kill_Complete_ies_specs_2 = { - sizeof(struct kill_Complete_ies), - offsetof(struct kill_Complete_ies, _asn_ctx), + sizeof(struct SABP_Kill_Complete__kill_Complete_ies), + offsetof(struct SABP_Kill_Complete__kill_Complete_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Kill-Failure.c b/src/sabp/SABP_Kill-Failure.c index b09fa79..ada7122 100644 --- a/src/sabp/SABP_Kill-Failure.c +++ b/src/sabp/SABP_Kill-Failure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_kill_Failure_ies_specs_2 = { - sizeof(struct kill_Failure_ies), - offsetof(struct kill_Failure_ies, _asn_ctx), + sizeof(struct SABP_Kill_Failure__kill_Failure_ies), + offsetof(struct SABP_Kill_Failure__kill_Failure_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Kill.c b/src/sabp/SABP_Kill.c index 4a3bb90..e9d5874 100644 --- a/src/sabp/SABP_Kill.c +++ b/src/sabp/SABP_Kill.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_kill_ies_specs_2 = { - sizeof(struct kill_ies), - offsetof(struct kill_ies, _asn_ctx), + sizeof(struct SABP_Kill__kill_ies), + offsetof(struct SABP_Kill__kill_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Load-Query-Complete.c b/src/sabp/SABP_Load-Query-Complete.c index c840a7e..4b03553 100644 --- a/src/sabp/SABP_Load-Query-Complete.c +++ b/src/sabp/SABP_Load-Query-Complete.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_load_Query_Complete_ies_specs_2 = { - sizeof(struct load_Query_Complete_ies), - offsetof(struct load_Query_Complete_ies, _asn_ctx), + sizeof(struct SABP_Load_Query_Complete__load_Query_Complete_ies), + offsetof(struct SABP_Load_Query_Complete__load_Query_Complete_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Load-Query-Failure.c b/src/sabp/SABP_Load-Query-Failure.c index 6ff5d49..ad04a30 100644 --- a/src/sabp/SABP_Load-Query-Failure.c +++ b/src/sabp/SABP_Load-Query-Failure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_load_Query_Failure_ies_specs_2 = { - sizeof(struct load_Query_Failure_ies), - offsetof(struct load_Query_Failure_ies, _asn_ctx), + sizeof(struct SABP_Load_Query_Failure__load_Query_Failure_ies), + offsetof(struct SABP_Load_Query_Failure__load_Query_Failure_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Load-Query.c b/src/sabp/SABP_Load-Query.c index 7ec4624..483d988 100644 --- a/src/sabp/SABP_Load-Query.c +++ b/src/sabp/SABP_Load-Query.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_load_Query_ies_specs_2 = { - sizeof(struct load_Query_ies), - offsetof(struct load_Query_ies, _asn_ctx), + sizeof(struct SABP_Load_Query__load_Query_ies), + offsetof(struct SABP_Load_Query__load_Query_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Message-Identifier.c b/src/sabp/SABP_Message-Identifier.c index 80d4d68..0d2432d 100644 --- a/src/sabp/SABP_Message-Identifier.c +++ b/src/sabp/SABP_Message-Identifier.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Message-Status-Query-Complete.c b/src/sabp/SABP_Message-Status-Query-Complete.c index f75adc2..6483ed1 100644 --- a/src/sabp/SABP_Message-Status-Query-Complete.c +++ b/src/sabp/SABP_Message-Status-Query-Complete.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_message_Status_Query_Complete_ies_specs_2 = { - sizeof(struct message_Status_Query_Complete_ies), - offsetof(struct message_Status_Query_Complete_ies, _asn_ctx), + sizeof(struct SABP_Message_Status_Query_Complete__message_Status_Query_Complete_ies), + offsetof(struct SABP_Message_Status_Query_Complete__message_Status_Query_Complete_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Message-Status-Query-Failure.c b/src/sabp/SABP_Message-Status-Query-Failure.c index 21601c8..3308a27 100644 --- a/src/sabp/SABP_Message-Status-Query-Failure.c +++ b/src/sabp/SABP_Message-Status-Query-Failure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_message_Status_Query_Failure_ies_specs_2 = { - sizeof(struct message_Status_Query_Failure_ies), - offsetof(struct message_Status_Query_Failure_ies, _asn_ctx), + sizeof(struct SABP_Message_Status_Query_Failure__message_Status_Query_Failure_ies), + offsetof(struct SABP_Message_Status_Query_Failure__message_Status_Query_Failure_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Message-Status-Query.c b/src/sabp/SABP_Message-Status-Query.c index 045aee9..5a0b5ac 100644 --- a/src/sabp/SABP_Message-Status-Query.c +++ b/src/sabp/SABP_Message-Status-Query.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_message_Status_Query_ies_specs_2 = { - sizeof(struct message_Status_Query_ies), - offsetof(struct message_Status_Query_ies, _asn_ctx), + sizeof(struct SABP_Message_Status_Query__message_Status_Query_ies), + offsetof(struct SABP_Message_Status_Query__message_Status_Query_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_MessageStructure.c b/src/sabp/SABP_MessageStructure.c index 53bd1f7..3c6755a 100644 --- a/src/sabp/SABP_MessageStructure.c +++ b/src/sabp/SABP_MessageStructure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -12,8 +12,8 @@ { APC_CONSTRAINED, 8, 8, 1l, 256l } /* (SIZE(1..256)) */, 0, 0 /* No PER value map */ }; -static asn_TYPE_member_t asn_MBR_MemberA_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct MemberA, iE_ID), +static asn_TYPE_member_t asn_MBR_Member_2[] = { + { ATF_NOFLAGS, 0, offsetof(struct SABP_MessageStructure__Member, iE_ID), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_ProtocolIE_ID, @@ -22,7 +22,7 @@ 0, "iE-ID" }, - { ATF_POINTER, 2, offsetof(struct MemberA, repetitionNumber), + { ATF_POINTER, 2, offsetof(struct SABP_MessageStructure__Member, repetitionNumber), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_RepetitionNumber1, @@ -31,7 +31,7 @@ 0, "repetitionNumber" }, - { ATF_POINTER, 1, offsetof(struct MemberA, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct SABP_MessageStructure__Member, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_IE_Extensions, @@ -41,27 +41,27 @@ "iE-Extensions" }, }; -static const int asn_MAP_MemberA_oms_2[] = { 1, 2 }; -static const ber_tlv_tag_t asn_DEF_MemberA_tags_2[] = { +static const int asn_MAP_Member_oms_2[] = { 1, 2 }; +static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; -static const asn_TYPE_tag2member_t asn_MAP_MemberA_tag2el_2[] = { +static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = { { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* iE-ID */ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* repetitionNumber */ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */ }; -static asn_SEQUENCE_specifics_t asn_SPC_MemberA_specs_2 = { - sizeof(struct MemberA), - offsetof(struct MemberA, _asn_ctx), - asn_MAP_MemberA_tag2el_2, +static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { + sizeof(struct SABP_MessageStructure__Member), + offsetof(struct SABP_MessageStructure__Member, _asn_ctx), + asn_MAP_Member_tag2el_2, 3, /* Count of tags in the map */ - asn_MAP_MemberA_oms_2, /* Optional members */ + asn_MAP_Member_oms_2, /* Optional members */ 2, 0, /* Root/Additions */ 2, /* Start extensions */ 4 /* Stop extensions */ }; static /* Use -fall-defs-global to expose */ -asn_TYPE_descriptor_t asn_DEF_MemberA_2 = { +asn_TYPE_descriptor_t asn_DEF_Member_2 = { "SEQUENCE", "SEQUENCE", SEQUENCE_free, @@ -76,23 +76,23 @@ SEQUENCE_decode_aper, SEQUENCE_encode_aper, 0, /* Use generic outmost tag fetcher */ - asn_DEF_MemberA_tags_2, - sizeof(asn_DEF_MemberA_tags_2) - /sizeof(asn_DEF_MemberA_tags_2[0]), /* 1 */ - asn_DEF_MemberA_tags_2, /* Same as above */ - sizeof(asn_DEF_MemberA_tags_2) - /sizeof(asn_DEF_MemberA_tags_2[0]), /* 1 */ + asn_DEF_Member_tags_2, + sizeof(asn_DEF_Member_tags_2) + /sizeof(asn_DEF_Member_tags_2[0]), /* 1 */ + asn_DEF_Member_tags_2, /* Same as above */ + sizeof(asn_DEF_Member_tags_2) + /sizeof(asn_DEF_Member_tags_2[0]), /* 1 */ 0, /* No PER visible constraints */ - asn_MBR_MemberA_2, + asn_MBR_Member_2, 3, /* Elements count */ - &asn_SPC_MemberA_specs_2 /* Additional specs */ + &asn_SPC_Member_specs_2 /* Additional specs */ }; static asn_TYPE_member_t asn_MBR_SABP_MessageStructure_1[] = { { ATF_POINTER, 0, 0, (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, - &asn_DEF_MemberA_2, + &asn_DEF_Member_2, 0, /* Defer constraints checking to the member type */ 0, /* No PER visible constraints */ 0, diff --git a/src/sabp/SABP_New-Serial-Number.c b/src/sabp/SABP_New-Serial-Number.c index 01e5f22..f4ffd1d 100644 --- a/src/sabp/SABP_New-Serial-Number.c +++ b/src/sabp/SABP_New-Serial-Number.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Number-Of-Broadcasts-Completed-Info.c b/src/sabp/SABP_Number-Of-Broadcasts-Completed-Info.c index b4c8f07..239bfc9 100644 --- a/src/sabp/SABP_Number-Of-Broadcasts-Completed-Info.c +++ b/src/sabp/SABP_Number-Of-Broadcasts-Completed-Info.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.c b/src/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.c index 78fc565..11693c0 100644 --- a/src/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.c +++ b/src/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Number-of-Broadcasts-Completed-List.c b/src/sabp/SABP_Number-of-Broadcasts-Completed-List.c index c76fc7f..26a42f0 100644 --- a/src/sabp/SABP_Number-of-Broadcasts-Completed-List.c +++ b/src/sabp/SABP_Number-of-Broadcasts-Completed-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Number-of-Broadcasts-Requested.c b/src/sabp/SABP_Number-of-Broadcasts-Requested.c index 4aea5fb..ce72ab7 100644 --- a/src/sabp/SABP_Number-of-Broadcasts-Requested.c +++ b/src/sabp/SABP_Number-of-Broadcasts-Requested.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Old-Serial-Number.c b/src/sabp/SABP_Old-Serial-Number.c index 48af4dd..d40c297 100644 --- a/src/sabp/SABP_Old-Serial-Number.c +++ b/src/sabp/SABP_Old-Serial-Number.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Paging-ETWS-Indicator.c b/src/sabp/SABP_Paging-ETWS-Indicator.c index 8c1a14a..1d8c847 100644 --- a/src/sabp/SABP_Paging-ETWS-Indicator.c +++ b/src/sabp/SABP_Paging-ETWS-Indicator.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Presence.c b/src/sabp/SABP_Presence.c index f1136ca..3706a4b 100644 --- a/src/sabp/SABP_Presence.c +++ b/src/sabp/SABP_Presence.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_ProcedureCode.c b/src/sabp/SABP_ProcedureCode.c index 7625d85..98df07b 100644 --- a/src/sabp/SABP_ProcedureCode.c +++ b/src/sabp/SABP_ProcedureCode.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_ProtocolExtensionID.c b/src/sabp/SABP_ProtocolExtensionID.c index 7ff84fb..9ac99a9 100644 --- a/src/sabp/SABP_ProtocolExtensionID.c +++ b/src/sabp/SABP_ProtocolExtensionID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_ProtocolIE-ID.c b/src/sabp/SABP_ProtocolIE-ID.c index 5d46525..2f2f704 100644 --- a/src/sabp/SABP_ProtocolIE-ID.c +++ b/src/sabp/SABP_ProtocolIE-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Radio-Resource-Loading-List-Item.c b/src/sabp/SABP_Radio-Resource-Loading-List-Item.c index 5970bd5..3abf2d7 100644 --- a/src/sabp/SABP_Radio-Resource-Loading-List-Item.c +++ b/src/sabp/SABP_Radio-Resource-Loading-List-Item.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Radio-Resource-Loading-List.c b/src/sabp/SABP_Radio-Resource-Loading-List.c index 5453300..9e1a208 100644 --- a/src/sabp/SABP_Radio-Resource-Loading-List.c +++ b/src/sabp/SABP_Radio-Resource-Loading-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Recovery-Indication.c b/src/sabp/SABP_Recovery-Indication.c index 2fa6e7c..4d84bcb 100644 --- a/src/sabp/SABP_Recovery-Indication.c +++ b/src/sabp/SABP_Recovery-Indication.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Repetition-Period.c b/src/sabp/SABP_Repetition-Period.c index 77c90e7..9cceab6 100644 --- a/src/sabp/SABP_Repetition-Period.c +++ b/src/sabp/SABP_Repetition-Period.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_RepetitionNumber0.c b/src/sabp/SABP_RepetitionNumber0.c index ae315cc..9a1b172 100644 --- a/src/sabp/SABP_RepetitionNumber0.c +++ b/src/sabp/SABP_RepetitionNumber0.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_RepetitionNumber1.c b/src/sabp/SABP_RepetitionNumber1.c index 48077be..f4befd1 100644 --- a/src/sabp/SABP_RepetitionNumber1.c +++ b/src/sabp/SABP_RepetitionNumber1.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Reset-Complete.c b/src/sabp/SABP_Reset-Complete.c index e1d6111..3ccf9d5 100644 --- a/src/sabp/SABP_Reset-Complete.c +++ b/src/sabp/SABP_Reset-Complete.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_reset_Complete_ies_specs_2 = { - sizeof(struct reset_Complete_ies), - offsetof(struct reset_Complete_ies, _asn_ctx), + sizeof(struct SABP_Reset_Complete__reset_Complete_ies), + offsetof(struct SABP_Reset_Complete__reset_Complete_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Reset-Failure.c b/src/sabp/SABP_Reset-Failure.c index deef866..08b07c8 100644 --- a/src/sabp/SABP_Reset-Failure.c +++ b/src/sabp/SABP_Reset-Failure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_reset_Failure_ies_specs_2 = { - sizeof(struct reset_Failure_ies), - offsetof(struct reset_Failure_ies, _asn_ctx), + sizeof(struct SABP_Reset_Failure__reset_Failure_ies), + offsetof(struct SABP_Reset_Failure__reset_Failure_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Reset.c b/src/sabp/SABP_Reset.c index 9d3801d..89e661f 100644 --- a/src/sabp/SABP_Reset.c +++ b/src/sabp/SABP_Reset.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_reset_ies_specs_2 = { - sizeof(struct reset_ies), - offsetof(struct reset_ies, _asn_ctx), + sizeof(struct SABP_Reset__reset_ies), + offsetof(struct SABP_Reset__reset_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Restart.c b/src/sabp/SABP_Restart.c index b00781a..dad513b 100644 --- a/src/sabp/SABP_Restart.c +++ b/src/sabp/SABP_Restart.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_restart_ies_specs_2 = { - sizeof(struct restart_ies), - offsetof(struct restart_ies, _asn_ctx), + sizeof(struct SABP_Restart__restart_ies), + offsetof(struct SABP_Restart__restart_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_SABP-PDU.c b/src/sabp/SABP_SABP-PDU.c index c8c91ab..c1e7f57 100644 --- a/src/sabp/SABP_SABP-PDU.c +++ b/src/sabp/SABP_SABP-PDU.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Serial-Number.c b/src/sabp/SABP_Serial-Number.c index 0358638..36dc3ed 100644 --- a/src/sabp/SABP_Serial-Number.c +++ b/src/sabp/SABP_Serial-Number.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Service-Area-Identifier.c b/src/sabp/SABP_Service-Area-Identifier.c index bc0dbba..495c3d5 100644 --- a/src/sabp/SABP_Service-Area-Identifier.c +++ b/src/sabp/SABP_Service-Area-Identifier.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Service-Areas-List.c b/src/sabp/SABP_Service-Areas-List.c index 79a4ae5..3a6b9ee 100644 --- a/src/sabp/SABP_Service-Areas-List.c +++ b/src/sabp/SABP_Service-Areas-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_SuccessfulOutcome.c b/src/sabp/SABP_SuccessfulOutcome.c index 5269eeb..7fd444c 100644 --- a/src/sabp/SABP_SuccessfulOutcome.c +++ b/src/sabp/SABP_SuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_TriggeringMessage.c b/src/sabp/SABP_TriggeringMessage.c index 2d01975..5ec0087 100644 --- a/src/sabp/SABP_TriggeringMessage.c +++ b/src/sabp/SABP_TriggeringMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_TypeOfError.c b/src/sabp/SABP_TypeOfError.c index 09793e1..1273b67 100644 --- a/src/sabp/SABP_TypeOfError.c +++ b/src/sabp/SABP_TypeOfError.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_UnsuccessfulOutcome.c b/src/sabp/SABP_UnsuccessfulOutcome.c index 33c4b4a..bd869f9 100644 --- a/src/sabp/SABP_UnsuccessfulOutcome.c +++ b/src/sabp/SABP_UnsuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Warning-Type.c b/src/sabp/SABP_Warning-Type.c index 725a982..9e958a2 100644 --- a/src/sabp/SABP_Warning-Type.c +++ b/src/sabp/SABP_Warning-Type.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_WarningSecurityInfo.c b/src/sabp/SABP_WarningSecurityInfo.c index 0294ad3..70859e3 100644 --- a/src/sabp/SABP_WarningSecurityInfo.c +++ b/src/sabp/SABP_WarningSecurityInfo.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Write-Replace-Complete.c b/src/sabp/SABP_Write-Replace-Complete.c index 1cebe1f..56f44d4 100644 --- a/src/sabp/SABP_Write-Replace-Complete.c +++ b/src/sabp/SABP_Write-Replace-Complete.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_write_Replace_Complete_ies_specs_2 = { - sizeof(struct write_Replace_Complete_ies), - offsetof(struct write_Replace_Complete_ies, _asn_ctx), + sizeof(struct SABP_Write_Replace_Complete__write_Replace_Complete_ies), + offsetof(struct SABP_Write_Replace_Complete__write_Replace_Complete_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Write-Replace-Failure.c b/src/sabp/SABP_Write-Replace-Failure.c index 40f49bd..9d1fad3 100644 --- a/src/sabp/SABP_Write-Replace-Failure.c +++ b/src/sabp/SABP_Write-Replace-Failure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_write_Replace_Failure_ies_specs_2 = { - sizeof(struct write_Replace_Failure_ies), - offsetof(struct write_Replace_Failure_ies, _asn_ctx), + sizeof(struct SABP_Write_Replace_Failure__write_Replace_Failure_ies), + offsetof(struct SABP_Write_Replace_Failure__write_Replace_Failure_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Write-Replace.c b/src/sabp/SABP_Write-Replace.c index 23b406c..994e145 100644 --- a/src/sabp/SABP_Write-Replace.c +++ b/src/sabp/SABP_Write-Replace.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_write_Replace_ies_specs_2 = { - sizeof(struct write_Replace_ies), - offsetof(struct write_Replace_ies, _asn_ctx), + sizeof(struct SABP_Write_Replace__write_Replace_ies), + offsetof(struct SABP_Write_Replace__write_Replace_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I10ce4a9414768cdcf850feeca4088296e339919f Gerrit-Change-Number: 25993 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:22:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:22:58 +0000 Subject: Change in osmo-iuh[master]: ranap: Use asn1c flag -fcompound-names to avoid name collisions with ... References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25994 ) Change subject: ranap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... ranap: Use asn1c flag -fcompound-names to avoid name collisions with other libs Change-Id: Iba106dcc18e3d429b4b9808610a44ac29b798172 --- M include/osmocom/ranap/RANAP_APN.h M include/osmocom/ranap/RANAP_AccuracyFulfilmentIndicator.h M include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameters.h M include/osmocom/ranap/RANAP_AlternativeRABConfigurationRequest.h M include/osmocom/ranap/RANAP_AreaIdentity.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameters.h M include/osmocom/ranap/RANAP_AuthorisedPLMNs.h M include/osmocom/ranap/RANAP_AuthorisedSNAs.h M include/osmocom/ranap/RANAP_BindingID.h M include/osmocom/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.h M include/osmocom/ranap/RANAP_CGI.h M include/osmocom/ranap/RANAP_CI.h M include/osmocom/ranap/RANAP_CN-DeactivateTrace.h M include/osmocom/ranap/RANAP_CN-DomainIndicator.h M include/osmocom/ranap/RANAP_CN-ID.h M include/osmocom/ranap/RANAP_CN-InvokeTrace.h M include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h M include/osmocom/ranap/RANAP_CSFB-Information.h M include/osmocom/ranap/RANAP_CSG-Id-List.h M include/osmocom/ranap/RANAP_CSG-Id.h M include/osmocom/ranap/RANAP_CSG-Membership-Status.h M include/osmocom/ranap/RANAP_Cause.h M include/osmocom/ranap/RANAP_CauseMisc.h M include/osmocom/ranap/RANAP_CauseNAS.h M include/osmocom/ranap/RANAP_CauseNon-Standard.h M include/osmocom/ranap/RANAP_CauseProtocol.h M include/osmocom/ranap/RANAP_CauseRadioNetwork.h M include/osmocom/ranap/RANAP_CauseRadioNetworkExtension.h M include/osmocom/ranap/RANAP_CauseTransmissionNetwork.h M include/osmocom/ranap/RANAP_Cell-Access-Mode.h M include/osmocom/ranap/RANAP_Cell-Capacity-Class-Value.h M include/osmocom/ranap/RANAP_Cell-Id.h M include/osmocom/ranap/RANAP_CellBased.h M include/osmocom/ranap/RANAP_CellIdList.h M include/osmocom/ranap/RANAP_CellLoadInformation.h M include/osmocom/ranap/RANAP_CellLoadInformationGroup.h M include/osmocom/ranap/RANAP_CellType.h M include/osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h M include/osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h M include/osmocom/ranap/RANAP_ClassmarkInformation2.h M include/osmocom/ranap/RANAP_ClassmarkInformation3.h M include/osmocom/ranap/RANAP_ClientType.h M include/osmocom/ranap/RANAP_CommonID.h M include/osmocom/ranap/RANAP_Correlation-ID.h M include/osmocom/ranap/RANAP_Criticality.h M include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h M include/osmocom/ranap/RANAP_CriticalityDiagnostics.h M include/osmocom/ranap/RANAP_D-RNTI.h M include/osmocom/ranap/RANAP_DCH-ID.h M include/osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_DL-N-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_DRX-CycleLengthCoefficient.h M include/osmocom/ranap/RANAP_DSCH-ID.h M include/osmocom/ranap/RANAP_DataPDUType.h M include/osmocom/ranap/RANAP_DataVolumeList.h M include/osmocom/ranap/RANAP_DataVolumeReference.h M include/osmocom/ranap/RANAP_DataVolumeReport.h M include/osmocom/ranap/RANAP_DataVolumeReportList.h M include/osmocom/ranap/RANAP_DataVolumeReportRequest.h M include/osmocom/ranap/RANAP_DataVolumeReportingIndication.h M include/osmocom/ranap/RANAP_DeliveryOfErroneousSDU.h M include/osmocom/ranap/RANAP_DeliveryOrder.h M include/osmocom/ranap/RANAP_DeltaRAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_DirectInformationTransfer.h M include/osmocom/ranap/RANAP_DirectReportingIndicator.h M include/osmocom/ranap/RANAP_DirectTransfer-IE-ContainerList.h M include/osmocom/ranap/RANAP_DirectTransfer.h M include/osmocom/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h M include/osmocom/ranap/RANAP_E-DCH-MAC-d-Flow-ID.h M include/osmocom/ranap/RANAP_E-UTRAN-Service-Handover.h M include/osmocom/ranap/RANAP_EARFCN-Extended.h M include/osmocom/ranap/RANAP_ENB-ID.h M include/osmocom/ranap/RANAP_EUTRANFrequencies.h M include/osmocom/ranap/RANAP_EncryptionAlgorithm.h M include/osmocom/ranap/RANAP_EncryptionInformation.h M include/osmocom/ranap/RANAP_EncryptionKey.h M include/osmocom/ranap/RANAP_End-Of-CSFB.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteConfirm.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteFailure.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteRequest.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteResponse.h M include/osmocom/ranap/RANAP_EquipmentsToBeTraced.h M include/osmocom/ranap/RANAP_ErrorIndication.h M include/osmocom/ranap/RANAP_Event.h M include/osmocom/ranap/RANAP_Event1F-Parameters.h M include/osmocom/ranap/RANAP_Event1I-Parameters.h M include/osmocom/ranap/RANAP_ExtendedGuaranteedBitrate.h M include/osmocom/ranap/RANAP_ExtendedMaxBitrate.h M include/osmocom/ranap/RANAP_ExtendedRNC-ID.h M include/osmocom/ranap/RANAP_ForwardSRNS-Context.h M include/osmocom/ranap/RANAP_ForwardingIndication.h M include/osmocom/ranap/RANAP_FrameSequenceNumber.h M include/osmocom/ranap/RANAP_FrequenceLayerConvergenceFlag.h M include/osmocom/ranap/RANAP_GA-AltitudeAndDirection.h M include/osmocom/ranap/RANAP_GA-EllipsoidArc.h M include/osmocom/ranap/RANAP_GA-Point.h M include/osmocom/ranap/RANAP_GA-PointWithAltitude.h M include/osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h M include/osmocom/ranap/RANAP_GA-PointWithUnCertainty.h M include/osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h M include/osmocom/ranap/RANAP_GA-Polygon.h M include/osmocom/ranap/RANAP_GA-UncertaintyEllipse.h M include/osmocom/ranap/RANAP_GANSS-PositioningDataSet.h M include/osmocom/ranap/RANAP_GANSS-PositioningMethodAndUsage.h M include/osmocom/ranap/RANAP_GERAN-BSC-Container.h M include/osmocom/ranap/RANAP_GERAN-Cell-ID.h M include/osmocom/ranap/RANAP_GERAN-Classmark.h M include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h M include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h M include/osmocom/ranap/RANAP_GTP-TEI.h M include/osmocom/ranap/RANAP_GeographicalArea.h M include/osmocom/ranap/RANAP_GeographicalCoordinates.h M include/osmocom/ranap/RANAP_GlobalCN-ID.h M include/osmocom/ranap/RANAP_GlobalRNC-ID.h M include/osmocom/ranap/RANAP_GuaranteedBitrate.h M include/osmocom/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.h M include/osmocom/ranap/RANAP_HigherBitratesThan16MbpsFlag.h M include/osmocom/ranap/RANAP_HorizontalSpeedAndBearing.h M include/osmocom/ranap/RANAP_HorizontalVelocity.h M include/osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h M include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h M include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h M include/osmocom/ranap/RANAP_IE-Extensions.h M include/osmocom/ranap/RANAP_IE.h M include/osmocom/ranap/RANAP_IMEI.h M include/osmocom/ranap/RANAP_IMEIGroup.h M include/osmocom/ranap/RANAP_IMEIList.h M include/osmocom/ranap/RANAP_IMEISV.h M include/osmocom/ranap/RANAP_IMEISVGroup.h M include/osmocom/ranap/RANAP_IMEISVList.h M include/osmocom/ranap/RANAP_IMSI.h M include/osmocom/ranap/RANAP_IPMulticastAddress.h M include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h M include/osmocom/ranap/RANAP_IRATmeasurementParameters.h M include/osmocom/ranap/RANAP_ImmediateMDT.h M include/osmocom/ranap/RANAP_IncludeVelocity.h M include/osmocom/ranap/RANAP_InformationExchangeID.h M include/osmocom/ranap/RANAP_InformationExchangeType.h M include/osmocom/ranap/RANAP_InformationRequestType.h M include/osmocom/ranap/RANAP_InformationRequested.h M include/osmocom/ranap/RANAP_InformationTransferConfirmation.h M include/osmocom/ranap/RANAP_InformationTransferFailure.h M include/osmocom/ranap/RANAP_InformationTransferID.h M include/osmocom/ranap/RANAP_InformationTransferIndication.h M include/osmocom/ranap/RANAP_InformationTransferType.h M include/osmocom/ranap/RANAP_InitialUE-Message.h M include/osmocom/ranap/RANAP_InitiatingMessage.h M include/osmocom/ranap/RANAP_IntegrityProtectionAlgorithm.h M include/osmocom/ranap/RANAP_IntegrityProtectionInformation.h M include/osmocom/ranap/RANAP_IntegrityProtectionKey.h M include/osmocom/ranap/RANAP_InterSystemInformation-TransparentContainer.h M include/osmocom/ranap/RANAP_InterSystemInformationTransferType.h M include/osmocom/ranap/RANAP_InterfacesToTraceItem.h M include/osmocom/ranap/RANAP_Iu-ReleaseCommand.h M include/osmocom/ranap/RANAP_Iu-ReleaseComplete.h M include/osmocom/ranap/RANAP_Iu-ReleaseRequest.h M include/osmocom/ranap/RANAP_IuSigConId-IE-ContainerList.h M include/osmocom/ranap/RANAP_IuSignallingConnectionIdentifier.h M include/osmocom/ranap/RANAP_IuTransportAssociation.h M include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h M include/osmocom/ranap/RANAP_KeyStatus.h M include/osmocom/ranap/RANAP_L3-Information.h M include/osmocom/ranap/RANAP_LA-LIST.h M include/osmocom/ranap/RANAP_LABased.h M include/osmocom/ranap/RANAP_LAC.h M include/osmocom/ranap/RANAP_LAI-List.h M include/osmocom/ranap/RANAP_LAI.h M include/osmocom/ranap/RANAP_LAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_LHN-ID.h M include/osmocom/ranap/RANAP_LastKnownServiceArea.h M include/osmocom/ranap/RANAP_LastVisitedUTRANCell-Item.h M include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h M include/osmocom/ranap/RANAP_Links-to-log.h M include/osmocom/ranap/RANAP_ListOF-SNAs.h M include/osmocom/ranap/RANAP_ListOfInterfacesToTrace.h M include/osmocom/ranap/RANAP_LoadValue.h M include/osmocom/ranap/RANAP_LocationRelatedDataFailure.h M include/osmocom/ranap/RANAP_LocationRelatedDataRequest.h M include/osmocom/ranap/RANAP_LocationRelatedDataRequestType.h M include/osmocom/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.h M include/osmocom/ranap/RANAP_LocationRelatedDataResponse.h M include/osmocom/ranap/RANAP_LocationReport.h M include/osmocom/ranap/RANAP_LocationReportingControl.h M include/osmocom/ranap/RANAP_LocationReportingTransferInformation.h M include/osmocom/ranap/RANAP_LoggedMDT.h M include/osmocom/ranap/RANAP_LoggingDuration.h M include/osmocom/ranap/RANAP_LoggingInterval.h M include/osmocom/ranap/RANAP_M1Report.h M include/osmocom/ranap/RANAP_M2Report.h M include/osmocom/ranap/RANAP_M4-Collection-Parameters.h M include/osmocom/ranap/RANAP_M4-Period.h M include/osmocom/ranap/RANAP_M4-Threshold.h M include/osmocom/ranap/RANAP_M4Report.h M include/osmocom/ranap/RANAP_M5-Period.h M include/osmocom/ranap/RANAP_M5Report.h M include/osmocom/ranap/RANAP_M6-Period.h M include/osmocom/ranap/RANAP_M6Report.h M include/osmocom/ranap/RANAP_M7-Period.h M include/osmocom/ranap/RANAP_M7Report.h M include/osmocom/ranap/RANAP_MBMS-PTP-RAB-ID.h M include/osmocom/ranap/RANAP_MBMSBearerServiceType.h M include/osmocom/ranap/RANAP_MBMSCNDe-Registration.h M include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationRequest.h M include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationResponse.h M include/osmocom/ranap/RANAP_MBMSCountingInformation.h M include/osmocom/ranap/RANAP_MBMSHCIndicator.h M include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h M include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h M include/osmocom/ranap/RANAP_MBMSLinkingInformation.h M include/osmocom/ranap/RANAP_MBMSRABEstablishmentIndication.h M include/osmocom/ranap/RANAP_MBMSRABRelease.h M include/osmocom/ranap/RANAP_MBMSRABReleaseFailure.h M include/osmocom/ranap/RANAP_MBMSRABReleaseRequest.h M include/osmocom/ranap/RANAP_MBMSRegistrationFailure.h M include/osmocom/ranap/RANAP_MBMSRegistrationRequest.h M include/osmocom/ranap/RANAP_MBMSRegistrationRequestType.h M include/osmocom/ranap/RANAP_MBMSRegistrationResponse.h M include/osmocom/ranap/RANAP_MBMSServiceArea.h M include/osmocom/ranap/RANAP_MBMSSessionDuration.h M include/osmocom/ranap/RANAP_MBMSSessionIdentity.h M include/osmocom/ranap/RANAP_MBMSSessionRepetitionNumber.h M include/osmocom/ranap/RANAP_MBMSSessionStart.h M include/osmocom/ranap/RANAP_MBMSSessionStartFailure.h M include/osmocom/ranap/RANAP_MBMSSessionStartResponse.h M include/osmocom/ranap/RANAP_MBMSSessionStop.h M include/osmocom/ranap/RANAP_MBMSSessionStopResponse.h M include/osmocom/ranap/RANAP_MBMSSessionUpdate.h M include/osmocom/ranap/RANAP_MBMSSessionUpdateFailure.h M include/osmocom/ranap/RANAP_MBMSSessionUpdateResponse.h M include/osmocom/ranap/RANAP_MBMSSynchronisationInformation.h M include/osmocom/ranap/RANAP_MBMSUELinkingRequest.h M include/osmocom/ranap/RANAP_MBMSUELinkingResponse.h M include/osmocom/ranap/RANAP_MDT-Activation.h M include/osmocom/ranap/RANAP_MDT-Configuration.h M include/osmocom/ranap/RANAP_MDT-PLMN-List.h M include/osmocom/ranap/RANAP_MDT-Report-Parameters.h M include/osmocom/ranap/RANAP_MDTAreaScope.h M include/osmocom/ranap/RANAP_MDTMode.h M include/osmocom/ranap/RANAP_MSISDN.h M include/osmocom/ranap/RANAP_Management-Based-MDT-Allowed.h M include/osmocom/ranap/RANAP_MaxBitrate.h M include/osmocom/ranap/RANAP_MaxSDU-Size.h M include/osmocom/ranap/RANAP_MeasBand.h M include/osmocom/ranap/RANAP_MeasurementQuantity.h M include/osmocom/ranap/RANAP_MeasurementsToActivate.h M include/osmocom/ranap/RANAP_MessageStructure.h M include/osmocom/ranap/RANAP_NAS-PDU.h M include/osmocom/ranap/RANAP_NAS-SequenceNumber.h M include/osmocom/ranap/RANAP_NAS-SynchronisationIndicator.h M include/osmocom/ranap/RANAP_NRTLoadInformationValue.h M include/osmocom/ranap/RANAP_NewBSS-To-OldBSS-Information.h M include/osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_NonSearchingIndication.h M include/osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_NumberOfIuInstances.h M include/osmocom/ranap/RANAP_NumberOfSteps.h M include/osmocom/ranap/RANAP_OMC-ID.h M include/osmocom/ranap/RANAP_Offload-RAB-Parameters-APN.h M include/osmocom/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.h M include/osmocom/ranap/RANAP_Offload-RAB-Parameters.h M include/osmocom/ranap/RANAP_OldBSS-ToNewBSS-Information.h M include/osmocom/ranap/RANAP_Out-Of-UTRAN.h M include/osmocom/ranap/RANAP_Outcome.h M include/osmocom/ranap/RANAP_Overload.h M include/osmocom/ranap/RANAP_P-TMSI.h M include/osmocom/ranap/RANAP_PDP-Type-extension.h M include/osmocom/ranap/RANAP_PDP-Type.h M include/osmocom/ranap/RANAP_PDP-TypeInformation-extension.h M include/osmocom/ranap/RANAP_PDP-TypeInformation.h M include/osmocom/ranap/RANAP_PDUType14FrameSequenceNumber.h M include/osmocom/ranap/RANAP_PLMNidentity.h M include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h M include/osmocom/ranap/RANAP_Paging.h M include/osmocom/ranap/RANAP_PagingAreaID.h M include/osmocom/ranap/RANAP_PagingCause.h M include/osmocom/ranap/RANAP_PeriodicLocationInfo.h M include/osmocom/ranap/RANAP_PeriodicReportingIndicator.h M include/osmocom/ranap/RANAP_PermanentNAS-UE-ID.h M include/osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h M include/osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h M include/osmocom/ranap/RANAP_Port-Number.h M include/osmocom/ranap/RANAP_PositionData.h M include/osmocom/ranap/RANAP_PositionDataSpecificToGERANIuMode.h M include/osmocom/ranap/RANAP_PositioningDataDiscriminator.h M include/osmocom/ranap/RANAP_PositioningDataSet.h M include/osmocom/ranap/RANAP_PositioningMethodAndUsage.h M include/osmocom/ranap/RANAP_PositioningPriority.h M include/osmocom/ranap/RANAP_Pre-emptionCapability.h M include/osmocom/ranap/RANAP_Pre-emptionVulnerability.h M include/osmocom/ranap/RANAP_Presence.h M include/osmocom/ranap/RANAP_Priority-Class-Indicator.h M include/osmocom/ranap/RANAP_PriorityLevel.h M include/osmocom/ranap/RANAP_PrivateIE-ID.h M include/osmocom/ranap/RANAP_PrivateMessage.h M include/osmocom/ranap/RANAP_ProcedureCode.h M include/osmocom/ranap/RANAP_ProtocolError-IE-ContainerList.h M include/osmocom/ranap/RANAP_ProtocolExtensionContainer.h M include/osmocom/ranap/RANAP_ProtocolExtensionField.h M include/osmocom/ranap/RANAP_ProtocolExtensionID.h M include/osmocom/ranap/RANAP_ProtocolIE-Container.h M include/osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h M include/osmocom/ranap/RANAP_ProtocolIE-FieldPair.h M include/osmocom/ranap/RANAP_ProtocolIE-ID.h M include/osmocom/ranap/RANAP_ProvidedData.h M include/osmocom/ranap/RANAP_QueuingAllowed.h M include/osmocom/ranap/RANAP_RAB-AssignmentRequest.h M include/osmocom/ranap/RANAP_RAB-AssignmentResponse.h M include/osmocom/ranap/RANAP_RAB-AsymmetryIndicator.h M include/osmocom/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h M include/osmocom/ranap/RANAP_RAB-ContextItem.h M include/osmocom/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h M include/osmocom/ranap/RANAP_RAB-ContextList.h M include/osmocom/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h M include/osmocom/ranap/RANAP_RAB-DataForwardingItem.h M include/osmocom/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h M include/osmocom/ranap/RANAP_RAB-DataForwardingList.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportList.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestItem.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestList.h M include/osmocom/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-FailedItem.h M include/osmocom/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-FailedList.h M include/osmocom/ranap/RANAP_RAB-ID.h M include/osmocom/ranap/RANAP_RAB-IE-ContainerList.h M include/osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h M include/osmocom/ranap/RANAP_RAB-ModifyItem.h M include/osmocom/ranap/RANAP_RAB-ModifyList.h M include/osmocom/ranap/RANAP_RAB-ModifyRequest.h M include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameters.h M include/osmocom/ranap/RANAP_RAB-QueuedItem.h M include/osmocom/ranap/RANAP_RAB-QueuedList.h M include/osmocom/ranap/RANAP_RAB-ReleaseFailedList.h M include/osmocom/ranap/RANAP_RAB-ReleaseItem.h M include/osmocom/ranap/RANAP_RAB-ReleaseList.h M include/osmocom/ranap/RANAP_RAB-ReleaseRequest.h M include/osmocom/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h M include/osmocom/ranap/RANAP_RAB-ReleasedItem.h M include/osmocom/ranap/RANAP_RAB-ReleasedList-IuRelComp.h M include/osmocom/ranap/RANAP_RAB-ReleasedList.h M include/osmocom/ranap/RANAP_RAB-RelocationReleaseItem.h M include/osmocom/ranap/RANAP_RAB-RelocationReleaseList.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReq.h M include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReqAck.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-SetupList-RelocReq.h M include/osmocom/ranap/RANAP_RAB-SetupList-RelocReqAck.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifiedList.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemFirst.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemSecond.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifyList.h M include/osmocom/ranap/RANAP_RAB-SubflowCombinationBitRate.h M include/osmocom/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-TrCH-Mapping.h M include/osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h M include/osmocom/ranap/RANAP_RABDataVolumeReport.h M include/osmocom/ranap/RANAP_RABParametersList.h M include/osmocom/ranap/RANAP_RABased.h M include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferItem.h M include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferList.h M include/osmocom/ranap/RANAP_RABs-failed-to-reportItem.h M include/osmocom/ranap/RANAP_RABs-failed-to-reportList.h M include/osmocom/ranap/RANAP_RAC.h M include/osmocom/ranap/RANAP_RAI-List.h M include/osmocom/ranap/RANAP_RAI.h M include/osmocom/ranap/RANAP_RAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h M include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h M include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h M include/osmocom/ranap/RANAP_RANAP-PDU.h M include/osmocom/ranap/RANAP_RANAP-RelocationInformation.h M include/osmocom/ranap/RANAP_RAT-Type.h M include/osmocom/ranap/RANAP_RAofIdleModeUEs.h M include/osmocom/ranap/RANAP_RIM-Transfer.h M include/osmocom/ranap/RANAP_RIMInformation.h M include/osmocom/ranap/RANAP_RIMRoutingAddress.h M include/osmocom/ranap/RANAP_RNC-ID.h M include/osmocom/ranap/RANAP_RNCTraceInformation.h M include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h M include/osmocom/ranap/RANAP_RRC-Container.h M include/osmocom/ranap/RANAP_RSRQ-Extension.h M include/osmocom/ranap/RANAP_RSRQ-Type.h M include/osmocom/ranap/RANAP_RSRVCC-HO-Indication.h M include/osmocom/ranap/RANAP_RSRVCC-Information.h M include/osmocom/ranap/RANAP_RSRVCC-Operation-Possible.h M include/osmocom/ranap/RANAP_RTLoadValue.h M include/osmocom/ranap/RANAP_RateControlAllowed.h M include/osmocom/ranap/RANAP_RedirectAttemptFlag.h M include/osmocom/ranap/RANAP_RedirectionCompleted.h M include/osmocom/ranap/RANAP_RedirectionIndication.h M include/osmocom/ranap/RANAP_RejectCauseValue.h M include/osmocom/ranap/RANAP_RelocationCancel.h M include/osmocom/ranap/RANAP_RelocationCancelAcknowledge.h M include/osmocom/ranap/RANAP_RelocationCommand.h M include/osmocom/ranap/RANAP_RelocationComplete.h M include/osmocom/ranap/RANAP_RelocationDetect.h M include/osmocom/ranap/RANAP_RelocationFailure.h M include/osmocom/ranap/RANAP_RelocationPreparationFailure.h M include/osmocom/ranap/RANAP_RelocationRequest.h M include/osmocom/ranap/RANAP_RelocationRequestAcknowledge.h M include/osmocom/ranap/RANAP_RelocationRequired.h M include/osmocom/ranap/RANAP_RelocationRequirement.h M include/osmocom/ranap/RANAP_RelocationType.h M include/osmocom/ranap/RANAP_RepetitionNumber0.h M include/osmocom/ranap/RANAP_RepetitionNumber1.h M include/osmocom/ranap/RANAP_ReportAmount.h M include/osmocom/ranap/RANAP_ReportArea.h M include/osmocom/ranap/RANAP_ReportChangeOfSAI.h M include/osmocom/ranap/RANAP_ReportInterval.h M include/osmocom/ranap/RANAP_RequestType.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h M include/osmocom/ranap/RANAP_RequestedGANSSAssistanceData.h M include/osmocom/ranap/RANAP_RequestedGPSAssistanceData.h M include/osmocom/ranap/RANAP_RequestedLocationRelatedDataType.h M include/osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h M include/osmocom/ranap/RANAP_RequestedMulticastServiceList.h M include/osmocom/ranap/RANAP_Reset.h M include/osmocom/ranap/RANAP_ResetAcknowledge.h M include/osmocom/ranap/RANAP_ResetResource.h M include/osmocom/ranap/RANAP_ResetResourceAckItem.h M include/osmocom/ranap/RANAP_ResetResourceAckList.h M include/osmocom/ranap/RANAP_ResetResourceAcknowledge.h M include/osmocom/ranap/RANAP_ResetResourceItem.h M include/osmocom/ranap/RANAP_ResetResourceList.h M include/osmocom/ranap/RANAP_ResidualBitErrorRatio.h M include/osmocom/ranap/RANAP_ResponseTime.h M include/osmocom/ranap/RANAP_SAC.h M include/osmocom/ranap/RANAP_SAI.h M include/osmocom/ranap/RANAP_SAPI.h M include/osmocom/ranap/RANAP_SDU-ErrorRatio.h M include/osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h M include/osmocom/ranap/RANAP_SDU-FormatInformationParameters.h M include/osmocom/ranap/RANAP_SDU-ParameterItem.h M include/osmocom/ranap/RANAP_SDU-Parameters.h M include/osmocom/ranap/RANAP_SNA-Access-Information.h M include/osmocom/ranap/RANAP_SNAC.h M include/osmocom/ranap/RANAP_SRB-ID.h M include/osmocom/ranap/RANAP_SRB-TrCH-Mapping.h M include/osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h M include/osmocom/ranap/RANAP_SRNS-ContextRequest.h M include/osmocom/ranap/RANAP_SRNS-ContextResponse.h M include/osmocom/ranap/RANAP_SRNS-DataForwardCommand.h M include/osmocom/ranap/RANAP_SRVCC-CSKeysRequest.h M include/osmocom/ranap/RANAP_SRVCC-CSKeysResponse.h M include/osmocom/ranap/RANAP_SRVCC-HO-Indication.h M include/osmocom/ranap/RANAP_SRVCC-Information.h M include/osmocom/ranap/RANAP_SRVCC-Operation-Possible.h M include/osmocom/ranap/RANAP_SecurityModeCommand.h M include/osmocom/ranap/RANAP_SecurityModeComplete.h M include/osmocom/ranap/RANAP_SecurityModeReject.h M include/osmocom/ranap/RANAP_Service-Handover.h M include/osmocom/ranap/RANAP_Session-Re-establishment-Indicator.h M include/osmocom/ranap/RANAP_SessionUpdateID.h M include/osmocom/ranap/RANAP_Shared-Network-Information.h M include/osmocom/ranap/RANAP_SignallingIndication.h M include/osmocom/ranap/RANAP_Source-ToTarget-TransparentContainer.h M include/osmocom/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.h M include/osmocom/ranap/RANAP_SourceCellID.h M include/osmocom/ranap/RANAP_SourceID.h M include/osmocom/ranap/RANAP_SourceRNC-ID.h M include/osmocom/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h M include/osmocom/ranap/RANAP_SourceStatisticsDescriptor.h M include/osmocom/ranap/RANAP_SourceUTRANCellID.h M include/osmocom/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.h M include/osmocom/ranap/RANAP_SubflowSDU-Size.h M include/osmocom/ranap/RANAP_SubscriberProfileIDforRFP.h M include/osmocom/ranap/RANAP_SuccessfulOutcome.h M include/osmocom/ranap/RANAP_SupportedBitrate.h M include/osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h M include/osmocom/ranap/RANAP_TAC.h M include/osmocom/ranap/RANAP_TAI.h M include/osmocom/ranap/RANAP_TBCD-STRING.h M include/osmocom/ranap/RANAP_TMGI.h M include/osmocom/ranap/RANAP_TMSI.h M include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h M include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h M include/osmocom/ranap/RANAP_Target-ToSource-TransparentContainer.h M include/osmocom/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.h M include/osmocom/ranap/RANAP_TargetCellId.h M include/osmocom/ranap/RANAP_TargetENB-ID.h M include/osmocom/ranap/RANAP_TargetID.h M include/osmocom/ranap/RANAP_TargetRNC-ID.h M include/osmocom/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h M include/osmocom/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.h M include/osmocom/ranap/RANAP_TemporaryUE-ID.h M include/osmocom/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.h M include/osmocom/ranap/RANAP_Time-UE-StayedInCell.h M include/osmocom/ranap/RANAP_TimeToMBMSDataTransfer.h M include/osmocom/ranap/RANAP_TimingDifferenceULDL.h M include/osmocom/ranap/RANAP_TrCH-ID-List.h M include/osmocom/ranap/RANAP_TrCH-ID.h M include/osmocom/ranap/RANAP_TraceDepth.h M include/osmocom/ranap/RANAP_TraceInformation.h M include/osmocom/ranap/RANAP_TracePropagationParameters.h M include/osmocom/ranap/RANAP_TraceRecordingSessionInformation.h M include/osmocom/ranap/RANAP_TraceRecordingSessionReference.h M include/osmocom/ranap/RANAP_TraceReference.h M include/osmocom/ranap/RANAP_TraceType.h M include/osmocom/ranap/RANAP_TrafficClass.h M include/osmocom/ranap/RANAP_TrafficHandlingPriority.h M include/osmocom/ranap/RANAP_TransferDelay.h M include/osmocom/ranap/RANAP_TransportLayerAddress.h M include/osmocom/ranap/RANAP_TransportLayerInformation.h M include/osmocom/ranap/RANAP_TriggerID.h M include/osmocom/ranap/RANAP_TriggeringMessage.h M include/osmocom/ranap/RANAP_TunnelInformation.h M include/osmocom/ranap/RANAP_TypeOfError.h M include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h M include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.h M include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRateUplink.h M include/osmocom/ranap/RANAP_UE-History-Information.h M include/osmocom/ranap/RANAP_UE-ID.h M include/osmocom/ranap/RANAP_UESBI-Iu.h M include/osmocom/ranap/RANAP_UESBI-IuA.h M include/osmocom/ranap/RANAP_UESBI-IuB.h M include/osmocom/ranap/RANAP_UESpecificInformationIndication.h M include/osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_UL-N-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_UP-ModeVersions.h M include/osmocom/ranap/RANAP_UPInformation.h M include/osmocom/ranap/RANAP_UPInitialisationFrame.h M include/osmocom/ranap/RANAP_USCH-ID.h M include/osmocom/ranap/RANAP_UTRAN-CellID.h M include/osmocom/ranap/RANAP_UeRadioCapabilityMatchRequest.h M include/osmocom/ranap/RANAP_UeRadioCapabilityMatchResponse.h M include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h M include/osmocom/ranap/RANAP_UnsuccessfulOutcome.h M include/osmocom/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h M include/osmocom/ranap/RANAP_UplinkInformationExchangeFailure.h M include/osmocom/ranap/RANAP_UplinkInformationExchangeRequest.h M include/osmocom/ranap/RANAP_UplinkInformationExchangeResponse.h M include/osmocom/ranap/RANAP_UserPlaneInformation.h M include/osmocom/ranap/RANAP_UserPlaneMode.h M include/osmocom/ranap/RANAP_VelocityEstimate.h M include/osmocom/ranap/RANAP_VerticalAccuracyCode.h M include/osmocom/ranap/RANAP_VerticalSpeedDirection.h M include/osmocom/ranap/RANAP_VerticalVelocity.h M include/osmocom/ranap/RANAP_VoiceSupportMatchIndicator.h M src/ranap/Makefile.am M src/ranap/RANAP_APN.c M src/ranap/RANAP_AccuracyFulfilmentIndicator.c M src/ranap/RANAP_AllocationOrRetentionPriority.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.c M src/ranap/RANAP_Alt-RAB-Parameters.c M src/ranap/RANAP_AlternativeRABConfigurationRequest.c M src/ranap/RANAP_AreaIdentity.c M src/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameters.c M src/ranap/RANAP_AuthorisedPLMNs.c M src/ranap/RANAP_AuthorisedSNAs.c M src/ranap/RANAP_BindingID.c M src/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.c M src/ranap/RANAP_CGI.c M src/ranap/RANAP_CI.c M src/ranap/RANAP_CN-DeactivateTrace.c M src/ranap/RANAP_CN-DomainIndicator.c M src/ranap/RANAP_CN-ID.c M src/ranap/RANAP_CN-InvokeTrace.c M src/ranap/RANAP_CNMBMSLinkingInformation.c M src/ranap/RANAP_CSFB-Information.c M src/ranap/RANAP_CSG-Id-List.c M src/ranap/RANAP_CSG-Id.c M src/ranap/RANAP_CSG-Membership-Status.c M src/ranap/RANAP_Cause.c M src/ranap/RANAP_CauseMisc.c M src/ranap/RANAP_CauseNAS.c M src/ranap/RANAP_CauseNon-Standard.c M src/ranap/RANAP_CauseProtocol.c M src/ranap/RANAP_CauseRadioNetwork.c M src/ranap/RANAP_CauseRadioNetworkExtension.c M src/ranap/RANAP_CauseTransmissionNetwork.c M src/ranap/RANAP_Cell-Access-Mode.c M src/ranap/RANAP_Cell-Capacity-Class-Value.c M src/ranap/RANAP_Cell-Id.c M src/ranap/RANAP_CellBased.c M src/ranap/RANAP_CellIdList.c M src/ranap/RANAP_CellLoadInformation.c M src/ranap/RANAP_CellLoadInformationGroup.c M src/ranap/RANAP_CellType.c M src/ranap/RANAP_ChosenEncryptionAlgorithm.c M src/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.c M src/ranap/RANAP_ClassmarkInformation2.c M src/ranap/RANAP_ClassmarkInformation3.c M src/ranap/RANAP_ClientType.c M src/ranap/RANAP_CommonID.c M src/ranap/RANAP_Correlation-ID.c M src/ranap/RANAP_Criticality.c M src/ranap/RANAP_CriticalityDiagnostics-IE-List.c M src/ranap/RANAP_CriticalityDiagnostics.c M src/ranap/RANAP_D-RNTI.c M src/ranap/RANAP_DCH-ID.c M src/ranap/RANAP_DL-GTP-PDU-SequenceNumber.c M src/ranap/RANAP_DL-N-PDU-SequenceNumber.c M src/ranap/RANAP_DRX-CycleLengthCoefficient.c M src/ranap/RANAP_DSCH-ID.c M src/ranap/RANAP_DataPDUType.c M src/ranap/RANAP_DataVolumeList.c M src/ranap/RANAP_DataVolumeReference.c M src/ranap/RANAP_DataVolumeReport.c M src/ranap/RANAP_DataVolumeReportList.c M src/ranap/RANAP_DataVolumeReportRequest.c M src/ranap/RANAP_DataVolumeReportingIndication.c M src/ranap/RANAP_DeliveryOfErroneousSDU.c M src/ranap/RANAP_DeliveryOrder.c M src/ranap/RANAP_DeltaRAListofIdleModeUEs.c M src/ranap/RANAP_DirectInformationTransfer.c M src/ranap/RANAP_DirectReportingIndicator.c M src/ranap/RANAP_DirectTransfer-IE-ContainerList.c M src/ranap/RANAP_DirectTransfer.c M src/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.c M src/ranap/RANAP_E-DCH-MAC-d-Flow-ID.c M src/ranap/RANAP_E-UTRAN-Service-Handover.c M src/ranap/RANAP_EARFCN-Extended.c M src/ranap/RANAP_ENB-ID.c M src/ranap/RANAP_EUTRANFrequencies.c M src/ranap/RANAP_EncryptionAlgorithm.c M src/ranap/RANAP_EncryptionInformation.c M src/ranap/RANAP_EncryptionKey.c M src/ranap/RANAP_End-Of-CSFB.c M src/ranap/RANAP_EnhancedRelocationCompleteConfirm.c M src/ranap/RANAP_EnhancedRelocationCompleteFailure.c M src/ranap/RANAP_EnhancedRelocationCompleteRequest.c M src/ranap/RANAP_EnhancedRelocationCompleteResponse.c M src/ranap/RANAP_EquipmentsToBeTraced.c M src/ranap/RANAP_ErrorIndication.c M src/ranap/RANAP_Event.c M src/ranap/RANAP_Event1F-Parameters.c M src/ranap/RANAP_Event1I-Parameters.c M src/ranap/RANAP_ExtendedGuaranteedBitrate.c M src/ranap/RANAP_ExtendedMaxBitrate.c M src/ranap/RANAP_ExtendedRNC-ID.c M src/ranap/RANAP_ForwardSRNS-Context.c M src/ranap/RANAP_ForwardingIndication.c M src/ranap/RANAP_FrameSequenceNumber.c M src/ranap/RANAP_FrequenceLayerConvergenceFlag.c M src/ranap/RANAP_GA-AltitudeAndDirection.c M src/ranap/RANAP_GA-EllipsoidArc.c M src/ranap/RANAP_GA-Point.c M src/ranap/RANAP_GA-PointWithAltitude.c M src/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.c M src/ranap/RANAP_GA-PointWithUnCertainty.c M src/ranap/RANAP_GA-PointWithUnCertaintyEllipse.c M src/ranap/RANAP_GA-Polygon.c M src/ranap/RANAP_GA-UncertaintyEllipse.c M src/ranap/RANAP_GANSS-PositioningDataSet.c M src/ranap/RANAP_GANSS-PositioningMethodAndUsage.c M src/ranap/RANAP_GERAN-BSC-Container.c M src/ranap/RANAP_GERAN-Cell-ID.c M src/ranap/RANAP_GERAN-Classmark.c M src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.c M src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.c M src/ranap/RANAP_GTP-TEI.c M src/ranap/RANAP_GeographicalArea.c M src/ranap/RANAP_GeographicalCoordinates.c M src/ranap/RANAP_GlobalCN-ID.c M src/ranap/RANAP_GlobalRNC-ID.c M src/ranap/RANAP_GuaranteedBitrate.c M src/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.c M src/ranap/RANAP_HigherBitratesThan16MbpsFlag.c M src/ranap/RANAP_HorizontalSpeedAndBearing.c M src/ranap/RANAP_HorizontalVelocity.c M src/ranap/RANAP_HorizontalVelocityWithUncertainty.c M src/ranap/RANAP_HorizontalWithVerticalVelocity.c M src/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.c M src/ranap/RANAP_IE-Extensions.c M src/ranap/RANAP_IE.c M src/ranap/RANAP_IMEI.c M src/ranap/RANAP_IMEIGroup.c M src/ranap/RANAP_IMEIList.c M src/ranap/RANAP_IMEISV.c M src/ranap/RANAP_IMEISVGroup.c M src/ranap/RANAP_IMEISVList.c M src/ranap/RANAP_IMSI.c M src/ranap/RANAP_IPMulticastAddress.c M src/ranap/RANAP_IRAT-Measurement-Configuration.c M src/ranap/RANAP_IRATmeasurementParameters.c M src/ranap/RANAP_ImmediateMDT.c M src/ranap/RANAP_IncludeVelocity.c M src/ranap/RANAP_InformationExchangeID.c M src/ranap/RANAP_InformationExchangeType.c M src/ranap/RANAP_InformationRequestType.c M src/ranap/RANAP_InformationRequested.c M src/ranap/RANAP_InformationTransferConfirmation.c M src/ranap/RANAP_InformationTransferFailure.c M src/ranap/RANAP_InformationTransferID.c M src/ranap/RANAP_InformationTransferIndication.c M src/ranap/RANAP_InformationTransferType.c M src/ranap/RANAP_InitialUE-Message.c M src/ranap/RANAP_InitiatingMessage.c M src/ranap/RANAP_IntegrityProtectionAlgorithm.c M src/ranap/RANAP_IntegrityProtectionInformation.c M src/ranap/RANAP_IntegrityProtectionKey.c M src/ranap/RANAP_InterSystemInformation-TransparentContainer.c M src/ranap/RANAP_InterSystemInformationTransferType.c M src/ranap/RANAP_InterfacesToTraceItem.c M src/ranap/RANAP_Iu-ReleaseCommand.c M src/ranap/RANAP_Iu-ReleaseComplete.c M src/ranap/RANAP_Iu-ReleaseRequest.c M src/ranap/RANAP_IuSigConId-IE-ContainerList.c M src/ranap/RANAP_IuSignallingConnectionIdentifier.c M src/ranap/RANAP_IuTransportAssociation.c M src/ranap/RANAP_JoinedMBMSBearerService-IEs.c M src/ranap/RANAP_KeyStatus.c M src/ranap/RANAP_L3-Information.c M src/ranap/RANAP_LA-LIST.c M src/ranap/RANAP_LABased.c M src/ranap/RANAP_LAC.c M src/ranap/RANAP_LAI-List.c M src/ranap/RANAP_LAI.c M src/ranap/RANAP_LAListofIdleModeUEs.c M src/ranap/RANAP_LHN-ID.c M src/ranap/RANAP_LastKnownServiceArea.c M src/ranap/RANAP_LastVisitedUTRANCell-Item.c M src/ranap/RANAP_LeftMBMSBearerService-IEs.c M src/ranap/RANAP_Links-to-log.c M src/ranap/RANAP_ListOF-SNAs.c M src/ranap/RANAP_ListOfInterfacesToTrace.c M src/ranap/RANAP_LoadValue.c M src/ranap/RANAP_LocationRelatedDataFailure.c M src/ranap/RANAP_LocationRelatedDataRequest.c M src/ranap/RANAP_LocationRelatedDataRequestType.c M src/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.c M src/ranap/RANAP_LocationRelatedDataResponse.c M src/ranap/RANAP_LocationReport.c M src/ranap/RANAP_LocationReportingControl.c M src/ranap/RANAP_LocationReportingTransferInformation.c M src/ranap/RANAP_LoggedMDT.c M src/ranap/RANAP_LoggingDuration.c M src/ranap/RANAP_LoggingInterval.c M src/ranap/RANAP_M1Report.c M src/ranap/RANAP_M2Report.c M src/ranap/RANAP_M4-Collection-Parameters.c M src/ranap/RANAP_M4-Period.c M src/ranap/RANAP_M4-Threshold.c M src/ranap/RANAP_M4Report.c M src/ranap/RANAP_M5-Period.c M src/ranap/RANAP_M5Report.c M src/ranap/RANAP_M6-Period.c M src/ranap/RANAP_M6Report.c M src/ranap/RANAP_M7-Period.c M src/ranap/RANAP_M7Report.c M src/ranap/RANAP_MBMS-PTP-RAB-ID.c M src/ranap/RANAP_MBMSBearerServiceType.c M src/ranap/RANAP_MBMSCNDe-Registration.c M src/ranap/RANAP_MBMSCNDe-RegistrationRequest.c M src/ranap/RANAP_MBMSCNDe-RegistrationResponse.c M src/ranap/RANAP_MBMSCountingInformation.c M src/ranap/RANAP_MBMSHCIndicator.c M src/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.c M src/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.c M src/ranap/RANAP_MBMSLinkingInformation.c M src/ranap/RANAP_MBMSRABEstablishmentIndication.c M src/ranap/RANAP_MBMSRABRelease.c M src/ranap/RANAP_MBMSRABReleaseFailure.c M src/ranap/RANAP_MBMSRABReleaseRequest.c M src/ranap/RANAP_MBMSRegistrationFailure.c M src/ranap/RANAP_MBMSRegistrationRequest.c M src/ranap/RANAP_MBMSRegistrationRequestType.c M src/ranap/RANAP_MBMSRegistrationResponse.c M src/ranap/RANAP_MBMSServiceArea.c M src/ranap/RANAP_MBMSSessionDuration.c M src/ranap/RANAP_MBMSSessionIdentity.c M src/ranap/RANAP_MBMSSessionRepetitionNumber.c M src/ranap/RANAP_MBMSSessionStart.c M src/ranap/RANAP_MBMSSessionStartFailure.c M src/ranap/RANAP_MBMSSessionStartResponse.c M src/ranap/RANAP_MBMSSessionStop.c M src/ranap/RANAP_MBMSSessionStopResponse.c M src/ranap/RANAP_MBMSSessionUpdate.c M src/ranap/RANAP_MBMSSessionUpdateFailure.c M src/ranap/RANAP_MBMSSessionUpdateResponse.c M src/ranap/RANAP_MBMSSynchronisationInformation.c M src/ranap/RANAP_MBMSUELinkingRequest.c M src/ranap/RANAP_MBMSUELinkingResponse.c M src/ranap/RANAP_MDT-Activation.c M src/ranap/RANAP_MDT-Configuration.c M src/ranap/RANAP_MDT-PLMN-List.c M src/ranap/RANAP_MDT-Report-Parameters.c M src/ranap/RANAP_MDTAreaScope.c M src/ranap/RANAP_MDTMode.c M src/ranap/RANAP_MSISDN.c M src/ranap/RANAP_Management-Based-MDT-Allowed.c M src/ranap/RANAP_MaxBitrate.c M src/ranap/RANAP_MaxSDU-Size.c M src/ranap/RANAP_MeasBand.c M src/ranap/RANAP_MeasurementQuantity.c M src/ranap/RANAP_MeasurementsToActivate.c M src/ranap/RANAP_MessageStructure.c M src/ranap/RANAP_NAS-PDU.c M src/ranap/RANAP_NAS-SequenceNumber.c M src/ranap/RANAP_NAS-SynchronisationIndicator.c M src/ranap/RANAP_NRTLoadInformationValue.c M src/ranap/RANAP_NewBSS-To-OldBSS-Information.c M src/ranap/RANAP_NewRAListofIdleModeUEs.c M src/ranap/RANAP_NonSearchingIndication.c M src/ranap/RANAP_NotEmptyRAListofIdleModeUEs.c M src/ranap/RANAP_NumberOfIuInstances.c M src/ranap/RANAP_NumberOfSteps.c M src/ranap/RANAP_OMC-ID.c M src/ranap/RANAP_Offload-RAB-Parameters-APN.c M src/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.c M src/ranap/RANAP_Offload-RAB-Parameters.c M src/ranap/RANAP_OldBSS-ToNewBSS-Information.c M src/ranap/RANAP_Out-Of-UTRAN.c M src/ranap/RANAP_Outcome.c M src/ranap/RANAP_Overload.c M src/ranap/RANAP_P-TMSI.c M src/ranap/RANAP_PDP-Type-extension.c M src/ranap/RANAP_PDP-Type.c M src/ranap/RANAP_PDP-TypeInformation-extension.c M src/ranap/RANAP_PDP-TypeInformation.c M src/ranap/RANAP_PDUType14FrameSequenceNumber.c M src/ranap/RANAP_PLMNidentity.c M src/ranap/RANAP_PLMNs-in-shared-network.c M src/ranap/RANAP_Paging.c M src/ranap/RANAP_PagingAreaID.c M src/ranap/RANAP_PagingCause.c M src/ranap/RANAP_PeriodicLocationInfo.c M src/ranap/RANAP_PeriodicReportingIndicator.c M src/ranap/RANAP_PermanentNAS-UE-ID.c M src/ranap/RANAP_PermittedEncryptionAlgorithms.c M src/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.c M src/ranap/RANAP_Port-Number.c M src/ranap/RANAP_PositionData.c M src/ranap/RANAP_PositionDataSpecificToGERANIuMode.c M src/ranap/RANAP_PositioningDataDiscriminator.c M src/ranap/RANAP_PositioningDataSet.c M src/ranap/RANAP_PositioningMethodAndUsage.c M src/ranap/RANAP_PositioningPriority.c M src/ranap/RANAP_Pre-emptionCapability.c M src/ranap/RANAP_Pre-emptionVulnerability.c M src/ranap/RANAP_Presence.c M src/ranap/RANAP_Priority-Class-Indicator.c M src/ranap/RANAP_PriorityLevel.c M src/ranap/RANAP_PrivateIE-ID.c M src/ranap/RANAP_PrivateMessage.c M src/ranap/RANAP_ProcedureCode.c M src/ranap/RANAP_ProtocolError-IE-ContainerList.c M src/ranap/RANAP_ProtocolExtensionContainer.c M src/ranap/RANAP_ProtocolExtensionField.c M src/ranap/RANAP_ProtocolExtensionID.c M src/ranap/RANAP_ProtocolIE-Container.c M src/ranap/RANAP_ProtocolIE-ContainerPair.c M src/ranap/RANAP_ProtocolIE-FieldPair.c M src/ranap/RANAP_ProtocolIE-ID.c M src/ranap/RANAP_ProvidedData.c M src/ranap/RANAP_QueuingAllowed.c M src/ranap/RANAP_RAB-AssignmentRequest.c M src/ranap/RANAP_RAB-AssignmentResponse.c M src/ranap/RANAP_RAB-AsymmetryIndicator.c M src/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.c M src/ranap/RANAP_RAB-ContextItem.c M src/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.c M src/ranap/RANAP_RAB-ContextList.c M src/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.c M src/ranap/RANAP_RAB-DataForwardingItem.c M src/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.c M src/ranap/RANAP_RAB-DataForwardingList.c M src/ranap/RANAP_RAB-DataVolumeReportItem.c M src/ranap/RANAP_RAB-DataVolumeReportList.c M src/ranap/RANAP_RAB-DataVolumeReportRequestItem.c M src/ranap/RANAP_RAB-DataVolumeReportRequestList.c M src/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-FailedItem.c M src/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-FailedList.c M src/ranap/RANAP_RAB-ID.c M src/ranap/RANAP_RAB-IE-ContainerList.c M src/ranap/RANAP_RAB-IE-ContainerPairList.c M src/ranap/RANAP_RAB-ModifyItem.c M src/ranap/RANAP_RAB-ModifyList.c M src/ranap/RANAP_RAB-ModifyRequest.c M src/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_RAB-Parameters.c M src/ranap/RANAP_RAB-QueuedItem.c M src/ranap/RANAP_RAB-QueuedList.c M src/ranap/RANAP_RAB-ReleaseFailedList.c M src/ranap/RANAP_RAB-ReleaseItem.c M src/ranap/RANAP_RAB-ReleaseList.c M src/ranap/RANAP_RAB-ReleaseRequest.c M src/ranap/RANAP_RAB-ReleasedItem-IuRelComp.c M src/ranap/RANAP_RAB-ReleasedItem.c M src/ranap/RANAP_RAB-ReleasedList-IuRelComp.c M src/ranap/RANAP_RAB-ReleasedList.c M src/ranap/RANAP_RAB-RelocationReleaseItem.c M src/ranap/RANAP_RAB-RelocationReleaseList.c M src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.c M src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.c M src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-SetupItem-RelocReq.c M src/ranap/RANAP_RAB-SetupItem-RelocReqAck.c M src/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.c M src/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.c M src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-SetupList-RelocReq.c M src/ranap/RANAP_RAB-SetupList-RelocReqAck.c M src/ranap/RANAP_RAB-SetupOrModifiedItem.c M src/ranap/RANAP_RAB-SetupOrModifiedList.c M src/ranap/RANAP_RAB-SetupOrModifyItemFirst.c M src/ranap/RANAP_RAB-SetupOrModifyItemSecond.c M src/ranap/RANAP_RAB-SetupOrModifyList.c M src/ranap/RANAP_RAB-SubflowCombinationBitRate.c M src/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-TrCH-Mapping.c M src/ranap/RANAP_RAB-TrCH-MappingItem.c M src/ranap/RANAP_RABDataVolumeReport.c M src/ranap/RANAP_RABParametersList.c M src/ranap/RANAP_RABased.c M src/ranap/RANAP_RABs-ContextFailedtoTransferItem.c M src/ranap/RANAP_RABs-ContextFailedtoTransferList.c M src/ranap/RANAP_RABs-failed-to-reportItem.c M src/ranap/RANAP_RABs-failed-to-reportList.c M src/ranap/RANAP_RAC.c M src/ranap/RANAP_RAI-List.c M src/ranap/RANAP_RAI.c M src/ranap/RANAP_RAListofIdleModeUEs.c M src/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.c M src/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.c M src/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.c M src/ranap/RANAP_RANAP-PDU.c M src/ranap/RANAP_RANAP-RelocationInformation.c M src/ranap/RANAP_RAT-Type.c M src/ranap/RANAP_RAofIdleModeUEs.c M src/ranap/RANAP_RIM-Transfer.c M src/ranap/RANAP_RIMInformation.c M src/ranap/RANAP_RIMRoutingAddress.c M src/ranap/RANAP_RNC-ID.c M src/ranap/RANAP_RNCTraceInformation.c M src/ranap/RANAP_RNSAPRelocationParameters.c M src/ranap/RANAP_RRC-Container.c M src/ranap/RANAP_RSRQ-Extension.c M src/ranap/RANAP_RSRQ-Type.c M src/ranap/RANAP_RSRVCC-HO-Indication.c M src/ranap/RANAP_RSRVCC-Information.c M src/ranap/RANAP_RSRVCC-Operation-Possible.c M src/ranap/RANAP_RTLoadValue.c M src/ranap/RANAP_RateControlAllowed.c M src/ranap/RANAP_RedirectAttemptFlag.c M src/ranap/RANAP_RedirectionCompleted.c M src/ranap/RANAP_RedirectionIndication.c M src/ranap/RANAP_RejectCauseValue.c M src/ranap/RANAP_RelocationCancel.c M src/ranap/RANAP_RelocationCancelAcknowledge.c M src/ranap/RANAP_RelocationCommand.c M src/ranap/RANAP_RelocationComplete.c M src/ranap/RANAP_RelocationDetect.c M src/ranap/RANAP_RelocationFailure.c M src/ranap/RANAP_RelocationPreparationFailure.c M src/ranap/RANAP_RelocationRequest.c M src/ranap/RANAP_RelocationRequestAcknowledge.c M src/ranap/RANAP_RelocationRequired.c M src/ranap/RANAP_RelocationRequirement.c M src/ranap/RANAP_RelocationType.c M src/ranap/RANAP_RepetitionNumber0.c M src/ranap/RANAP_RepetitionNumber1.c M src/ranap/RANAP_ReportAmount.c M src/ranap/RANAP_ReportArea.c M src/ranap/RANAP_ReportChangeOfSAI.c M src/ranap/RANAP_ReportInterval.c M src/ranap/RANAP_RequestType.c M src/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-Values.c M src/ranap/RANAP_RequestedGANSSAssistanceData.c M src/ranap/RANAP_RequestedGPSAssistanceData.c M src/ranap/RANAP_RequestedLocationRelatedDataType.c M src/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.c M src/ranap/RANAP_RequestedMulticastServiceList.c M src/ranap/RANAP_Reset.c M src/ranap/RANAP_ResetAcknowledge.c M src/ranap/RANAP_ResetResource.c M src/ranap/RANAP_ResetResourceAckItem.c M src/ranap/RANAP_ResetResourceAckList.c M src/ranap/RANAP_ResetResourceAcknowledge.c M src/ranap/RANAP_ResetResourceItem.c M src/ranap/RANAP_ResetResourceList.c M src/ranap/RANAP_ResidualBitErrorRatio.c M src/ranap/RANAP_ResponseTime.c M src/ranap/RANAP_SAC.c M src/ranap/RANAP_SAI.c M src/ranap/RANAP_SAPI.c M src/ranap/RANAP_SDU-ErrorRatio.c M src/ranap/RANAP_SDU-FormatInformationParameterItem.c M src/ranap/RANAP_SDU-FormatInformationParameters.c M src/ranap/RANAP_SDU-ParameterItem.c M src/ranap/RANAP_SDU-Parameters.c M src/ranap/RANAP_SNA-Access-Information.c M src/ranap/RANAP_SNAC.c M src/ranap/RANAP_SRB-ID.c M src/ranap/RANAP_SRB-TrCH-Mapping.c M src/ranap/RANAP_SRB-TrCH-MappingItem.c M src/ranap/RANAP_SRNS-ContextRequest.c M src/ranap/RANAP_SRNS-ContextResponse.c M src/ranap/RANAP_SRNS-DataForwardCommand.c M src/ranap/RANAP_SRVCC-CSKeysRequest.c M src/ranap/RANAP_SRVCC-CSKeysResponse.c M src/ranap/RANAP_SRVCC-HO-Indication.c M src/ranap/RANAP_SRVCC-Information.c M src/ranap/RANAP_SRVCC-Operation-Possible.c M src/ranap/RANAP_SecurityModeCommand.c M src/ranap/RANAP_SecurityModeComplete.c M src/ranap/RANAP_SecurityModeReject.c M src/ranap/RANAP_Service-Handover.c M src/ranap/RANAP_Session-Re-establishment-Indicator.c M src/ranap/RANAP_SessionUpdateID.c M src/ranap/RANAP_Shared-Network-Information.c M src/ranap/RANAP_SignallingIndication.c M src/ranap/RANAP_Source-ToTarget-TransparentContainer.c M src/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.c M src/ranap/RANAP_SourceCellID.c M src/ranap/RANAP_SourceID.c M src/ranap/RANAP_SourceRNC-ID.c M src/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.c M src/ranap/RANAP_SourceStatisticsDescriptor.c M src/ranap/RANAP_SourceUTRANCellID.c M src/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.c M src/ranap/RANAP_SubflowSDU-Size.c M src/ranap/RANAP_SubscriberProfileIDforRFP.c M src/ranap/RANAP_SuccessfulOutcome.c M src/ranap/RANAP_SupportedBitrate.c M src/ranap/RANAP_SupportedRAB-ParameterBitrateList.c M src/ranap/RANAP_TAC.c M src/ranap/RANAP_TAI.c M src/ranap/RANAP_TBCD-STRING.c M src/ranap/RANAP_TMGI.c M src/ranap/RANAP_TMSI.c M src/ranap/RANAP_TNLInformationEnhRelInfoReq.c M src/ranap/RANAP_TNLInformationEnhRelInfoRes.c M src/ranap/RANAP_Target-ToSource-TransparentContainer.c M src/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.c M src/ranap/RANAP_TargetCellId.c M src/ranap/RANAP_TargetENB-ID.c M src/ranap/RANAP_TargetID.c M src/ranap/RANAP_TargetRNC-ID.c M src/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.c M src/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.c M src/ranap/RANAP_TemporaryUE-ID.c M src/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.c M src/ranap/RANAP_Time-UE-StayedInCell.c M src/ranap/RANAP_TimeToMBMSDataTransfer.c M src/ranap/RANAP_TimingDifferenceULDL.c M src/ranap/RANAP_TrCH-ID-List.c M src/ranap/RANAP_TrCH-ID.c M src/ranap/RANAP_TraceDepth.c M src/ranap/RANAP_TraceInformation.c M src/ranap/RANAP_TracePropagationParameters.c M src/ranap/RANAP_TraceRecordingSessionInformation.c M src/ranap/RANAP_TraceRecordingSessionReference.c M src/ranap/RANAP_TraceReference.c M src/ranap/RANAP_TraceType.c M src/ranap/RANAP_TrafficClass.c M src/ranap/RANAP_TrafficHandlingPriority.c M src/ranap/RANAP_TransferDelay.c M src/ranap/RANAP_TransportLayerAddress.c M src/ranap/RANAP_TransportLayerInformation.c M src/ranap/RANAP_TriggerID.c M src/ranap/RANAP_TriggeringMessage.c M src/ranap/RANAP_TunnelInformation.c M src/ranap/RANAP_TypeOfError.c M src/ranap/RANAP_UE-AggregateMaximumBitRate.c M src/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.c M src/ranap/RANAP_UE-AggregateMaximumBitRateUplink.c M src/ranap/RANAP_UE-History-Information.c M src/ranap/RANAP_UE-ID.c M src/ranap/RANAP_UESBI-Iu.c M src/ranap/RANAP_UESBI-IuA.c M src/ranap/RANAP_UESBI-IuB.c M src/ranap/RANAP_UESpecificInformationIndication.c M src/ranap/RANAP_UL-GTP-PDU-SequenceNumber.c M src/ranap/RANAP_UL-N-PDU-SequenceNumber.c M src/ranap/RANAP_UP-ModeVersions.c M src/ranap/RANAP_UPInformation.c M src/ranap/RANAP_UPInitialisationFrame.c M src/ranap/RANAP_USCH-ID.c M src/ranap/RANAP_UTRAN-CellID.c M src/ranap/RANAP_UeRadioCapabilityMatchRequest.c M src/ranap/RANAP_UeRadioCapabilityMatchResponse.c M src/ranap/RANAP_UnsuccessfulLinking-IEs.c M src/ranap/RANAP_UnsuccessfulOutcome.c M src/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.c M src/ranap/RANAP_UplinkInformationExchangeFailure.c M src/ranap/RANAP_UplinkInformationExchangeRequest.c M src/ranap/RANAP_UplinkInformationExchangeResponse.c M src/ranap/RANAP_UserPlaneInformation.c M src/ranap/RANAP_UserPlaneMode.c M src/ranap/RANAP_VelocityEstimate.c M src/ranap/RANAP_VerticalAccuracyCode.c M src/ranap/RANAP_VerticalSpeedDirection.c M src/ranap/RANAP_VerticalVelocity.c M src/ranap/RANAP_VoiceSupportMatchIndicator.c 1,159 files changed, 1,798 insertions(+), 1,811 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/94/25994/1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iba106dcc18e3d429b4b9808610a44ac29b798172 Gerrit-Change-Number: 25994 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:24:27 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:24:27 +0000 Subject: Change in osmo-hnodeb[master]: Import hnb-test from osmo-iuh.git References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25995 ) Change subject: Import hnb-test from osmo-iuh.git ...................................................................... Import hnb-test from osmo-iuh.git Import from osmo-iuh.git Change-Id Iba106dcc18e3d429b4b9808610a44ac29b798172, with minimal renaming of s/hnb_test/hnb/ and required mangling to have it compile and run. Change-Id: I36fd4aa5d39222371bd36e9f540b91e36a26de43 --- M configure.ac M include/osmocom/hnodeb/Makefile.am M include/osmocom/hnodeb/hnodeb.h A include/osmocom/hnodeb/ranap.h A include/osmocom/hnodeb/rua.h M src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/debug.c M src/osmo-hnodeb/main.c A src/osmo-hnodeb/ranap.c A src/osmo-hnodeb/rua.c 10 files changed, 1,266 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/95/25995/1 diff --git a/configure.ac b/configure.ac index 649cf55..750b5e9 100644 --- a/configure.ac +++ b/configure.ac @@ -45,6 +45,7 @@ AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DL="$LIBS";LIBS=""]) AC_SUBST(LIBRARY_DL) +PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.30) PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.5.0) PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.5.0) @@ -52,6 +53,10 @@ PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.1.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.4.0) +PKG_CHECK_MODULES(LIBOSMORUA, libosmo-rua >= 0.7.0) +PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 0.7.0) +PKG_CHECK_MODULES(LIBOSMOHNBAP, libosmo-hnbap >= 0.7.0) + dnl checks for header files AC_HEADER_STDC diff --git a/include/osmocom/hnodeb/Makefile.am b/include/osmocom/hnodeb/Makefile.am index 189ef37..9f8963a 100644 --- a/include/osmocom/hnodeb/Makefile.am +++ b/include/osmocom/hnodeb/Makefile.am @@ -1,3 +1,5 @@ noinst_HEADERS = \ hnodeb.h \ + ranap.h \ + rua.h \ $(NULL) diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h index 6f70f09..5e42399 100644 --- a/include/osmocom/hnodeb/hnodeb.h +++ b/include/osmocom/hnodeb/hnodeb.h @@ -1 +1,85 @@ #pragma once + +#include +#include +#include +#include + +enum { + DMAIN, + DHNBAP, + DRUA, + DRANAP, +}; +extern const struct log_info hnb_log_info; + +/* 25.467 Section 7.1 */ +#define IUH_DEFAULT_SCTP_PORT 29169 +#define RNA_DEFAULT_SCTP_PORT 25471 + +#define IUH_PPI_RUA 19 +#define IUH_PPI_HNBAP 20 +#define IUH_PPI_SABP 31 +#define IUH_PPI_RNA 42 +#define IUH_PPI_PUA 55 + +#define IUH_MSGB_SIZE 2048 + +struct umts_cell_id { + uint16_t mcc; /*!< Mobile Country Code */ + uint16_t mnc; /*!< Mobile Network Code */ + uint16_t lac; /*!< Locaton Area Code */ + uint16_t rac; /*!< Routing Area Code */ + uint16_t sac; /*!< Service Area Code */ + uint32_t cid; /*!< Cell ID */ +}; + +struct ue_context { + /*! Entry in the HNB-global list of UE */ + struct llist_head list; + /*! Unique Context ID for this UE */ + uint32_t context_id; + char imsi[16+1]; +}; + +struct hnbtest_chan { + int is_ps; + uint32_t conn_id; + char *imsi; +}; + +struct hnb { + const char *gw_addr; + uint16_t gw_port; + /*! SCTP listen socket for incoming connections */ + struct osmo_fd conn_fd; + + /*! SCTP socket + write queue for Iuh to this specific HNB */ + struct osmo_wqueue wqueue; + /*! copied from HNB-Identity-Info IE */ + char identity_info[256]; + /*! copied from Cell Identity IE */ + struct umts_cell_id id; + + /*! SCTP stream ID for HNBAP */ + uint16_t hnbap_stream; + /*! SCTP stream ID for RUA */ + uint16_t rua_stream; + + uint16_t rnc_id; + + uint32_t ctx_id; + + int ues; + + struct { + struct hnbtest_chan *chan; + } cs; +}; + +void hnb_rx_iu_release(struct hnb *hnb); +void hnb_rx_paging(struct hnb *hnb, const char *imsi); +void hnb_nas_rx_dtap(struct hnb *hnb, void *data, int len); +void hnb_rx_secmode_cmd(struct hnb *hnb, long ip_alg); + +extern struct hnb g_hnb; diff --git a/include/osmocom/hnodeb/ranap.h b/include/osmocom/hnodeb/ranap.h new file mode 100644 index 0000000..78b8217 --- /dev/null +++ b/include/osmocom/hnodeb/ranap.h @@ -0,0 +1,7 @@ +#pragma once + +struct ranap_message_s; +#include + +void hnb_rua_dt_handle_ranap(struct hnb *hnb, struct ranap_message_s *ranap_msg); +void hnb_rua_cl_handle_ranap(struct hnb *hnb, struct ranap_message_s *ranap_msg); diff --git a/include/osmocom/hnodeb/rua.h b/include/osmocom/hnodeb/rua.h new file mode 100644 index 0000000..7ce2692 --- /dev/null +++ b/include/osmocom/hnodeb/rua.h @@ -0,0 +1,8 @@ +#pragma once + +#include + +struct hnb; + +void hnb_rua_dt_handle(struct hnb *hnb, struct ANY *in); +void hnb_rua_cl_handle(struct hnb *hnb, struct ANY *in); diff --git a/src/osmo-hnodeb/Makefile.am b/src/osmo-hnodeb/Makefile.am index 2ec8b24..5ca020f 100644 --- a/src/osmo-hnodeb/Makefile.am +++ b/src/osmo-hnodeb/Makefile.am @@ -6,6 +6,7 @@ AM_CFLAGS = \ -Wall \ + $(LIBASN1C_CFLAGS) \ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ @@ -14,6 +15,9 @@ $(COVERAGE_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ $(LIBOSMOSIGTRAN_CFLAGS) \ + $(LIBOSMORUA_CFLAGS) \ + $(LIBOSMORANAP_CFLAGS) \ + $(LIBOSMOHNBAP_CFLAGS) \ $(NULL) AM_LDFLAGS = \ @@ -26,9 +30,13 @@ osmo_hnodeb_SOURCES = \ main.c \ + debug.c \ + ranap.c \ + rua.c \ $(NULL) osmo_hnodeb_LDADD = \ + $(LIBASN1C_LIBS) \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ $(LIBOSMOVTY_LIBS) \ @@ -37,4 +45,7 @@ $(COVERAGE_LDFLAGS) \ $(LIBOSMOABIS_LIBS) \ $(LIBOSMOSIGTRAN_LIBS) \ + $(LIBOSMORUA_LIBS) \ + $(LIBOSMORANAP_LIBS) \ + $(LIBOSMOHNBAP_LIBS) \ $(NULL) diff --git a/src/osmo-hnodeb/debug.c b/src/osmo-hnodeb/debug.c new file mode 100644 index 0000000..25cde9b --- /dev/null +++ b/src/osmo-hnodeb/debug.c @@ -0,0 +1,31 @@ +#include + +#include + +static const struct log_info_cat log_cat[] = { + [DMAIN] = { + .name = "DMAIN", .loglevel = LOGL_INFO, .enabled = 1, + .color = "", + .description = "Main program", + }, + [DHNBAP] = { + .name = "DHNBAP", .loglevel = LOGL_DEBUG, .enabled = 1, + .color = "", + .description = "Home Node B Application Part", + }, + [DRANAP] = { + .name = "RANAP", .loglevel = LOGL_DEBUG, .enabled = 1, + .color = "", + .description = "RAN Application Part", + }, + [DRUA] = { + .name = "RUA", .loglevel = LOGL_DEBUG, .enabled = 1, + .color = "", + .description = "RANAP User Adaptation", + }, +}; + +const struct log_info hnb_log_info = { + .cat = log_cat, + .num_cat = ARRAY_SIZE(log_cat), +}; diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c index 96d9136..9ebef35 100644 --- a/src/osmo-hnodeb/main.c +++ b/src/osmo-hnodeb/main.c @@ -1,4 +1,5 @@ -/* (C) 2021 by sysmocom - s.f.m.c. GmbH +/* (C) 2015 by Daniel Willmann + * (C) 2021 by sysmocom - s.f.m.c. GmbH * Author: Pau Espin Pedrol * All Rights Reserved * @@ -19,7 +20,992 @@ #include "config.h" +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include +#include +#include +#include "asn1helpers.h" +#include + +#include + +#include + +#include + +#include +#include +#include +#include + +#include +#include +#include + +static void *tall_hnb_ctx; + +struct hnb g_hnb = { + .gw_addr = "127.0.0.1", + .gw_port = IUH_DEFAULT_SCTP_PORT, +}; + +struct msgb *rua_new_udt(struct msgb *inmsg); + +#if 0 +static int hnb_ue_de_register_tx(struct hnb *hnb) +{ + struct msgb *msg; + int rc; + uint32_t ctx_id; + + UEDe_Register_t dereg; + UEDe_RegisterIEs_t dereg_ies; + memset(&dereg_ies, 0, sizeof(dereg_ies)); + + asn1_u24_to_bitstring(&dereg_ies.context_ID, &ctx_id, hnb->ctx_id); + dereg_ies.cause.present = Cause_PR_radioNetwork; + dereg_ies.cause.choice.radioNetwork = CauseRadioNetwork_connection_with_UE_lost; + + memset(&dereg, 0, sizeof(dereg)); + rc = hnbap_encode_uede_registeries(&dereg, &dereg_ies); + OSMO_ASSERT(rc == 0); + + msg = hnbap_generate_initiating_message(ProcedureCode_id_UEDe_Register, + Criticality_ignore, + &asn_DEF_UEDe_Register, + &dereg); + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_UEDe_Register, &dereg); + + msgb_sctp_ppid(msg) = IUH_PPI_HNBAP; + + return osmo_wqueue_enqueue(&hnb->wqueue, msg); +} +#endif + +static int hnb_ue_register_tx(struct hnb *hnb, const char *imsi_str) +{ + struct msgb *msg; + int rc, imsi_len; + + uint8_t imsi_buf[16]; + + HNBAP_UERegisterRequest_t request_out; + HNBAP_UERegisterRequestIEs_t request; + memset(&request, 0, sizeof(request)); + + request.uE_Identity.present = HNBAP_UE_Identity_PR_iMSI; + + imsi_len = ranap_imsi_encode(imsi_buf, sizeof(imsi_buf), imsi_str); + OCTET_STRING_fromBuf(&request.uE_Identity.choice.iMSI, (const char*)imsi_buf, imsi_len); + + request.registration_Cause = HNBAP_Registration_Cause_normal; + request.uE_Capabilities.access_stratum_release_indicator = HNBAP_Access_stratum_release_indicator_rel_6; + request.uE_Capabilities.csg_capability = HNBAP_CSG_Capability_not_csg_capable; + + memset(&request_out, 0, sizeof(request_out)); + rc = hnbap_encode_ueregisterrequesties(&request_out, &request); + OSMO_ASSERT(rc == 0); + + msg = hnbap_generate_initiating_message(HNBAP_ProcedureCode_id_UERegister, + HNBAP_Criticality_reject, + &asn_DEF_HNBAP_UERegisterRequest, + &request_out); + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_HNBAP_UERegisterRequest, &request_out); + + msgb_sctp_ppid(msg) = IUH_PPI_HNBAP; + + return osmo_wqueue_enqueue(&hnb->wqueue, msg); +} + +static int hnb_rx_hnb_register_acc(struct hnb *hnb, ANY_t *in) +{ + int rc; + HNBAP_HNBRegisterAcceptIEs_t accept; + + rc = hnbap_decode_hnbregisteraccepties(&accept, in); + if (rc < 0) { + } + + hnb->rnc_id = accept.rnc_id; + printf("HNB Register accept with RNC ID %u\n", hnb->rnc_id); + + hnbap_free_hnbregisteraccepties(&accept); + return 0; +} + +static int hnb_rx_ue_register_acc(struct hnb *hnb, ANY_t *in) +{ + int rc; + uint32_t ctx_id; + HNBAP_UERegisterAcceptIEs_t accept; + char imsi[16]; + + rc = hnbap_decode_ueregisteraccepties(&accept, in); + if (rc < 0) { + return rc; + } + + if (accept.uE_Identity.present != HNBAP_UE_Identity_PR_iMSI) { + printf("Wrong type in UE register accept\n"); + return -1; + } + + ctx_id = asn1bitstr_to_u24(&accept.context_ID); + + ranap_bcd_decode(imsi, sizeof(imsi), accept.uE_Identity.choice.iMSI.buf, + accept.uE_Identity.choice.iMSI.size); + printf("UE Register accept for IMSI %s, context %u\n", imsi, ctx_id); + + hnb->ctx_id = ctx_id; + hnbap_free_ueregisteraccepties(&accept); + + return 0; +} + +static struct msgb *gen_nas_id_resp() +{ + uint8_t id_resp[] = { + GSM48_PDISC_MM, + GSM48_MT_MM_ID_RESP, + /* IMEISV */ + 0x09, /* len */ + 0x03, /* first digit (0000) + even (0) + id IMEISV (011) */ + 0x31, 0x91, 0x06, 0x00, 0x28, 0x47, 0x11, /* digits */ + 0xf2, /* filler (1111) + last digit (0010) */ + }; + + return ranap_new_msg_dt(0, id_resp, sizeof(id_resp)); +} + +static struct msgb *gen_nas_tmsi_realloc_compl() +{ + uint8_t id_resp[] = { + GSM48_PDISC_MM, + GSM48_MT_MM_TMSI_REALL_COMPL, + }; + + return ranap_new_msg_dt(0, id_resp, sizeof(id_resp)); +} + +static struct msgb *gen_nas_auth_resp(uint8_t *sres) +{ + uint8_t id_resp[] = { + GSM48_PDISC_MM, + 0x80 | GSM48_MT_MM_AUTH_RESP, /* simulate sequence nr 2 */ + 0x61, 0xb5, 0x69, 0xf5 /* hardcoded SRES */ + }; + + memcpy(id_resp + 2, sres, 4); + + return ranap_new_msg_dt(0, id_resp, sizeof(id_resp)); +} + +static int hnb_tx_dt(struct hnb *hnb, struct msgb *txm) +{ + struct hnbtest_chan *chan; + struct msgb *rua; + + chan = hnb->cs.chan; + if (!chan) { + printf("hnb_nas_tx_tmsi_realloc_compl(): No CS channel established yet.\n"); + return -1; + } + + rua = rua_new_dt(chan->is_ps, chan->conn_id, txm); + osmo_wqueue_enqueue(&g_hnb.wqueue, rua); + return 0; +} + +static struct tlv_parsed *parse_mm(struct gsm48_hdr *gh, int len) +{ + static struct tlv_parsed tp; + int parse_res; + + len -= (const char *)&gh->data[0] - (const char *)gh; + + OSMO_ASSERT(gsm48_hdr_pdisc(gh) == GSM48_PDISC_MM); + + parse_res = tlv_parse(&tp, &gsm48_mm_att_tlvdef, &gh->data[0], len, 0, 0); + if (parse_res <= 0) { + uint8_t msg_type = gsm48_hdr_msg_type(gh); + printf("Error parsing MM message 0x%hhx: %d\n", msg_type, parse_res); + return NULL; + } + + return &tp; +} + +int hnb_nas_rx_lu_accept(struct gsm48_hdr *gh, int len, int *sent_tmsi) +{ + printf(" :D Location Update Accept :D\n"); + struct gsm48_loc_area_id *lai; + + lai = (struct gsm48_loc_area_id *)&gh->data[0]; + + struct osmo_location_area_id laid; + gsm48_decode_lai2(lai, &laid); + printf("LU: mcc %s mnc %s lac %hd\n", + osmo_mcc_name(laid.plmn.mcc), osmo_mnc_name(laid.plmn.mnc, laid.plmn.mnc_3_digits), + laid.lac); + + struct tlv_parsed tp; + int parse_res; + + len -= (const char *)&gh->data[0] - (const char *)gh; + parse_res = tlv_parse(&tp, &gsm48_mm_att_tlvdef, &gh->data[0], len, 0, 0); + if (parse_res <= 0) { + printf("Error parsing Location Update Accept message: %d\n", parse_res); + return -1; + } + + if (TLVP_PRESENT(&tp, GSM48_IE_MOBILE_ID)) { + uint8_t type = TLVP_VAL(&tp, GSM48_IE_NAME_SHORT)[0] & 0x0f; + if (type == GSM_MI_TYPE_TMSI) + *sent_tmsi = 1; + else *sent_tmsi = 0; + } + return 0; +} + +void hnb_nas_rx_mm_info(struct gsm48_hdr *gh, int len) +{ + printf(" :) MM Info :)\n"); + struct tlv_parsed *tp = parse_mm(gh, len); + if (!tp) + return; + + if (TLVP_PRESENT(tp, GSM48_IE_NAME_SHORT)) { + char name[128] = {0}; + gsm_7bit_decode_n(name, 127, + TLVP_VAL(tp, GSM48_IE_NAME_SHORT)+1, + (TLVP_LEN(tp, GSM48_IE_NAME_SHORT)-1)*8/7); + printf("Info: Short Network Name: %s\n", name); + } + + if (TLVP_PRESENT(tp, GSM48_IE_NAME_LONG)) { + char name[128] = {0}; + gsm_7bit_decode_n(name, 127, + TLVP_VAL(tp, GSM48_IE_NAME_LONG)+1, + (TLVP_LEN(tp, GSM48_IE_NAME_LONG)-1)*8/7); + printf("Info: Long Network Name: %s\n", name); + } +} + +static int hnb_nas_rx_auth_req(struct hnb *hnb, struct gsm48_hdr *gh, + int len) +{ + struct gsm48_auth_req *ar; + + len -= (const char *)&gh->data[0] - (const char *)gh; + + if (len < sizeof(*ar)) { + printf("GSM48 Auth Req does not fit.\n"); + return -1; + } + + printf(" :) Authentication Request :)\n"); + + ar = (struct gsm48_auth_req*) &gh->data[0]; + int seq = ar->key_seq; + + /* Generate SRES from *HARDCODED* Ki for Iuh testing */ + struct osmo_auth_vector vec; + /* Ki 000102030405060708090a0b0c0d0e0f */ + struct osmo_sub_auth_data auth = { + .type = OSMO_AUTH_TYPE_GSM, + .algo = OSMO_AUTH_ALG_COMP128v1, + .u.gsm.ki = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, + 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, + 0x0e, 0x0f + }, + }; + + memset(&vec, 0, sizeof(vec)); + osmo_auth_gen_vec(&vec, &auth, ar->rand); + + printf("seq %d rand %s", + seq, osmo_hexdump(ar->rand, sizeof(ar->rand))); + printf(" --> sres %s\n", + osmo_hexdump(vec.sres, 4)); + + return hnb_tx_dt(hnb, gen_nas_auth_resp(vec.sres)); +} + +void hnb_tx_iu_release_req(struct hnb *hnb) +{ + RANAP_Cause_t cause = { + .present = RANAP_Cause_PR_radioNetwork, + .choice.transmissionNetwork = RANAP_CauseRadioNetwork_release_due_to_UE_generated_signalling_connection_release, + }; + hnb_tx_dt(hnb, ranap_new_msg_iu_rel_req(&cause)); +} + +void hnb_tx_iu_release_compl(struct hnb *hnb) +{ + hnb_tx_dt(hnb, ranap_new_msg_iu_rel_compl()); +} + +static int hnb_nas_rx_mm(struct hnb *hnb, struct gsm48_hdr *gh, int len) +{ + struct hnbtest_chan *chan; + + chan = hnb->cs.chan; + if (!chan) { + printf("hnb_nas_rx_mm(): No CS channel established yet.\n"); + return -1; + } + + OSMO_ASSERT(!chan->is_ps); + + uint8_t msg_type = gsm48_hdr_msg_type(gh); + int sent_tmsi; + + switch (msg_type) { + case GSM48_MT_MM_ID_REQ: + return hnb_tx_dt(hnb, gen_nas_id_resp()); + + case GSM48_MT_MM_LOC_UPD_ACCEPT: + if (hnb_nas_rx_lu_accept(gh, len, &sent_tmsi)) + return -1; + if (sent_tmsi) + return hnb_tx_dt(hnb, gen_nas_tmsi_realloc_compl()); + else + return 0; + + case GSM48_MT_MM_LOC_UPD_REJECT: + printf("Received Location Update Reject\n"); + return 0; + + case GSM48_MT_MM_INFO: + hnb_nas_rx_mm_info(gh, len); + hnb_tx_iu_release_req(hnb); + return 0; + + case GSM48_MT_MM_AUTH_REQ: + return hnb_nas_rx_auth_req(hnb, gh, len); + + default: + printf("04.08 message type not handled by hnb-test: 0x%x\n", + msg_type); + return 0; + } + +} + +void hnb_nas_rx_dtap(struct hnb *hnb, void *data, int len) +{ + int rc; + printf("got %d bytes: %s\n", len, osmo_hexdump(data, len)); + + // nas_pdu == '05 08 12' ==> IMEI Identity request + // '05 04 0d' ==> LU reject + + struct gsm48_hdr *gh = data; + if (len < sizeof(*gh)) { + printf("hnb_nas_rx_dtap(): NAS PDU is too short: %d. Ignoring.\n", + len); + return; + } + uint8_t pdisc = gsm48_hdr_pdisc(gh); + + switch (pdisc) { + case GSM48_PDISC_MM: + rc = hnb_nas_rx_mm(hnb, gh, len); + if (rc != 0) + printf("Error receiving MM message: %d\n", rc); + return; + default: + printf("04.08 discriminator not handled by hnb-test: %d\n", + pdisc); + return; + } +} + +void hnb_rx_secmode_cmd(struct hnb *hnb, long ip_alg) +{ + printf(" :) Security Mode Command :)\n"); + /* not caring about encryption yet, just pass 0 for No Encryption. */ + hnb_tx_dt(hnb, ranap_new_msg_sec_mod_compl(ip_alg, 0)); +} + +void hnb_rx_iu_release(struct hnb *hnb) +{ + hnb_tx_iu_release_compl(hnb); +} + +void hnb_rx_paging(struct hnb *hnb, const char *imsi) +{ + printf(" :) Paging Request for %s :)\n", imsi); + /* TODO reply */ +} + +int hnb_hnbap_rx(struct hnb *hnb, struct msgb *msg) +{ + HNBAP_HNBAP_PDU_t _pdu, *pdu = &_pdu; + asn_dec_rval_t dec_ret; + int rc; + + memset(pdu, 0, sizeof(*pdu)); + dec_ret = aper_decode(NULL, &asn_DEF_HNBAP_HNBAP_PDU, (void **) &pdu, + msg->data, msgb_length(msg), 0, 0); + if (dec_ret.code != RC_OK) { + LOGP(DMAIN, LOGL_ERROR, "Error in ASN.1 decode\n"); + return -EINVAL; + } + + if (pdu->present != HNBAP_HNBAP_PDU_PR_successfulOutcome) { + printf("Unexpected HNBAP message received\n"); + } + + switch (pdu->choice.successfulOutcome.procedureCode) { + case HNBAP_ProcedureCode_id_HNBRegister: + /* Get HNB id and send UE Register request */ + rc = hnb_rx_hnb_register_acc(hnb, &pdu->choice.successfulOutcome.value); + break; + case HNBAP_ProcedureCode_id_UERegister: + rc = hnb_rx_ue_register_acc(hnb, &pdu->choice.successfulOutcome.value); + break; + default: + rc = -ENOSPC; + break; + } + + return rc; +} + +extern void direct_transfer_nas_pdu_print(ANY_t *in); + +int hnb_rua_rx(struct hnb *hnb, struct msgb *msg) +{ + RUA_RUA_PDU_t _pdu, *pdu = &_pdu; + asn_dec_rval_t dec_ret; + + memset(pdu, 0, sizeof(*pdu)); + dec_ret = aper_decode(NULL, &asn_DEF_RUA_RUA_PDU, (void **) &pdu, + msg->data, msgb_length(msg), 0, 0); + if (dec_ret.code != RC_OK) { + LOGP(DMAIN, LOGL_ERROR, "Error in ASN.1 decode\n"); + return -EINVAL; + } + + switch (pdu->present) { + case RUA_RUA_PDU_PR_successfulOutcome: + printf("RUA_RUA_PDU_PR_successfulOutcome\n"); + break; + case RUA_RUA_PDU_PR_initiatingMessage: + printf("RUA_RUA_PDU_PR_initiatingMessage\n"); + break; + case RUA_RUA_PDU_PR_NOTHING: + printf("RUA_RUA_PDU_PR_NOTHING\n"); + break; + case RUA_RUA_PDU_PR_unsuccessfulOutcome: + printf("RUA_RUA_PDU_PR_unsuccessfulOutcome\n"); + break; + default: + printf("Unexpected RUA message received\n"); + break; + } + + switch (pdu->choice.successfulOutcome.procedureCode) { + case RUA_ProcedureCode_id_ConnectionlessTransfer: + printf("RUA rx Connectionless Transfer\n"); + hnb_rua_cl_handle(hnb, &pdu->choice.successfulOutcome.value); + break; + case RUA_ProcedureCode_id_Connect: + printf("RUA rx Connect\n"); + break; + case RUA_ProcedureCode_id_DirectTransfer: + printf("RUA rx DirectTransfer\n"); + hnb_rua_dt_handle(hnb, &pdu->choice.successfulOutcome.value); + break; + case RUA_ProcedureCode_id_Disconnect: + printf("RUA rx Disconnect\n"); + break; + case RUA_ProcedureCode_id_ErrorIndication: + printf("RUA rx ErrorIndication\n"); + break; + case RUA_ProcedureCode_id_privateMessage: + printf("RUA rx privateMessage\n"); + break; + default: + printf("RUA rx unknown message\n"); + break; + } + + return 0; +} + +static int hnb_read_cb(struct osmo_fd *fd) +{ + struct hnb *hnb = fd->data; + struct sctp_sndrcvinfo sinfo; + struct msgb *msg = msgb_alloc(IUH_MSGB_SIZE, "Iuh rx"); + int flags = 0; + int rc; + + if (!msg) + return -ENOMEM; + + rc = sctp_recvmsg(fd->fd, msgb_data(msg), msgb_tailroom(msg), + NULL, NULL, &sinfo, &flags); + if (rc < 0) { + LOGP(DMAIN, LOGL_ERROR, "Error during sctp_recvmsg()\n"); + /* FIXME: clean up after disappeared HNB */ + close(fd->fd); + osmo_fd_unregister(fd); + return rc; + } else if (rc == 0) { + LOGP(DMAIN, LOGL_INFO, "Connection to HNB closed\n"); + close(fd->fd); + osmo_fd_unregister(fd); + fd->fd = -1; + + return -1; + } else { + msgb_put(msg, rc); + } + + if (flags & MSG_NOTIFICATION) { + LOGP(DMAIN, LOGL_DEBUG, "Ignoring SCTP notification\n"); + msgb_free(msg); + return 0; + } + + sinfo.sinfo_ppid = ntohl(sinfo.sinfo_ppid); + + switch (sinfo.sinfo_ppid) { + case IUH_PPI_HNBAP: + printf("HNBAP message received\n"); + rc = hnb_hnbap_rx(hnb, msg); + break; + case IUH_PPI_RUA: + printf("RUA message received\n"); + rc = hnb_rua_rx(hnb, msg); + break; + case IUH_PPI_SABP: + case IUH_PPI_RNA: + case IUH_PPI_PUA: + LOGP(DMAIN, LOGL_ERROR, "Unimplemented SCTP PPID=%u received\n", + sinfo.sinfo_ppid); + rc = 0; + break; + default: + LOGP(DMAIN, LOGL_ERROR, "Unknown SCTP PPID=%u received\n", + sinfo.sinfo_ppid); + rc = 0; + break; + } + + msgb_free(msg); + return rc; +} + +static int hnb_write_cb(struct osmo_fd *fd, struct msgb *msg) +{ + /* struct hnb *ctx = fd->data; */ + struct sctp_sndrcvinfo sinfo = { + .sinfo_ppid = htonl(msgb_sctp_ppid(msg)), + .sinfo_stream = 0, + }; + int rc; + + printf("Sending: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); + rc = sctp_send(fd->fd, msgb_data(msg), msgb_length(msg), + &sinfo, 0); + /* we don't need to msgb_free(), write_queue does this for us */ + return rc; +} + +static void hnb_send_register_req(struct hnb *hnb) +{ + HNBAP_HNBRegisterRequest_t request_out; + struct msgb *msg; + int rc; + uint16_t lac, sac; + uint8_t rac; + uint32_t cid; + uint8_t plmn[] = {0x09, 0xf1, 0x99}; + char identity[50] = "ATestHNB@"; + + HNBAP_HNBRegisterRequestIEs_t request; + memset(&request, 0, sizeof(request)); + + lac = 0xc0fe; + sac = 0xabab; + rac = 0x42; + cid = 0xadceaab; + + asn1_u16_to_str(&request.lac, &lac, lac); + asn1_u16_to_str(&request.sac, &sac, sac); + asn1_u8_to_str(&request.rac, &rac, rac); + asn1_u28_to_bitstring(&request.cellIdentity, &cid, cid); + + request.hnB_Identity.hNB_Identity_Info.buf = (uint8_t*) identity; + request.hnB_Identity.hNB_Identity_Info.size = strlen(identity); + + request.plmNidentity.buf = plmn; + request.plmNidentity.size = 3; + + + + memset(&request_out, 0, sizeof(request_out)); + rc = hnbap_encode_hnbregisterrequesties(&request_out, &request); + if (rc < 0) { + printf("Could not encode HNB register request IEs\n"); + } + + msg = hnbap_generate_initiating_message(HNBAP_ProcedureCode_id_HNBRegister, + HNBAP_Criticality_reject, + &asn_DEF_HNBAP_HNBRegisterRequest, + &request_out); + + + msgb_sctp_ppid(msg) = IUH_PPI_HNBAP; + + osmo_wqueue_enqueue(&hnb->wqueue, msg); +} + +static void hnb_send_deregister_req(struct hnb *hnb) +{ + struct msgb *msg; + int rc; + + HNBAP_HNBDe_RegisterIEs_t request; + memset(&request, 0, sizeof(request)); + + request.cause.present = HNBAP_Cause_PR_misc; + request.cause.choice.misc = HNBAP_CauseMisc_o_and_m_intervention; + + HNBAP_HNBDe_Register_t request_out; + memset(&request_out, 0, sizeof(request_out)); + rc = hnbap_encode_hnbde_registeries(&request_out, &request); + if (rc < 0) { + printf("Could not encode HNB deregister request IEs\n"); + } + + msg = hnbap_generate_initiating_message(HNBAP_ProcedureCode_id_HNBDe_Register, + HNBAP_Criticality_reject, + &asn_DEF_HNBAP_HNBDe_Register, + &request_out); + + msgb_sctp_ppid(msg) = IUH_PPI_HNBAP; + + osmo_wqueue_enqueue(&hnb->wqueue, msg); +} + +static struct vty_app_info vty_info = { + .name = "OsmohNodeB", + .version = "0", +}; + +static int sctp_sock_init(int fd) +{ + struct sctp_event_subscribe event; + int rc; + + /* subscribe for all events */ + memset((uint8_t *)&event, 1, sizeof(event)); + rc = setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, + &event, sizeof(event)); + + return rc; +} + +#define HNBAP_STR "HNBAP related commands\n" +#define HNB_STR "HomeNodeB commands\n" +#define UE_STR "User Equipment commands\n" +#define RANAP_STR "RANAP related commands\n" +#define CSPS_STR "Circuit Switched\n" "Packet Switched\n" + +DEFUN(hnb_register, hnb_register_cmd, + "hnbap hnb register", HNBAP_STR HNB_STR "Send HNB-REGISTER REQUEST") +{ + hnb_send_register_req(&g_hnb); + + return CMD_SUCCESS; +} + +DEFUN(hnb_deregister, hnb_deregister_cmd, + "hnbap hnb deregister", HNBAP_STR HNB_STR "Send HNB-DEREGISTER REQUEST") +{ + hnb_send_deregister_req(&g_hnb); + + return CMD_SUCCESS; +} + +DEFUN(ue_register, ue_register_cmd, + "hnbap ue register IMSI", HNBAP_STR UE_STR "Send UE-REGISTER REQUEST") +{ + hnb_ue_register_tx(&g_hnb, argv[0]); + + return CMD_SUCCESS; +} + +DEFUN(asn_dbg, asn_dbg_cmd, + "asn-debug (1|0)", "Enable or disable libasn1c debugging") +{ + asn_debug = atoi(argv[0]); + + return CMD_SUCCESS; +} + +DEFUN(ranap_reset, ranap_reset_cmd, + "ranap reset (cs|ps)", RANAP_STR "Send RANAP RESET\n" CSPS_STR) +{ + int is_ps = 0; + struct msgb *msg, *rua; + + RANAP_Cause_t cause = { + .present = RANAP_Cause_PR_transmissionNetwork, + .choice.transmissionNetwork = RANAP_CauseTransmissionNetwork_signalling_transport_resource_failure, + }; + + if (!strcmp(argv[0], "ps")) + is_ps = 1; + + msg = ranap_new_msg_reset(is_ps, &cause); + rua = rua_new_udt(msg); + //msgb_free(msg); + osmo_wqueue_enqueue(&g_hnb.wqueue, rua); + + return CMD_SUCCESS; +} + + +enum my_vty_nodes { + CHAN_NODE = _LAST_OSMOVTY_NODE, +}; + +static struct cmd_node chan_node = { + CHAN_NODE, + "%s(chan)> ", + 1, +}; + + +static struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi) +{ + uint8_t lu[] = { GSM48_PDISC_MM, GSM48_MT_MM_LOC_UPD_REQUEST, + 0x70, 0x62, 0xf2, 0x30, 0xff, 0xf3, 0x57, + /* len, IMSI/type, IMSI-------------------------------- */ + 0x08, 0x29, 0x26, 0x24, 0x10, 0x32, 0x54, 0x76, 0x98, + 0x33, 0x03, 0x57, 0x18 , 0xb2 }; + uint8_t plmn_id[] = { 0x09, 0x01, 0x99 }; + RANAP_GlobalRNC_ID_t rnc_id = { + .rNC_ID = 23, + .pLMNidentity.buf = plmn_id, + .pLMNidentity.size = sizeof(plmn_id), + }; + + /* FIXME: patch imsi */ + /* Note: the Mobile Identitiy IE's IMSI data has the identity type and + * an even/odd indicator bit encoded in the first octet. So the first + * octet looks like this: + * + * 8 7 6 5 | 4 | 3 2 1 + * IMSI-digit | even/odd | type + * + * followed by the remaining IMSI digits. + * If digit count is even (bit 4 == 0), that first high-nibble is 0xf. + * (derived from Iu pcap Location Update Request msg and TS 25.413) + * + * TODO I'm only 90% sure about this + */ + + return ranap_new_msg_initial_ue(conn_id, is_ps, &rnc_id, lu, sizeof(lu)); +} + +DEFUN(chan, chan_cmd, + "channel (cs|ps) lu imsi IMSI", + "Open a new Signalling Connection\n" + "To Circuit-Switched CN\n" + "To Packet-Switched CN\n" + "Performing a Location Update\n" + ) +{ + struct hnbtest_chan *chan; + struct msgb *msg, *rua; + static uint16_t conn_id = 42; + + chan = talloc_zero(tall_hnb_ctx, struct hnbtest_chan); + if (!strcmp(argv[0], "ps")) + chan->is_ps = 1; + chan->imsi = talloc_strdup(chan, argv[1]); + chan->conn_id = conn_id; + conn_id++; + + msg = gen_initue_lu(chan->is_ps, chan->conn_id, chan->imsi); + rua = rua_new_conn(chan->is_ps, chan->conn_id, msg); + + osmo_wqueue_enqueue(&g_hnb.wqueue, rua); + + vty->index = chan; + vty->node = CHAN_NODE; + + if (!chan->is_ps) + g_hnb.cs.chan = chan; + + + return CMD_SUCCESS; +} + +static void hnbtest_vty_init(void) +{ + install_element_ve(&asn_dbg_cmd); + install_element_ve(&hnb_register_cmd); + install_element_ve(&hnb_deregister_cmd); + install_element_ve(&ue_register_cmd); + install_element_ve(&ranap_reset_cmd); + install_element_ve(&chan_cmd); + + install_node(&chan_node, NULL); +} + +static void handle_options(int argc, char **argv) +{ + while (1) { + int idx = 0, c; + static const struct option long_options[] = { + { "ues", 1, 0, 'u' }, + { "gw-addr", 1, 0, 'g' }, + { 0, 0, 0, 0 }, + }; + + c = getopt_long(argc, argv, "u:g:", long_options, &idx); + + if (c == -1) + break; + + switch (c) { + case 'u': + g_hnb.ues = atoi(optarg); + break; + case 'g': + g_hnb.gw_addr = optarg; + break; + } + } +} + int main(int argc, char **argv) { - return 0; + int rc; + + tall_hnb_ctx = talloc_named_const(NULL, 0, "hnb_context"); + + msgb_talloc_ctx_init(tall_hnb_ctx, 0); + talloc_asn1_ctx = talloc_named_const(tall_hnb_ctx, 0, "asn1_context"); + + rc = osmo_init_logging2(tall_hnb_ctx, &hnb_log_info); + if (rc < 0) + exit(1); + + ranap_set_log_area(DRANAP); + + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_use_color(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 0); + log_set_print_category_hex(osmo_stderr_target, 0); + + vty_init(&vty_info); + hnbtest_vty_init(); + + rc = telnet_init_dynif(NULL, NULL, vty_get_bind_addr(), 2324); + if (rc < 0) { + perror("Error binding VTY port"); + exit(1); + } + + handle_options(argc, argv); + + osmo_wqueue_init(&g_hnb.wqueue, 16); + g_hnb.wqueue.bfd.data = &g_hnb; + g_hnb.wqueue.read_cb = hnb_read_cb; + g_hnb.wqueue.write_cb = hnb_write_cb; + + rc = osmo_sock_init_ofd(&g_hnb.wqueue.bfd, AF_INET, SOCK_STREAM, + IPPROTO_SCTP, g_hnb.gw_addr, + g_hnb.gw_port, OSMO_SOCK_F_CONNECT); + if (rc < 0) { + perror("Error connecting to Iuh port"); + exit(1); + } + sctp_sock_init(g_hnb.wqueue.bfd.fd); + +#if 0 + /* some hard-coded message generation. Doesn't make sense from + * a protocol point of view but enables to look at the encoded + * results in wireshark for manual verification */ + { + struct msgb *msg, *rua; + const uint8_t nas[] = { 0, 1, 2, 3 }; + const uint8_t ik[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; + + msg = ranap_new_msg_dt(0, nas, sizeof(nas)); + rua = rua_new_udt(msg); + osmo_wqueue_enqueue(&g_hnb.wqueue, rua); + + msg = ranap_new_msg_sec_mod_cmd(ik, ik, RANAP_KeyStatus_new); + rua = rua_new_udt(msg); + osmo_wqueue_enqueue(&g_hnb.wqueue, rua); + + msg = ranap_new_msg_iu_rel_cmd() + rua = rua_new_udt(msg); + osmo_wqueue_enqueue(&g_hnb.wqueue, rua); + + msg = ranap_new_msg_paging_cmd("901990123456789", NULL, 0, 0); + rua = rua_new_udt(msg); + osmo_wqueue_enqueue(&g_hnb.wqueue, rua); + + msg = ranap_new_msg_rab_assign_voice(1, 0x01020304, 0x1020); + rua = rua_new_udt(msg); + osmo_wqueue_enqueue(&g_hnb.wqueue, rua); + + msg = ranap_new_msg_rab_assign_data(2, 0x01020304, 0x11223344); + rua = rua_new_udt(msg); + osmo_wqueue_enqueue(&g_hnb.wqueue, rua); + } +#endif + + while (1) { + rc = osmo_select_main(0); + if (rc < 0) + exit(3); + } + + /* not reached */ + exit(0); } diff --git a/src/osmo-hnodeb/ranap.c b/src/osmo-hnodeb/ranap.c new file mode 100644 index 0000000..0b3c1db --- /dev/null +++ b/src/osmo-hnodeb/ranap.c @@ -0,0 +1,88 @@ +#include + +#include +#include +#include + +#include + +static const char *printstr(OCTET_STRING_t *s) +{ + return osmo_hexdump((const unsigned char*)s->buf, s->size); +} + +#define PP(octet_string_t) \ + printf(#octet_string_t " = %s\n",\ + printstr(&octet_string_t)) + +void hnb_rua_dt_handle_ranap(struct hnb *hnb, + struct ranap_message_s *ranap_msg) +{ + int len; + uint8_t *data; + RANAP_PermittedIntegrityProtectionAlgorithms_t *algs; + RANAP_IntegrityProtectionAlgorithm_t *first_alg; + + printf("rx ranap_msg->procedureCode %d\n", + ranap_msg->procedureCode); + + switch (ranap_msg->procedureCode) { + case RANAP_ProcedureCode_id_DirectTransfer: + printf("rx DirectTransfer: presence = %hx\n", + ranap_msg->msg.directTransferIEs.presenceMask); + PP(ranap_msg->msg.directTransferIEs.nas_pdu); + + len = ranap_msg->msg.directTransferIEs.nas_pdu.size; + data = ranap_msg->msg.directTransferIEs.nas_pdu.buf; + + hnb_nas_rx_dtap(hnb, data, len); + return; + + case RANAP_ProcedureCode_id_SecurityModeControl: + printf("rx SecurityModeControl: presence = %hx\n", + ranap_msg->msg.securityModeCommandIEs.presenceMask); + + /* Just pick the first available IP alg, don't care about + * encryption (yet?) */ + algs = &ranap_msg->msg.securityModeCommandIEs.integrityProtectionInformation.permittedAlgorithms; + if (algs->list.count < 1) { + printf("Security Mode Command: No permitted algorithms.\n"); + return; + } + first_alg = *algs->list.array; + + hnb_rx_secmode_cmd(hnb, *first_alg); + return; + + case RANAP_ProcedureCode_id_Iu_Release: + hnb_rx_iu_release(hnb); + return; + } +} + +void hnb_rua_cl_handle_ranap(struct hnb *hnb, + struct ranap_message_s *ranap_msg) +{ + char imsi[16]; + + printf("rx ranap_msg->procedureCode %d\n", + ranap_msg->procedureCode); + + switch (ranap_msg->procedureCode) { + case RANAP_ProcedureCode_id_Paging: + if (ranap_msg->msg.pagingIEs.permanentNAS_UE_ID.present == RANAP_PermanentNAS_UE_ID_PR_iMSI) { + ranap_bcd_decode(imsi, sizeof(imsi), + ranap_msg->msg.pagingIEs.permanentNAS_UE_ID.choice.iMSI.buf, + ranap_msg->msg.pagingIEs.permanentNAS_UE_ID.choice.iMSI.size); + } else imsi[0] = '\0'; + + printf("rx Paging: presence=%hx domain=%ld IMSI=%s\n", + ranap_msg->msg.pagingIEs.presenceMask, + ranap_msg->msg.pagingIEs.cN_DomainIndicator, + imsi + ); + + hnb_rx_paging(hnb, imsi); + return; + } +} diff --git a/src/osmo-hnodeb/rua.c b/src/osmo-hnodeb/rua.c new file mode 100644 index 0000000..ec8181c --- /dev/null +++ b/src/osmo-hnodeb/rua.c @@ -0,0 +1,42 @@ +#include + +#include +#include + +#include +#include + + +void hnb_rua_dt_handle(struct hnb *hnb, ANY_t *in) +{ + RUA_DirectTransferIEs_t ies; + int rc; + + rc = rua_decode_directtransferies(&ies, in); + if (rc < 0) { + printf("failed to decode RUA DT IEs\n"); + return; + } + + rc = ranap_cn_rx_co(hnb_rua_dt_handle_ranap, hnb, ies.ranaP_Message.buf, ies.ranaP_Message.size); + + /* FIXME: what to do with the asn1c-allocated memory */ + rua_free_directtransferies(&ies); +} + +void hnb_rua_cl_handle(struct hnb *hnb, ANY_t *in) +{ + RUA_ConnectionlessTransferIEs_t ies; + int rc; + + rc = rua_decode_connectionlesstransferies(&ies, in); + if (rc < 0) { + printf("failed to decode RUA CL IEs\n"); + return; + } + + rc = ranap_cn_rx_cl(hnb_rua_cl_handle_ranap, hnb, ies.ranaP_Message.buf, ies.ranaP_Message.size); + + /* FIXME: what to do with the asn1c-allocated memory */ + rua_free_connectionlesstransferies(&ies); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I36fd4aa5d39222371bd36e9f540b91e36a26de43 Gerrit-Change-Number: 25995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:24:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 15:24:28 +0000 Subject: Change in osmo-iuh[master]: hnbap: Drop no longer existing asn1c param -fnative-types In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25986 ) Change subject: hnbap: Drop no longer existing asn1c param -fnative-types ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iccf81539a5045416185e619d24c3d542204437e6 Gerrit-Change-Number: 25986 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 15:24:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:34:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:34:30 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with ... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25991 ) Change subject: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: Verified+1 linter doesn't apply here. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1bcbe047d233684647d6ffe9febb14a12c579696 Gerrit-Change-Number: 25991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 15:34:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:34:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:34:31 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with ... In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25991 ) Change subject: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1bcbe047d233684647d6ffe9febb14a12c579696 Gerrit-Change-Number: 25991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:34:47 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:34:47 +0000 Subject: Change in osmo-iuh[master]: rua: Use asn1c flag -fcompound-names to avoid name collisions with ot... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25992 ) Change subject: rua: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: Verified+1 linter doesn't apply here. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Id4e337cdc82c26922b7ca7f0fe8af523e9a0945c Gerrit-Change-Number: 25992 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 15:34:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:34:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:34:49 +0000 Subject: Change in osmo-iuh[master]: rua: Use asn1c flag -fcompound-names to avoid name collisions with ot... In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25992 ) Change subject: rua: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Id4e337cdc82c26922b7ca7f0fe8af523e9a0945c Gerrit-Change-Number: 25992 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:34:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:34:53 +0000 Subject: Change in osmo-iuh[master]: sabp: Use asn1c flag -fcompound-names to avoid name collisions with o... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25993 ) Change subject: sabp: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: Verified+1 linter doesn't apply here. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I10ce4a9414768cdcf850feeca4088296e339919f Gerrit-Change-Number: 25993 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 15:34:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:34:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:34:56 +0000 Subject: Change in osmo-iuh[master]: sabp: Use asn1c flag -fcompound-names to avoid name collisions with o... In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25993 ) Change subject: sabp: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I10ce4a9414768cdcf850feeca4088296e339919f Gerrit-Change-Number: 25993 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:35:02 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:35:02 +0000 Subject: Change in osmo-iuh[master]: ranap: Use asn1c flag -fcompound-names to avoid name collisions with ... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25994 ) Change subject: ranap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: Verified+1 linter doesn't apply here. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iba106dcc18e3d429b4b9808610a44ac29b798172 Gerrit-Change-Number: 25994 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 15:35:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:35:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:35:03 +0000 Subject: Change in osmo-iuh[master]: ranap: Use asn1c flag -fcompound-names to avoid name collisions with ... In-Reply-To: References: Message-ID: pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25994 ) Change subject: ranap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iba106dcc18e3d429b4b9808610a44ac29b798172 Gerrit-Change-Number: 25994 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:47:38 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 27 Oct 2021 15:47:38 +0000 Subject: Change in osmo-bsc[master]: heighbor_ident: add/del neighbor cells via ctrl interface In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25976 to look at the new patch set (#4). Change subject: heighbor_ident: add/del neighbor cells via ctrl interface ...................................................................... heighbor_ident: add/del neighbor cells via ctrl interface The VTY allows flexible control over the neighbor cell information via the neighbor command, which can be found in the configure terminal under the bts node. Lets add pendant of this command on the control interface as well. Change-Id: I343a40e18fa9b91e6c381912c0426a002841e079 Related: SYS#5641 --- M doc/manuals/chapters/control.adoc M include/osmocom/bsc/neighbor_ident.h M src/osmo-bsc/Makefile.am M src/osmo-bsc/bsc_ctrl_commands.c A src/osmo-bsc/neighbor_ident_ctrl.c M src/osmo-bsc/neighbor_ident_vty.c M tests/ctrl_test_runner.py 7 files changed, 916 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/76/25976/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I343a40e18fa9b91e6c381912c0426a002841e079 Gerrit-Change-Number: 25976 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:47:39 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Wed, 27 Oct 2021 15:47:39 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: change neighbor-list mode/arfcn via control interface References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25996 ) Change subject: bsc_ctrl_commands: change neighbor-list mode/arfcn via control interface ...................................................................... bsc_ctrl_commands: change neighbor-list mode/arfcn via control interface It is possible to change the neighbor-list mode via the VTY from automatic mode to manual neighbor-list configuration. In the manual mode, the user can add ARFCN values manually. This command can be found under the bts node. Lets add pendant of this command on the control interface as well. Related: SYS#5641 Change-Id: Id97bc0d31a358db6221c385761773fb48670c921 --- M doc/manuals/chapters/control.adoc M src/osmo-bsc/bsc_ctrl_commands.c M tests/ctrl_test_runner.py 3 files changed, 160 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/25996/1 diff --git a/doc/manuals/chapters/control.adoc b/doc/manuals/chapters/control.adoc index cf3110b..8e54561 100644 --- a/doc/manuals/chapters/control.adoc +++ b/doc/manuals/chapters/control.adoc @@ -69,6 +69,9 @@ |[bts.N.]handover2.retries|RW|No|<0-9>,"default"|Number of times to immediately retry a failed handover/assignment, before a penalty time is applied. |handover2.congestion-check|RW|No|"disabled",<1-999>,"now"|Congestion check interval in seconds, "now" triggers immediate congestion check. |bts.N.resend-si|WO|No|Ignored|Resend system information to BTS. +|bts.N.neighbor-list.mode|WO|No|"automatic","manual","manual-si5"|Mode of Neighbor List generation. +|bts.N.neighbor-list.add|WO|No|<0-1023>|Add to manual neighbor list. +|bts.N.neighbor-list.del|WO|No|<0-1023>|Delete from manual neighbor list. |=== [[notif]] diff --git a/src/osmo-bsc/bsc_ctrl_commands.c b/src/osmo-bsc/bsc_ctrl_commands.c index f2ba5af..456fcd9 100644 --- a/src/osmo-bsc/bsc_ctrl_commands.c +++ b/src/osmo-bsc/bsc_ctrl_commands.c @@ -683,6 +683,120 @@ CTRL_CMD_DEFINE_WO_NOVRF(bts_resend_si, "resend-si"); +static int verify_bts_neighbor_list_add_del(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + int arfcn; + + if (osmo_str_to_int(&arfcn, value, 10, 0, 1023) < 0) { + cmd->reply = "Invalid ARFCN value"; + return 1; + } + + return 0; +} + +static int set_bts_neighbor_list_add_del(struct ctrl_cmd *cmd, void *data, bool add) +{ + struct gsm_bts *bts = cmd->node; + struct bitvec *bv = &bts->si_common.neigh_list; + int arfcn_int; + uint16_t arfcn; + enum gsm_band unused; + + if (osmo_str_to_int(&arfcn_int, cmd->value, 10, 0, 1023) < 0) { + cmd->reply = "Failed to parse ARFCN value"; + return CTRL_CMD_ERROR; + } + arfcn = (uint16_t) arfcn_int; + + if (bts->neigh_list_manual_mode == NL_MODE_AUTOMATIC) { + cmd->reply = "Neighbor list not in manual mode"; + return CTRL_CMD_ERROR; + } + + if (gsm_arfcn2band_rc(arfcn, &unused) < 0) { + cmd->reply = "Invalid arfcn detected"; + return CTRL_CMD_ERROR; + } + + if (add) + bitvec_set_bit_pos(bv, arfcn, 1); + else + bitvec_set_bit_pos(bv, arfcn, 0); + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +static int verify_bts_neighbor_list_add(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return verify_bts_neighbor_list_add_del(cmd, value, _data); +} + +static int set_bts_neighbor_list_add(struct ctrl_cmd *cmd, void *data) +{ + return set_bts_neighbor_list_add_del(cmd, data, true); +} + +CTRL_CMD_DEFINE_WO(bts_neighbor_list_add, "neighbor-list add"); + +static int verify_bts_neighbor_list_del(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + return verify_bts_neighbor_list_add_del(cmd, value, _data); +} + +static int set_bts_neighbor_list_del(struct ctrl_cmd *cmd, void *data) +{ + return set_bts_neighbor_list_add_del(cmd, data, false); +} + +CTRL_CMD_DEFINE_WO(bts_neighbor_list_del, "neighbor-list del"); + +static int verify_bts_neighbor_list_mode(struct ctrl_cmd *cmd, const char *value, void *_data) +{ + if (!strcmp(value, "automatic")) + return 0; + if (!strcmp(value, "manual")) + return 0; + if (!strcmp(value, "manual-si5")) + return 0; + + cmd->reply = "Invalid mode"; + return 1; +} + +static int set_bts_neighbor_list_mode(struct ctrl_cmd *cmd, void *data) +{ + struct gsm_bts *bts = cmd->node; + int mode; + + if (!strcmp(cmd->value, "automatic")) + mode = NL_MODE_AUTOMATIC; + else if (!strcmp(cmd->value, "manual")) + mode = NL_MODE_MANUAL; + else if (!strcmp(cmd->value, "manual-si5")) + mode = NL_MODE_MANUAL_SI5SEP; + + switch (mode) { + case NL_MODE_MANUAL_SI5SEP: + case NL_MODE_MANUAL: + /* make sure we clear the current list when switching to + * manual mode */ + if (bts->neigh_list_manual_mode == 0) + memset(&bts->si_common.data.neigh_list, 0, sizeof(bts->si_common.data.neigh_list)); + break; + default: + break; + } + + bts->neigh_list_manual_mode = mode; + + cmd->reply = "OK"; + return CTRL_CMD_REPLY; +} + +CTRL_CMD_DEFINE_WO(bts_neighbor_list_mode, "neighbor-list mode"); + int bsc_base_ctrl_cmds_install(void) { int rc = 0; @@ -708,6 +822,9 @@ rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rf_states); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_c0_power_red); rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_resend_si); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_add); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_del); + rc |= ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_neighbor_list_mode); rc |= neighbor_ident_ctrl_init(); diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py index 5e9bcef..4c07d5e 100755 --- a/tests/ctrl_test_runner.py +++ b/tests/ctrl_test_runner.py @@ -525,6 +525,46 @@ self.assertEqual(r['var'], 'apply-config-file') self.assertEqual(r['value'], 'OK') + def testNeighborList(self): + # Enter manual neighbor-list mode + r = self.do_set('bts.0.neighbor-list.mode', 'manual') + print('respose: ' + str(r)) + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.neighbor-list.mode') + self.assertEqual(r['value'], 'OK') + + # Add an ARFCN + r = self.do_set('bts.0.neighbor-list.add', '123') + print('respose: ' + str(r)) + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.neighbor-list.add') + self.assertEqual(r['value'], 'OK') + + # Delete the ARFCN again + r = self.do_set('bts.0.neighbor-list.del', '123') + print('respose: ' + str(r)) + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.neighbor-list.del') + self.assertEqual(r['value'], 'OK') + + # Go back to automatic neighbor-list mode + r = self.do_set('bts.0.neighbor-list.mode', 'automatic') + print('respose: ' + str(r)) + self.assertEqual(r['mtype'], 'SET_REPLY') + self.assertEqual(r['var'], 'bts.0.neighbor-list.mode') + self.assertEqual(r['value'], 'OK') + + # This must not work as we are in automatic neighbor-list mode + r = self.do_set('bts.0.neighbor-list.add', '123') + print('respose: ' + str(r)) + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Neighbor list not in manual mode') + + # Try an invalid neighbor-list mode + r = self.do_set('bts.0.neighbor-list.mode', 'qwertzuiop') + print('respose: ' + str(r)) + self.assertEqual(r['mtype'], 'ERROR') + self.assertEqual(r['error'], 'Invalid mode') class TestCtrlBSCNeighbor(TestCtrlBase): -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id97bc0d31a358db6221c385761773fb48670c921 Gerrit-Change-Number: 25996 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:48:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:48:57 +0000 Subject: Change in osmo-bsc[master]: heighbor_ident: add/del neighbor cells via ctrl interface In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25976 ) Change subject: heighbor_ident: add/del neighbor cells via ctrl interface ...................................................................... Patch Set 4: Some comments from prev version still apply. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I343a40e18fa9b91e6c381912c0426a002841e079 Gerrit-Change-Number: 25976 Gerrit-PatchSet: 4 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 15:48:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:50:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:50:54 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: change neighbor-list mode/arfcn via control interface In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25996 ) Change subject: bsc_ctrl_commands: change neighbor-list mode/arfcn via control interface ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25996/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/25996/1//COMMIT_MSG at 12 PS1, Line 12: under the bts node. Lets add pendant of this command on the control pendant? https://gerrit.osmocom.org/c/osmo-bsc/+/25996/1/src/osmo-bsc/bsc_ctrl_commands.c File src/osmo-bsc/bsc_ctrl_commands.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25996/1/src/osmo-bsc/bsc_ctrl_commands.c at 741 PS1, Line 741: CTRL_CMD_DEFINE_WO(bts_neighbor_list_add, "neighbor-list add"); Same, please add some comment lines documenting the command. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id97bc0d31a358db6221c385761773fb48670c921 Gerrit-Change-Number: 25996 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-CC: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 15:50:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:56:35 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:56:35 +0000 Subject: Change in osmo-hnodeb[master]: Import hnb-test from osmo-iuh.git In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25995 to look at the new patch set (#2). Change subject: Import hnb-test from osmo-iuh.git ...................................................................... Import hnb-test from osmo-iuh.git Import from osmo-iuh.git Change-Id Iba106dcc18e3d429b4b9808610a44ac29b798172, with minimal renaming of s/hnb_test/hnb/ and required mangling to have it compile and run. Change-Id: I36fd4aa5d39222371bd36e9f540b91e36a26de43 --- M configure.ac M include/osmocom/hnodeb/Makefile.am M include/osmocom/hnodeb/hnodeb.h A include/osmocom/hnodeb/ranap.h A include/osmocom/hnodeb/rua.h M src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/debug.c M src/osmo-hnodeb/main.c A src/osmo-hnodeb/ranap.c A src/osmo-hnodeb/rua.c 10 files changed, 1,266 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/95/25995/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I36fd4aa5d39222371bd36e9f540b91e36a26de43 Gerrit-Change-Number: 25995 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 15:59:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 15:59:12 +0000 Subject: Change in osmo-hnodeb[master]: Import hnb-test from osmo-iuh.git In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25995 to look at the new patch set (#3). Change subject: Import hnb-test from osmo-iuh.git ...................................................................... Import hnb-test from osmo-iuh.git Import from osmo-iuh.git Change-Id Iba106dcc18e3d429b4b9808610a44ac29b798172, with minimal renaming of s/hnb_test/hnb/ and required mangling to have it compile and run. Change-Id: I36fd4aa5d39222371bd36e9f540b91e36a26de43 --- M configure.ac M include/osmocom/hnodeb/Makefile.am M include/osmocom/hnodeb/hnodeb.h A include/osmocom/hnodeb/ranap.h A include/osmocom/hnodeb/rua.h M src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/debug.c M src/osmo-hnodeb/main.c A src/osmo-hnodeb/ranap.c A src/osmo-hnodeb/rua.c 10 files changed, 1,380 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/95/25995/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I36fd4aa5d39222371bd36e9f540b91e36a26de43 Gerrit-Change-Number: 25995 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 16:15:05 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 16:15:05 +0000 Subject: Change in osmo-hnodeb[master]: Move existing vty code to its own cty.c/h file References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25997 ) Change subject: Move existing vty code to its own cty.c/h file ...................................................................... Move existing vty code to its own cty.c/h file Change-Id: I88107e9ed03ff8f807b57a3ea0d189fd70864861 --- M include/osmocom/hnodeb/Makefile.am M include/osmocom/hnodeb/hnodeb.h A include/osmocom/hnodeb/vty.h M src/osmo-hnodeb/Makefile.am M src/osmo-hnodeb/main.c A src/osmo-hnodeb/vty.c 6 files changed, 195 insertions(+), 123 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/97/25997/1 diff --git a/include/osmocom/hnodeb/Makefile.am b/include/osmocom/hnodeb/Makefile.am index 9f8963a..339f8a3 100644 --- a/include/osmocom/hnodeb/Makefile.am +++ b/include/osmocom/hnodeb/Makefile.am @@ -2,4 +2,5 @@ hnodeb.h \ ranap.h \ rua.h \ + vty.h \ $(NULL) diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h index ef11ab7..e36311e 100644 --- a/include/osmocom/hnodeb/hnodeb.h +++ b/include/osmocom/hnodeb/hnodeb.h @@ -19,6 +19,8 @@ */ #pragma once +#include + #include #include #include @@ -101,4 +103,10 @@ void hnb_nas_rx_dtap(struct hnb *hnb, void *data, int len); void hnb_rx_secmode_cmd(struct hnb *hnb, long ip_alg); +int hnb_ue_register_tx(struct hnb *hnb, const char *imsi_str); +void hnb_send_register_req(struct hnb *hnb); +void hnb_send_deregister_req(struct hnb *hnb); +struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi); + +extern void *tall_hnb_ctx; extern struct hnb g_hnb; diff --git a/include/osmocom/hnodeb/vty.h b/include/osmocom/hnodeb/vty.h new file mode 100644 index 0000000..7e3f29f --- /dev/null +++ b/include/osmocom/hnodeb/vty.h @@ -0,0 +1,31 @@ +/* (C) 2015 by Daniel Willmann + * (C) 2021 by sysmocom - s.f.m.c. GmbH + * Author: Pau Espin Pedrol + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#pragma once + +#include +#include +#include + +enum hnb_vty_nodes { + CHAN_NODE = _LAST_OSMOVTY_NODE, +}; + +void hnb_vty_init(void); diff --git a/src/osmo-hnodeb/Makefile.am b/src/osmo-hnodeb/Makefile.am index 5ca020f..7526c28 100644 --- a/src/osmo-hnodeb/Makefile.am +++ b/src/osmo-hnodeb/Makefile.am @@ -33,6 +33,7 @@ debug.c \ ranap.c \ rua.c \ + vty.c \ $(NULL) osmo_hnodeb_LDADD = \ diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c index 9a2aaf9..ae9403d 100644 --- a/src/osmo-hnodeb/main.c +++ b/src/osmo-hnodeb/main.c @@ -54,7 +54,6 @@ #include #include #include -#include "asn1helpers.h" #include #include @@ -70,9 +69,10 @@ #include #include +#include #include -static void *tall_hnb_ctx; +void *tall_hnb_ctx; struct hnb g_hnb = { .gw_addr = "127.0.0.1", @@ -113,7 +113,7 @@ } #endif -static int hnb_ue_register_tx(struct hnb *hnb, const char *imsi_str) +int hnb_ue_register_tx(struct hnb *hnb, const char *imsi_str) { struct msgb *msg; int rc, imsi_len; @@ -649,7 +649,7 @@ return rc; } -static void hnb_send_register_req(struct hnb *hnb) +void hnb_send_register_req(struct hnb *hnb) { HNBAP_HNBRegisterRequest_t request_out; struct msgb *msg; @@ -698,7 +698,7 @@ osmo_wqueue_enqueue(&hnb->wqueue, msg); } -static void hnb_send_deregister_req(struct hnb *hnb) +void hnb_send_deregister_req(struct hnb *hnb) { struct msgb *msg; int rc; @@ -744,79 +744,8 @@ return rc; } -#define HNBAP_STR "HNBAP related commands\n" -#define HNB_STR "HomeNodeB commands\n" -#define UE_STR "User Equipment commands\n" -#define RANAP_STR "RANAP related commands\n" -#define CSPS_STR "Circuit Switched\n" "Packet Switched\n" -DEFUN(hnb_register, hnb_register_cmd, - "hnbap hnb register", HNBAP_STR HNB_STR "Send HNB-REGISTER REQUEST") -{ - hnb_send_register_req(&g_hnb); - - return CMD_SUCCESS; -} - -DEFUN(hnb_deregister, hnb_deregister_cmd, - "hnbap hnb deregister", HNBAP_STR HNB_STR "Send HNB-DEREGISTER REQUEST") -{ - hnb_send_deregister_req(&g_hnb); - - return CMD_SUCCESS; -} - -DEFUN(ue_register, ue_register_cmd, - "hnbap ue register IMSI", HNBAP_STR UE_STR "Send UE-REGISTER REQUEST") -{ - hnb_ue_register_tx(&g_hnb, argv[0]); - - return CMD_SUCCESS; -} - -DEFUN(asn_dbg, asn_dbg_cmd, - "asn-debug (1|0)", "Enable or disable libasn1c debugging") -{ - asn_debug = atoi(argv[0]); - - return CMD_SUCCESS; -} - -DEFUN(ranap_reset, ranap_reset_cmd, - "ranap reset (cs|ps)", RANAP_STR "Send RANAP RESET\n" CSPS_STR) -{ - int is_ps = 0; - struct msgb *msg, *rua; - - RANAP_Cause_t cause = { - .present = RANAP_Cause_PR_transmissionNetwork, - .choice.transmissionNetwork = RANAP_CauseTransmissionNetwork_signalling_transport_resource_failure, - }; - - if (!strcmp(argv[0], "ps")) - is_ps = 1; - - msg = ranap_new_msg_reset(is_ps, &cause); - rua = rua_new_udt(msg); - //msgb_free(msg); - osmo_wqueue_enqueue(&g_hnb.wqueue, rua); - - return CMD_SUCCESS; -} - - -enum my_vty_nodes { - CHAN_NODE = _LAST_OSMOVTY_NODE, -}; - -static struct cmd_node chan_node = { - CHAN_NODE, - "%s(chan)> ", - 1, -}; - - -static struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi) +struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi) { uint8_t lu[] = { GSM48_PDISC_MM, GSM48_MT_MM_LOC_UPD_REQUEST, 0x70, 0x62, 0xf2, 0x30, 0xff, 0xf3, 0x57, @@ -848,52 +777,6 @@ return ranap_new_msg_initial_ue(conn_id, is_ps, &rnc_id, lu, sizeof(lu)); } -DEFUN(chan, chan_cmd, - "channel (cs|ps) lu imsi IMSI", - "Open a new Signalling Connection\n" - "To Circuit-Switched CN\n" - "To Packet-Switched CN\n" - "Performing a Location Update\n" - ) -{ - struct hnb_chan *chan; - struct msgb *msg, *rua; - static uint16_t conn_id = 42; - - chan = talloc_zero(tall_hnb_ctx, struct hnb_chan); - if (!strcmp(argv[0], "ps")) - chan->is_ps = 1; - chan->imsi = talloc_strdup(chan, argv[1]); - chan->conn_id = conn_id; - conn_id++; - - msg = gen_initue_lu(chan->is_ps, chan->conn_id, chan->imsi); - rua = rua_new_conn(chan->is_ps, chan->conn_id, msg); - - osmo_wqueue_enqueue(&g_hnb.wqueue, rua); - - vty->index = chan; - vty->node = CHAN_NODE; - - if (!chan->is_ps) - g_hnb.cs.chan = chan; - - - return CMD_SUCCESS; -} - -static void hnb_vty_init(void) -{ - install_element_ve(&asn_dbg_cmd); - install_element_ve(&hnb_register_cmd); - install_element_ve(&hnb_deregister_cmd); - install_element_ve(&ue_register_cmd); - install_element_ve(&ranap_reset_cmd); - install_element_ve(&chan_cmd); - - install_node(&chan_node, NULL); -} - static void handle_options(int argc, char **argv) { while (1) { diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c new file mode 100644 index 0000000..ccca6d0 --- /dev/null +++ b/src/osmo-hnodeb/vty.c @@ -0,0 +1,148 @@ +/* (C) 2015 by Daniel Willmann + * (C) 2021 by sysmocom - s.f.m.c. GmbH + * Author: Pau Espin Pedrol + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include "config.h" + +#include + +#include +#include +#include +#include + +#include + +#include +#include + +#include +#include + +static struct cmd_node chan_node = { + CHAN_NODE, + "%s(chan)> ", + 1, +}; + +#define HNBAP_STR "HNBAP related commands\n" +#define HNB_STR "HomeNodeB commands\n" +#define UE_STR "User Equipment commands\n" +#define RANAP_STR "RANAP related commands\n" +#define CSPS_STR "Circuit Switched\n" "Packet Switched\n" + +DEFUN(hnb_register, hnb_register_cmd, + "hnbap hnb register", HNBAP_STR HNB_STR "Send HNB-REGISTER REQUEST") +{ + hnb_send_register_req(&g_hnb); + + return CMD_SUCCESS; +} + +DEFUN(hnb_deregister, hnb_deregister_cmd, + "hnbap hnb deregister", HNBAP_STR HNB_STR "Send HNB-DEREGISTER REQUEST") +{ + hnb_send_deregister_req(&g_hnb); + + return CMD_SUCCESS; +} + +DEFUN(ue_register, ue_register_cmd, + "hnbap ue register IMSI", HNBAP_STR UE_STR "Send UE-REGISTER REQUEST") +{ + hnb_ue_register_tx(&g_hnb, argv[0]); + + return CMD_SUCCESS; +} + +DEFUN(asn_dbg, asn_dbg_cmd, + "asn-debug (1|0)", "Enable or disable libasn1c debugging") +{ + asn_debug = atoi(argv[0]); + + return CMD_SUCCESS; +} + +DEFUN(ranap_reset, ranap_reset_cmd, + "ranap reset (cs|ps)", RANAP_STR "Send RANAP RESET\n" CSPS_STR) +{ + int is_ps = 0; + struct msgb *msg, *rua; + + RANAP_Cause_t cause = { + .present = RANAP_Cause_PR_transmissionNetwork, + .choice.transmissionNetwork = RANAP_CauseTransmissionNetwork_signalling_transport_resource_failure, + }; + + if (!strcmp(argv[0], "ps")) + is_ps = 1; + + msg = ranap_new_msg_reset(is_ps, &cause); + rua = rua_new_udt(msg); + //msgb_free(msg); + osmo_wqueue_enqueue(&g_hnb.wqueue, rua); + + return CMD_SUCCESS; +} + +DEFUN(chan, chan_cmd, + "channel (cs|ps) lu imsi IMSI", + "Open a new Signalling Connection\n" + "To Circuit-Switched CN\n" + "To Packet-Switched CN\n" + "Performing a Location Update\n" + ) +{ + struct hnb_chan *chan; + struct msgb *msg, *rua; + static uint16_t conn_id = 42; + + chan = talloc_zero(tall_hnb_ctx, struct hnb_chan); + if (!strcmp(argv[0], "ps")) + chan->is_ps = 1; + chan->imsi = talloc_strdup(chan, argv[1]); + chan->conn_id = conn_id; + conn_id++; + + msg = gen_initue_lu(chan->is_ps, chan->conn_id, chan->imsi); + rua = rua_new_conn(chan->is_ps, chan->conn_id, msg); + + osmo_wqueue_enqueue(&g_hnb.wqueue, rua); + + vty->index = chan; + vty->node = CHAN_NODE; + + if (!chan->is_ps) + g_hnb.cs.chan = chan; + + + return CMD_SUCCESS; +} + +void hnb_vty_init(void) +{ + install_element_ve(&asn_dbg_cmd); + install_element_ve(&hnb_register_cmd); + install_element_ve(&hnb_deregister_cmd); + install_element_ve(&ue_register_cmd); + install_element_ve(&ranap_reset_cmd); + install_element_ve(&chan_cmd); + + install_node(&chan_node, NULL); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I88107e9ed03ff8f807b57a3ea0d189fd70864861 Gerrit-Change-Number: 25997 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 17:23:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 17:23:19 +0000 Subject: Change in osmo-hnodeb[master]: main.c: Drop commented out code References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25998 ) Change subject: main.c: Drop commented out code ...................................................................... main.c: Drop commented out code We can always get it back from git history if necessary, let's drop it. Change-Id: I6ea1e3b8692cc6e162962d2e812eb1342c100251 --- M src/osmo-hnodeb/main.c 1 file changed, 0 insertions(+), 67 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/98/25998/1 diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c index ae9403d..a9c26bf 100644 --- a/src/osmo-hnodeb/main.c +++ b/src/osmo-hnodeb/main.c @@ -81,38 +81,6 @@ struct msgb *rua_new_udt(struct msgb *inmsg); -#if 0 -static int hnb_ue_de_register_tx(struct hnb *hnb) -{ - struct msgb *msg; - int rc; - uint32_t ctx_id; - - UEDe_Register_t dereg; - UEDe_RegisterIEs_t dereg_ies; - memset(&dereg_ies, 0, sizeof(dereg_ies)); - - asn1_u24_to_bitstring(&dereg_ies.context_ID, &ctx_id, hnb->ctx_id); - dereg_ies.cause.present = Cause_PR_radioNetwork; - dereg_ies.cause.choice.radioNetwork = CauseRadioNetwork_connection_with_UE_lost; - - memset(&dereg, 0, sizeof(dereg)); - rc = hnbap_encode_uede_registeries(&dereg, &dereg_ies); - OSMO_ASSERT(rc == 0); - - msg = hnbap_generate_initiating_message(ProcedureCode_id_UEDe_Register, - Criticality_ignore, - &asn_DEF_UEDe_Register, - &dereg); - - ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_UEDe_Register, &dereg); - - msgb_sctp_ppid(msg) = IUH_PPI_HNBAP; - - return osmo_wqueue_enqueue(&hnb->wqueue, msg); -} -#endif - int hnb_ue_register_tx(struct hnb *hnb, const char *imsi_str) { struct msgb *msg; @@ -848,41 +816,6 @@ } sctp_sock_init(g_hnb.wqueue.bfd.fd); -#if 0 - /* some hard-coded message generation. Doesn't make sense from - * a protocol point of view but enables to look at the encoded - * results in wireshark for manual verification */ - { - struct msgb *msg, *rua; - const uint8_t nas[] = { 0, 1, 2, 3 }; - const uint8_t ik[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; - - msg = ranap_new_msg_dt(0, nas, sizeof(nas)); - rua = rua_new_udt(msg); - osmo_wqueue_enqueue(&g_hnb.wqueue, rua); - - msg = ranap_new_msg_sec_mod_cmd(ik, ik, RANAP_KeyStatus_new); - rua = rua_new_udt(msg); - osmo_wqueue_enqueue(&g_hnb.wqueue, rua); - - msg = ranap_new_msg_iu_rel_cmd() - rua = rua_new_udt(msg); - osmo_wqueue_enqueue(&g_hnb.wqueue, rua); - - msg = ranap_new_msg_paging_cmd("901990123456789", NULL, 0, 0); - rua = rua_new_udt(msg); - osmo_wqueue_enqueue(&g_hnb.wqueue, rua); - - msg = ranap_new_msg_rab_assign_voice(1, 0x01020304, 0x1020); - rua = rua_new_udt(msg); - osmo_wqueue_enqueue(&g_hnb.wqueue, rua); - - msg = ranap_new_msg_rab_assign_data(2, 0x01020304, 0x11223344); - rua = rua_new_udt(msg); - osmo_wqueue_enqueue(&g_hnb.wqueue, rua); - } -#endif - while (1) { rc = osmo_select_main(0); if (rc < 0) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ea1e3b8692cc6e162962d2e812eb1342c100251 Gerrit-Change-Number: 25998 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 17:23:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 17:23:19 +0000 Subject: Change in osmo-hnodeb[master]: Move rua related code to rua.c/h References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25999 ) Change subject: Move rua related code to rua.c/h ...................................................................... Move rua related code to rua.c/h Change-Id: Ibefe952fe1b642cab5c4abe36383a7ebb05f39c3 --- M include/osmocom/hnodeb/rua.h M src/osmo-hnodeb/main.c M src/osmo-hnodeb/rua.c 3 files changed, 66 insertions(+), 64 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/99/25999/1 diff --git a/include/osmocom/hnodeb/rua.h b/include/osmocom/hnodeb/rua.h index 28d0a1a..9d7cc12 100644 --- a/include/osmocom/hnodeb/rua.h +++ b/include/osmocom/hnodeb/rua.h @@ -23,5 +23,4 @@ struct hnb; -void hnb_rua_dt_handle(struct hnb *hnb, struct ANY *in); -void hnb_rua_cl_handle(struct hnb *hnb, struct ANY *in); +int hnb_rua_rx(struct hnb *hnb, struct msgb *msg); diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c index a9c26bf..0fcb909 100644 --- a/src/osmo-hnodeb/main.c +++ b/src/osmo-hnodeb/main.c @@ -476,66 +476,6 @@ extern void direct_transfer_nas_pdu_print(ANY_t *in); -int hnb_rua_rx(struct hnb *hnb, struct msgb *msg) -{ - RUA_RUA_PDU_t _pdu, *pdu = &_pdu; - asn_dec_rval_t dec_ret; - - memset(pdu, 0, sizeof(*pdu)); - dec_ret = aper_decode(NULL, &asn_DEF_RUA_RUA_PDU, (void **) &pdu, - msg->data, msgb_length(msg), 0, 0); - if (dec_ret.code != RC_OK) { - LOGP(DMAIN, LOGL_ERROR, "Error in ASN.1 decode\n"); - return -EINVAL; - } - - switch (pdu->present) { - case RUA_RUA_PDU_PR_successfulOutcome: - printf("RUA_RUA_PDU_PR_successfulOutcome\n"); - break; - case RUA_RUA_PDU_PR_initiatingMessage: - printf("RUA_RUA_PDU_PR_initiatingMessage\n"); - break; - case RUA_RUA_PDU_PR_NOTHING: - printf("RUA_RUA_PDU_PR_NOTHING\n"); - break; - case RUA_RUA_PDU_PR_unsuccessfulOutcome: - printf("RUA_RUA_PDU_PR_unsuccessfulOutcome\n"); - break; - default: - printf("Unexpected RUA message received\n"); - break; - } - - switch (pdu->choice.successfulOutcome.procedureCode) { - case RUA_ProcedureCode_id_ConnectionlessTransfer: - printf("RUA rx Connectionless Transfer\n"); - hnb_rua_cl_handle(hnb, &pdu->choice.successfulOutcome.value); - break; - case RUA_ProcedureCode_id_Connect: - printf("RUA rx Connect\n"); - break; - case RUA_ProcedureCode_id_DirectTransfer: - printf("RUA rx DirectTransfer\n"); - hnb_rua_dt_handle(hnb, &pdu->choice.successfulOutcome.value); - break; - case RUA_ProcedureCode_id_Disconnect: - printf("RUA rx Disconnect\n"); - break; - case RUA_ProcedureCode_id_ErrorIndication: - printf("RUA rx ErrorIndication\n"); - break; - case RUA_ProcedureCode_id_privateMessage: - printf("RUA rx privateMessage\n"); - break; - default: - printf("RUA rx unknown message\n"); - break; - } - - return 0; -} - static int hnb_read_cb(struct osmo_fd *fd) { struct hnb *hnb = fd->data; diff --git a/src/osmo-hnodeb/rua.c b/src/osmo-hnodeb/rua.c index 3db9de7..0839c0d 100644 --- a/src/osmo-hnodeb/rua.c +++ b/src/osmo-hnodeb/rua.c @@ -17,6 +17,9 @@ * along with this program. If not, see . * */ + +#include + #include #include @@ -26,7 +29,7 @@ #include -void hnb_rua_dt_handle(struct hnb *hnb, ANY_t *in) +static void hnb_rua_dt_handle(struct hnb *hnb, ANY_t *in) { RUA_DirectTransferIEs_t ies; int rc; @@ -43,7 +46,7 @@ rua_free_directtransferies(&ies); } -void hnb_rua_cl_handle(struct hnb *hnb, ANY_t *in) +static void hnb_rua_cl_handle(struct hnb *hnb, ANY_t *in) { RUA_ConnectionlessTransferIEs_t ies; int rc; @@ -59,3 +62,63 @@ /* FIXME: what to do with the asn1c-allocated memory */ rua_free_connectionlesstransferies(&ies); } + +int hnb_rua_rx(struct hnb *hnb, struct msgb *msg) +{ + RUA_RUA_PDU_t _pdu, *pdu = &_pdu; + asn_dec_rval_t dec_ret; + + memset(pdu, 0, sizeof(*pdu)); + dec_ret = aper_decode(NULL, &asn_DEF_RUA_RUA_PDU, (void **) &pdu, + msg->data, msgb_length(msg), 0, 0); + if (dec_ret.code != RC_OK) { + LOGP(DMAIN, LOGL_ERROR, "Error in ASN.1 decode\n"); + return -EINVAL; + } + + switch (pdu->present) { + case RUA_RUA_PDU_PR_successfulOutcome: + printf("RUA_RUA_PDU_PR_successfulOutcome\n"); + break; + case RUA_RUA_PDU_PR_initiatingMessage: + printf("RUA_RUA_PDU_PR_initiatingMessage\n"); + break; + case RUA_RUA_PDU_PR_NOTHING: + printf("RUA_RUA_PDU_PR_NOTHING\n"); + break; + case RUA_RUA_PDU_PR_unsuccessfulOutcome: + printf("RUA_RUA_PDU_PR_unsuccessfulOutcome\n"); + break; + default: + printf("Unexpected RUA message received\n"); + break; + } + + switch (pdu->choice.successfulOutcome.procedureCode) { + case RUA_ProcedureCode_id_ConnectionlessTransfer: + printf("RUA rx Connectionless Transfer\n"); + hnb_rua_cl_handle(hnb, &pdu->choice.successfulOutcome.value); + break; + case RUA_ProcedureCode_id_Connect: + printf("RUA rx Connect\n"); + break; + case RUA_ProcedureCode_id_DirectTransfer: + printf("RUA rx DirectTransfer\n"); + hnb_rua_dt_handle(hnb, &pdu->choice.successfulOutcome.value); + break; + case RUA_ProcedureCode_id_Disconnect: + printf("RUA rx Disconnect\n"); + break; + case RUA_ProcedureCode_id_ErrorIndication: + printf("RUA rx ErrorIndication\n"); + break; + case RUA_ProcedureCode_id_privateMessage: + printf("RUA rx privateMessage\n"); + break; + default: + printf("RUA rx unknown message\n"); + break; + } + + return 0; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ibefe952fe1b642cab5c4abe36383a7ebb05f39c3 Gerrit-Change-Number: 25999 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 17:23:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 17:23:20 +0000 Subject: Change in osmo-hnodeb[master]: Move hnbap related code to hnbap.c/h References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26000 ) Change subject: Move hnbap related code to hnbap.c/h ...................................................................... Move hnbap related code to hnbap.c/h Change-Id: I8356421169bebe1d411b05b19241ea639dc3f733 --- M include/osmocom/hnodeb/Makefile.am A include/osmocom/hnodeb/hnbap.h M include/osmocom/hnodeb/hnodeb.h M src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/hnbap.c M src/osmo-hnodeb/main.c M src/osmo-hnodeb/vty.c 7 files changed, 261 insertions(+), 197 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/00/26000/1 diff --git a/include/osmocom/hnodeb/Makefile.am b/include/osmocom/hnodeb/Makefile.am index 339f8a3..f6c91b4 100644 --- a/include/osmocom/hnodeb/Makefile.am +++ b/include/osmocom/hnodeb/Makefile.am @@ -1,4 +1,5 @@ noinst_HEADERS = \ + hnbap.h \ hnodeb.h \ ranap.h \ rua.h \ diff --git a/include/osmocom/hnodeb/hnbap.h b/include/osmocom/hnodeb/hnbap.h new file mode 100644 index 0000000..22f6d25 --- /dev/null +++ b/include/osmocom/hnodeb/hnbap.h @@ -0,0 +1,31 @@ +/* (C) 2015 by Daniel Willmann + * (C) 2021 by sysmocom - s.f.m.c. GmbH + * Author: Pau Espin Pedrol + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ +#pragma once + +#include + +struct hnb; +struct msg; + +int hnb_hnbap_rx(struct hnb *hnb, struct msgb *msg); + +int hnb_ue_register_tx(struct hnb *hnb, const char *imsi_str); +void hnb_send_register_req(struct hnb *hnb); +void hnb_send_deregister_req(struct hnb *hnb); diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h index e36311e..b283145 100644 --- a/include/osmocom/hnodeb/hnodeb.h +++ b/include/osmocom/hnodeb/hnodeb.h @@ -103,9 +103,6 @@ void hnb_nas_rx_dtap(struct hnb *hnb, void *data, int len); void hnb_rx_secmode_cmd(struct hnb *hnb, long ip_alg); -int hnb_ue_register_tx(struct hnb *hnb, const char *imsi_str); -void hnb_send_register_req(struct hnb *hnb); -void hnb_send_deregister_req(struct hnb *hnb); struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi); extern void *tall_hnb_ctx; diff --git a/src/osmo-hnodeb/Makefile.am b/src/osmo-hnodeb/Makefile.am index 7526c28..d782a4a 100644 --- a/src/osmo-hnodeb/Makefile.am +++ b/src/osmo-hnodeb/Makefile.am @@ -31,6 +31,7 @@ osmo_hnodeb_SOURCES = \ main.c \ debug.c \ + hnbap.c \ ranap.c \ rua.c \ vty.c \ diff --git a/src/osmo-hnodeb/hnbap.c b/src/osmo-hnodeb/hnbap.c new file mode 100644 index 0000000..7e54004 --- /dev/null +++ b/src/osmo-hnodeb/hnbap.c @@ -0,0 +1,226 @@ +/* (C) 2015 by Daniel Willmann + * (C) 2021 by sysmocom - s.f.m.c. GmbH + * Author: Pau Espin Pedrol + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include + +#include + +#include +#include + +#include +#include + +#include /* ranap_bcd_decode() */ + +#include +#include + +static int hnb_rx_hnb_register_acc(struct hnb *hnb, ANY_t *in) +{ + int rc; + HNBAP_HNBRegisterAcceptIEs_t accept; + + rc = hnbap_decode_hnbregisteraccepties(&accept, in); + if (rc < 0) { + } + + hnb->rnc_id = accept.rnc_id; + printf("HNB Register accept with RNC ID %u\n", hnb->rnc_id); + + hnbap_free_hnbregisteraccepties(&accept); + return 0; +} + +static int hnb_rx_ue_register_acc(struct hnb *hnb, ANY_t *in) +{ + int rc; + uint32_t ctx_id; + HNBAP_UERegisterAcceptIEs_t accept; + char imsi[16]; + + rc = hnbap_decode_ueregisteraccepties(&accept, in); + if (rc < 0) { + return rc; + } + + if (accept.uE_Identity.present != HNBAP_UE_Identity_PR_iMSI) { + printf("Wrong type in UE register accept\n"); + return -1; + } + + ctx_id = asn1bitstr_to_u24(&accept.context_ID); + + ranap_bcd_decode(imsi, sizeof(imsi), accept.uE_Identity.choice.iMSI.buf, + accept.uE_Identity.choice.iMSI.size); + printf("UE Register accept for IMSI %s, context %u\n", imsi, ctx_id); + + hnb->ctx_id = ctx_id; + hnbap_free_ueregisteraccepties(&accept); + + return 0; +} + +int hnb_hnbap_rx(struct hnb *hnb, struct msgb *msg) +{ + HNBAP_HNBAP_PDU_t _pdu, *pdu = &_pdu; + asn_dec_rval_t dec_ret; + int rc; + + memset(pdu, 0, sizeof(*pdu)); + dec_ret = aper_decode(NULL, &asn_DEF_HNBAP_HNBAP_PDU, (void **) &pdu, + msg->data, msgb_length(msg), 0, 0); + if (dec_ret.code != RC_OK) { + LOGP(DMAIN, LOGL_ERROR, "Error in ASN.1 decode\n"); + return -EINVAL; + } + + if (pdu->present != HNBAP_HNBAP_PDU_PR_successfulOutcome) { + printf("Unexpected HNBAP message received\n"); + } + + switch (pdu->choice.successfulOutcome.procedureCode) { + case HNBAP_ProcedureCode_id_HNBRegister: + /* Get HNB id and send UE Register request */ + rc = hnb_rx_hnb_register_acc(hnb, &pdu->choice.successfulOutcome.value); + break; + case HNBAP_ProcedureCode_id_UERegister: + rc = hnb_rx_ue_register_acc(hnb, &pdu->choice.successfulOutcome.value); + break; + default: + rc = -ENOSPC; + break; + } + + return rc; +} + +int hnb_ue_register_tx(struct hnb *hnb, const char *imsi_str) +{ + struct msgb *msg; + int rc, imsi_len; + + uint8_t imsi_buf[16]; + + HNBAP_UERegisterRequest_t request_out; + HNBAP_UERegisterRequestIEs_t request; + memset(&request, 0, sizeof(request)); + + request.uE_Identity.present = HNBAP_UE_Identity_PR_iMSI; + + imsi_len = ranap_imsi_encode(imsi_buf, sizeof(imsi_buf), imsi_str); + OCTET_STRING_fromBuf(&request.uE_Identity.choice.iMSI, (const char*)imsi_buf, imsi_len); + + request.registration_Cause = HNBAP_Registration_Cause_normal; + request.uE_Capabilities.access_stratum_release_indicator = HNBAP_Access_stratum_release_indicator_rel_6; + request.uE_Capabilities.csg_capability = HNBAP_CSG_Capability_not_csg_capable; + + memset(&request_out, 0, sizeof(request_out)); + rc = hnbap_encode_ueregisterrequesties(&request_out, &request); + OSMO_ASSERT(rc == 0); + + msg = hnbap_generate_initiating_message(HNBAP_ProcedureCode_id_UERegister, + HNBAP_Criticality_reject, + &asn_DEF_HNBAP_UERegisterRequest, + &request_out); + + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_HNBAP_UERegisterRequest, &request_out); + + msgb_sctp_ppid(msg) = IUH_PPI_HNBAP; + + return osmo_wqueue_enqueue(&hnb->wqueue, msg); +} + +void hnb_send_register_req(struct hnb *hnb) +{ + HNBAP_HNBRegisterRequest_t request_out; + struct msgb *msg; + int rc; + uint16_t lac, sac; + uint8_t rac; + uint32_t cid; + uint8_t plmn[] = {0x09, 0xf1, 0x99}; + char identity[50] = "ATestHNB@"; + + HNBAP_HNBRegisterRequestIEs_t request; + memset(&request, 0, sizeof(request)); + + lac = 0xc0fe; + sac = 0xabab; + rac = 0x42; + cid = 0xadceaab; + + asn1_u16_to_str(&request.lac, &lac, lac); + asn1_u16_to_str(&request.sac, &sac, sac); + asn1_u8_to_str(&request.rac, &rac, rac); + asn1_u28_to_bitstring(&request.cellIdentity, &cid, cid); + + request.hnB_Identity.hNB_Identity_Info.buf = (uint8_t*) identity; + request.hnB_Identity.hNB_Identity_Info.size = strlen(identity); + + request.plmNidentity.buf = plmn; + request.plmNidentity.size = 3; + + + + memset(&request_out, 0, sizeof(request_out)); + rc = hnbap_encode_hnbregisterrequesties(&request_out, &request); + if (rc < 0) { + printf("Could not encode HNB register request IEs\n"); + } + + msg = hnbap_generate_initiating_message(HNBAP_ProcedureCode_id_HNBRegister, + HNBAP_Criticality_reject, + &asn_DEF_HNBAP_HNBRegisterRequest, + &request_out); + + + msgb_sctp_ppid(msg) = IUH_PPI_HNBAP; + + osmo_wqueue_enqueue(&hnb->wqueue, msg); +} + +void hnb_send_deregister_req(struct hnb *hnb) +{ + struct msgb *msg; + int rc; + + HNBAP_HNBDe_RegisterIEs_t request; + memset(&request, 0, sizeof(request)); + + request.cause.present = HNBAP_Cause_PR_misc; + request.cause.choice.misc = HNBAP_CauseMisc_o_and_m_intervention; + + HNBAP_HNBDe_Register_t request_out; + memset(&request_out, 0, sizeof(request_out)); + rc = hnbap_encode_hnbde_registeries(&request_out, &request); + if (rc < 0) { + printf("Could not encode HNB deregister request IEs\n"); + } + + msg = hnbap_generate_initiating_message(HNBAP_ProcedureCode_id_HNBDe_Register, + HNBAP_Criticality_reject, + &asn_DEF_HNBAP_HNBDe_Register, + &request_out); + + msgb_sctp_ppid(msg) = IUH_PPI_HNBAP; + + osmo_wqueue_enqueue(&hnb->wqueue, msg); +} diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c index 0fcb909..3abfc7c 100644 --- a/src/osmo-hnodeb/main.c +++ b/src/osmo-hnodeb/main.c @@ -51,8 +51,6 @@ #include -#include -#include #include #include @@ -67,6 +65,7 @@ #include #include +#include #include #include #include @@ -81,87 +80,6 @@ struct msgb *rua_new_udt(struct msgb *inmsg); -int hnb_ue_register_tx(struct hnb *hnb, const char *imsi_str) -{ - struct msgb *msg; - int rc, imsi_len; - - uint8_t imsi_buf[16]; - - HNBAP_UERegisterRequest_t request_out; - HNBAP_UERegisterRequestIEs_t request; - memset(&request, 0, sizeof(request)); - - request.uE_Identity.present = HNBAP_UE_Identity_PR_iMSI; - - imsi_len = ranap_imsi_encode(imsi_buf, sizeof(imsi_buf), imsi_str); - OCTET_STRING_fromBuf(&request.uE_Identity.choice.iMSI, (const char*)imsi_buf, imsi_len); - - request.registration_Cause = HNBAP_Registration_Cause_normal; - request.uE_Capabilities.access_stratum_release_indicator = HNBAP_Access_stratum_release_indicator_rel_6; - request.uE_Capabilities.csg_capability = HNBAP_CSG_Capability_not_csg_capable; - - memset(&request_out, 0, sizeof(request_out)); - rc = hnbap_encode_ueregisterrequesties(&request_out, &request); - OSMO_ASSERT(rc == 0); - - msg = hnbap_generate_initiating_message(HNBAP_ProcedureCode_id_UERegister, - HNBAP_Criticality_reject, - &asn_DEF_HNBAP_UERegisterRequest, - &request_out); - - ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_HNBAP_UERegisterRequest, &request_out); - - msgb_sctp_ppid(msg) = IUH_PPI_HNBAP; - - return osmo_wqueue_enqueue(&hnb->wqueue, msg); -} - -static int hnb_rx_hnb_register_acc(struct hnb *hnb, ANY_t *in) -{ - int rc; - HNBAP_HNBRegisterAcceptIEs_t accept; - - rc = hnbap_decode_hnbregisteraccepties(&accept, in); - if (rc < 0) { - } - - hnb->rnc_id = accept.rnc_id; - printf("HNB Register accept with RNC ID %u\n", hnb->rnc_id); - - hnbap_free_hnbregisteraccepties(&accept); - return 0; -} - -static int hnb_rx_ue_register_acc(struct hnb *hnb, ANY_t *in) -{ - int rc; - uint32_t ctx_id; - HNBAP_UERegisterAcceptIEs_t accept; - char imsi[16]; - - rc = hnbap_decode_ueregisteraccepties(&accept, in); - if (rc < 0) { - return rc; - } - - if (accept.uE_Identity.present != HNBAP_UE_Identity_PR_iMSI) { - printf("Wrong type in UE register accept\n"); - return -1; - } - - ctx_id = asn1bitstr_to_u24(&accept.context_ID); - - ranap_bcd_decode(imsi, sizeof(imsi), accept.uE_Identity.choice.iMSI.buf, - accept.uE_Identity.choice.iMSI.size); - printf("UE Register accept for IMSI %s, context %u\n", imsi, ctx_id); - - hnb->ctx_id = ctx_id; - hnbap_free_ueregisteraccepties(&accept); - - return 0; -} - static struct msgb *gen_nas_id_resp() { uint8_t id_resp[] = { @@ -440,40 +358,6 @@ /* TODO reply */ } -int hnb_hnbap_rx(struct hnb *hnb, struct msgb *msg) -{ - HNBAP_HNBAP_PDU_t _pdu, *pdu = &_pdu; - asn_dec_rval_t dec_ret; - int rc; - - memset(pdu, 0, sizeof(*pdu)); - dec_ret = aper_decode(NULL, &asn_DEF_HNBAP_HNBAP_PDU, (void **) &pdu, - msg->data, msgb_length(msg), 0, 0); - if (dec_ret.code != RC_OK) { - LOGP(DMAIN, LOGL_ERROR, "Error in ASN.1 decode\n"); - return -EINVAL; - } - - if (pdu->present != HNBAP_HNBAP_PDU_PR_successfulOutcome) { - printf("Unexpected HNBAP message received\n"); - } - - switch (pdu->choice.successfulOutcome.procedureCode) { - case HNBAP_ProcedureCode_id_HNBRegister: - /* Get HNB id and send UE Register request */ - rc = hnb_rx_hnb_register_acc(hnb, &pdu->choice.successfulOutcome.value); - break; - case HNBAP_ProcedureCode_id_UERegister: - rc = hnb_rx_ue_register_acc(hnb, &pdu->choice.successfulOutcome.value); - break; - default: - rc = -ENOSPC; - break; - } - - return rc; -} - extern void direct_transfer_nas_pdu_print(ANY_t *in); static int hnb_read_cb(struct osmo_fd *fd) @@ -557,83 +441,6 @@ return rc; } -void hnb_send_register_req(struct hnb *hnb) -{ - HNBAP_HNBRegisterRequest_t request_out; - struct msgb *msg; - int rc; - uint16_t lac, sac; - uint8_t rac; - uint32_t cid; - uint8_t plmn[] = {0x09, 0xf1, 0x99}; - char identity[50] = "ATestHNB@"; - - HNBAP_HNBRegisterRequestIEs_t request; - memset(&request, 0, sizeof(request)); - - lac = 0xc0fe; - sac = 0xabab; - rac = 0x42; - cid = 0xadceaab; - - asn1_u16_to_str(&request.lac, &lac, lac); - asn1_u16_to_str(&request.sac, &sac, sac); - asn1_u8_to_str(&request.rac, &rac, rac); - asn1_u28_to_bitstring(&request.cellIdentity, &cid, cid); - - request.hnB_Identity.hNB_Identity_Info.buf = (uint8_t*) identity; - request.hnB_Identity.hNB_Identity_Info.size = strlen(identity); - - request.plmNidentity.buf = plmn; - request.plmNidentity.size = 3; - - - - memset(&request_out, 0, sizeof(request_out)); - rc = hnbap_encode_hnbregisterrequesties(&request_out, &request); - if (rc < 0) { - printf("Could not encode HNB register request IEs\n"); - } - - msg = hnbap_generate_initiating_message(HNBAP_ProcedureCode_id_HNBRegister, - HNBAP_Criticality_reject, - &asn_DEF_HNBAP_HNBRegisterRequest, - &request_out); - - - msgb_sctp_ppid(msg) = IUH_PPI_HNBAP; - - osmo_wqueue_enqueue(&hnb->wqueue, msg); -} - -void hnb_send_deregister_req(struct hnb *hnb) -{ - struct msgb *msg; - int rc; - - HNBAP_HNBDe_RegisterIEs_t request; - memset(&request, 0, sizeof(request)); - - request.cause.present = HNBAP_Cause_PR_misc; - request.cause.choice.misc = HNBAP_CauseMisc_o_and_m_intervention; - - HNBAP_HNBDe_Register_t request_out; - memset(&request_out, 0, sizeof(request_out)); - rc = hnbap_encode_hnbde_registeries(&request_out, &request); - if (rc < 0) { - printf("Could not encode HNB deregister request IEs\n"); - } - - msg = hnbap_generate_initiating_message(HNBAP_ProcedureCode_id_HNBDe_Register, - HNBAP_Criticality_reject, - &asn_DEF_HNBAP_HNBDe_Register, - &request_out); - - msgb_sctp_ppid(msg) = IUH_PPI_HNBAP; - - osmo_wqueue_enqueue(&hnb->wqueue, msg); -} - static struct vty_app_info vty_info = { .name = "OsmohNodeB", .version = "0", diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c index ccca6d0..a1bb885 100644 --- a/src/osmo-hnodeb/vty.c +++ b/src/osmo-hnodeb/vty.c @@ -32,6 +32,7 @@ #include #include +#include #include #include -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I8356421169bebe1d411b05b19241ea639dc3f733 Gerrit-Change-Number: 26000 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 17:23:21 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 17:23:21 +0000 Subject: Change in osmo-hnodeb[master]: Allocate g_hnb as a pointer, move code to hnb.c/h References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26001 ) Change subject: Allocate g_hnb as a pointer, move code to hnb.c/h ...................................................................... Allocate g_hnb as a pointer, move code to hnb.c/h Change-Id: I5ec61d2a72d55d182e1498939209b30b6e652467 --- M include/osmocom/hnodeb/hnodeb.h M src/osmo-hnodeb/Makefile.am A src/osmo-hnodeb/hnb.c M src/osmo-hnodeb/main.c M src/osmo-hnodeb/vty.c 5 files changed, 178 insertions(+), 127 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/01/26001/1 diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h index b283145..261fc3a 100644 --- a/include/osmocom/hnodeb/hnodeb.h +++ b/include/osmocom/hnodeb/hnodeb.h @@ -97,6 +97,8 @@ struct hnb_chan *chan; } cs; }; +struct hnb *hnb_alloc(void *tall_ctx); +int hnb_connect(struct hnb *hnb); void hnb_rx_iu_release(struct hnb *hnb); void hnb_rx_paging(struct hnb *hnb, const char *imsi); @@ -106,4 +108,4 @@ struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi); extern void *tall_hnb_ctx; -extern struct hnb g_hnb; +extern struct hnb *g_hnb; diff --git a/src/osmo-hnodeb/Makefile.am b/src/osmo-hnodeb/Makefile.am index d782a4a..54c7083 100644 --- a/src/osmo-hnodeb/Makefile.am +++ b/src/osmo-hnodeb/Makefile.am @@ -32,6 +32,7 @@ main.c \ debug.c \ hnbap.c \ + hnb.c \ ranap.c \ rua.c \ vty.c \ diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c new file mode 100644 index 0000000..335fd3a --- /dev/null +++ b/src/osmo-hnodeb/hnb.c @@ -0,0 +1,161 @@ +/* (C) 2015 by Daniel Willmann + * (C) 2021 by sysmocom - s.f.m.c. GmbH + * Author: Pau Espin Pedrol + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include "config.h" + +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +static int sctp_sock_init(int fd) +{ + struct sctp_event_subscribe event; + int rc; + + /* subscribe for all events */ + memset((uint8_t *)&event, 1, sizeof(event)); + rc = setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, + &event, sizeof(event)); + + return rc; +} + +static int hnb_read_cb(struct osmo_fd *fd) +{ + struct hnb *hnb = fd->data; + struct sctp_sndrcvinfo sinfo; + struct msgb *msg = msgb_alloc(IUH_MSGB_SIZE, "Iuh rx"); + int flags = 0; + int rc; + + if (!msg) + return -ENOMEM; + + rc = sctp_recvmsg(fd->fd, msgb_data(msg), msgb_tailroom(msg), + NULL, NULL, &sinfo, &flags); + if (rc < 0) { + LOGP(DMAIN, LOGL_ERROR, "Error during sctp_recvmsg()\n"); + /* FIXME: clean up after disappeared HNB */ + close(fd->fd); + osmo_fd_unregister(fd); + return rc; + } else if (rc == 0) { + LOGP(DMAIN, LOGL_INFO, "Connection to HNB closed\n"); + close(fd->fd); + osmo_fd_unregister(fd); + fd->fd = -1; + + return -1; + } else { + msgb_put(msg, rc); + } + + if (flags & MSG_NOTIFICATION) { + LOGP(DMAIN, LOGL_DEBUG, "Ignoring SCTP notification\n"); + msgb_free(msg); + return 0; + } + + sinfo.sinfo_ppid = ntohl(sinfo.sinfo_ppid); + + switch (sinfo.sinfo_ppid) { + case IUH_PPI_HNBAP: + printf("HNBAP message received\n"); + rc = hnb_hnbap_rx(hnb, msg); + break; + case IUH_PPI_RUA: + printf("RUA message received\n"); + rc = hnb_rua_rx(hnb, msg); + break; + case IUH_PPI_SABP: + case IUH_PPI_RNA: + case IUH_PPI_PUA: + LOGP(DMAIN, LOGL_ERROR, "Unimplemented SCTP PPID=%u received\n", + sinfo.sinfo_ppid); + rc = 0; + break; + default: + LOGP(DMAIN, LOGL_ERROR, "Unknown SCTP PPID=%u received\n", + sinfo.sinfo_ppid); + rc = 0; + break; + } + + msgb_free(msg); + return rc; +} + +static int hnb_write_cb(struct osmo_fd *fd, struct msgb *msg) +{ + /* struct hnb *ctx = fd->data; */ + struct sctp_sndrcvinfo sinfo = { + .sinfo_ppid = htonl(msgb_sctp_ppid(msg)), + .sinfo_stream = 0, + }; + int rc; + + printf("Sending: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); + rc = sctp_send(fd->fd, msgb_data(msg), msgb_length(msg), + &sinfo, 0); + /* we don't need to msgb_free(), write_queue does this for us */ + return rc; +} + +struct hnb *hnb_alloc(void *tall_ctx) +{ + struct hnb *hnb; + hnb = talloc_zero(tall_ctx, struct hnb); + if (!hnb) + return NULL; + + hnb->gw_addr = "127.0.0.1", + hnb->gw_port = IUH_DEFAULT_SCTP_PORT, + + osmo_wqueue_init(&hnb->wqueue, 16); + hnb->wqueue.bfd.data = hnb; + hnb->wqueue.read_cb = hnb_read_cb; + hnb->wqueue.write_cb = hnb_write_cb; + + return hnb; +} + +int hnb_connect(struct hnb *hnb) +{ + int rc; + rc = osmo_sock_init_ofd(&hnb->wqueue.bfd, AF_INET, SOCK_STREAM, + IPPROTO_SCTP, hnb->gw_addr, + hnb->gw_port, OSMO_SOCK_F_CONNECT); + if (rc < 0) + return rc; + sctp_sock_init(hnb->wqueue.bfd.fd); + return 0; +} diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c index 3abfc7c..dc662aa 100644 --- a/src/osmo-hnodeb/main.c +++ b/src/osmo-hnodeb/main.c @@ -28,20 +28,11 @@ #include #include -#include -#include -#include -#include -#include - #include #include #include #include -#include #include -#include -#include #include #include @@ -72,11 +63,7 @@ #include void *tall_hnb_ctx; - -struct hnb g_hnb = { - .gw_addr = "127.0.0.1", - .gw_port = IUH_DEFAULT_SCTP_PORT, -}; +struct hnb *g_hnb; struct msgb *rua_new_udt(struct msgb *inmsg); @@ -130,7 +117,7 @@ } rua = rua_new_dt(chan->is_ps, chan->conn_id, txm); - osmo_wqueue_enqueue(&g_hnb.wqueue, rua); + osmo_wqueue_enqueue(&hnb->wqueue, rua); return 0; } @@ -360,105 +347,11 @@ extern void direct_transfer_nas_pdu_print(ANY_t *in); -static int hnb_read_cb(struct osmo_fd *fd) -{ - struct hnb *hnb = fd->data; - struct sctp_sndrcvinfo sinfo; - struct msgb *msg = msgb_alloc(IUH_MSGB_SIZE, "Iuh rx"); - int flags = 0; - int rc; - - if (!msg) - return -ENOMEM; - - rc = sctp_recvmsg(fd->fd, msgb_data(msg), msgb_tailroom(msg), - NULL, NULL, &sinfo, &flags); - if (rc < 0) { - LOGP(DMAIN, LOGL_ERROR, "Error during sctp_recvmsg()\n"); - /* FIXME: clean up after disappeared HNB */ - close(fd->fd); - osmo_fd_unregister(fd); - return rc; - } else if (rc == 0) { - LOGP(DMAIN, LOGL_INFO, "Connection to HNB closed\n"); - close(fd->fd); - osmo_fd_unregister(fd); - fd->fd = -1; - - return -1; - } else { - msgb_put(msg, rc); - } - - if (flags & MSG_NOTIFICATION) { - LOGP(DMAIN, LOGL_DEBUG, "Ignoring SCTP notification\n"); - msgb_free(msg); - return 0; - } - - sinfo.sinfo_ppid = ntohl(sinfo.sinfo_ppid); - - switch (sinfo.sinfo_ppid) { - case IUH_PPI_HNBAP: - printf("HNBAP message received\n"); - rc = hnb_hnbap_rx(hnb, msg); - break; - case IUH_PPI_RUA: - printf("RUA message received\n"); - rc = hnb_rua_rx(hnb, msg); - break; - case IUH_PPI_SABP: - case IUH_PPI_RNA: - case IUH_PPI_PUA: - LOGP(DMAIN, LOGL_ERROR, "Unimplemented SCTP PPID=%u received\n", - sinfo.sinfo_ppid); - rc = 0; - break; - default: - LOGP(DMAIN, LOGL_ERROR, "Unknown SCTP PPID=%u received\n", - sinfo.sinfo_ppid); - rc = 0; - break; - } - - msgb_free(msg); - return rc; -} - -static int hnb_write_cb(struct osmo_fd *fd, struct msgb *msg) -{ - /* struct hnb *ctx = fd->data; */ - struct sctp_sndrcvinfo sinfo = { - .sinfo_ppid = htonl(msgb_sctp_ppid(msg)), - .sinfo_stream = 0, - }; - int rc; - - printf("Sending: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); - rc = sctp_send(fd->fd, msgb_data(msg), msgb_length(msg), - &sinfo, 0); - /* we don't need to msgb_free(), write_queue does this for us */ - return rc; -} - static struct vty_app_info vty_info = { .name = "OsmohNodeB", .version = "0", }; -static int sctp_sock_init(int fd) -{ - struct sctp_event_subscribe event; - int rc; - - /* subscribe for all events */ - memset((uint8_t *)&event, 1, sizeof(event)); - rc = setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, - &event, sizeof(event)); - - return rc; -} - struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi) { @@ -509,10 +402,10 @@ switch (c) { case 'u': - g_hnb.ues = atoi(optarg); + g_hnb->ues = atoi(optarg); break; case 'g': - g_hnb.gw_addr = optarg; + g_hnb->gw_addr = optarg; break; } } @@ -538,6 +431,8 @@ log_set_print_category(osmo_stderr_target, 0); log_set_print_category_hex(osmo_stderr_target, 0); + g_hnb = hnb_alloc(tall_hnb_ctx); + vty_init(&vty_info); hnb_vty_init(); @@ -549,19 +444,11 @@ handle_options(argc, argv); - osmo_wqueue_init(&g_hnb.wqueue, 16); - g_hnb.wqueue.bfd.data = &g_hnb; - g_hnb.wqueue.read_cb = hnb_read_cb; - g_hnb.wqueue.write_cb = hnb_write_cb; - - rc = osmo_sock_init_ofd(&g_hnb.wqueue.bfd, AF_INET, SOCK_STREAM, - IPPROTO_SCTP, g_hnb.gw_addr, - g_hnb.gw_port, OSMO_SOCK_F_CONNECT); + rc = hnb_connect(g_hnb); if (rc < 0) { perror("Error connecting to Iuh port"); exit(1); } - sctp_sock_init(g_hnb.wqueue.bfd.fd); while (1) { rc = osmo_select_main(0); diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c index a1bb885..b8dc7da 100644 --- a/src/osmo-hnodeb/vty.c +++ b/src/osmo-hnodeb/vty.c @@ -51,7 +51,7 @@ DEFUN(hnb_register, hnb_register_cmd, "hnbap hnb register", HNBAP_STR HNB_STR "Send HNB-REGISTER REQUEST") { - hnb_send_register_req(&g_hnb); + hnb_send_register_req(g_hnb); return CMD_SUCCESS; } @@ -59,7 +59,7 @@ DEFUN(hnb_deregister, hnb_deregister_cmd, "hnbap hnb deregister", HNBAP_STR HNB_STR "Send HNB-DEREGISTER REQUEST") { - hnb_send_deregister_req(&g_hnb); + hnb_send_deregister_req(g_hnb); return CMD_SUCCESS; } @@ -67,7 +67,7 @@ DEFUN(ue_register, ue_register_cmd, "hnbap ue register IMSI", HNBAP_STR UE_STR "Send UE-REGISTER REQUEST") { - hnb_ue_register_tx(&g_hnb, argv[0]); + hnb_ue_register_tx(g_hnb, argv[0]); return CMD_SUCCESS; } @@ -97,7 +97,7 @@ msg = ranap_new_msg_reset(is_ps, &cause); rua = rua_new_udt(msg); //msgb_free(msg); - osmo_wqueue_enqueue(&g_hnb.wqueue, rua); + osmo_wqueue_enqueue(&g_hnb->wqueue, rua); return CMD_SUCCESS; } @@ -124,13 +124,13 @@ msg = gen_initue_lu(chan->is_ps, chan->conn_id, chan->imsi); rua = rua_new_conn(chan->is_ps, chan->conn_id, msg); - osmo_wqueue_enqueue(&g_hnb.wqueue, rua); + osmo_wqueue_enqueue(&g_hnb->wqueue, rua); vty->index = chan; vty->node = CHAN_NODE; if (!chan->is_ps) - g_hnb.cs.chan = chan; + g_hnb->cs.chan = chan; return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I5ec61d2a72d55d182e1498939209b30b6e652467 Gerrit-Change-Number: 26001 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 17:23:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Wed, 27 Oct 2021 17:23:22 +0000 Subject: Change in osmo-hnodeb[master]: Move protocol related code in main.c to related proto files References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26002 ) Change subject: Move protocol related code in main.c to related proto files ...................................................................... Move protocol related code in main.c to related proto files Change-Id: I771b3d3f61207137477eed2b316a5f670fb79ef2 --- M include/osmocom/hnodeb/Makefile.am M include/osmocom/hnodeb/hnodeb.h A include/osmocom/hnodeb/nas.h M include/osmocom/hnodeb/ranap.h M include/osmocom/hnodeb/rua.h M src/osmo-hnodeb/Makefile.am M src/osmo-hnodeb/main.c A src/osmo-hnodeb/nas.c M src/osmo-hnodeb/ranap.c M src/osmo-hnodeb/rua.c M src/osmo-hnodeb/vty.c 11 files changed, 389 insertions(+), 339 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/02/26002/1 diff --git a/include/osmocom/hnodeb/Makefile.am b/include/osmocom/hnodeb/Makefile.am index f6c91b4..197568c 100644 --- a/include/osmocom/hnodeb/Makefile.am +++ b/include/osmocom/hnodeb/Makefile.am @@ -1,6 +1,7 @@ noinst_HEADERS = \ hnbap.h \ hnodeb.h \ + nas.h \ ranap.h \ rua.h \ vty.h \ diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h index 261fc3a..50432d1 100644 --- a/include/osmocom/hnodeb/hnodeb.h +++ b/include/osmocom/hnodeb/hnodeb.h @@ -100,12 +100,5 @@ struct hnb *hnb_alloc(void *tall_ctx); int hnb_connect(struct hnb *hnb); -void hnb_rx_iu_release(struct hnb *hnb); -void hnb_rx_paging(struct hnb *hnb, const char *imsi); -void hnb_nas_rx_dtap(struct hnb *hnb, void *data, int len); -void hnb_rx_secmode_cmd(struct hnb *hnb, long ip_alg); - -struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi); - extern void *tall_hnb_ctx; extern struct hnb *g_hnb; diff --git a/include/osmocom/hnodeb/nas.h b/include/osmocom/hnodeb/nas.h new file mode 100644 index 0000000..f6a7976 --- /dev/null +++ b/include/osmocom/hnodeb/nas.h @@ -0,0 +1,24 @@ +/* (C) 2015 by Daniel Willmann + * (C) 2021 by sysmocom - s.f.m.c. GmbH + * Author: Pau Espin Pedrol + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#pragma once + +struct hnb; +void hnb_nas_rx_dtap(struct hnb *hnb, void *data, int len); diff --git a/include/osmocom/hnodeb/ranap.h b/include/osmocom/hnodeb/ranap.h index f68006f..df756b1 100644 --- a/include/osmocom/hnodeb/ranap.h +++ b/include/osmocom/hnodeb/ranap.h @@ -19,8 +19,15 @@ */ #pragma once +struct hnb; struct ranap_message_s; #include +void hnb_rx_iu_release(struct hnb *hnb); +void hnb_rx_paging(struct hnb *hnb, const char *imsi); +void hnb_rx_secmode_cmd(struct hnb *hnb, long ip_alg); + void hnb_rua_dt_handle_ranap(struct hnb *hnb, struct ranap_message_s *ranap_msg); void hnb_rua_cl_handle_ranap(struct hnb *hnb, struct ranap_message_s *ranap_msg); +void hnb_tx_iu_release_req(struct hnb *hnb); +struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi); diff --git a/include/osmocom/hnodeb/rua.h b/include/osmocom/hnodeb/rua.h index 9d7cc12..52221be 100644 --- a/include/osmocom/hnodeb/rua.h +++ b/include/osmocom/hnodeb/rua.h @@ -22,5 +22,7 @@ #include struct hnb; +struct msgb; int hnb_rua_rx(struct hnb *hnb, struct msgb *msg); +int hnb_tx_dt(struct hnb *hnb, struct msgb *txm); diff --git a/src/osmo-hnodeb/Makefile.am b/src/osmo-hnodeb/Makefile.am index 54c7083..fd18233 100644 --- a/src/osmo-hnodeb/Makefile.am +++ b/src/osmo-hnodeb/Makefile.am @@ -33,6 +33,7 @@ debug.c \ hnbap.c \ hnb.c \ + nas.c \ ranap.c \ rua.c \ vty.c \ diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c index dc662aa..9c7a548 100644 --- a/src/osmo-hnodeb/main.c +++ b/src/osmo-hnodeb/main.c @@ -33,28 +33,12 @@ #include #include #include -#include -#include #include #include #include -#include - -#include -#include - -#include - -#include - -#include - -#include -#include -#include -#include +#include /* ranap_set_log_area() */ #include #include @@ -65,326 +49,11 @@ void *tall_hnb_ctx; struct hnb *g_hnb; -struct msgb *rua_new_udt(struct msgb *inmsg); - -static struct msgb *gen_nas_id_resp() -{ - uint8_t id_resp[] = { - GSM48_PDISC_MM, - GSM48_MT_MM_ID_RESP, - /* IMEISV */ - 0x09, /* len */ - 0x03, /* first digit (0000) + even (0) + id IMEISV (011) */ - 0x31, 0x91, 0x06, 0x00, 0x28, 0x47, 0x11, /* digits */ - 0xf2, /* filler (1111) + last digit (0010) */ - }; - - return ranap_new_msg_dt(0, id_resp, sizeof(id_resp)); -} - -static struct msgb *gen_nas_tmsi_realloc_compl() -{ - uint8_t id_resp[] = { - GSM48_PDISC_MM, - GSM48_MT_MM_TMSI_REALL_COMPL, - }; - - return ranap_new_msg_dt(0, id_resp, sizeof(id_resp)); -} - -static struct msgb *gen_nas_auth_resp(uint8_t *sres) -{ - uint8_t id_resp[] = { - GSM48_PDISC_MM, - 0x80 | GSM48_MT_MM_AUTH_RESP, /* simulate sequence nr 2 */ - 0x61, 0xb5, 0x69, 0xf5 /* hardcoded SRES */ - }; - - memcpy(id_resp + 2, sres, 4); - - return ranap_new_msg_dt(0, id_resp, sizeof(id_resp)); -} - -static int hnb_tx_dt(struct hnb *hnb, struct msgb *txm) -{ - struct hnb_chan *chan; - struct msgb *rua; - - chan = hnb->cs.chan; - if (!chan) { - printf("hnb_nas_tx_tmsi_realloc_compl(): No CS channel established yet.\n"); - return -1; - } - - rua = rua_new_dt(chan->is_ps, chan->conn_id, txm); - osmo_wqueue_enqueue(&hnb->wqueue, rua); - return 0; -} - -static struct tlv_parsed *parse_mm(struct gsm48_hdr *gh, int len) -{ - static struct tlv_parsed tp; - int parse_res; - - len -= (const char *)&gh->data[0] - (const char *)gh; - - OSMO_ASSERT(gsm48_hdr_pdisc(gh) == GSM48_PDISC_MM); - - parse_res = tlv_parse(&tp, &gsm48_mm_att_tlvdef, &gh->data[0], len, 0, 0); - if (parse_res <= 0) { - uint8_t msg_type = gsm48_hdr_msg_type(gh); - printf("Error parsing MM message 0x%hhx: %d\n", msg_type, parse_res); - return NULL; - } - - return &tp; -} - -int hnb_nas_rx_lu_accept(struct gsm48_hdr *gh, int len, int *sent_tmsi) -{ - printf(" :D Location Update Accept :D\n"); - struct gsm48_loc_area_id *lai; - - lai = (struct gsm48_loc_area_id *)&gh->data[0]; - - struct osmo_location_area_id laid; - gsm48_decode_lai2(lai, &laid); - printf("LU: mcc %s mnc %s lac %hd\n", - osmo_mcc_name(laid.plmn.mcc), osmo_mnc_name(laid.plmn.mnc, laid.plmn.mnc_3_digits), - laid.lac); - - struct tlv_parsed tp; - int parse_res; - - len -= (const char *)&gh->data[0] - (const char *)gh; - parse_res = tlv_parse(&tp, &gsm48_mm_att_tlvdef, &gh->data[0], len, 0, 0); - if (parse_res <= 0) { - printf("Error parsing Location Update Accept message: %d\n", parse_res); - return -1; - } - - if (TLVP_PRESENT(&tp, GSM48_IE_MOBILE_ID)) { - uint8_t type = TLVP_VAL(&tp, GSM48_IE_NAME_SHORT)[0] & 0x0f; - if (type == GSM_MI_TYPE_TMSI) - *sent_tmsi = 1; - else *sent_tmsi = 0; - } - return 0; -} - -void hnb_nas_rx_mm_info(struct gsm48_hdr *gh, int len) -{ - printf(" :) MM Info :)\n"); - struct tlv_parsed *tp = parse_mm(gh, len); - if (!tp) - return; - - if (TLVP_PRESENT(tp, GSM48_IE_NAME_SHORT)) { - char name[128] = {0}; - gsm_7bit_decode_n(name, 127, - TLVP_VAL(tp, GSM48_IE_NAME_SHORT)+1, - (TLVP_LEN(tp, GSM48_IE_NAME_SHORT)-1)*8/7); - printf("Info: Short Network Name: %s\n", name); - } - - if (TLVP_PRESENT(tp, GSM48_IE_NAME_LONG)) { - char name[128] = {0}; - gsm_7bit_decode_n(name, 127, - TLVP_VAL(tp, GSM48_IE_NAME_LONG)+1, - (TLVP_LEN(tp, GSM48_IE_NAME_LONG)-1)*8/7); - printf("Info: Long Network Name: %s\n", name); - } -} - -static int hnb_nas_rx_auth_req(struct hnb *hnb, struct gsm48_hdr *gh, - int len) -{ - struct gsm48_auth_req *ar; - - len -= (const char *)&gh->data[0] - (const char *)gh; - - if (len < sizeof(*ar)) { - printf("GSM48 Auth Req does not fit.\n"); - return -1; - } - - printf(" :) Authentication Request :)\n"); - - ar = (struct gsm48_auth_req*) &gh->data[0]; - int seq = ar->key_seq; - - /* Generate SRES from *HARDCODED* Ki for Iuh testing */ - struct osmo_auth_vector vec; - /* Ki 000102030405060708090a0b0c0d0e0f */ - struct osmo_sub_auth_data auth = { - .type = OSMO_AUTH_TYPE_GSM, - .algo = OSMO_AUTH_ALG_COMP128v1, - .u.gsm.ki = { - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, - 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, - 0x0e, 0x0f - }, - }; - - memset(&vec, 0, sizeof(vec)); - osmo_auth_gen_vec(&vec, &auth, ar->rand); - - printf("seq %d rand %s", - seq, osmo_hexdump(ar->rand, sizeof(ar->rand))); - printf(" --> sres %s\n", - osmo_hexdump(vec.sres, 4)); - - return hnb_tx_dt(hnb, gen_nas_auth_resp(vec.sres)); -} - -void hnb_tx_iu_release_req(struct hnb *hnb) -{ - RANAP_Cause_t cause = { - .present = RANAP_Cause_PR_radioNetwork, - .choice.transmissionNetwork = RANAP_CauseRadioNetwork_release_due_to_UE_generated_signalling_connection_release, - }; - hnb_tx_dt(hnb, ranap_new_msg_iu_rel_req(&cause)); -} - -void hnb_tx_iu_release_compl(struct hnb *hnb) -{ - hnb_tx_dt(hnb, ranap_new_msg_iu_rel_compl()); -} - -static int hnb_nas_rx_mm(struct hnb *hnb, struct gsm48_hdr *gh, int len) -{ - struct hnb_chan *chan; - - chan = hnb->cs.chan; - if (!chan) { - printf("hnb_nas_rx_mm(): No CS channel established yet.\n"); - return -1; - } - - OSMO_ASSERT(!chan->is_ps); - - uint8_t msg_type = gsm48_hdr_msg_type(gh); - int sent_tmsi; - - switch (msg_type) { - case GSM48_MT_MM_ID_REQ: - return hnb_tx_dt(hnb, gen_nas_id_resp()); - - case GSM48_MT_MM_LOC_UPD_ACCEPT: - if (hnb_nas_rx_lu_accept(gh, len, &sent_tmsi)) - return -1; - if (sent_tmsi) - return hnb_tx_dt(hnb, gen_nas_tmsi_realloc_compl()); - else - return 0; - - case GSM48_MT_MM_LOC_UPD_REJECT: - printf("Received Location Update Reject\n"); - return 0; - - case GSM48_MT_MM_INFO: - hnb_nas_rx_mm_info(gh, len); - hnb_tx_iu_release_req(hnb); - return 0; - - case GSM48_MT_MM_AUTH_REQ: - return hnb_nas_rx_auth_req(hnb, gh, len); - - default: - printf("04.08 message type not handled by hnb-test: 0x%x\n", - msg_type); - return 0; - } - -} - -void hnb_nas_rx_dtap(struct hnb *hnb, void *data, int len) -{ - int rc; - printf("got %d bytes: %s\n", len, osmo_hexdump(data, len)); - - // nas_pdu == '05 08 12' ==> IMEI Identity request - // '05 04 0d' ==> LU reject - - struct gsm48_hdr *gh = data; - if (len < sizeof(*gh)) { - printf("hnb_nas_rx_dtap(): NAS PDU is too short: %d. Ignoring.\n", - len); - return; - } - uint8_t pdisc = gsm48_hdr_pdisc(gh); - - switch (pdisc) { - case GSM48_PDISC_MM: - rc = hnb_nas_rx_mm(hnb, gh, len); - if (rc != 0) - printf("Error receiving MM message: %d\n", rc); - return; - default: - printf("04.08 discriminator not handled by hnb-test: %d\n", - pdisc); - return; - } -} - -void hnb_rx_secmode_cmd(struct hnb *hnb, long ip_alg) -{ - printf(" :) Security Mode Command :)\n"); - /* not caring about encryption yet, just pass 0 for No Encryption. */ - hnb_tx_dt(hnb, ranap_new_msg_sec_mod_compl(ip_alg, 0)); -} - -void hnb_rx_iu_release(struct hnb *hnb) -{ - hnb_tx_iu_release_compl(hnb); -} - -void hnb_rx_paging(struct hnb *hnb, const char *imsi) -{ - printf(" :) Paging Request for %s :)\n", imsi); - /* TODO reply */ -} - -extern void direct_transfer_nas_pdu_print(ANY_t *in); - static struct vty_app_info vty_info = { .name = "OsmohNodeB", .version = "0", }; - -struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi) -{ - uint8_t lu[] = { GSM48_PDISC_MM, GSM48_MT_MM_LOC_UPD_REQUEST, - 0x70, 0x62, 0xf2, 0x30, 0xff, 0xf3, 0x57, - /* len, IMSI/type, IMSI-------------------------------- */ - 0x08, 0x29, 0x26, 0x24, 0x10, 0x32, 0x54, 0x76, 0x98, - 0x33, 0x03, 0x57, 0x18 , 0xb2 }; - uint8_t plmn_id[] = { 0x09, 0x01, 0x99 }; - RANAP_GlobalRNC_ID_t rnc_id = { - .rNC_ID = 23, - .pLMNidentity.buf = plmn_id, - .pLMNidentity.size = sizeof(plmn_id), - }; - - /* FIXME: patch imsi */ - /* Note: the Mobile Identitiy IE's IMSI data has the identity type and - * an even/odd indicator bit encoded in the first octet. So the first - * octet looks like this: - * - * 8 7 6 5 | 4 | 3 2 1 - * IMSI-digit | even/odd | type - * - * followed by the remaining IMSI digits. - * If digit count is even (bit 4 == 0), that first high-nibble is 0xf. - * (derived from Iu pcap Location Update Request msg and TS 25.413) - * - * TODO I'm only 90% sure about this - */ - - return ranap_new_msg_initial_ue(conn_id, is_ps, &rnc_id, lu, sizeof(lu)); -} - static void handle_options(int argc, char **argv) { while (1) { diff --git a/src/osmo-hnodeb/nas.c b/src/osmo-hnodeb/nas.c new file mode 100644 index 0000000..163f458 --- /dev/null +++ b/src/osmo-hnodeb/nas.c @@ -0,0 +1,268 @@ +/* (C) 2015 by Daniel Willmann + * (C) 2021 by sysmocom - s.f.m.c. GmbH + * Author: Pau Espin Pedrol + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +#include "config.h" + +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include + +static struct msgb *gen_nas_id_resp() +{ + uint8_t id_resp[] = { + GSM48_PDISC_MM, + GSM48_MT_MM_ID_RESP, + /* IMEISV */ + 0x09, /* len */ + 0x03, /* first digit (0000) + even (0) + id IMEISV (011) */ + 0x31, 0x91, 0x06, 0x00, 0x28, 0x47, 0x11, /* digits */ + 0xf2, /* filler (1111) + last digit (0010) */ + }; + + return ranap_new_msg_dt(0, id_resp, sizeof(id_resp)); +} + +static struct msgb *gen_nas_tmsi_realloc_compl() +{ + uint8_t id_resp[] = { + GSM48_PDISC_MM, + GSM48_MT_MM_TMSI_REALL_COMPL, + }; + + return ranap_new_msg_dt(0, id_resp, sizeof(id_resp)); +} + +static struct msgb *gen_nas_auth_resp(uint8_t *sres) +{ + uint8_t id_resp[] = { + GSM48_PDISC_MM, + 0x80 | GSM48_MT_MM_AUTH_RESP, /* simulate sequence nr 2 */ + 0x61, 0xb5, 0x69, 0xf5 /* hardcoded SRES */ + }; + + memcpy(id_resp + 2, sres, 4); + + return ranap_new_msg_dt(0, id_resp, sizeof(id_resp)); +} + +static struct tlv_parsed *parse_mm(struct gsm48_hdr *gh, int len) +{ + static struct tlv_parsed tp; + int parse_res; + + len -= (const char *)&gh->data[0] - (const char *)gh; + + OSMO_ASSERT(gsm48_hdr_pdisc(gh) == GSM48_PDISC_MM); + + parse_res = tlv_parse(&tp, &gsm48_mm_att_tlvdef, &gh->data[0], len, 0, 0); + if (parse_res <= 0) { + uint8_t msg_type = gsm48_hdr_msg_type(gh); + printf("Error parsing MM message 0x%hhx: %d\n", msg_type, parse_res); + return NULL; + } + + return &tp; +} + +int hnb_nas_rx_lu_accept(struct gsm48_hdr *gh, int len, int *sent_tmsi) +{ + printf(" :D Location Update Accept :D\n"); + struct gsm48_loc_area_id *lai; + + lai = (struct gsm48_loc_area_id *)&gh->data[0]; + + struct osmo_location_area_id laid; + gsm48_decode_lai2(lai, &laid); + printf("LU: mcc %s mnc %s lac %hd\n", + osmo_mcc_name(laid.plmn.mcc), osmo_mnc_name(laid.plmn.mnc, laid.plmn.mnc_3_digits), + laid.lac); + + struct tlv_parsed tp; + int parse_res; + + len -= (const char *)&gh->data[0] - (const char *)gh; + parse_res = tlv_parse(&tp, &gsm48_mm_att_tlvdef, &gh->data[0], len, 0, 0); + if (parse_res <= 0) { + printf("Error parsing Location Update Accept message: %d\n", parse_res); + return -1; + } + + if (TLVP_PRESENT(&tp, GSM48_IE_MOBILE_ID)) { + uint8_t type = TLVP_VAL(&tp, GSM48_IE_NAME_SHORT)[0] & 0x0f; + if (type == GSM_MI_TYPE_TMSI) + *sent_tmsi = 1; + else *sent_tmsi = 0; + } + return 0; +} + +void hnb_nas_rx_mm_info(struct gsm48_hdr *gh, int len) +{ + printf(" :) MM Info :)\n"); + struct tlv_parsed *tp = parse_mm(gh, len); + if (!tp) + return; + + if (TLVP_PRESENT(tp, GSM48_IE_NAME_SHORT)) { + char name[128] = {0}; + gsm_7bit_decode_n(name, 127, + TLVP_VAL(tp, GSM48_IE_NAME_SHORT)+1, + (TLVP_LEN(tp, GSM48_IE_NAME_SHORT)-1)*8/7); + printf("Info: Short Network Name: %s\n", name); + } + + if (TLVP_PRESENT(tp, GSM48_IE_NAME_LONG)) { + char name[128] = {0}; + gsm_7bit_decode_n(name, 127, + TLVP_VAL(tp, GSM48_IE_NAME_LONG)+1, + (TLVP_LEN(tp, GSM48_IE_NAME_LONG)-1)*8/7); + printf("Info: Long Network Name: %s\n", name); + } +} + +static int hnb_nas_rx_auth_req(struct hnb *hnb, struct gsm48_hdr *gh, + int len) +{ + struct gsm48_auth_req *ar; + + len -= (const char *)&gh->data[0] - (const char *)gh; + + if (len < sizeof(*ar)) { + printf("GSM48 Auth Req does not fit.\n"); + return -1; + } + + printf(" :) Authentication Request :)\n"); + + ar = (struct gsm48_auth_req*) &gh->data[0]; + int seq = ar->key_seq; + + /* Generate SRES from *HARDCODED* Ki for Iuh testing */ + struct osmo_auth_vector vec; + /* Ki 000102030405060708090a0b0c0d0e0f */ + struct osmo_sub_auth_data auth = { + .type = OSMO_AUTH_TYPE_GSM, + .algo = OSMO_AUTH_ALG_COMP128v1, + .u.gsm.ki = { + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, + 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, + 0x0e, 0x0f + }, + }; + + memset(&vec, 0, sizeof(vec)); + osmo_auth_gen_vec(&vec, &auth, ar->rand); + + printf("seq %d rand %s", + seq, osmo_hexdump(ar->rand, sizeof(ar->rand))); + printf(" --> sres %s\n", + osmo_hexdump(vec.sres, 4)); + + return hnb_tx_dt(hnb, gen_nas_auth_resp(vec.sres)); +} + +static int hnb_nas_rx_mm(struct hnb *hnb, struct gsm48_hdr *gh, int len) +{ + struct hnb_chan *chan; + + chan = hnb->cs.chan; + if (!chan) { + printf("hnb_nas_rx_mm(): No CS channel established yet.\n"); + return -1; + } + + OSMO_ASSERT(!chan->is_ps); + + uint8_t msg_type = gsm48_hdr_msg_type(gh); + int sent_tmsi; + + switch (msg_type) { + case GSM48_MT_MM_ID_REQ: + return hnb_tx_dt(hnb, gen_nas_id_resp()); + + case GSM48_MT_MM_LOC_UPD_ACCEPT: + if (hnb_nas_rx_lu_accept(gh, len, &sent_tmsi)) + return -1; + if (sent_tmsi) + return hnb_tx_dt(hnb, gen_nas_tmsi_realloc_compl()); + else + return 0; + + case GSM48_MT_MM_LOC_UPD_REJECT: + printf("Received Location Update Reject\n"); + return 0; + + case GSM48_MT_MM_INFO: + hnb_nas_rx_mm_info(gh, len); + hnb_tx_iu_release_req(hnb); + return 0; + + case GSM48_MT_MM_AUTH_REQ: + return hnb_nas_rx_auth_req(hnb, gh, len); + + default: + printf("04.08 message type not handled by hnb-test: 0x%x\n", + msg_type); + return 0; + } + +} + +void hnb_nas_rx_dtap(struct hnb *hnb, void *data, int len) +{ + int rc; + printf("got %d bytes: %s\n", len, osmo_hexdump(data, len)); + + // nas_pdu == '05 08 12' ==> IMEI Identity request + // '05 04 0d' ==> LU reject + + struct gsm48_hdr *gh = data; + if (len < sizeof(*gh)) { + printf("hnb_nas_rx_dtap(): NAS PDU is too short: %d. Ignoring.\n", + len); + return; + } + uint8_t pdisc = gsm48_hdr_pdisc(gh); + + switch (pdisc) { + case GSM48_PDISC_MM: + rc = hnb_nas_rx_mm(hnb, gh, len); + if (rc != 0) + printf("Error receiving MM message: %d\n", rc); + return; + default: + printf("04.08 discriminator not handled by hnb-test: %d\n", + pdisc); + return; + } +} diff --git a/src/osmo-hnodeb/ranap.c b/src/osmo-hnodeb/ranap.c index a6a92cc..8f1b9c0 100644 --- a/src/osmo-hnodeb/ranap.c +++ b/src/osmo-hnodeb/ranap.c @@ -18,11 +18,15 @@ * */ #include +#include #include #include #include +#include +#include +#include #include static const char *printstr(OCTET_STRING_t *s) @@ -105,3 +109,67 @@ return; } } + +struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi) +{ + uint8_t lu[] = { GSM48_PDISC_MM, GSM48_MT_MM_LOC_UPD_REQUEST, + 0x70, 0x62, 0xf2, 0x30, 0xff, 0xf3, 0x57, + /* len, IMSI/type, IMSI-------------------------------- */ + 0x08, 0x29, 0x26, 0x24, 0x10, 0x32, 0x54, 0x76, 0x98, + 0x33, 0x03, 0x57, 0x18 , 0xb2 }; + uint8_t plmn_id[] = { 0x09, 0x01, 0x99 }; + RANAP_GlobalRNC_ID_t rnc_id = { + .rNC_ID = 23, + .pLMNidentity.buf = plmn_id, + .pLMNidentity.size = sizeof(plmn_id), + }; + + /* FIXME: patch imsi */ + /* Note: the Mobile Identitiy IE's IMSI data has the identity type and + * an even/odd indicator bit encoded in the first octet. So the first + * octet looks like this: + * + * 8 7 6 5 | 4 | 3 2 1 + * IMSI-digit | even/odd | type + * + * followed by the remaining IMSI digits. + * If digit count is even (bit 4 == 0), that first high-nibble is 0xf. + * (derived from Iu pcap Location Update Request msg and TS 25.413) + * + * TODO I'm only 90% sure about this + */ + + return ranap_new_msg_initial_ue(conn_id, is_ps, &rnc_id, lu, sizeof(lu)); +} + +void hnb_tx_iu_release_req(struct hnb *hnb) +{ + RANAP_Cause_t cause = { + .present = RANAP_Cause_PR_radioNetwork, + .choice.transmissionNetwork = RANAP_CauseRadioNetwork_release_due_to_UE_generated_signalling_connection_release, + }; + hnb_tx_dt(hnb, ranap_new_msg_iu_rel_req(&cause)); +} + +void hnb_tx_iu_release_compl(struct hnb *hnb) +{ + hnb_tx_dt(hnb, ranap_new_msg_iu_rel_compl()); +} + +void hnb_rx_secmode_cmd(struct hnb *hnb, long ip_alg) +{ + printf(" :) Security Mode Command :)\n"); + /* not caring about encryption yet, just pass 0 for No Encryption. */ + hnb_tx_dt(hnb, ranap_new_msg_sec_mod_compl(ip_alg, 0)); +} + +void hnb_rx_iu_release(struct hnb *hnb) +{ + hnb_tx_iu_release_compl(hnb); +} + +void hnb_rx_paging(struct hnb *hnb, const char *imsi) +{ + printf(" :) Paging Request for %s :)\n", imsi); + /* TODO reply */ +} diff --git a/src/osmo-hnodeb/rua.c b/src/osmo-hnodeb/rua.c index 0839c0d..229df30 100644 --- a/src/osmo-hnodeb/rua.c +++ b/src/osmo-hnodeb/rua.c @@ -24,10 +24,26 @@ #include #include +#include #include #include +int hnb_tx_dt(struct hnb *hnb, struct msgb *txm) +{ + struct hnb_chan *chan; + struct msgb *rua; + + chan = hnb->cs.chan; + if (!chan) { + printf("hnb_nas_tx_tmsi_realloc_compl(): No CS channel established yet.\n"); + return -1; + } + + rua = rua_new_dt(chan->is_ps, chan->conn_id, txm); + osmo_wqueue_enqueue(&hnb->wqueue, rua); + return 0; +} static void hnb_rua_dt_handle(struct hnb *hnb, ANY_t *in) { diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c index b8dc7da..114f1c0 100644 --- a/src/osmo-hnodeb/vty.c +++ b/src/osmo-hnodeb/vty.c @@ -33,6 +33,7 @@ #include #include +#include #include #include -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I771b3d3f61207137477eed2b316a5f670fb79ef2 Gerrit-Change-Number: 26002 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 18:28:50 2021 From: gerrit-no-reply at lists.osmocom.org (keith) Date: Wed, 27 Oct 2021 18:28:50 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information In-Reply-To: References: Message-ID: keith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25829 ) Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25829/3/src/osmo-bsc/bsc_ctrl_commands.c File src/osmo-bsc/bsc_ctrl_commands.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25829/3/src/osmo-bsc/bsc_ctrl_commands.c at 670 PS3, Line 670: static int set_bts_resend_si(struct ctrl_cmd *cmd, void *data) Not that I object at all, but this is basically code duplication of lines 276-290 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 18:28:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 20:57:08 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 27 Oct 2021 20:57:08 +0000 Subject: Change in osmo-bsc[master]: refactor lchan counting In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25972 ) Change subject: refactor lchan counting ...................................................................... Patch Set 1: (6 comments) feedback on my feedback to your feedback is welcome... https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/include/osmocom/bsc/gsm_data.h at 1439 PS1, Line 1439: CHAN_COUNTS2_N > is this simply to flag the end? please document so, since it's a bit confusing as this is an enum en [?] it's to know how large to define the array (N as in number of indexes) https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/include/osmocom/bsc/gsm_data.h at 1442 PS1, Line 1442: extern const struct value_string chan_count2_strs[]; > Lots of new infra, sounds like all this can be moved to a new header file. oh i thought i had kept those *str* functions in a separate patch, just needed it for debugging and haven't decided yet whether to commit at all. these shouldn't be here but ack, maybe a separate .h/.c pair could be nice https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/abis_rsl.c at 1961 PS1, Line 1961: chan_counts_t bts_counts; > we don't tend to use *_t types in osmocom (see kernel programming style guide). [?] well, we usually use 'struct foo' or 'enum foo', but this typedef (used to pinpoint the array sizes) can't be used as 'typedef chan_counts', just 'chan_counts'. So what I often like to do, name the instance exactly like the type: struct foo foo; is not possible with a typedef like this. That's why I added the _t. Not harmful, is it? https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/abis_rsl.c at 1974 PS1, Line 1974: free_tchf = bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F]; > I'd rather prefer getters here, this way the array can be kept internal to its own module and no nee [?] To me it all seems super obvious, could it be about improving readability? Maybe abbreviating CHAN_COUNTS1_ to CC1_ could make it more readable? (but CC also means Call Control ...) CHANS1_ CHANS2_ ? ...you mean a getter like this? static inline unsigned int chan_counts_get(chan_counts vals, enum chan_counts_dim1 dim1, enum chan_counts_dim2 dim2, enum gsm_chan_t dim3) { return vals[dim1][dim2][dim3]; } free_tchf = chan_counts_get(bts_counts, CHAN_COUNTS1_ALL, CHAN_COUNTS2_FREE, GSM_LCHAN_TCH_F); Does that help? From typedef chan_counts_t it's obvious which enum values to use in which array dimension?? "some comment here describing what you fetch here" I fetch literally the count of "ALL FREE TCH_F" as the enum values indicate. Besides ALL, there could be STATIC or DYNAMIC, as seen in the enum definition, but here i get ALL. FREE is obvious, TCH_F is obvious ... what is there to explain? https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/bts_trx.c File src/osmo-bsc/bts_trx.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/bts_trx.c at 327 PS1, Line 327: void trx_count_lchans(chan_counts_t ret, const struct gsm_bts_trx *trx) > All this could go into a new counts.c file, to have all this logic in one place. [?] re "all logic in one file" -- who introduced the separation of bts and trx? I dimly remember that this used to be in the same place at some point? The only reason why this is here is because previous bts lchan counting and trx lchan counting code was in these separate places. I assumed that is so for a reason, so rather leave all trx logic in the same file...? we usually put out-arguments first, right? 'ret' is a returned argument, maybe I should doc that https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/gsm_data.c File src/osmo-bsc/gsm_data.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/gsm_data.c at 650 PS1, Line 650: * TODO: include possible VAMOS secondary lchans? */ > what about this TODO? wait, this bit of patch may be an unrelated leftover from a previous patch version... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2fb48c549186db812b1e9d6b735a92e80f27b8d3 Gerrit-Change-Number: 25972 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 20:57:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 21:03:06 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 27 Oct 2021 21:03:06 +0000 Subject: Change in osmo-bsc[master]: refactor lchan counting In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25972 ) Change subject: refactor lchan counting ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/include/osmocom/bsc/gsm_data.h at 1448 PS1, Line 1448: typedef unsigned int chan_counts_t [CHAN_COUNTS1_N][CHAN_COUNTS2_N][_GSM_LCHAN_MAX]; lol, the linter says "NEW_TYPEDEFS: do not add new typedefs" but I'd really really like to fixate the array dimensions. interwebs says one can put it in a struct like struct chan_counts { unsigned int x[2][3][4]; } but i don't know, seems weird to me when all i need is an array. Also for functions accessing only the third or second dimension, i still need to put the array dimensions, and if not as a typedef, then all callers need to put the correct array dimensions everywhere. seems we don't have a way to deal with multi-dimension arrays yet, in the way that i'd like to do it? any suggestions? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2fb48c549186db812b1e9d6b735a92e80f27b8d3 Gerrit-Change-Number: 25972 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 21:03:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 21:06:58 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 27 Oct 2021 21:06:58 +0000 Subject: Change in osmo-bsc[master]: add time_cc API: cumlative counter for time, reported as rate_ctr In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25973 ) Change subject: add time_cc API: cumlative counter for time, reported as rate_ctr ...................................................................... Patch Set 1: > I'm really lacking some perspective/documentation on the exact use of this. I mean, how is someone expected to consume this information and how is it displayed? through VTY rate_ctr show? You are familiar with rate_ctr, the prime way we deal out statistics from osmo programs. As you certainly know, via stats exporter, also possible via CTRL, and IIRC via VTY too. I don't understand what you're getting at. This is a rate counter that counts elapsed time, nothing else to it. Commit log states the inteded use, namely allAvailableSDCCHAllocated etc. I don't know what else to say? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icdd36f27cb54b2e1b940c9e6404ba9dd3692a310 Gerrit-Change-Number: 25973 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 21:06:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 21:09:54 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 27 Oct 2021 21:09:54 +0000 Subject: Change in osmo-bsc[master]: add time_cc API: cumlative counter for time, reported as rate_ctr In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25973 ) Change subject: add time_cc API: cumlative counter for time, reported as rate_ctr ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25973/1/include/osmocom/bsc/time_cc.h File include/osmocom/bsc/time_cc.h: https://gerrit.osmocom.org/c/osmo-bsc/+/25973/1/include/osmocom/bsc/time_cc.h at 129 PS1, Line 129: struct time_cc { > Maybe add an API to allocate/initialize a structure for this. Hmm, the usage example above this line actually lacks mention of talloc_zero(). There is no init needed besides bzero(). will add that. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icdd36f27cb54b2e1b940c9e6404ba9dd3692a310 Gerrit-Change-Number: 25973 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 21:09:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 21:12:40 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 27 Oct 2021 21:12:40 +0000 Subject: Change in osmo-bsc[master]: implement all_allocated:{sdcch, tch} rate counters In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25974 ) Change subject: implement all_allocated:{sdcch,tch} rate counters ...................................................................... Patch Set 1: > Please share an example on how this would look like from user point of view, I'm totally lost here. Again, you are familiar with the concept of rate counters, right? Seems that you already know everything i am going to explain? in summary, i add rate counters that increment for each second where all SDCCH slots are allocated. Same for TCH. They are rate counters... I don't know what else to explain =) =) =) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8b06e435a224c8708cd6c67e97ee5413718fc1ed Gerrit-Change-Number: 25974 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 21:12:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 21:15:37 2021 From: gerrit-no-reply at lists.osmocom.org (neels) Date: Wed, 27 Oct 2021 21:15:37 +0000 Subject: Change in osmo-bsc[master]: implement all_allocated:{sdcch, tch} rate counters In-Reply-To: References: Message-ID: neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25974 ) Change subject: implement all_allocated:{sdcch,tch} rate counters ...................................................................... Patch Set 1: The user simply sees a rate counter named "all_allocated:sdcch", both on each BTS and on the global BSC level, and when that rate counter shows '1', it means all SDCCH have been fully allocated for 1 second. If they increment a lot, it means there is a lot of congestion. No further action needed from the user, besides evaluating stats obtained from osmo-bsc -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25974 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8b06e435a224c8708cd6c67e97ee5413718fc1ed Gerrit-Change-Number: 25974 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 21:15:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Wed Oct 27 22:54:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Wed, 27 Oct 2021 22:54:24 +0000 Subject: Change in osmo-bsc[master]: constify lchan_state_is() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25971 ) Change subject: constify lchan_state_is() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I523cbf04e77f43924c3f09094d56f815d3de640d Gerrit-Change-Number: 25971 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 27 Oct 2021 22:54:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Thu Oct 28 00:35:24 2021 From: noreply at opensuse.org (OBS Notification) Date: Thu, 28 Oct 2021 00:35:24 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <6179f05b13a4d_192a2ae2e44c05f82305b4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 93s] intention of the Shared Library Policy is to allow parallel installation of [ 93s] multiple versions of the same shared library, hard dependencies likely make [ 93s] that impossible. Please remove this dependency and instead move it to the [ 93s] runtime uses of your library. [ 93s] [ 93s] osmo-iuh.x86_64: W: suse-missing-rclink osmo-hnbgw [ 93s] The package contains an init script or systemd service file but lacks the [ 93s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 93s] [ 93s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 93s] libosmo-rua0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 93s] This package contains a library and provides no %post scriptlet containing a [ 93s] call to ldconfig. [ 93s] [ 93s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 93s] libosmo-rua0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 93s] This package contains a library and provides no %postun scriptlet containing a [ 93s] call to ldconfig. [ 93s] [ 93s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 93s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 93s] [ 93s] ### VM INTERACTION START ### [ 96s] [ 90.899513] sysrq: Power Off [ 96s] [ 90.902693] reboot: Power down [ 96s] ### VM INTERACTION END ### [ 96s] [ 96s] goat07 failed "build osmo-iuh.spec" at Thu Oct 28 00:35:08 UTC 2021. [ 96s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Thu Oct 28 00:39:39 2021 From: noreply at opensuse.org (OBS Notification) Date: Thu, 28 Oct 2021 00:39:39 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <6179f166d9022_192a2ae2e44c05f82310d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 214s] intention of the Shared Library Policy is to allow parallel installation of [ 214s] multiple versions of the same shared library, hard dependencies likely make [ 214s] that impossible. Please remove this dependency and instead move it to the [ 214s] runtime uses of your library. [ 214s] [ 214s] osmo-iuh.x86_64: W: suse-missing-rclink osmo-hnbgw [ 214s] The package contains an init script or systemd service file but lacks the [ 214s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 214s] [ 214s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 214s] libosmo-rua0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 214s] This package contains a library and provides no %post scriptlet containing a [ 214s] call to ldconfig. [ 214s] [ 214s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 214s] libosmo-rua0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 214s] This package contains a library and provides no %postun scriptlet containing a [ 214s] call to ldconfig. [ 214s] [ 214s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 214s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 214s] [ 214s] ### VM INTERACTION START ### [ 217s] [ 207.552211] sysrq: SysRq : Power Off [ 217s] [ 207.557003] reboot: Power down [ 217s] ### VM INTERACTION END ### [ 217s] [ 217s] old-cirrus3 failed "build osmo-iuh.spec" at Thu Oct 28 00:39:36 UTC 2021. [ 217s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Thu Oct 28 00:41:38 2021 From: noreply at opensuse.org (OBS Notification) Date: Thu, 28 Oct 2021 00:41:38 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <6179f1ddc338f_192a2ae2e44c05f8231292@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 159s] intention of the Shared Library Policy is to allow parallel installation of [ 159s] multiple versions of the same shared library, hard dependencies likely make [ 159s] that impossible. Please remove this dependency and instead move it to the [ 159s] runtime uses of your library. [ 159s] [ 159s] osmo-iuh.aarch64: W: suse-missing-rclink osmo-hnbgw [ 159s] The package contains an init script or systemd service file but lacks the [ 159s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 159s] [ 159s] libosmo-hnbap0.aarch64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 159s] libosmo-rua0.aarch64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 159s] This package contains a library and provides no %post scriptlet containing a [ 159s] call to ldconfig. [ 159s] [ 159s] libosmo-hnbap0.aarch64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 159s] libosmo-rua0.aarch64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 159s] This package contains a library and provides no %postun scriptlet containing a [ 159s] call to ldconfig. [ 159s] [ 159s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 159s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 159s] [ 159s] ### VM INTERACTION START ### [ 165s] [ 158.460446] sysrq: SysRq : Power Off [ 165s] [ 158.461321] reboot: Power down [ 165s] ### VM INTERACTION END ### [ 165s] [ 165s] obs-arm-11 failed "build osmo-iuh.spec" at Thu Oct 28 00:41:33 UTC 2021. [ 165s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Oct 28 00:52:59 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 00:52:59 +0000 Subject: Change in osmo-bsc[master]: refactor lchan counting In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25972 ) Change subject: refactor lchan counting ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/include/osmocom/bsc/gsm_data.h at 1439 PS1, Line 1439: CHAN_COUNTS2_N > it's to know how large to define the array (N as in number of indexes) A more usual naming would be '_CHAN_COUNTS2_NUM'. https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/include/osmocom/bsc/gsm_data.h at 1442 PS1, Line 1442: extern const struct value_string chan_count2_strs[]; > oh i thought i had kept those *str* functions in a separate patch, just needed it for debugging and [?] If you don't move them yourself, Pau will do this during his next refactoring ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2fb48c549186db812b1e9d6b735a92e80f27b8d3 Gerrit-Change-Number: 25972 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 28 Oct 2021 00:52:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Thu Oct 28 01:10:15 2021 From: noreply at opensuse.org (OBS Notification) Date: Thu, 28 Oct 2021 01:10:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1_ARM/armv7l In-Reply-To: References: Message-ID: <6179f88f9d287_192a2ae2e44c05f8231998@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1_ARM/armv7l Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 1459s] intention of the Shared Library Policy is to allow parallel installation of [ 1459s] multiple versions of the same shared library, hard dependencies likely make [ 1459s] that impossible. Please remove this dependency and instead move it to the [ 1459s] runtime uses of your library. [ 1459s] [ 1459s] osmo-iuh.armv7hl: W: suse-missing-rclink osmo-hnbgw [ 1459s] The package contains an init script or systemd service file but lacks the [ 1459s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 1459s] [ 1459s] libosmo-hnbap0.armv7hl: E: library-without-ldconfig-postin (Badness: 300) /usr/lib/libosmo-hnbap.so.0.0.0 [ 1459s] libosmo-rua0.armv7hl: E: library-without-ldconfig-postin (Badness: 300) /usr/lib/libosmo-rua.so.0.0.0 [ 1459s] This package contains a library and provides no %post scriptlet containing a [ 1459s] call to ldconfig. [ 1459s] [ 1459s] libosmo-hnbap0.armv7hl: E: library-without-ldconfig-postun (Badness: 300) /usr/lib/libosmo-hnbap.so.0.0.0 [ 1459s] libosmo-rua0.armv7hl: E: library-without-ldconfig-postun (Badness: 300) /usr/lib/libosmo-rua.so.0.0.0 [ 1459s] This package contains a library and provides no %postun scriptlet containing a [ 1459s] call to ldconfig. [ 1459s] [ 1459s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 1459s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 1459s] [ 1459s] ### VM INTERACTION START ### [ 1463s] [ 1433.510209] sysrq: SysRq : Power Off [ 1463s] [ 1433.520833] reboot: Power down [ 1463s] ### VM INTERACTION END ### [ 1463s] [ 1463s] obs-arm-5 failed "build osmo-iuh.spec" at Thu Oct 28 01:10:00 UTC 2021. [ 1463s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Thu Oct 28 08:24:13 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 28 Oct 2021 08:24:13 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25829 ) Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25829/3/src/osmo-bsc/bsc_ctrl_commands.c File src/osmo-bsc/bsc_ctrl_commands.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25829/3/src/osmo-bsc/bsc_ctrl_commands.c at 670 PS3, Line 670: static int set_bts_resend_si(struct ctrl_cmd *cmd, void *data) > Not that I object at all, but this is basically code duplication of lines 276-290 Ok, thats interesting, its even documented: bts.N.send-new-system-informations, but the description "Regenerate SystemInformation messagesfor given BTS" does not make clear that the sysinfo is also resent. That probably means that this can be abandoned. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 08:24:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: keith Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 08:47:54 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 28 Oct 2021 08:47:54 +0000 Subject: Change in osmo-bsc[master]: control.adoc: improve description of command bts.N.send-new-system-in... References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26003 ) Change subject: control.adoc: improve description of command bts.N.send-new-system-informations ...................................................................... control.adoc: improve description of command bts.N.send-new-system-informations Change-Id: I48bdb7fd991dac2d5112440c879d0ded5b726715 Related: SYS#5641 --- M doc/manuals/chapters/control.adoc 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/26003/1 diff --git a/doc/manuals/chapters/control.adoc b/doc/manuals/chapters/control.adoc index 2585126..c2d7a82 100644 --- a/doc/manuals/chapters/control.adoc +++ b/doc/manuals/chapters/control.adoc @@ -32,7 +32,7 @@ |bts.N.location-area-code|RW|No|""|Set/Get LAC (value between (0, 65535)). |bts.N.cell-identity|RW|No|""|Set/Get Cell Identity (value between (0, 65535)). |bts.N.apply-configuration|WO|No|Ignored|Restart BTS via OML. -|bts.N.send-new-system-informations|WO|No|Ignored|Regenerate System Information messages for given BTS. +|bts.N.send-new-system-informations|WO|No|Ignored|Regenerate and resend System Information messages for given BTS. |bts.N.channel-load|RO|No|",,"|See <> for details. |bts.N.oml-connection-state|RO|No|"connected", "disconnected", "degraded"|Indicate the status of OML connection of BTS. |bts.N.oml-uptime|RO|No||Return OML link uptime in seconds. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I48bdb7fd991dac2d5112440c879d0ded5b726715 Gerrit-Change-Number: 26003 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 08:50:05 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 28 Oct 2021 08:50:05 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: add ctrl command to resend system information In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25829 ) Change subject: bsc_ctrl_commands: add ctrl command to resend system information ...................................................................... Abandoned bts.N.send-new-system-informations does the same -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25829 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id628fc6f0771de67f60cbc96b631000b04c765f4 Gerrit-Change-Number: 25829 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 10:01:38 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 28 Oct 2021 10:01:38 +0000 Subject: Change in osmo-bsc[master]: heighbor_ident: add/del neighbor cells via ctrl interface In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25976 to look at the new patch set (#5). Change subject: heighbor_ident: add/del neighbor cells via ctrl interface ...................................................................... heighbor_ident: add/del neighbor cells via ctrl interface The VTY allows flexible control over the neighbor cell information via the neighbor command, which can be found in the configure terminal under the bts node. Lets add pendant of this command on the control interface as well. Change-Id: I343a40e18fa9b91e6c381912c0426a002841e079 Related: SYS#5641 --- M doc/manuals/chapters/control.adoc M include/osmocom/bsc/neighbor_ident.h M src/osmo-bsc/Makefile.am M src/osmo-bsc/bsc_ctrl_commands.c A src/osmo-bsc/neighbor_ident_ctrl.c M src/osmo-bsc/neighbor_ident_vty.c M tests/ctrl_test_runner.py 7 files changed, 943 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/76/25976/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I343a40e18fa9b91e6c381912c0426a002841e079 Gerrit-Change-Number: 25976 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 10:01:38 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 28 Oct 2021 10:01:38 +0000 Subject: Change in osmo-bsc[master]: bsc_ctrl_commands: change neighbor-list mode/arfcn via control interface In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/25996 to look at the new patch set (#2). Change subject: bsc_ctrl_commands: change neighbor-list mode/arfcn via control interface ...................................................................... bsc_ctrl_commands: change neighbor-list mode/arfcn via control interface It is possible to change the neighbor-list mode via the VTY from automatic mode to manual neighbor-list configuration. In the manual mode, the user can add ARFCN values manually. This command can be found under the bts node. Lets add pendant of this command on the control interface as well. Change-Id: Id97bc0d31a358db6221c385761773fb48670c921 Related: SYS#5641 --- M doc/manuals/chapters/control.adoc M src/osmo-bsc/bsc_ctrl_commands.c M tests/ctrl_test_runner.py 3 files changed, 160 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/25996/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id97bc0d31a358db6221c385761773fb48670c921 Gerrit-Change-Number: 25996 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 10:02:13 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 28 Oct 2021 10:02:13 +0000 Subject: Change in osmo-bsc[master]: heighbor_ident: add/del neighbor cells via ctrl interface In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25976 ) Change subject: heighbor_ident: add/del neighbor cells via ctrl interface ...................................................................... Patch Set 5: (4 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25976/3/doc/manuals/chapters/control.adoc File doc/manuals/chapters/control.adoc: https://gerrit.osmocom.org/c/osmo-bsc/+/25976/3/doc/manuals/chapters/control.adoc at 124 PS3, Line 124: FIXME: add variables defined in src/ctrl/control_if.c? > This FIXME probably needs to be kept at the end. Done https://gerrit.osmocom.org/c/osmo-bsc/+/25976/3/src/osmo-bsc/neighbor_ident_ctrl.c File src/osmo-bsc/neighbor_ident_ctrl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25976/3/src/osmo-bsc/neighbor_ident_ctrl.c at 28 PS3, Line 28: #include > why are these vty headers needed here? Done https://gerrit.osmocom.org/c/osmo-bsc/+/25976/3/src/osmo-bsc/neighbor_ident_ctrl.c at 121 PS3, Line 121: CTRL_CMD_DEFINE_WO(neighbor_bts_add, "neighbor-bts add"); > Please add some documentation here on the expected format regarding params, etc. for each command. Done https://gerrit.osmocom.org/c/osmo-bsc/+/25976/3/tests/ctrl_test_runner.py File tests/ctrl_test_runner.py: https://gerrit.osmocom.org/c/osmo-bsc/+/25976/3/tests/ctrl_test_runner.py at 655 PS3, Line 655: r = self.do_set('bts.0.neighbor-cgi.add', '001-01-100-200-123-4') > This kind of stuff is what you need to add as a comment before definining each CTRL command, explain [?] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I343a40e18fa9b91e6c381912c0426a002841e079 Gerrit-Change-Number: 25976 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 10:02:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 10:11:17 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 28 Oct 2021 10:11:17 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: remove unused option -t --testmode References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26004 ) Change subject: osmo_bsc_main: remove unused option -t --testmode ...................................................................... osmo_bsc_main: remove unused option -t --testmode The option -t --testmode is defined, but not evaluated. It seems that the code of this option was removed long ago. Lets remove it now. Change-Id: Ie11173f5a7aab568b9a25102ad7dcf37fd49f318 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/04/26004/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 92b7475..17196e9 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -108,7 +108,6 @@ printf(" -c --config-file filename The config file to use.\n"); printf(" -e --log-level number Set a global loglevel.\n"); printf(" -r --rf-ctl NAME A unix domain socket to listen for cmds.\n"); - printf(" -t --testmode A special mode to provoke failures at the MSC.\n"); printf("\nVTY reference generation:\n"); printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); @@ -155,13 +154,12 @@ {"version", 0, 0, 'V' }, {"log-level", 1, 0, 'e'}, {"rf-ctl", 1, 0, 'r'}, - {"testmode", 0, 0, 't'}, {"vty-ref-mode", 1, &long_option, 1}, {"vty-ref-xml", 0, &long_option, 2}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "hd:DsTVc:e:r:t", + c = getopt_long(argc, argv, "hd:DsTVc:e:r:", long_options, &option_index); if (c == -1) break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie11173f5a7aab568b9a25102ad7dcf37fd49f318 Gerrit-Change-Number: 26004 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 10:53:20 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 10:53:20 +0000 Subject: Change in osmo-bsc[master]: control.adoc: improve description of command bts.N.send-new-system-in... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26003 ) Change subject: control.adoc: improve description of command bts.N.send-new-system-informations ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26003 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I48bdb7fd991dac2d5112440c879d0ded5b726715 Gerrit-Change-Number: 26003 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 10:53:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 10:55:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 10:55:36 +0000 Subject: Change in osmo-bsc[master]: heighbor_ident: add/del neighbor cells via ctrl interface In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25976 ) Change subject: heighbor_ident: add/del neighbor cells via ctrl interface ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I343a40e18fa9b91e6c381912c0426a002841e079 Gerrit-Change-Number: 25976 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 10:55:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 11:08:19 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 11:08:19 +0000 Subject: Change in osmo-bsc[master]: heighbor_ident: add/del neighbor cells via ctrl interface In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25976 ) Change subject: heighbor_ident: add/del neighbor cells via ctrl interface ...................................................................... Patch Set 5: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/25976/5/doc/manuals/chapters/control.adoc File doc/manuals/chapters/control.adoc: https://gerrit.osmocom.org/c/osmo-bsc/+/25976/5/doc/manuals/chapters/control.adoc at 148 PS5, Line 148: FIXME: add variables defined in src/ctrl/control_if.c? I would comment this line out: // FIXME: ... because it may look confusing for the end user. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I343a40e18fa9b91e6c381912c0426a002841e079 Gerrit-Change-Number: 25976 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 28 Oct 2021 11:08:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 11:08:43 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 11:08:43 +0000 Subject: Change in osmo-bsc[master]: neighbor_ident: add comment about Neighbor Address Resolution Service In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25977 ) Change subject: neighbor_ident: add comment about Neighbor Address Resolution Service ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iec86f72548bfc54a2c86dadec69dd1c64813d852 Gerrit-Change-Number: 25977 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 11:08:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 11:32:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 11:32:12 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: remove unused option -t --testmode In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26004 ) Change subject: osmo_bsc_main: remove unused option -t --testmode ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie11173f5a7aab568b9a25102ad7dcf37fd49f318 Gerrit-Change-Number: 26004 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 11:32:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 11:38:16 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 11:38:16 +0000 Subject: Change in osmo-bsc[master]: add time_cc API: cumlative counter for time, reported as rate_ctr In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25973 ) Change subject: add time_cc API: cumlative counter for time, reported as rate_ctr ...................................................................... Patch Set 1: Well maybe then the question is why are you using rate_ctr and not stat_items here, it really confuses me. The point of rate_ctr is seeing how frequently some event happens over time, for instance shown in VTY: "device:rx_underruns: 0 (0/s 0/m 0/h 0/d) Number of Rx underruns" But my understanding here is that allAvailableSDCCHAllocated fits with a stat_item, which is simply a counter value changing over time. So I'm not really following on why you need all this infrastructure sorry, this all looks super complicated for no reason (I'm able to see). Maybe someone else can also shed some light on it. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icdd36f27cb54b2e1b940c9e6404ba9dd3692a310 Gerrit-Change-Number: 25973 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 11:38:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 11:43:14 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 11:43:14 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_EncDec.cc: fix encoding of optional 'sdp' field References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005 ) Change subject: library/MNCC_EncDec.cc: fix encoding of optional 'sdp' field ...................................................................... library/MNCC_EncDec.cc: fix encoding of optional 'sdp' field Decoding was implemented in [1], but encoding was not. Change-Id: I82f8afd3e64d83d165a7070a1b82a6276ef0b020 Fixes: [1] Ic9568c8927507e161aadfad1a4d20aa896d8ae30 --- M library/MNCC_EncDec.cc 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/05/26005/1 diff --git a/library/MNCC_EncDec.cc b/library/MNCC_EncDec.cc index 7d09d0a..f896cd3 100644 --- a/library/MNCC_EncDec.cc +++ b/library/MNCC_EncDec.cc @@ -184,6 +184,10 @@ strncpy(mncc.imsi, in_sig.imsi(), sizeof(mncc.imsi)); mncc.lchan_type = in_sig.lchan__type(); mncc.lchan_mode = in_sig.lchan__mode(); + if (in_sig.sdp().is_value()) { + const CHARSTRING &sdp = in_sig.sdp(); + strncpy(&mncc.sdp[0], sdp, sizeof(mncc.sdp)); + } ret_val = OCTETSTRING(sizeof(mncc), (uint8_t *)&mncc); } break; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I82f8afd3e64d83d165a7070a1b82a6276ef0b020 Gerrit-Change-Number: 26005 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 11:47:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 11:47:36 +0000 Subject: Change in osmo-bsc[master]: refactor lchan counting In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25972 ) Change subject: refactor lchan counting ...................................................................... Patch Set 1: (4 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/include/osmocom/bsc/gsm_data.h File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/include/osmocom/bsc/gsm_data.h at 1442 PS1, Line 1442: extern const struct value_string chan_count2_strs[]; > If you don't move them yourself, Pau will do this during his next refactoring ;) Ack https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/include/osmocom/bsc/gsm_data.h at 1448 PS1, Line 1448: typedef unsigned int chan_counts_t [CHAN_COUNTS1_N][CHAN_COUNTS2_N][_GSM_LCHAN_MAX]; > lol, the linter says "NEW_TYPEDEFS: do not add new typedefs" [?] I'd go for the struct with the multidimensional array inside it. This way it can be easily extended if needed for whatever reason. https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/abis_rsl.c File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/abis_rsl.c at 1974 PS1, Line 1974: free_tchf = bts_counts[CHAN_COUNTS1_ALL][CHAN_COUNTS2_FREE][GSM_LCHAN_TCH_F]; > To me it all seems super obvious, could it be about improving readability? [?] Yes please, a getter like you wrote, and with some minimal description like "Remember to call bts_counts_chans() or alike before using it. https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/bts_trx.c File src/osmo-bsc/bts_trx.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25972/1/src/osmo-bsc/bts_trx.c at 327 PS1, Line 327: void trx_count_lchans(chan_counts_t ret, const struct gsm_bts_trx *trx) > re "all logic in one file" -- who introduced the separation of bts and trx? I dimly remember that th [?] As I said, I'm fine with keeping it either way, but if you keep it here, let's make it an operation on trx and have trx as first param, since the function is called "trx_count_lchans()". If you want to keep the ret function first, then it'd be clear naming it "count_lchans_trx" and moving it to the count specific file. This way one has some code which is consistent in some sort of object-oriented way. So ig a function starts with trx_*, then you know it's an operation on trx and the first param is a trx. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2fb48c549186db812b1e9d6b735a92e80f27b8d3 Gerrit-Change-Number: 25972 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-Comment-Date: Thu, 28 Oct 2021 11:47:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 13:14:22 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 13:14:22 +0000 Subject: Change in libosmocore[master]: configure.ac: Depend on talloc 2.1.0 References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26006 ) Change subject: configure.ac: Depend on talloc 2.1.0 ...................................................................... configure.ac: Depend on talloc 2.1.0 With recent commit (see below) libosmocore started using talloc API talloc_pooled_object(), which is available only startinf from talloc 2.1.0. Let's bump required version check in configure.ac accordingly. Fixes: b72867f0e68c96ca25e1f9929ce92be0a802db6b Change-Id: Id9d10d02b9b4500a246fcc3e071a14c1d7da4f14 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/06/26006/1 diff --git a/configure.ac b/configure.ac index f5af0d0..b36bd6f 100644 --- a/configure.ac +++ b/configure.ac @@ -150,7 +150,7 @@ dnl Generate the output AC_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) +PKG_CHECK_MODULES(TALLOC, [talloc >= 2.1.0]) AC_ARG_ENABLE([pcsc], [AS_HELP_STRING([--disable-pcsc], [Build without PC/SC support])], [ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id9d10d02b9b4500a246fcc3e071a14c1d7da4f14 Gerrit-Change-Number: 26006 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 13:24:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 13:24:58 +0000 Subject: Change in osmo-iuh[master]: RFC: Add lib prefix to structs with duplicated names In-Reply-To: References: Message-ID: pespin has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25888 ) Change subject: RFC: Add lib prefix to structs with duplicated names ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I552fc028c7d08c880fdb844ece75816602c5bb67 Gerrit-Change-Number: 25888 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 13:26:06 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 13:26:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_Types: set 'sdp' field to omit by default References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26007 ) Change subject: library/MNCC_Types: set 'sdp' field to omit by default ...................................................................... library/MNCC_Types: set 'sdp' field to omit by default It's defined as 'optional', so let's rather use omit. Change-Id: I96b03fe5363cc9bf1df622f7436d1a7c2da7514a --- M library/MNCC_Types.ttcn 1 file changed, 25 insertions(+), 25 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/26007/1 diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn index bd233ce..e396892 100644 --- a/library/MNCC_Types.ttcn +++ b/library/MNCC_Types.ttcn @@ -472,7 +472,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -537,7 +537,7 @@ imsi := imsi, lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } }; @@ -604,7 +604,7 @@ imsi := imsi, lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } }; @@ -703,7 +703,7 @@ imsi := imsi, lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -735,7 +735,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -841,7 +841,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -908,7 +908,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -944,7 +944,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1012,7 +1012,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1046,7 +1046,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1148,7 +1148,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1181,7 +1181,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1281,7 +1281,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1316,7 +1316,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1417,7 +1417,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1450,7 +1450,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1529,7 +1529,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1625,7 +1625,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1657,7 +1657,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1729,7 +1729,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1761,7 +1761,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1826,7 +1826,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1899,7 +1899,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1929,7 +1929,7 @@ rtp_port := 0, payload_type := 0, payload_msg_type := 0, - sdp := "" + sdp := omit } } } @@ -1967,7 +1967,7 @@ rtp_port := rtp_port, payload_type := pt, payload_msg_type := 0, - sdp := "" + sdp := omit } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I96b03fe5363cc9bf1df622f7436d1a7c2da7514a Gerrit-Change-Number: 26007 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 13:26:06 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 13:26:06 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC: implement MNCCv8 encoding/decoding support References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26008 ) Change subject: library/MNCC: implement MNCCv8 encoding/decoding support ...................................................................... library/MNCC: implement MNCCv8 encoding/decoding support Change-Id: I5488c5a4cc671e1d6a0d35b2ff4bdda0b0b48c00 Related: OS#5164, OS#5282 --- M library/MNCC_Emulation.ttcn M library/MNCC_EncDec.cc M library/MNCC_Types.ttcn M library/mncc.h 4 files changed, 74 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/26008/1 diff --git a/library/MNCC_Emulation.ttcn b/library/MNCC_Emulation.ttcn index 66294a4..85556c1 100644 --- a/library/MNCC_Emulation.ttcn +++ b/library/MNCC_Emulation.ttcn @@ -38,7 +38,7 @@ import from UD_Types all; modulepar { - int mp_mncc_version := 7; + int mp_mncc_version := 8; } /* General "base class" component definition, of which specific implementations diff --git a/library/MNCC_EncDec.cc b/library/MNCC_EncDec.cc index f896cd3..ffc2aa8 100644 --- a/library/MNCC_EncDec.cc +++ b/library/MNCC_EncDec.cc @@ -9,7 +9,7 @@ BOOLEAN set__MNCC__version(INTEGER const& version) { - if (version != 7) + if (version != 7 && version != 8) return false; mncc_sock_version = version; return true; @@ -184,9 +184,19 @@ strncpy(mncc.imsi, in_sig.imsi(), sizeof(mncc.imsi)); mncc.lchan_type = in_sig.lchan__type(); mncc.lchan_mode = in_sig.lchan__mode(); + if (in_sig.gcr().is_value()) { + const OCTETSTRING &gcr = in_sig.gcr(); + if (mncc_sock_version < 8) + TTCN_error("GCR is only available since MNCCv8"); + memcpy(&mncc.v8.gcr[0], gcr, sizeof(mncc.v8.gcr)); + mncc.fields |= MNCC_F_GCR; + } if (in_sig.sdp().is_value()) { const CHARSTRING &sdp = in_sig.sdp(); - strncpy(&mncc.sdp[0], sdp, sizeof(mncc.sdp)); + if (mncc_sock_version > 7) + strncpy(&mncc.v8.sdp[0], sdp, sizeof(mncc.v8.sdp)); + else + strncpy(&mncc.v7.sdp[0], sdp, sizeof(mncc.v7.sdp)); } ret_val = OCTETSTRING(sizeof(mncc), (uint8_t *)&mncc); } @@ -361,7 +371,13 @@ sign.imsi() = CHARSTRING(in_mncc->imsi); sign.lchan__type() = in_mncc->lchan_type; sign.lchan__mode() = in_mncc->lchan_mode; - sign.sdp() = in_mncc->sdp; + if (mncc_sock_version > 7) { + if (in_mncc->fields & MNCC_F_GCR) + sign.gcr() = OCTETSTRING(sizeof(in_mncc->v8.gcr), in_mncc->v8.gcr); + sign.sdp() = in_mncc->v8.sdp; + } else { + sign.sdp() = in_mncc->v7.sdp; + } u.signal() = sign; break; } diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn index e396892..1de34a0 100644 --- a/library/MNCC_Types.ttcn +++ b/library/MNCC_Types.ttcn @@ -362,6 +362,7 @@ uint8_t lchan_type, /* empty in OSmoMSC */ uint8_t lchan_mode, /* empty in OsmoMSC */ + octetstring gcr optional, charstring sdp optional }; @@ -472,6 +473,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -503,6 +505,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -537,6 +540,7 @@ imsi := imsi, lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -570,6 +574,7 @@ imsi := imsi, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -604,6 +609,7 @@ imsi := imsi, lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -636,6 +642,7 @@ imsi := imsi, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -670,6 +677,7 @@ imsi := imsi, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -703,6 +711,7 @@ imsi := imsi, lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -735,6 +744,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -767,6 +777,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -809,6 +820,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -841,6 +853,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -875,6 +888,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -908,6 +922,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -944,6 +959,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -978,6 +994,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1012,6 +1029,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1046,6 +1064,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1079,6 +1098,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1115,6 +1135,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1148,6 +1169,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1181,6 +1203,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1213,6 +1236,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1248,6 +1272,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1281,6 +1306,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1316,6 +1342,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1350,6 +1377,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1384,6 +1412,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1417,6 +1446,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1450,6 +1480,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1481,6 +1512,7 @@ imsi := ?, lchan_type := 0, lchan_mode := 0, + gcr := *, sdp := * } } @@ -1529,6 +1561,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1561,6 +1594,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1593,6 +1627,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1625,6 +1660,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1657,6 +1693,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1697,6 +1734,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1729,6 +1767,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1761,6 +1800,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1794,6 +1834,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1826,6 +1867,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1859,6 +1901,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := *, sdp := * } } @@ -1899,6 +1942,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } diff --git a/library/mncc.h b/library/mncc.h index 1e45c37..f70f9bd 100644 --- a/library/mncc.h +++ b/library/mncc.h @@ -230,6 +230,7 @@ #define MNCC_F_CCCAP 0x0800 #define MNCC_F_KEYPAD 0x1000 #define MNCC_F_SIGNAL 0x2000 +#define MNCC_F_GCR 0x4000 struct gsm_mncc { /* context based information */ @@ -267,7 +268,15 @@ unsigned char lchan_type; unsigned char lchan_mode; - char sdp[1024]; + union { + struct { + char sdp[1024]; + } v7; + struct { + uint8_t gcr[16]; + char sdp[1024]; + } v8; + }; }; struct gsm_data_frame { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5488c5a4cc671e1d6a0d35b2ff4bdda0b0b48c00 Gerrit-Change-Number: 26008 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:01:15 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 28 Oct 2021 14:01:15 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Improve STATUS handling from SGSN In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25984 ) Change subject: gbproxy: Improve STATUS handling from SGSN ...................................................................... Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0ab88634fe2eab5299ff4587fcef4177ce5b4831 Gerrit-Change-Number: 25984 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:01:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:07:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 14:07:58 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_EncDec.cc: fix encoding of optional 'sdp' field In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005 ) Change subject: library/MNCC_EncDec.cc: fix encoding of optional 'sdp' field ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005/2/library/MNCC_EncDec.cc File library/MNCC_EncDec.cc: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005/2/library/MNCC_EncDec.cc at 189 PS2, Line 189: strncpy(&mncc.sdp[0], sdp, sizeof(mncc.sdp)); are you sure this is the proper way to get the content? simply copying from sdp pointer and also using sizeof() looks potentially wrong to me. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I82f8afd3e64d83d165a7070a1b82a6276ef0b020 Gerrit-Change-Number: 26005 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:07:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:10:26 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 14:10:26 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC: implement MNCCv8 encoding/decoding support In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26008 ) Change subject: library/MNCC: implement MNCCv8 encoding/decoding support ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5488c5a4cc671e1d6a0d35b2ff4bdda0b0b48c00 Gerrit-Change-Number: 26008 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:10:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:10:43 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 14:10:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_Types: set 'sdp' field to omit by default In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26007 ) Change subject: library/MNCC_Types: set 'sdp' field to omit by default ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I96b03fe5363cc9bf1df622f7436d1a7c2da7514a Gerrit-Change-Number: 26007 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:10:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:10:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 14:10:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_EncDec.cc: fix encoding of optional 'sdp' field In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005 ) Change subject: library/MNCC_EncDec.cc: fix encoding of optional 'sdp' field ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I82f8afd3e64d83d165a7070a1b82a6276ef0b020 Gerrit-Change-Number: 26005 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:10:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:14:43 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 14:14:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_EncDec.cc: fix encoding of optional 'sdp' field In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005 ) Change subject: library/MNCC_EncDec.cc: fix encoding of optional 'sdp' field ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005/2/library/MNCC_EncDec.cc File library/MNCC_EncDec.cc: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005/2/library/MNCC_EncDec.cc at 189 PS2, Line 189: strncpy(&mncc.sdp[0], sdp, sizeof(mncc.sdp)); > are you sure this is the proper way to get the content? simply copying from sdp pointer and also usi [?] I use sizeof() on 'mncc.sdp' (array), not 'sdp' (pointer). As an example, see how it's done for 'mncc.ssversion.info' above. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I82f8afd3e64d83d165a7070a1b82a6276ef0b020 Gerrit-Change-Number: 26005 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:14:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:17:49 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 14:17:49 +0000 Subject: Change in docker-playground[master]: ttcn3-sip-test: use MNCCv7 for the '-latest' SUT References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/26009 ) Change subject: ttcn3-sip-test: use MNCCv7 for the '-latest' SUT ...................................................................... ttcn3-sip-test: use MNCCv7 for the '-latest' SUT Change-Id: Ic1e6e5f9ea959166b727795232bb58b9a25cc049 Related: OS#5282, OS#5164 --- M ttcn3-sip-test/jenkins.sh 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/09/26009/1 diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index ffec3d2..3e8fb94 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -16,6 +16,13 @@ mkdir $VOL_BASE_DIR/sip-tester/unix cp SIP_Tests.cfg $VOL_BASE_DIR/sip-tester/ +# TODO: remove this block once we release a new version of the SUT +if image_suffix_is_latest; then + # Use MNCCv7 for the '-latest' + sed -i "/MODULE_PARAMETERS/a MNCC_Emulation.mp_mncc_version := 7" \ + "$VOL_BASE_DIR/sip-tester/SIP_Tests.cfg" +fi + mkdir $VOL_BASE_DIR/sip mkdir $VOL_BASE_DIR/sip/unix cp osmo-sip-connector.cfg $VOL_BASE_DIR/sip/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic1e6e5f9ea959166b727795232bb58b9a25cc049 Gerrit-Change-Number: 26009 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:18:44 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 28 Oct 2021 14:18:44 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Route DL STATUS with BVCI on SIG-BVC In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985 to look at the new patch set (#2). Change subject: gbproxy: Route DL STATUS with BVCI on SIG-BVC ...................................................................... gbproxy: Route DL STATUS with BVCI on SIG-BVC Fixes TTCN3 gbproxy test TC_status_sig_dl_bvci Related: OS#4892 Change-Id: I5928cebea7f39d6648f95dfa1a46437de202f723 --- M src/gb_proxy.c 1 file changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/85/25985/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5928cebea7f39d6648f95dfa1a46437de202f723 Gerrit-Change-Number: 25985 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:18:44 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 28 Oct 2021 14:18:44 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Add comment, remove unused param in gbproxy_tlli_from_status... References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/26010 ) Change subject: gbproxy: Add comment, remove unused param in gbproxy_tlli_from_status_pdu ...................................................................... gbproxy: Add comment, remove unused param in gbproxy_tlli_from_status_pdu Change-Id: I8fc4c42c11ee38df80fbd316bbe6b1eb243b5323 --- M src/gb_proxy.c 1 file changed, 5 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/10/26010/1 diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 5d9219d..18e0efb 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -989,7 +989,8 @@ return gbprox_relay2nse(msg, sgsn->nse, 0); } -static int gbproxy_tlli_from_status_pdu(struct msgb *msg, struct tlv_parsed *tp, uint32_t *tlli, char *log_pfx) +/* Extract the TLLI from the PDU-in-error of the STATUS PDU (if available) */ +static int gbproxy_tlli_from_status_pdu(struct tlv_parsed *tp, uint32_t *tlli, char *log_pfx) { int rc; int pdu_len = TLVP_LEN(&tp[0], BSSGP_IE_PDU_IN_ERROR); @@ -1149,7 +1150,7 @@ LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s) ", cause, bssgp_cause_str(cause)); - if (gbproxy_tlli_from_status_pdu(msg, tp, &tlli, log_pfx) == 0) + if (gbproxy_tlli_from_status_pdu(tp, &tlli, log_pfx) == 0) sgsn = gbproxy_select_sgsn(nse->cfg, &tlli); else sgsn = gbproxy_select_sgsn(nse->cfg, NULL); @@ -1535,7 +1536,8 @@ return gbprox_relay2nse(msg, cell->bss_bvc->nse, 0); } - if (gbproxy_tlli_from_status_pdu(msg, tp, &tlli, log_pfx) == 0) { + /* We can only forward this TLLI if it's in the cache (which only happens on suspend/resume) */ + if (gbproxy_tlli_from_status_pdu(tp, &tlli, log_pfx) == 0) { nse_peer = gbproxy_nse_by_tlli(cfg, tlli); if (nse_peer) return gbprox_relay2nse(msg, nse_peer, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/26010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I8fc4c42c11ee38df80fbd316bbe6b1eb243b5323 Gerrit-Change-Number: 26010 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:18:57 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Thu, 28 Oct 2021 14:18:57 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Route DL STATUS with BVCI on SIG-BVC In-Reply-To: References: Message-ID: daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985 ) Change subject: gbproxy: Route DL STATUS with BVCI on SIG-BVC ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985/1/src/gb_proxy.c File src/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985/1/src/gb_proxy.c at 1021 PS1, Line 1021: static int gbproxy_bvci_from_status_pdu(struct msgb *msg, struct tlv_parsed *tp, uint16_t *bvci, char *log_pfx) > Some small func description would be helpful here. [?] good catch about msg, thanks. Will add comment here and for the tlli function above https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985/1/src/gb_proxy.c at 1527 PS1, Line 1527: if (bvci != 0) { > You can add this check inline with the other if: [?] Ack https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985/1/src/gb_proxy.c at 1530 PS1, Line 1530: /* TODO: Log */ > Please add the log right now :) Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5928cebea7f39d6648f95dfa1a46437de202f723 Gerrit-Change-Number: 25985 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:18:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:23:11 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 14:23:11 +0000 Subject: Change in docker-playground[master]: ttcn3-sip-test: use MNCCv7 for the '-latest' SUT In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26009 ) Change subject: ttcn3-sip-test: use MNCCv7 for the '-latest' SUT ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic1e6e5f9ea959166b727795232bb58b9a25cc049 Gerrit-Change-Number: 26009 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:23:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:23:44 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 14:23:44 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Add comment, remove unused param in gbproxy_tlli_from_status... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/26010 ) Change subject: gbproxy: Add comment, remove unused param in gbproxy_tlli_from_status_pdu ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/26010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I8fc4c42c11ee38df80fbd316bbe6b1eb243b5323 Gerrit-Change-Number: 26010 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:23:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:24:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 14:24:56 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Route DL STATUS with BVCI on SIG-BVC In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985 ) Change subject: gbproxy: Route DL STATUS with BVCI on SIG-BVC ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5928cebea7f39d6648f95dfa1a46437de202f723 Gerrit-Change-Number: 25985 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:24:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:31:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:31:55 +0000 Subject: Change in osmo-bts[master]: l1sap: fix handling of lchan->pending_rel_ind_msg In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25948 ) Change subject: l1sap: fix handling of lchan->pending_rel_ind_msg ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2c380f9045624f0a0a8f988bb207bc73d8354857 Gerrit-Change-Number: 25948 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:31:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:32:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:32:23 +0000 Subject: Change in osmo-bts[master]: l1sap: move false PTCCH/U detection into PDCH branch In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25987 ) Change subject: l1sap: move false PTCCH/U detection into PDCH branch ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I187fef8f3de0b41b502b0b18acfb11c56c5551f0 Gerrit-Change-Number: 25987 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:32:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:32:50 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:32:50 +0000 Subject: Change in osmo-bts[master]: l1sap: use designated initializers in process_l1sap_meas_data() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25988 ) Change subject: l1sap: use designated initializers in process_l1sap_meas_data() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5169a6c5f6865655dbfebb6b68d5f67941d9cdb1 Gerrit-Change-Number: 25988 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:32:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:33:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:33:41 +0000 Subject: Change in osmo-bts[master]: l1sap: process_l1sap_meas_data() accepts pointer to lchan In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25989 ) Change subject: l1sap: process_l1sap_meas_data() accepts pointer to lchan ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9de67a0b2d2b18923f2c2003b400387a0f1af411 Gerrit-Change-Number: 25989 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:33:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:34:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:34:30 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_EncDec: rip out MNCC version 6 support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25990 ) Change subject: library/MNCC_EncDec: rip out MNCC version 6 support ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie45158e805a62e86b9496b46f323b83a74630460 Gerrit-Change-Number: 25990 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:34:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:35:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:35:00 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_EncDec.cc: fix encoding of optional 'sdp' field In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005 ) Change subject: library/MNCC_EncDec.cc: fix encoding of optional 'sdp' field ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I82f8afd3e64d83d165a7070a1b82a6276ef0b020 Gerrit-Change-Number: 26005 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:35:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:35:12 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:35:12 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_Types: set 'sdp' field to omit by default In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26007 ) Change subject: library/MNCC_Types: set 'sdp' field to omit by default ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I96b03fe5363cc9bf1df622f7436d1a7c2da7514a Gerrit-Change-Number: 26007 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:35:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:35:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:35:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC: implement MNCCv8 encoding/decoding support In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26008 ) Change subject: library/MNCC: implement MNCCv8 encoding/decoding support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5488c5a4cc671e1d6a0d35b2ff4bdda0b0b48c00 Gerrit-Change-Number: 26008 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:35:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:35:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:35:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_EncDec: rip out MNCC version 6 support In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25990 ) Change subject: library/MNCC_EncDec: rip out MNCC version 6 support ...................................................................... library/MNCC_EncDec: rip out MNCC version 6 support The latest release of osmo-sip-connector (1.5.0, 23 Feb 2021) does support MNCCv7, so there is no need to maintain MNCCv6 support. Change-Id: Ie45158e805a62e86b9496b46f323b83a74630460 Related: I5448ff931ec33f24f4837a51376f1703fe97683b Related: OS#5282 --- M library/MNCC_EncDec.cc M library/mncc.h 2 files changed, 37 insertions(+), 83 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/library/MNCC_EncDec.cc b/library/MNCC_EncDec.cc index be5d01a..7d09d0a 100644 --- a/library/MNCC_EncDec.cc +++ b/library/MNCC_EncDec.cc @@ -9,7 +9,7 @@ BOOLEAN set__MNCC__version(INTEGER const& version) { - if (version != 6 && version != 7) + if (version != 7) return false; mncc_sock_version = version; return true; @@ -195,46 +195,27 @@ ret_val = ret_val & in.u().data().data(); break; case MNCC__MsgUnion::ALT_rtp: - switch (mncc_sock_version) { - case 6: - struct gsm_mncc_rtp_mncc6 rtp_old; - memset(&rtp_old, 0, sizeof(rtp_old)); - rtp_old.msg_type = in.msg__type(); - rtp_old.callref = in.u().rtp().callref(); - ttcn_buffer.put_string(in.u().rtp().ip()); - if (!in.u().rtp().is__ipv6()) { - memcpy(&rtp_old.ip, ttcn_buffer.get_data(), sizeof(struct in_addr)); - rtp_old.ip = ntohl(rtp_old.ip); - } /* else: ipv6 not supported in MNCCv6 */ - rtp_old.port = in.u().rtp().rtp__port(); - rtp_old.payload_type = in.u().rtp().payload__type(); - rtp_old.payload_msg_type = in.u().rtp().payload__msg__type(); - ret_val = OCTETSTRING(sizeof(rtp_old), (uint8_t *) &rtp_old); - break; - case 7: - struct gsm_mncc_rtp rtp; - memset(&rtp, 0, sizeof(rtp)); - rtp.msg_type = in.msg__type(); - rtp.callref = in.u().rtp().callref(); - ttcn_buffer.put_string(in.u().rtp().ip()); - if (in.u().rtp().is__ipv6()) { - // if(in.u().rtp().ip().lengthof() != 16) print error - rtp.addr.ss_family = AF_INET6; - memcpy(&((struct sockaddr_in6*)&rtp.addr)->sin6_addr, ttcn_buffer.get_data(), - sizeof(struct in6_addr)); - ((struct sockaddr_in6*)&rtp.addr)->sin6_port = htons(in.u().rtp().rtp__port()); - } else { - // if(in.u().rtp().ip().lengthof() != 4) print error - rtp.addr.ss_family = AF_INET; - memcpy(&((struct sockaddr_in*)&rtp.addr)->sin_addr, ttcn_buffer.get_data(), - sizeof(struct in_addr)); - ((struct sockaddr_in*)&rtp.addr)->sin_port = htons(in.u().rtp().rtp__port()); - } - rtp.payload_type = in.u().rtp().payload__type(); - rtp.payload_msg_type = in.u().rtp().payload__msg__type(); - ret_val = OCTETSTRING(sizeof(rtp), (uint8_t *) &rtp); - break; + struct gsm_mncc_rtp rtp; + memset(&rtp, 0, sizeof(rtp)); + rtp.msg_type = in.msg__type(); + rtp.callref = in.u().rtp().callref(); + ttcn_buffer.put_string(in.u().rtp().ip()); + if (in.u().rtp().is__ipv6()) { + // if(in.u().rtp().ip().lengthof() != 16) print error + rtp.addr.ss_family = AF_INET6; + memcpy(&((struct sockaddr_in6*)&rtp.addr)->sin6_addr, ttcn_buffer.get_data(), + sizeof(struct in6_addr)); + ((struct sockaddr_in6*)&rtp.addr)->sin6_port = htons(in.u().rtp().rtp__port()); + } else { + // if(in.u().rtp().ip().lengthof() != 4) print error + rtp.addr.ss_family = AF_INET; + memcpy(&((struct sockaddr_in*)&rtp.addr)->sin_addr, ttcn_buffer.get_data(), + sizeof(struct in_addr)); + ((struct sockaddr_in*)&rtp.addr)->sin_port = htons(in.u().rtp().rtp__port()); } + rtp.payload_type = in.u().rtp().payload__type(); + rtp.payload_msg_type = in.u().rtp().payload__msg__type(); + ret_val = OCTETSTRING(sizeof(rtp), (uint8_t *) &rtp); break; case MNCC__MsgUnion::ALT_hello: struct gsm_mncc_hello hello; @@ -264,7 +245,6 @@ const struct gsm_data_frame *in_data; MNCC__PDU__Data data; const struct gsm_mncc_rtp *in_rtp; - const struct gsm_mncc_rtp_mncc6 *in_rtp_old; MNCC__PDU__Rtp rtp; MNCC__MsgUnion u; bool is_ipv6; @@ -303,40 +283,26 @@ case MNCC_RTP_CREATE: case MNCC_RTP_CONNECT: case MNCC_RTP_FREE: - switch (mncc_sock_version) { - case 6: - struct in_addr inaddr; - in_rtp_old = (const struct gsm_mncc_rtp_mncc6 *) in_mncc; - inaddr.s_addr = htonl(in_rtp_old->ip); - ip = OCTETSTRING(sizeof(struct in_addr), - (const unsigned char*)&inaddr); - rtp = MNCC__PDU__Rtp(in_rtp_old->callref, false, ip, in_rtp_old->port, in_rtp_old->payload_type, - in_rtp_old->payload_msg_type, in_rtp_old->sdp); - u.rtp() = rtp; - break; - case 7: - in_rtp = (const struct gsm_mncc_rtp *) in_mncc; - switch (in_rtp->addr.ss_family) { - case AF_INET6: - is_ipv6 = true; - port = ntohs(((struct sockaddr_in6*)&in_rtp->addr)->sin6_port); - ip = OCTETSTRING(sizeof(struct in6_addr), - (const unsigned char*)&((struct sockaddr_in6*)&in_rtp->addr)->sin6_addr); + in_rtp = (const struct gsm_mncc_rtp *) in_mncc; + switch (in_rtp->addr.ss_family) { + case AF_INET6: + is_ipv6 = true; + port = ntohs(((struct sockaddr_in6*)&in_rtp->addr)->sin6_port); + ip = OCTETSTRING(sizeof(struct in6_addr), + (const unsigned char*)&((struct sockaddr_in6*)&in_rtp->addr)->sin6_addr); break; - case AF_UNSPEC: //RTP_CREATE and RTP_FREE can contain fully zeroed addr - case AF_INET: - is_ipv6 = false; - port = ntohs(((struct sockaddr_in*)&in_rtp->addr)->sin_port); - ip = OCTETSTRING(sizeof(struct in_addr), - (const unsigned char*)&((struct sockaddr_in*)&in_rtp->addr)->sin_addr); - break; - } - rtp = MNCC__PDU__Rtp(in_rtp->callref, is_ipv6, ip, port, in_rtp->payload_type, - in_rtp->payload_msg_type, in_rtp->sdp); - u.rtp() = rtp; + case AF_UNSPEC: //RTP_CREATE and RTP_FREE can contain fully zeroed addr + case AF_INET: + is_ipv6 = false; + port = ntohs(((struct sockaddr_in*)&in_rtp->addr)->sin_port); + ip = OCTETSTRING(sizeof(struct in_addr), + (const unsigned char*)&((struct sockaddr_in*)&in_rtp->addr)->sin_addr); break; } + rtp = MNCC__PDU__Rtp(in_rtp->callref, is_ipv6, ip, port, in_rtp->payload_type, + in_rtp->payload_msg_type, in_rtp->sdp); + u.rtp() = rtp; break; default: sign.callref() = in_mncc->callref; diff --git a/library/mncc.h b/library/mncc.h index a55d155..1e45c37 100644 --- a/library/mncc.h +++ b/library/mncc.h @@ -292,18 +292,6 @@ uint32_t lchan_type_offset; }; -/* Use this one in MNCCv6 */ -struct gsm_mncc_rtp_mncc6 { - uint32_t msg_type; - uint32_t callref; - uint32_t ip; - uint16_t port; - uint32_t payload_type; - uint32_t payload_msg_type; - - char sdp[1024]; -}; - struct gsm_mncc_rtp { uint32_t msg_type; uint32_t callref; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25990 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie45158e805a62e86b9496b46f323b83a74630460 Gerrit-Change-Number: 25990 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:35:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:35:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_EncDec.cc: fix encoding of optional 'sdp' field In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005 ) Change subject: library/MNCC_EncDec.cc: fix encoding of optional 'sdp' field ...................................................................... library/MNCC_EncDec.cc: fix encoding of optional 'sdp' field Decoding was implemented in [1], but encoding was not. Change-Id: I82f8afd3e64d83d165a7070a1b82a6276ef0b020 Fixes: [1] Ic9568c8927507e161aadfad1a4d20aa896d8ae30 --- M library/MNCC_EncDec.cc 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/MNCC_EncDec.cc b/library/MNCC_EncDec.cc index 7d09d0a..f896cd3 100644 --- a/library/MNCC_EncDec.cc +++ b/library/MNCC_EncDec.cc @@ -184,6 +184,10 @@ strncpy(mncc.imsi, in_sig.imsi(), sizeof(mncc.imsi)); mncc.lchan_type = in_sig.lchan__type(); mncc.lchan_mode = in_sig.lchan__mode(); + if (in_sig.sdp().is_value()) { + const CHARSTRING &sdp = in_sig.sdp(); + strncpy(&mncc.sdp[0], sdp, sizeof(mncc.sdp)); + } ret_val = OCTETSTRING(sizeof(mncc), (uint8_t *)&mncc); } break; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I82f8afd3e64d83d165a7070a1b82a6276ef0b020 Gerrit-Change-Number: 26005 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:35:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:35:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC_Types: set 'sdp' field to omit by default In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26007 ) Change subject: library/MNCC_Types: set 'sdp' field to omit by default ...................................................................... library/MNCC_Types: set 'sdp' field to omit by default It's defined as 'optional', so let's rather use omit. Change-Id: I96b03fe5363cc9bf1df622f7436d1a7c2da7514a --- M library/MNCC_Types.ttcn 1 file changed, 25 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn index bd233ce..e396892 100644 --- a/library/MNCC_Types.ttcn +++ b/library/MNCC_Types.ttcn @@ -472,7 +472,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -537,7 +537,7 @@ imsi := imsi, lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } }; @@ -604,7 +604,7 @@ imsi := imsi, lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } }; @@ -703,7 +703,7 @@ imsi := imsi, lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -735,7 +735,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -841,7 +841,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -908,7 +908,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -944,7 +944,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1012,7 +1012,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1046,7 +1046,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1148,7 +1148,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1181,7 +1181,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1281,7 +1281,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1316,7 +1316,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1417,7 +1417,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1450,7 +1450,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1529,7 +1529,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1625,7 +1625,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1657,7 +1657,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1729,7 +1729,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1761,7 +1761,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1826,7 +1826,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1899,7 +1899,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, - sdp := "" + sdp := omit } } } @@ -1929,7 +1929,7 @@ rtp_port := 0, payload_type := 0, payload_msg_type := 0, - sdp := "" + sdp := omit } } } @@ -1967,7 +1967,7 @@ rtp_port := rtp_port, payload_type := pt, payload_msg_type := 0, - sdp := "" + sdp := omit } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I96b03fe5363cc9bf1df622f7436d1a7c2da7514a Gerrit-Change-Number: 26007 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:35:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:35:46 +0000 Subject: Change in osmo-ttcn3-hacks[master]: library/MNCC: implement MNCCv8 encoding/decoding support In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26008 ) Change subject: library/MNCC: implement MNCCv8 encoding/decoding support ...................................................................... library/MNCC: implement MNCCv8 encoding/decoding support Change-Id: I5488c5a4cc671e1d6a0d35b2ff4bdda0b0b48c00 Related: OS#5164, OS#5282 --- M library/MNCC_Emulation.ttcn M library/MNCC_EncDec.cc M library/MNCC_Types.ttcn M library/mncc.h 4 files changed, 74 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/MNCC_Emulation.ttcn b/library/MNCC_Emulation.ttcn index 66294a4..85556c1 100644 --- a/library/MNCC_Emulation.ttcn +++ b/library/MNCC_Emulation.ttcn @@ -38,7 +38,7 @@ import from UD_Types all; modulepar { - int mp_mncc_version := 7; + int mp_mncc_version := 8; } /* General "base class" component definition, of which specific implementations diff --git a/library/MNCC_EncDec.cc b/library/MNCC_EncDec.cc index f896cd3..ffc2aa8 100644 --- a/library/MNCC_EncDec.cc +++ b/library/MNCC_EncDec.cc @@ -9,7 +9,7 @@ BOOLEAN set__MNCC__version(INTEGER const& version) { - if (version != 7) + if (version != 7 && version != 8) return false; mncc_sock_version = version; return true; @@ -184,9 +184,19 @@ strncpy(mncc.imsi, in_sig.imsi(), sizeof(mncc.imsi)); mncc.lchan_type = in_sig.lchan__type(); mncc.lchan_mode = in_sig.lchan__mode(); + if (in_sig.gcr().is_value()) { + const OCTETSTRING &gcr = in_sig.gcr(); + if (mncc_sock_version < 8) + TTCN_error("GCR is only available since MNCCv8"); + memcpy(&mncc.v8.gcr[0], gcr, sizeof(mncc.v8.gcr)); + mncc.fields |= MNCC_F_GCR; + } if (in_sig.sdp().is_value()) { const CHARSTRING &sdp = in_sig.sdp(); - strncpy(&mncc.sdp[0], sdp, sizeof(mncc.sdp)); + if (mncc_sock_version > 7) + strncpy(&mncc.v8.sdp[0], sdp, sizeof(mncc.v8.sdp)); + else + strncpy(&mncc.v7.sdp[0], sdp, sizeof(mncc.v7.sdp)); } ret_val = OCTETSTRING(sizeof(mncc), (uint8_t *)&mncc); } @@ -361,7 +371,13 @@ sign.imsi() = CHARSTRING(in_mncc->imsi); sign.lchan__type() = in_mncc->lchan_type; sign.lchan__mode() = in_mncc->lchan_mode; - sign.sdp() = in_mncc->sdp; + if (mncc_sock_version > 7) { + if (in_mncc->fields & MNCC_F_GCR) + sign.gcr() = OCTETSTRING(sizeof(in_mncc->v8.gcr), in_mncc->v8.gcr); + sign.sdp() = in_mncc->v8.sdp; + } else { + sign.sdp() = in_mncc->v7.sdp; + } u.signal() = sign; break; } diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn index e396892..1de34a0 100644 --- a/library/MNCC_Types.ttcn +++ b/library/MNCC_Types.ttcn @@ -362,6 +362,7 @@ uint8_t lchan_type, /* empty in OSmoMSC */ uint8_t lchan_mode, /* empty in OsmoMSC */ + octetstring gcr optional, charstring sdp optional }; @@ -472,6 +473,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -503,6 +505,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -537,6 +540,7 @@ imsi := imsi, lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -570,6 +574,7 @@ imsi := imsi, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -604,6 +609,7 @@ imsi := imsi, lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -636,6 +642,7 @@ imsi := imsi, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -670,6 +677,7 @@ imsi := imsi, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -703,6 +711,7 @@ imsi := imsi, lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -735,6 +744,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -767,6 +777,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -809,6 +820,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -841,6 +853,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -875,6 +888,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -908,6 +922,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -944,6 +959,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -978,6 +994,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1012,6 +1029,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1046,6 +1064,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1079,6 +1098,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1115,6 +1135,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1148,6 +1169,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1181,6 +1203,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1213,6 +1236,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1248,6 +1272,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1281,6 +1306,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1316,6 +1342,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1350,6 +1377,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1384,6 +1412,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1417,6 +1446,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1450,6 +1480,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1481,6 +1512,7 @@ imsi := ?, lchan_type := 0, lchan_mode := 0, + gcr := *, sdp := * } } @@ -1529,6 +1561,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1561,6 +1594,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1593,6 +1627,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1625,6 +1660,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1657,6 +1693,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1697,6 +1734,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1729,6 +1767,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1761,6 +1800,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1794,6 +1834,7 @@ imsi := ?, lchan_type := ?, lchan_mode := ?, + gcr := *, sdp := * } } @@ -1826,6 +1867,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } @@ -1859,6 +1901,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := *, sdp := * } } @@ -1899,6 +1942,7 @@ imsi := "", lchan_type := 0, lchan_mode := 0, + gcr := omit, sdp := omit } } diff --git a/library/mncc.h b/library/mncc.h index 1e45c37..f70f9bd 100644 --- a/library/mncc.h +++ b/library/mncc.h @@ -230,6 +230,7 @@ #define MNCC_F_CCCAP 0x0800 #define MNCC_F_KEYPAD 0x1000 #define MNCC_F_SIGNAL 0x2000 +#define MNCC_F_GCR 0x4000 struct gsm_mncc { /* context based information */ @@ -267,7 +268,15 @@ unsigned char lchan_type; unsigned char lchan_mode; - char sdp[1024]; + union { + struct { + char sdp[1024]; + } v7; + struct { + uint8_t gcr[16]; + char sdp[1024]; + } v8; + }; }; struct gsm_data_frame { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5488c5a4cc671e1d6a0d35b2ff4bdda0b0b48c00 Gerrit-Change-Number: 26008 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:36:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:36:04 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Add comment, improve log message in gbproxy_tlli_from_status... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25983 ) Change subject: gbproxy: Add comment, improve log message in gbproxy_tlli_from_status_pdu ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Idcd2742f451ba5ae79f62395e033924782336cac Gerrit-Change-Number: 25983 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:36:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:36:22 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 14:36:22 +0000 Subject: Change in osmo-bts[master]: l1sap: fix handling of lchan->pending_rel_ind_msg In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25948 ) Change subject: l1sap: fix handling of lchan->pending_rel_ind_msg ...................................................................... l1sap: fix handling of lchan->pending_rel_ind_msg After merging the patch [1] fixing handling of the RLL RELease INDication message in lapdm_rll_tx_cb(), ttcn3-bts-test shows several regressions: pass->fail: BTS_Tests.TC_rll_rel_ind_DCCH_0 pass->fail: BTS_Tests.TC_rll_rel_ind_DCCH_3 pass->fail: BTS_Tests.TC_rll_rel_ind_ACCH_0 pass->fail: BTS_Tests.TC_rll_rel_ind_ACCH_3 pass->fail: BTS_Tests_LAPDm.TC_sabm_dm [1] I823c9101bcca72d5792e16379b02d3602ffc2726 991020c049c63768e147d49bd2918c2d2e0f6dcb The problem is actually *not* in patch [1], but in the older one [2] which we attempted to fix. While a logical channel is in signalling mode, the lower layers do not produce PRIM_TCH_RTS, and thus the l1sap_tch_rts_ind() is not being called. Unlike l1sap_tch_rts_ind(), the l1sap_ph_rts_ind() is being called regardless of the channel mode (signalling vs speech), so let's move handling of lchan->pending_rel_ind_msg there. Change-Id: I2c380f9045624f0a0a8f988bb207bc73d8354857 Fixes: [2] Ie4f70c75f0137b4bd72d579b3a32575bac2fca3 --- M src/common/l1sap.c 1 file changed, 7 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/common/l1sap.c b/src/common/l1sap.c index f1d1575..6eb08ba 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1139,6 +1139,13 @@ rsl_chan_nr_str(chan_nr)); return 0; } + if (lchan->pending_rel_ind_msg) { + LOGPGT(DRSL, LOGL_INFO, &g_time, + "%s Forward RLL RELease INDication to the BSC\n", + gsm_lchan_name(lchan)); + abis_bts_rsl_sendmsg(lchan->pending_rel_ind_msg); + lchan->pending_rel_ind_msg = NULL; + } if (L1SAP_IS_LINK_SACCH(link_id)) { p = msgb_put(msg, GSM_MACBLOCK_LEN); /* L1-header, if not set/modified by layer 1 */ @@ -1274,7 +1281,6 @@ struct gsm_lchan *lchan; uint8_t chan_nr, marker = 0; uint32_t fn; - int rc; chan_nr = rts_ind->chan_nr; fn = rts_ind->fn; @@ -1318,16 +1324,6 @@ resp_l1sap = msgb_l1sap_prim(resp_msg); } - /* check for pending REL_IND */ - if (lchan->pending_rel_ind_msg) { - LOGPGT(DRSL, LOGL_INFO, &g_time, "%s Forward REL_IND to L3\n", gsm_lchan_name(lchan)); - /* Forward it to L3 */ - rc = abis_bts_rsl_sendmsg(lchan->pending_rel_ind_msg); - lchan->pending_rel_ind_msg = NULL; - if (rc < 0) - return rc; - } - memset(resp_l1sap, 0, sizeof(*resp_l1sap)); osmo_prim_init(&resp_l1sap->oph, SAP_GSM_PH, PRIM_TCH, PRIM_OP_REQUEST, resp_msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25948 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2c380f9045624f0a0a8f988bb207bc73d8354857 Gerrit-Change-Number: 25948 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:36:23 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 14:36:23 +0000 Subject: Change in osmo-bts[master]: l1sap: move false PTCCH/U detection into PDCH branch In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25987 ) Change subject: l1sap: move false PTCCH/U detection into PDCH branch ...................................................................... l1sap: move false PTCCH/U detection into PDCH branch This check is only relevant for PDCH timeslots. Change-Id: I187fef8f3de0b41b502b0b18acfb11c56c5551f0 --- M src/common/l1sap.c 1 file changed, 8 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 6eb08ba..d9e27b2 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1494,15 +1494,6 @@ DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind chan_nr=%s link_id=0x%02x len=%d\n", rsl_chan_nr_str(chan_nr), link_id, len); - /* Actually, there can be no DATA.ind on PTCCH/U (rather RACH.ind instead), - * but some BTS models with buggy implementation may still be sending them - * to us. Let's keep this for backwards compatibility. */ - if (L1SAP_IS_CHAN_PDCH(chan_nr) && L1SAP_IS_PTCCH(fn)) { - LOGPGT(DL1P, LOGL_NOTICE, &g_time, "There can be no DATA.ind on PTCCH/U. " - "This is probably a bug of the BTS model you're using, please fix!\n"); - return -EINVAL; - } - /* The ph_data_param contained in the l1sap primitive may contain * measurement data. If this data is present, forward it for * processing */ @@ -1525,6 +1516,14 @@ return 1; } + /* There can be no DATA.ind on PTCCH/U (rather RACH.ind instead), but some + * BTS models with buggy implementation may still be sending them to us. */ + if (L1SAP_IS_PTCCH(fn)) { + LOGPGT(DL1P, LOGL_NOTICE, &g_time, "There can be no DATA.ind on PTCCH/U. " + "This is probably a bug of the BTS model you're using, please fix!\n"); + return -EINVAL; + } + /* Drop all data from incomplete UL block */ if (pr_info != PRES_INFO_BOTH) len = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I187fef8f3de0b41b502b0b18acfb11c56c5551f0 Gerrit-Change-Number: 25987 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:36:23 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 14:36:23 +0000 Subject: Change in osmo-bts[master]: l1sap: use designated initializers in process_l1sap_meas_data() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25988 ) Change subject: l1sap: use designated initializers in process_l1sap_meas_data() ...................................................................... l1sap: use designated initializers in process_l1sap_meas_data() Change-Id: I5169a6c5f6865655dbfebb6b68d5f67941d9cdb1 --- M src/common/l1sap.c 1 file changed, 24 insertions(+), 30 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index d9e27b2..d02676b 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -705,11 +705,6 @@ struct ph_tch_param *ph_tch_ind; uint8_t chan_nr; uint32_t fn; - uint8_t inv_rssi; - uint8_t is_sub; - int16_t ta_offs_256bits; - uint16_t ber10k; - int16_t ci_cb; const char *ind_name; switch (ind_type) { @@ -718,12 +713,14 @@ info_meas_ind = &l1sap->u.info.u.meas_ind; chan_nr = info_meas_ind->chan_nr; fn = info_meas_ind->fn; - inv_rssi = info_meas_ind->inv_rssi; - is_sub = info_meas_ind->is_sub; - ta_offs_256bits = info_meas_ind->ta_offs_256bits; - ber10k = info_meas_ind->ber10k; - ci_cb = info_meas_ind->c_i_cb; ind_name = "MPH INFO"; + ulm = (struct bts_ul_meas) { + .ta_offs_256bits = info_meas_ind->ta_offs_256bits, + .inv_rssi = info_meas_ind->inv_rssi, + .ber10k = info_meas_ind->ber10k, + .c_i = info_meas_ind->c_i_cb, + .is_sub = info_meas_ind->is_sub, + }; break; case PRIM_TCH: ph_tch_ind = &l1sap->u.tch; @@ -731,12 +728,14 @@ return; chan_nr = ph_tch_ind->chan_nr; fn = ph_tch_ind->fn; - inv_rssi = abs(ph_tch_ind->rssi); - is_sub = ph_tch_ind->is_sub; - ta_offs_256bits = ph_tch_ind->ta_offs_256bits; - ber10k = ph_tch_ind->ber10k; - ci_cb = ph_tch_ind->lqual_cb; ind_name = "TCH"; + ulm = (struct bts_ul_meas) { + .ta_offs_256bits = ph_tch_ind->ta_offs_256bits, + .inv_rssi = abs(ph_tch_ind->rssi), + .ber10k = ph_tch_ind->ber10k, + .c_i = ph_tch_ind->lqual_cb, + .is_sub = ph_tch_ind->is_sub, + }; break; case PRIM_PH_DATA: ph_data_ind = &l1sap->u.data; @@ -744,12 +743,14 @@ return; chan_nr = ph_data_ind->chan_nr; fn = ph_data_ind->fn; - inv_rssi = abs(ph_data_ind->rssi); - is_sub = ph_data_ind->is_sub; - ta_offs_256bits = ph_data_ind->ta_offs_256bits; - ber10k = ph_data_ind->ber10k; - ci_cb = ph_data_ind->lqual_cb; ind_name = "DATA"; + ulm = (struct bts_ul_meas) { + .ta_offs_256bits = ph_data_ind->ta_offs_256bits, + .inv_rssi = abs(ph_data_ind->rssi), + .ber10k = ph_data_ind->ber10k, + .c_i = ph_data_ind->lqual_cb, + .is_sub = ph_data_ind->is_sub, + }; break; default: OSMO_ASSERT(false); @@ -765,23 +766,16 @@ DEBUGPFN(DL1P, fn, "%s %s meas ind, ta_offs_256bits=%d, ber10k=%d, inv_rssi=%u, C/I=%d cB\n", - gsm_lchan_name(lchan), ind_name, ta_offs_256bits, ber10k, - inv_rssi, ci_cb); + gsm_lchan_name(lchan), ind_name, ulm.ta_offs_256bits, + ulm.ber10k, ulm.inv_rssi, ulm.c_i); /* in the GPRS case we are not interested in measurement * processing. The PCU will take care of it */ if (lchan->type == GSM_LCHAN_PDTCH) return; - memset(&ulm, 0, sizeof(ulm)); - ulm.ta_offs_256bits = ta_offs_256bits; - ulm.ber10k = ber10k; - ulm.c_i = ci_cb; - ulm.inv_rssi = inv_rssi; - ulm.is_sub = is_sub; - /* we assume that symbol period is 1 bit: */ - set_ms_to_data(lchan, ta_offs_256bits / 256, true); + set_ms_to_data(lchan, ulm.ta_offs_256bits / 256, true); lchan_meas_process_measurement(lchan, &ulm, fn); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25988 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5169a6c5f6865655dbfebb6b68d5f67941d9cdb1 Gerrit-Change-Number: 25988 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:36:24 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 14:36:24 +0000 Subject: Change in osmo-bts[master]: l1sap: process_l1sap_meas_data() accepts pointer to lchan In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/25989 ) Change subject: l1sap: process_l1sap_meas_data() accepts pointer to lchan ...................................................................... l1sap: process_l1sap_meas_data() accepts pointer to lchan In 2/3 cases when calling process_l1sap_meas_data() we already have a pointer to the logical channel, so let's pass it as the first argument instead of a pointer to the transceiver. This way we avoid calling get_active_lchan_by_chan_nr() two times. In l1sap_ph_data_ind(), call process_l1sap_meas_data() below the conditional branch handling PDCH, so it won't be called for GSM_LCHAN_PDTCH anymore. GPRS specific measurements are handled by the PCU and not of interest for the BSC. Change-Id: I9de67a0b2d2b18923f2c2003b400387a0f1af411 --- M src/common/l1sap.c 1 file changed, 21 insertions(+), 27 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/l1sap.c b/src/common/l1sap.c index d02676b..47ba663 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -694,16 +694,14 @@ } /* measurement information received from bts model */ -static void process_l1sap_meas_data(struct gsm_bts_trx *trx, +static void process_l1sap_meas_data(struct gsm_lchan *lchan, struct osmo_phsap_prim *l1sap, enum osmo_ph_prim ind_type) { struct bts_ul_meas ulm; - struct gsm_lchan *lchan; struct info_meas_ind_param *info_meas_ind; struct ph_data_param *ph_data_ind; struct ph_tch_param *ph_tch_ind; - uint8_t chan_nr; uint32_t fn; const char *ind_name; @@ -711,7 +709,6 @@ case PRIM_MPH_INFO: /* (legacy way, see also OS#2977) */ info_meas_ind = &l1sap->u.info.u.meas_ind; - chan_nr = info_meas_ind->chan_nr; fn = info_meas_ind->fn; ind_name = "MPH INFO"; ulm = (struct bts_ul_meas) { @@ -726,7 +723,6 @@ ph_tch_ind = &l1sap->u.tch; if (ph_tch_ind->rssi == 0) return; - chan_nr = ph_tch_ind->chan_nr; fn = ph_tch_ind->fn; ind_name = "TCH"; ulm = (struct bts_ul_meas) { @@ -741,7 +737,6 @@ ph_data_ind = &l1sap->u.data; if (ph_data_ind->rssi == 0) return; - chan_nr = ph_data_ind->chan_nr; fn = ph_data_ind->fn; ind_name = "DATA"; ulm = (struct bts_ul_meas) { @@ -756,24 +751,11 @@ OSMO_ASSERT(false); } - lchan = get_active_lchan_by_chan_nr(trx, chan_nr); - if (!lchan) { - LOGPFN(DL1P, LOGL_ERROR, fn, - "No lchan for %s MEAS IND (chan_nr=%s)\n", - ind_name, rsl_chan_nr_str(chan_nr)); - return; - } - DEBUGPFN(DL1P, fn, "%s %s meas ind, ta_offs_256bits=%d, ber10k=%d, inv_rssi=%u, C/I=%d cB\n", gsm_lchan_name(lchan), ind_name, ulm.ta_offs_256bits, ulm.ber10k, ulm.inv_rssi, ulm.c_i); - /* in the GPRS case we are not interested in measurement - * processing. The PCU will take care of it */ - if (lchan->type == GSM_LCHAN_PDTCH) - return; - /* we assume that symbol period is 1 bit: */ set_ms_to_data(lchan, ulm.ta_offs_256bits / 256, true); @@ -786,6 +768,8 @@ static int l1sap_mph_info_ind(struct gsm_bts_trx *trx, struct osmo_phsap_prim *l1sap, struct mph_info_param *info) { + const struct info_meas_ind_param *meas_ind; + struct gsm_lchan *lchan; int rc = 0; switch (info->type) { @@ -805,7 +789,17 @@ if (bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB)) OSMO_ASSERT(false); - process_l1sap_meas_data(trx, l1sap, PRIM_MPH_INFO); + meas_ind = &l1sap->u.info.u.meas_ind; + + lchan = get_active_lchan_by_chan_nr(trx, meas_ind->chan_nr); + if (!lchan) { + LOGPFN(DL1P, LOGL_ERROR, meas_ind->fn, + "No lchan for chan_nr=%s\n", + rsl_chan_nr_str(meas_ind->chan_nr)); + return 0; + } + + process_l1sap_meas_data(lchan, l1sap, PRIM_MPH_INFO); break; default: LOGP(DL1P, LOGL_NOTICE, "unknown MPH_INFO ind type %d\n", @@ -1488,12 +1482,6 @@ DEBUGPGT(DL1P, &g_time, "Rx PH-DATA.ind chan_nr=%s link_id=0x%02x len=%d\n", rsl_chan_nr_str(chan_nr), link_id, len); - /* The ph_data_param contained in the l1sap primitive may contain - * measurement data. If this data is present, forward it for - * processing */ - if (bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB)) - process_l1sap_meas_data(trx, l1sap, PRIM_PH_DATA); - if (ts_is_pdch(&trx->ts[tn])) { lchan = get_lchan_by_chan_nr(trx, chan_nr); if (!lchan) @@ -1535,6 +1523,12 @@ return 0; } + /* The ph_data_param contained in the l1sap primitive may contain + * measurement data. If this data is present, forward it for + * processing */ + if (bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB)) + process_l1sap_meas_data(lchan, l1sap, PRIM_PH_DATA); + if (L1SAP_IS_LINK_SACCH(link_id)) repeated_ul_sacch_active_decision(lchan, data_ind->ber10k); @@ -1618,7 +1612,7 @@ * measurement data. If this data is present, forward it for * processing */ if (bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB)) - process_l1sap_meas_data(trx, l1sap, PRIM_TCH); + process_l1sap_meas_data(lchan, l1sap, PRIM_TCH); msgb_pull_to_l2(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/25989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9de67a0b2d2b18923f2c2003b400387a0f1af411 Gerrit-Change-Number: 25989 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:36:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:36:27 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Improve STATUS handling from SGSN In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25984 ) Change subject: gbproxy: Improve STATUS handling from SGSN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0ab88634fe2eab5299ff4587fcef4177ce5b4831 Gerrit-Change-Number: 25984 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:36:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:37:22 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:37:22 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Route DL STATUS with BVCI on SIG-BVC In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985 ) Change subject: gbproxy: Route DL STATUS with BVCI on SIG-BVC ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5928cebea7f39d6648f95dfa1a46437de202f723 Gerrit-Change-Number: 25985 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:37:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:37:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:37:38 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Add comment, remove unused param in gbproxy_tlli_from_status... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/26010 ) Change subject: gbproxy: Add comment, remove unused param in gbproxy_tlli_from_status_pdu ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/26010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I8fc4c42c11ee38df80fbd316bbe6b1eb243b5323 Gerrit-Change-Number: 26010 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:37:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:37:42 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:37:42 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Add comment, improve log message in gbproxy_tlli_from_status... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25983 ) Change subject: gbproxy: Add comment, improve log message in gbproxy_tlli_from_status_pdu ...................................................................... gbproxy: Add comment, improve log message in gbproxy_tlli_from_status_pdu Change-Id: Idcd2742f451ba5ae79f62395e033924782336cac --- M src/gb_proxy.c 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 1e8bc96..5c2d5bb 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -997,6 +997,7 @@ struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *)pdu_data; struct tlv_parsed tp_inner[2]; + /* TODO: Parse partial messages as well */ rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp_inner, ARRAY_SIZE(tp_inner), bgph->pdu_type, bgph->data, pdu_len - sizeof(*bgph), 0, 0, DGPRS, log_pfx); @@ -1111,16 +1112,19 @@ struct gbproxy_sgsn *sgsn; /* Check if the status needs to be terminated locally */ uint8_t cause = *TLVP_VAL(&tp[0], BSSGP_IE_CAUSE); + if (cause == BSSGP_CAUSE_UNKNOWN_BVCI || cause == BSSGP_CAUSE_BVCI_BLOCKED) { /* Log and handle locally */ ptp_bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); - LOGP(DGPRS, LOGL_ERROR, "%s Rx STATUS with cause %s for PtP-BVC %05u\n", log_pfx, + LOGPNSE(nse, LOGL_ERROR, "Rx STATUS cause=0x%02x(%s) for PtP-BVC %05u\n", cause, bssgp_cause_str(cause), ptp_bvci); /* FIXME: Remove/block our BVC if present? */ break; } - LOGP(DGPRS, LOGL_INFO, "Forwarding STATUS with cause %s\n", bssgp_cause_str(cause)); + LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s) ", cause, + bssgp_cause_str(cause)); + if (gbproxy_tlli_from_status_pdu(msg, tp, &tlli, log_pfx) == 0) sgsn = gbproxy_select_sgsn(nse->cfg, &tlli); else -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Idcd2742f451ba5ae79f62395e033924782336cac Gerrit-Change-Number: 25983 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:37:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:37:43 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Improve STATUS handling from SGSN In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25984 ) Change subject: gbproxy: Improve STATUS handling from SGSN ...................................................................... gbproxy: Improve STATUS handling from SGSN STATUS with cause bvci blocked or unknown should not be forwarded Related: OS#4892 Change-Id: I0ab88634fe2eab5299ff4587fcef4177ce5b4831 --- M src/gb_proxy.c 1 file changed, 33 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 5c2d5bb..f92585a 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -1380,7 +1380,6 @@ uint16_t bvci; char log_pfx[32]; int rc = 0; - int cause; int i; bool paging_bc = false; @@ -1475,20 +1474,41 @@ rc = gbprox_rx_paging(nse, msg, pdut_name, &tp[0], ns_bvci, paging_bc); break; case BSSGP_PDUT_STATUS: - /* Some exception has occurred */ - cause = *TLVP_VAL(&tp[0], BSSGP_IE_CAUSE); - LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s) ", cause, + { + struct gbproxy_nse *nse_peer; + uint32_t tlli; + + /* Check if the status needs to be terminated locally */ + uint8_t cause = *TLVP_VAL(&tp[0], BSSGP_IE_CAUSE); + + if (cause == BSSGP_CAUSE_UNKNOWN_BVCI || cause == BSSGP_CAUSE_BVCI_BLOCKED) { + /* Log and handle locally, BVCI should be present for these causes */ + if (!TLVP_PRESENT(&tp[0], BSSGP_IE_BVCI)) { + LOGPNSE(nse, LOGL_ERROR, "Rx STATUS cause=0x%02x(%s), but BVCI is missing\n", cause, + bssgp_cause_str(cause)); + break; + } + uint16_t ptp_bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); + LOGPNSE(nse, LOGL_ERROR, "Rx STATUS cause=0x%02x(%s) for PtP-BVC %05u\n", cause, + bssgp_cause_str(cause), ptp_bvci); + /* FIXME: Remove/block the other BSS/SGSN BVCs if present? */ + break; + } + + LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s)\n", cause, bssgp_cause_str(cause)); - if (TLVP_PRES_LEN(&tp[0], BSSGP_IE_BVCI, 2)) { - bvci = ntohs(tlvp_val16_unal(&tp[0], BSSGP_IE_BVCI)); - LOGPC(DGPRS, LOGL_NOTICE, "BVCI=%05u\n", bvci); - sgsn_bvc = gbproxy_bvc_by_bvci(nse, bvci); - /* don't send STATUS in response to STATUS if !bvc */ - if (sgsn_bvc && sgsn_bvc->cell && sgsn_bvc->cell->bss_bvc) - rc = gbprox_relay2peer(msg, sgsn_bvc->cell->bss_bvc, ns_bvci); - } else - LOGPC(DGPRS, LOGL_NOTICE, "\n"); + + if (gbproxy_tlli_from_status_pdu(msg, tp, &tlli, log_pfx) == 0) { + nse_peer = gbproxy_nse_by_tlli(cfg, tlli); + if (nse_peer) + return gbprox_relay2nse(msg, nse_peer, 0); + } + + LOGPNSE(nse, LOGL_ERROR, "Unable to handle STATUS cause=0x%02x(%s)\n", cause, + bssgp_cause_str(cause)); + break; + } /* those only exist in the SGSN -> BSS direction */ case BSSGP_PDUT_SUSPEND_ACK: case BSSGP_PDUT_SUSPEND_NACK: -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I0ab88634fe2eab5299ff4587fcef4177ce5b4831 Gerrit-Change-Number: 25984 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:37:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:37:43 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Route DL STATUS with BVCI on SIG-BVC In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985 ) Change subject: gbproxy: Route DL STATUS with BVCI on SIG-BVC ...................................................................... gbproxy: Route DL STATUS with BVCI on SIG-BVC Fixes TTCN3 gbproxy test TC_status_sig_dl_bvci Related: OS#4892 Change-Id: I5928cebea7f39d6648f95dfa1a46437de202f723 --- M src/gb_proxy.c 1 file changed, 37 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb_proxy.c b/src/gb_proxy.c index f92585a..5d9219d 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -1018,6 +1018,30 @@ return 0; } +/* Extract the BVCI from the PDU-in-error of the STATUS PDU (if available) */ +static int gbproxy_bvci_from_status_pdu(struct tlv_parsed *tp, uint16_t *bvci, char *log_pfx) +{ + int rc; + int pdu_len = TLVP_LEN(&tp[0], BSSGP_IE_PDU_IN_ERROR); + const uint8_t *pdu_data = TLVP_VAL(&tp[0], BSSGP_IE_PDU_IN_ERROR); + struct bssgp_normal_hdr *bgph = (struct bssgp_normal_hdr *)pdu_data; + struct tlv_parsed tp_inner[2]; + + /* TODO: Parse partial messages as well */ + rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp_inner, ARRAY_SIZE(tp_inner), bgph->pdu_type, bgph->data, + pdu_len - sizeof(*bgph), 0, 0, DGPRS, log_pfx); + + if (rc < 0) + return rc; + + if (TLVP_PRESENT(&tp_inner[0], BSSGP_IE_BVCI)) + *bvci = ntohs(tlvp_val16_unal(&tp_inner[0], BSSGP_IE_BVCI)); + else + return -ENOENT; + + return 0; +} + /* Receive an incoming signalling message from a BSS-side NS-VC */ static int gbprox_rx_sig_from_bss(struct gbproxy_nse *nse, struct msgb *msg, uint16_t ns_bvci) { @@ -1498,6 +1522,19 @@ LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s)\n", cause, bssgp_cause_str(cause)); + + if (gbproxy_bvci_from_status_pdu(tp, &bvci, log_pfx) == 0 && bvci != 0) { + struct gbproxy_cell *cell = gbproxy_cell_by_bvci(cfg, bvci); + + if ((!cell || !cell->bss_bvc || !cell->bss_bvc->nse)) { + LOGPNSE(nse, LOGL_ERROR, "Rx STATUS cause=0x%02x(%s), but can't find NSE for cell\n", + cause, bssgp_cause_str(cause)); + break; + } + + return gbprox_relay2nse(msg, cell->bss_bvc->nse, 0); + } + if (gbproxy_tlli_from_status_pdu(msg, tp, &tlli, log_pfx) == 0) { nse_peer = gbproxy_nse_by_tlli(cfg, tlli); if (nse_peer) -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/25985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I5928cebea7f39d6648f95dfa1a46437de202f723 Gerrit-Change-Number: 25985 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:37:44 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:37:44 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Add comment, remove unused param in gbproxy_tlli_from_status... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/26010 ) Change subject: gbproxy: Add comment, remove unused param in gbproxy_tlli_from_status_pdu ...................................................................... gbproxy: Add comment, remove unused param in gbproxy_tlli_from_status_pdu Change-Id: I8fc4c42c11ee38df80fbd316bbe6b1eb243b5323 --- M src/gb_proxy.c 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 5d9219d..18e0efb 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -989,7 +989,8 @@ return gbprox_relay2nse(msg, sgsn->nse, 0); } -static int gbproxy_tlli_from_status_pdu(struct msgb *msg, struct tlv_parsed *tp, uint32_t *tlli, char *log_pfx) +/* Extract the TLLI from the PDU-in-error of the STATUS PDU (if available) */ +static int gbproxy_tlli_from_status_pdu(struct tlv_parsed *tp, uint32_t *tlli, char *log_pfx) { int rc; int pdu_len = TLVP_LEN(&tp[0], BSSGP_IE_PDU_IN_ERROR); @@ -1149,7 +1150,7 @@ LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s) ", cause, bssgp_cause_str(cause)); - if (gbproxy_tlli_from_status_pdu(msg, tp, &tlli, log_pfx) == 0) + if (gbproxy_tlli_from_status_pdu(tp, &tlli, log_pfx) == 0) sgsn = gbproxy_select_sgsn(nse->cfg, &tlli); else sgsn = gbproxy_select_sgsn(nse->cfg, NULL); @@ -1535,7 +1536,8 @@ return gbprox_relay2nse(msg, cell->bss_bvc->nse, 0); } - if (gbproxy_tlli_from_status_pdu(msg, tp, &tlli, log_pfx) == 0) { + /* We can only forward this TLLI if it's in the cache (which only happens on suspend/resume) */ + if (gbproxy_tlli_from_status_pdu(tp, &tlli, log_pfx) == 0) { nse_peer = gbproxy_nse_by_tlli(cfg, tlli); if (nse_peer) return gbprox_relay2nse(msg, nse_peer, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/26010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I8fc4c42c11ee38df80fbd316bbe6b1eb243b5323 Gerrit-Change-Number: 26010 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:37:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:37:53 +0000 Subject: Change in docker-playground[master]: ttcn3-sip-test: use MNCCv7 for the '-latest' SUT In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26009 ) Change subject: ttcn3-sip-test: use MNCCv7 for the '-latest' SUT ...................................................................... Patch Set 1: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic1e6e5f9ea959166b727795232bb58b9a25cc049 Gerrit-Change-Number: 26009 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:37:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:37:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:37:57 +0000 Subject: Change in docker-playground[master]: ttcn3-sip-test: use MNCCv7 for the '-latest' SUT In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26009 ) Change subject: ttcn3-sip-test: use MNCCv7 for the '-latest' SUT ...................................................................... ttcn3-sip-test: use MNCCv7 for the '-latest' SUT Change-Id: Ic1e6e5f9ea959166b727795232bb58b9a25cc049 Related: OS#5282, OS#5164 --- M ttcn3-sip-test/jenkins.sh 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved; Verified diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index ffec3d2..3e8fb94 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -16,6 +16,13 @@ mkdir $VOL_BASE_DIR/sip-tester/unix cp SIP_Tests.cfg $VOL_BASE_DIR/sip-tester/ +# TODO: remove this block once we release a new version of the SUT +if image_suffix_is_latest; then + # Use MNCCv7 for the '-latest' + sed -i "/MODULE_PARAMETERS/a MNCC_Emulation.mp_mncc_version := 7" \ + "$VOL_BASE_DIR/sip-tester/SIP_Tests.cfg" +fi + mkdir $VOL_BASE_DIR/sip mkdir $VOL_BASE_DIR/sip/unix cp osmo-sip-connector.cfg $VOL_BASE_DIR/sip/ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic1e6e5f9ea959166b727795232bb58b9a25cc049 Gerrit-Change-Number: 26009 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 14:38:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 14:38:29 +0000 Subject: Change in osmo-bsc[master]: constify lchan_state_is() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25971 ) Change subject: constify lchan_state_is() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25971 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I523cbf04e77f43924c3f09094d56f815d3de640d Gerrit-Change-Number: 25971 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 14:38:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 15:02:58 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 28 Oct 2021 15:02:58 +0000 Subject: Change in osmo-bsc[master]: bsc_subscr_conn_fsm: fix mgw-pool ref counting References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26011 ) Change subject: bsc_subscr_conn_fsm: fix mgw-pool ref counting ...................................................................... bsc_subscr_conn_fsm: fix mgw-pool ref counting When the gsm_subscr_conn_fsm (GSCO) terminates abormally it might not go through the forget-mgw-endpoint mechanism. It might be terminated forcefully, which means only the pre_term callback runs. The pre_term callback clears the endpoint, but it does not put the mgcp_client reference back into the pool. This results into a wrong ref-count in the mgw-pool. Change-Id: I5a7ce6a1880a1060df74d03dd4eb38b51fd85c69 Related: SYS#5675 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/26011/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 1e61d3f..c18079f 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -955,8 +955,14 @@ static void gscon_pre_term(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { struct gsm_subscriber_connection *conn = fi->priv; + struct mgcp_client *mgcp_client; + + /* Put MGCP client back into MGW pool */ + mgcp_client = osmo_mgcpc_ep_client(conn->user_plane.mgw_endpoint); + mgcp_client_pool_put(mgcp_client); osmo_mgcpc_ep_clear(conn->user_plane.mgw_endpoint); + conn->user_plane.mgw_endpoint = NULL; if (conn->lcls.fi) { /* request termination of LCLS FSM */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5a7ce6a1880a1060df74d03dd4eb38b51fd85c69 Gerrit-Change-Number: 26011 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 15:06:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 15:06:23 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use specific prefix for HNBAP generated code In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25961 ) Change subject: hnbap: Use specific prefix for HNBAP generated code ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6c062f631527ae42811bfec134933671c05ecba6 Gerrit-Change-Number: 25961 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 15:06:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 15:07:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 15:07:29 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25991 ) Change subject: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: I really wanted to avoid this when writing the original osmo-iuh code. Those names are just getting way too long. Are we sure we really need includes of clashing names in the same source file? -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1bcbe047d233684647d6ffe9febb14a12c579696 Gerrit-Change-Number: 25991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 15:07:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 15:07:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 15:07:56 +0000 Subject: Change in libosmocore[master]: configure.ac: Depend on talloc 2.1.0 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26006 ) Change subject: configure.ac: Depend on talloc 2.1.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id9d10d02b9b4500a246fcc3e071a14c1d7da4f14 Gerrit-Change-Number: 26006 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Thu, 28 Oct 2021 15:07:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 15:07:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 15:07:59 +0000 Subject: Change in libosmocore[master]: configure.ac: Depend on talloc 2.1.0 In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26006 ) Change subject: configure.ac: Depend on talloc 2.1.0 ...................................................................... configure.ac: Depend on talloc 2.1.0 With recent commit (see below) libosmocore started using talloc API talloc_pooled_object(), which is available only startinf from talloc 2.1.0. Let's bump required version check in configure.ac accordingly. Fixes: b72867f0e68c96ca25e1f9929ce92be0a802db6b Change-Id: Id9d10d02b9b4500a246fcc3e071a14c1d7da4f14 --- M configure.ac 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index f5af0d0..b36bd6f 100644 --- a/configure.ac +++ b/configure.ac @@ -150,7 +150,7 @@ dnl Generate the output AC_CONFIG_HEADER(config.h) -PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1]) +PKG_CHECK_MODULES(TALLOC, [talloc >= 2.1.0]) AC_ARG_ENABLE([pcsc], [AS_HELP_STRING([--disable-pcsc], [Build without PC/SC support])], [ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26006 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id9d10d02b9b4500a246fcc3e071a14c1d7da4f14 Gerrit-Change-Number: 26006 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 15:08:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 15:08:35 +0000 Subject: Change in osmo-bsc[master]: neighbor_ident: add comment about Neighbor Address Resolution Service In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25977 ) Change subject: neighbor_ident: add comment about Neighbor Address Resolution Service ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iec86f72548bfc54a2c86dadec69dd1c64813d852 Gerrit-Change-Number: 25977 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 15:08:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 15:14:50 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 15:14:50 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with ... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25991 ) Change subject: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: > Patch Set 1: > > I really wanted to avoid this when writing the original osmo-iuh code. Those names are just getting way too long. Are we sure we really need includes of clashing names in the same source file? I'd rather have a bit longer names than really having to waste hours playing tetris with header files and source files. Having these patches solves the build problems in osmo-hnodeb and whoever wishes to use this library. BTW, none of our code outside osmo-iuh really uses those structures being used, so nothing breaks, and we don't really care if they are longer because we don't use a lot of them in any place. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1bcbe047d233684647d6ffe9febb14a12c579696 Gerrit-Change-Number: 25991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 15:14:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 15:15:03 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 15:15:03 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use specific prefix for HNBAP generated code In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25961 ) Change subject: hnbap: Use specific prefix for HNBAP generated code ...................................................................... hnbap: Use specific prefix for HNBAP generated code Other libraries already use ASN1C_PREFIX except the HNBAP one. Let's use it here to avoid collisions. All new include/osmocom/hnbap/HNBAP_*.h and src/hnbap/HNBAP_*.c are generated using the updated src/hnbap/Makefile.am. Files such as src/*.c, test/* and include/osmocom/hnbap/hnbap_common.h are modified manually to update structs/enums to new prefix. Related: SYS#5516 Change-Id: I6c062f631527ae42811bfec134933671c05ecba6 --- D include/osmocom/hnbap/Access-stratum-release-indicator.h D include/osmocom/hnbap/AccessResult.h D include/osmocom/hnbap/AdditionalNeighbourInfoList.h D include/osmocom/hnbap/BackoffTimer.h D include/osmocom/hnbap/BindingID.h D include/osmocom/hnbap/CELL-FACHMobilitySupport.h D include/osmocom/hnbap/CGI.h D include/osmocom/hnbap/CI.h D include/osmocom/hnbap/CN-DomainIndicator.h D include/osmocom/hnbap/CSG-Capability.h D include/osmocom/hnbap/CSG-ID.h D include/osmocom/hnbap/CSGMembershipStatus.h D include/osmocom/hnbap/Cause.h D include/osmocom/hnbap/CauseMisc.h D include/osmocom/hnbap/CauseProtocol.h D include/osmocom/hnbap/CauseRadioNetwork.h D include/osmocom/hnbap/CauseTransport.h D include/osmocom/hnbap/CellIdentity.h D include/osmocom/hnbap/ConfigurationInformation.h D include/osmocom/hnbap/Context-ID.h D include/osmocom/hnbap/Criticality.h D include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h D include/osmocom/hnbap/CriticalityDiagnostics.h D include/osmocom/hnbap/ESN.h D include/osmocom/hnbap/GTP-TEI.h D include/osmocom/hnbap/GeographicalLocation.h D include/osmocom/hnbap/HNB-Cell-Access-Mode.h D include/osmocom/hnbap/HNB-Cell-Identifier.h D include/osmocom/hnbap/HNB-GWResponse.h D include/osmocom/hnbap/HNB-Identity-Info.h D include/osmocom/hnbap/HNB-Identity.h D include/osmocom/hnbap/HNB-Location-Information.h D include/osmocom/hnbap/HNB-RNL-Identity.h D include/osmocom/hnbap/HNBAP-PDU.h A include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h A include/osmocom/hnbap/HNBAP_AccessResult.h A include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h R include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h A include/osmocom/hnbap/HNBAP_BackoffTimer.h A include/osmocom/hnbap/HNBAP_BindingID.h A include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h A include/osmocom/hnbap/HNBAP_CGI.h A include/osmocom/hnbap/HNBAP_CI.h A include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h A include/osmocom/hnbap/HNBAP_CSG-Capability.h A include/osmocom/hnbap/HNBAP_CSG-ID.h A include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h R include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h A include/osmocom/hnbap/HNBAP_Cause.h A include/osmocom/hnbap/HNBAP_CauseMisc.h A include/osmocom/hnbap/HNBAP_CauseProtocol.h A include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h A include/osmocom/hnbap/HNBAP_CauseTransport.h A include/osmocom/hnbap/HNBAP_CellIdentity.h A include/osmocom/hnbap/HNBAP_ConfigurationInformation.h A include/osmocom/hnbap/HNBAP_Context-ID.h A include/osmocom/hnbap/HNBAP_Criticality.h A include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h A include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h A include/osmocom/hnbap/HNBAP_ESN.h R include/osmocom/hnbap/HNBAP_ErrorIndication.h A include/osmocom/hnbap/HNBAP_GTP-TEI.h R include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h A include/osmocom/hnbap/HNBAP_GeographicalLocation.h A include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h A include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h A include/osmocom/hnbap/HNBAP_HNB-GWResponse.h A include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h A include/osmocom/hnbap/HNBAP_HNB-Identity.h A include/osmocom/hnbap/HNBAP_HNB-Location-Information.h A include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h A include/osmocom/hnbap/HNBAP_HNBAP-PDU.h A include/osmocom/hnbap/HNBAP_HNBCapacity.h A include/osmocom/hnbap/HNBAP_HNBConfigInfo.h R include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h R include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h A include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h A include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h R include/osmocom/hnbap/HNBAP_HNBDe-Register.h R include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h R include/osmocom/hnbap/HNBAP_HNBRegisterReject.h R include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h C include/osmocom/hnbap/HNBAP_IE-Extensions.h R include/osmocom/hnbap/HNBAP_IE.h A include/osmocom/hnbap/HNBAP_IMEI.h A include/osmocom/hnbap/HNBAP_IMSI.h A include/osmocom/hnbap/HNBAP_IMSIDS41.h A include/osmocom/hnbap/HNBAP_IMSIESN.h R include/osmocom/hnbap/HNBAP_IP-Address.h A include/osmocom/hnbap/HNBAP_InitiatingMessage.h A include/osmocom/hnbap/HNBAP_Ipv4Address.h A include/osmocom/hnbap/HNBAP_Ipv6Address.h A include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h A include/osmocom/hnbap/HNBAP_LAC.h C include/osmocom/hnbap/HNBAP_LAI.h A include/osmocom/hnbap/HNBAP_MacroCellID.h A include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h A include/osmocom/hnbap/HNBAP_MuxPortNumber.h A include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h A include/osmocom/hnbap/HNBAP_NeighbourIdentity.h A include/osmocom/hnbap/HNBAP_NeighbourInfoList.h A include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h A include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h A include/osmocom/hnbap/HNBAP_PLMNidentity.h A include/osmocom/hnbap/HNBAP_PSC.h A include/osmocom/hnbap/HNBAP_PTMSI.h C include/osmocom/hnbap/HNBAP_PTMSIRAI.h A include/osmocom/hnbap/HNBAP_Presence.h A include/osmocom/hnbap/HNBAP_PrivateIE-ID.h R include/osmocom/hnbap/HNBAP_PrivateMessage.h A include/osmocom/hnbap/HNBAP_ProcedureCode.h A include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h A include/osmocom/hnbap/HNBAP_RAB-ID.h R include/osmocom/hnbap/HNBAP_RABList.h A include/osmocom/hnbap/HNBAP_RABListItem.h A include/osmocom/hnbap/HNBAP_RAC.h R include/osmocom/hnbap/HNBAP_RAI.h A include/osmocom/hnbap/HNBAP_RNC-ID.h A include/osmocom/hnbap/HNBAP_Registration-Cause.h R include/osmocom/hnbap/HNBAP_RelocationComplete.h A include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h A include/osmocom/hnbap/HNBAP_SAC.h A include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h A include/osmocom/hnbap/HNBAP_TMSIDS41.h R include/osmocom/hnbap/HNBAP_TMSILAI.h R include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h R include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h R include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h R include/osmocom/hnbap/HNBAP_TransportInfo.h A include/osmocom/hnbap/HNBAP_TransportLayerAddress.h A include/osmocom/hnbap/HNBAP_TriggeringMessage.h A include/osmocom/hnbap/HNBAP_Tunnel-Information.h A include/osmocom/hnbap/HNBAP_TypeOfError.h A include/osmocom/hnbap/HNBAP_U-RNTI.h R include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h R include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h A include/osmocom/hnbap/HNBAP_UDP-Port-Number.h A include/osmocom/hnbap/HNBAP_UE-Capabilities.h A include/osmocom/hnbap/HNBAP_UE-Identity.h R include/osmocom/hnbap/HNBAP_UEDe-Register.h R include/osmocom/hnbap/HNBAP_UERegisterAccept.h R include/osmocom/hnbap/HNBAP_UERegisterReject.h R include/osmocom/hnbap/HNBAP_UERegisterRequest.h A include/osmocom/hnbap/HNBAP_URAIdentity.h A include/osmocom/hnbap/HNBAP_URAIdentityList.h A include/osmocom/hnbap/HNBAP_UTRANCellID.h A include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h A include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h A include/osmocom/hnbap/HNBAP_Update-cause.h D include/osmocom/hnbap/HNBCapacity.h D include/osmocom/hnbap/HNBConfigInfo.h D include/osmocom/hnbap/HNBConfigurationInformationMissing.h D include/osmocom/hnbap/HNBConfigurationInformationProvided.h D include/osmocom/hnbap/IE-Extensions.h D include/osmocom/hnbap/IMEI.h D include/osmocom/hnbap/IMSI.h D include/osmocom/hnbap/IMSIDS41.h D include/osmocom/hnbap/IMSIESN.h D include/osmocom/hnbap/InitiatingMessage.h D include/osmocom/hnbap/Ipv4Address.h D include/osmocom/hnbap/Ipv6Address.h D include/osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h D include/osmocom/hnbap/LAC.h D include/osmocom/hnbap/MacroCellID.h D include/osmocom/hnbap/MacroCoverageInformation.h M include/osmocom/hnbap/Makefile.am D include/osmocom/hnbap/MuxPortNumber.h D include/osmocom/hnbap/NeighbourCellIdentityList.h D include/osmocom/hnbap/NeighbourIdentity.h D include/osmocom/hnbap/NeighbourInfoList.h D include/osmocom/hnbap/NeighbourInfoRequestItem.h D include/osmocom/hnbap/NeighbourInfoRequestList.h D include/osmocom/hnbap/PLMNidentity.h D include/osmocom/hnbap/PSC.h D include/osmocom/hnbap/PTMSI.h D include/osmocom/hnbap/PTMSIRAI.h D include/osmocom/hnbap/Presence.h D include/osmocom/hnbap/PrivateIE-ID.h D include/osmocom/hnbap/ProcedureCode.h D include/osmocom/hnbap/ProtocolIE-ID.h D include/osmocom/hnbap/RAB-ID.h D include/osmocom/hnbap/RABList.h D include/osmocom/hnbap/RABListItem.h D include/osmocom/hnbap/RAC.h D include/osmocom/hnbap/RAI.h D include/osmocom/hnbap/RNC-ID.h D include/osmocom/hnbap/Registration-Cause.h D include/osmocom/hnbap/S-RNTIPrefix.h D include/osmocom/hnbap/SAC.h D include/osmocom/hnbap/SuccessfulOutcome.h D include/osmocom/hnbap/TMSIDS41.h D include/osmocom/hnbap/TransportLayerAddress.h D include/osmocom/hnbap/TriggeringMessage.h D include/osmocom/hnbap/Tunnel-Information.h D include/osmocom/hnbap/TypeOfError.h D include/osmocom/hnbap/U-RNTI.h D include/osmocom/hnbap/UDP-Port-Number.h D include/osmocom/hnbap/UE-Capabilities.h D include/osmocom/hnbap/UE-Identity.h D include/osmocom/hnbap/URAIdentity.h D include/osmocom/hnbap/UTRANCellID.h D include/osmocom/hnbap/UnknownU-RNTIIndication.h D include/osmocom/hnbap/UnsuccessfulOutcome.h D include/osmocom/hnbap/Update-cause.h M include/osmocom/hnbap/hnbap_common.h M src/Makefile.am D src/hnbap/Access-stratum-release-indicator.c D src/hnbap/AccessResult.c D src/hnbap/AdditionalNeighbourInfoList.c D src/hnbap/BindingID.c D src/hnbap/CELL-FACHMobilitySupport.c D src/hnbap/CGI.c D src/hnbap/CN-DomainIndicator.c D src/hnbap/CSG-Capability.c D src/hnbap/CSG-ID.c D src/hnbap/CSGMembershipStatus.c D src/hnbap/CauseMisc.c D src/hnbap/CauseProtocol.c D src/hnbap/CauseTransport.c D src/hnbap/ConfigurationInformation.c D src/hnbap/Criticality.c D src/hnbap/CriticalityDiagnostics.c D src/hnbap/ESN.c D src/hnbap/GeographicalLocation.c D src/hnbap/HNB-Cell-Access-Mode.c D src/hnbap/HNB-Cell-Identifier.c D src/hnbap/HNB-GWResponse.c D src/hnbap/HNB-Identity.c D src/hnbap/HNB-Location-Information.c D src/hnbap/HNB-RNL-Identity.c A src/hnbap/HNBAP_Access-stratum-release-indicator.c A src/hnbap/HNBAP_AccessResult.c A src/hnbap/HNBAP_AdditionalNeighbourInfoList.c R src/hnbap/HNBAP_AltitudeAndDirection.c R src/hnbap/HNBAP_BackoffTimer.c R src/hnbap/HNBAP_BindingID.c A src/hnbap/HNBAP_CELL-FACHMobilitySupport.c A src/hnbap/HNBAP_CGI.c R src/hnbap/HNBAP_CI.c A src/hnbap/HNBAP_CN-DomainIndicator.c A src/hnbap/HNBAP_CSG-Capability.c R src/hnbap/HNBAP_CSG-ID.c A src/hnbap/HNBAP_CSGMembershipStatus.c R src/hnbap/HNBAP_CSGMembershipUpdate.c R src/hnbap/HNBAP_Cause.c A src/hnbap/HNBAP_CauseMisc.c A src/hnbap/HNBAP_CauseProtocol.c R src/hnbap/HNBAP_CauseRadioNetwork.c A src/hnbap/HNBAP_CauseTransport.c R src/hnbap/HNBAP_CellIdentity.c A src/hnbap/HNBAP_ConfigurationInformation.c R src/hnbap/HNBAP_Context-ID.c A src/hnbap/HNBAP_Criticality.c R src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c A src/hnbap/HNBAP_CriticalityDiagnostics.c R src/hnbap/HNBAP_ESN.c R src/hnbap/HNBAP_ErrorIndication.c R src/hnbap/HNBAP_GTP-TEI.c R src/hnbap/HNBAP_GeographicalCoordinates.c A src/hnbap/HNBAP_GeographicalLocation.c A src/hnbap/HNBAP_HNB-Cell-Access-Mode.c A src/hnbap/HNBAP_HNB-Cell-Identifier.c A src/hnbap/HNBAP_HNB-GWResponse.c A src/hnbap/HNBAP_HNB-Identity-Info.c A src/hnbap/HNBAP_HNB-Identity.c A src/hnbap/HNBAP_HNB-Location-Information.c A src/hnbap/HNBAP_HNB-RNL-Identity.c R src/hnbap/HNBAP_HNBAP-PDU.c R src/hnbap/HNBAP_HNBCapacity.c A src/hnbap/HNBAP_HNBConfigInfo.c R src/hnbap/HNBAP_HNBConfigTransferRequest.c R src/hnbap/HNBAP_HNBConfigTransferResponse.c A src/hnbap/HNBAP_HNBConfigurationInformationMissing.c A src/hnbap/HNBAP_HNBConfigurationInformationProvided.c R src/hnbap/HNBAP_HNBDe-Register.c R src/hnbap/HNBAP_HNBRegisterAccept.c R src/hnbap/HNBAP_HNBRegisterReject.c R src/hnbap/HNBAP_HNBRegisterRequest.c A src/hnbap/HNBAP_IE-Extensions.c R src/hnbap/HNBAP_IE.c R src/hnbap/HNBAP_IMEI.c R src/hnbap/HNBAP_IMSI.c R src/hnbap/HNBAP_IMSIDS41.c A src/hnbap/HNBAP_IMSIESN.c R src/hnbap/HNBAP_IP-Address.c A src/hnbap/HNBAP_InitiatingMessage.c C src/hnbap/HNBAP_Ipv4Address.c R src/hnbap/HNBAP_Ipv6Address.c A src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c C src/hnbap/HNBAP_LAC.c A src/hnbap/HNBAP_LAI.c A src/hnbap/HNBAP_MacroCellID.c A src/hnbap/HNBAP_MacroCoverageInformation.c A src/hnbap/HNBAP_MuxPortNumber.c A src/hnbap/HNBAP_NeighbourCellIdentityList.c A src/hnbap/HNBAP_NeighbourIdentity.c A src/hnbap/HNBAP_NeighbourInfoList.c A src/hnbap/HNBAP_NeighbourInfoRequestItem.c A src/hnbap/HNBAP_NeighbourInfoRequestList.c R src/hnbap/HNBAP_PLMNidentity.c R src/hnbap/HNBAP_PSC.c C src/hnbap/HNBAP_PTMSI.c A src/hnbap/HNBAP_PTMSIRAI.c A src/hnbap/HNBAP_Presence.c R src/hnbap/HNBAP_PrivateIE-ID.c R src/hnbap/HNBAP_PrivateMessage.c A src/hnbap/HNBAP_ProcedureCode.c A src/hnbap/HNBAP_ProtocolIE-ID.c R src/hnbap/HNBAP_RAB-ID.c A src/hnbap/HNBAP_RABList.c A src/hnbap/HNBAP_RABListItem.c R src/hnbap/HNBAP_RAC.c A src/hnbap/HNBAP_RAI.c R src/hnbap/HNBAP_RNC-ID.c A src/hnbap/HNBAP_Registration-Cause.c R src/hnbap/HNBAP_RelocationComplete.c C src/hnbap/HNBAP_S-RNTIPrefix.c R src/hnbap/HNBAP_SAC.c A src/hnbap/HNBAP_SuccessfulOutcome.c R src/hnbap/HNBAP_TMSIDS41.c R src/hnbap/HNBAP_TMSILAI.c R src/hnbap/HNBAP_TNLUpdateFailure.c R src/hnbap/HNBAP_TNLUpdateRequest.c R src/hnbap/HNBAP_TNLUpdateResponse.c R src/hnbap/HNBAP_TransportInfo.c A src/hnbap/HNBAP_TransportLayerAddress.c A src/hnbap/HNBAP_TriggeringMessage.c A src/hnbap/HNBAP_Tunnel-Information.c A src/hnbap/HNBAP_TypeOfError.c C src/hnbap/HNBAP_U-RNTI.c R src/hnbap/HNBAP_U-RNTIQueryRequest.c R src/hnbap/HNBAP_U-RNTIQueryResponse.c A src/hnbap/HNBAP_UDP-Port-Number.c A src/hnbap/HNBAP_UE-Capabilities.c R src/hnbap/HNBAP_UE-Identity.c R src/hnbap/HNBAP_UEDe-Register.c R src/hnbap/HNBAP_UERegisterAccept.c R src/hnbap/HNBAP_UERegisterReject.c R src/hnbap/HNBAP_UERegisterRequest.c C src/hnbap/HNBAP_URAIdentity.c A src/hnbap/HNBAP_URAIdentityList.c A src/hnbap/HNBAP_UTRANCellID.c A src/hnbap/HNBAP_UnknownU-RNTIIndication.c A src/hnbap/HNBAP_UnsuccessfulOutcome.c A src/hnbap/HNBAP_Update-cause.c D src/hnbap/HNBConfigInfo.c D src/hnbap/HNBConfigurationInformationMissing.c D src/hnbap/HNBConfigurationInformationProvided.c D src/hnbap/IE-Extensions.c D src/hnbap/IMSIESN.c D src/hnbap/InitiatingMessage.c D src/hnbap/Ipv4Address.c D src/hnbap/Ipv6Address.c D src/hnbap/Iurh-Signalling-TNL-AddressList.c D src/hnbap/LAC.c D src/hnbap/LAI.c D src/hnbap/MacroCellID.c D src/hnbap/MacroCoverageInformation.c M src/hnbap/Makefile.am D src/hnbap/MuxPortNumber.c D src/hnbap/NeighbourCellIdentityList.c D src/hnbap/NeighbourIdentity.c D src/hnbap/NeighbourInfoList.c D src/hnbap/NeighbourInfoRequestItem.c D src/hnbap/NeighbourInfoRequestList.c D src/hnbap/PTMSIRAI.c D src/hnbap/Presence.c D src/hnbap/ProcedureCode.c D src/hnbap/ProtocolIE-ID.c D src/hnbap/RABList.c D src/hnbap/RABListItem.c D src/hnbap/RAI.c D src/hnbap/RNC-ID.c D src/hnbap/Registration-Cause.c D src/hnbap/SuccessfulOutcome.c D src/hnbap/TransportLayerAddress.c D src/hnbap/TriggeringMessage.c D src/hnbap/Tunnel-Information.c D src/hnbap/TypeOfError.c D src/hnbap/U-RNTI.c D src/hnbap/UE-Capabilities.c D src/hnbap/URAIdentityList.c D src/hnbap/UTRANCellID.c D src/hnbap/UnknownU-RNTIIndication.c D src/hnbap/UnsuccessfulOutcome.c D src/hnbap/Update-cause.c M src/hnbap_common.c M src/hnbgw_hnbap.c M src/hnbgw_rua.c M src/tests/hnb-test.c M src/tests/test-hnbap.c 391 files changed, 13,507 insertions(+), 14,888 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25961 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6c062f631527ae42811bfec134933671c05ecba6 Gerrit-Change-Number: 25961 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 15:15:04 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 15:15:04 +0000 Subject: Change in osmo-iuh[master]: hnbap: Drop no longer existing asn1c param -fnative-types In-Reply-To: References: Message-ID: pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25986 ) Change subject: hnbap: Drop no longer existing asn1c param -fnative-types ...................................................................... hnbap: Drop no longer existing asn1c param -fnative-types This is an option enabled by default and not existent as cmdline param since asn1c 0.9.26. For some reason, when dropping it, asn1c generates different description comment section on related files. In any case, this makes hnbap look like other libraries which already got this param removed and hence also generateds code looks the same. Change-Id: Iccf81539a5045416185e619d24c3d542204437e6 --- M include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h M include/osmocom/hnbap/HNBAP_AccessResult.h M include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h M include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h M include/osmocom/hnbap/HNBAP_BackoffTimer.h M include/osmocom/hnbap/HNBAP_BindingID.h M include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h M include/osmocom/hnbap/HNBAP_CGI.h M include/osmocom/hnbap/HNBAP_CI.h M include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h M include/osmocom/hnbap/HNBAP_CSG-Capability.h M include/osmocom/hnbap/HNBAP_CSG-ID.h M include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h M include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h M include/osmocom/hnbap/HNBAP_Cause.h M include/osmocom/hnbap/HNBAP_CauseMisc.h M include/osmocom/hnbap/HNBAP_CauseProtocol.h M include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h M include/osmocom/hnbap/HNBAP_CauseTransport.h M include/osmocom/hnbap/HNBAP_CellIdentity.h M include/osmocom/hnbap/HNBAP_ConfigurationInformation.h M include/osmocom/hnbap/HNBAP_Context-ID.h M include/osmocom/hnbap/HNBAP_Criticality.h M include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h M include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h M include/osmocom/hnbap/HNBAP_ESN.h M include/osmocom/hnbap/HNBAP_ErrorIndication.h M include/osmocom/hnbap/HNBAP_GTP-TEI.h M include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h M include/osmocom/hnbap/HNBAP_GeographicalLocation.h M include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h M include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h M include/osmocom/hnbap/HNBAP_HNB-GWResponse.h M include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h M include/osmocom/hnbap/HNBAP_HNB-Identity.h M include/osmocom/hnbap/HNBAP_HNB-Location-Information.h M include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h M include/osmocom/hnbap/HNBAP_HNBAP-PDU.h M include/osmocom/hnbap/HNBAP_HNBCapacity.h M include/osmocom/hnbap/HNBAP_HNBConfigInfo.h M include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h M include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h M include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h M include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h M include/osmocom/hnbap/HNBAP_HNBDe-Register.h M include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h M include/osmocom/hnbap/HNBAP_HNBRegisterReject.h M include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h M include/osmocom/hnbap/HNBAP_IE-Extensions.h M include/osmocom/hnbap/HNBAP_IE.h M include/osmocom/hnbap/HNBAP_IMEI.h M include/osmocom/hnbap/HNBAP_IMSI.h M include/osmocom/hnbap/HNBAP_IMSIDS41.h M include/osmocom/hnbap/HNBAP_IMSIESN.h M include/osmocom/hnbap/HNBAP_IP-Address.h M include/osmocom/hnbap/HNBAP_InitiatingMessage.h M include/osmocom/hnbap/HNBAP_Ipv4Address.h M include/osmocom/hnbap/HNBAP_Ipv6Address.h M include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h M include/osmocom/hnbap/HNBAP_LAC.h M include/osmocom/hnbap/HNBAP_LAI.h M include/osmocom/hnbap/HNBAP_MacroCellID.h M include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h M include/osmocom/hnbap/HNBAP_MuxPortNumber.h M include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h M include/osmocom/hnbap/HNBAP_NeighbourIdentity.h M include/osmocom/hnbap/HNBAP_NeighbourInfoList.h M include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h M include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h M include/osmocom/hnbap/HNBAP_PLMNidentity.h M include/osmocom/hnbap/HNBAP_PSC.h M include/osmocom/hnbap/HNBAP_PTMSI.h M include/osmocom/hnbap/HNBAP_PTMSIRAI.h M include/osmocom/hnbap/HNBAP_Presence.h M include/osmocom/hnbap/HNBAP_PrivateIE-ID.h M include/osmocom/hnbap/HNBAP_PrivateMessage.h M include/osmocom/hnbap/HNBAP_ProcedureCode.h M include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h M include/osmocom/hnbap/HNBAP_RAB-ID.h M include/osmocom/hnbap/HNBAP_RABList.h M include/osmocom/hnbap/HNBAP_RABListItem.h M include/osmocom/hnbap/HNBAP_RAC.h M include/osmocom/hnbap/HNBAP_RAI.h M include/osmocom/hnbap/HNBAP_RNC-ID.h M include/osmocom/hnbap/HNBAP_Registration-Cause.h M include/osmocom/hnbap/HNBAP_RelocationComplete.h M include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h M include/osmocom/hnbap/HNBAP_SAC.h M include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h M include/osmocom/hnbap/HNBAP_TMSIDS41.h M include/osmocom/hnbap/HNBAP_TMSILAI.h M include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h M include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h M include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h M include/osmocom/hnbap/HNBAP_TransportInfo.h M include/osmocom/hnbap/HNBAP_TransportLayerAddress.h M include/osmocom/hnbap/HNBAP_TriggeringMessage.h M include/osmocom/hnbap/HNBAP_Tunnel-Information.h M include/osmocom/hnbap/HNBAP_TypeOfError.h M include/osmocom/hnbap/HNBAP_U-RNTI.h M include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h M include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h M include/osmocom/hnbap/HNBAP_UDP-Port-Number.h M include/osmocom/hnbap/HNBAP_UE-Capabilities.h M include/osmocom/hnbap/HNBAP_UE-Identity.h M include/osmocom/hnbap/HNBAP_UEDe-Register.h M include/osmocom/hnbap/HNBAP_UERegisterAccept.h M include/osmocom/hnbap/HNBAP_UERegisterReject.h M include/osmocom/hnbap/HNBAP_UERegisterRequest.h M include/osmocom/hnbap/HNBAP_URAIdentity.h M include/osmocom/hnbap/HNBAP_URAIdentityList.h M include/osmocom/hnbap/HNBAP_UTRANCellID.h M include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h M include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h M include/osmocom/hnbap/HNBAP_Update-cause.h M src/hnbap/HNBAP_Access-stratum-release-indicator.c M src/hnbap/HNBAP_AccessResult.c M src/hnbap/HNBAP_AdditionalNeighbourInfoList.c M src/hnbap/HNBAP_AltitudeAndDirection.c M src/hnbap/HNBAP_BackoffTimer.c M src/hnbap/HNBAP_BindingID.c M src/hnbap/HNBAP_CELL-FACHMobilitySupport.c M src/hnbap/HNBAP_CGI.c M src/hnbap/HNBAP_CI.c M src/hnbap/HNBAP_CN-DomainIndicator.c M src/hnbap/HNBAP_CSG-Capability.c M src/hnbap/HNBAP_CSG-ID.c M src/hnbap/HNBAP_CSGMembershipStatus.c M src/hnbap/HNBAP_CSGMembershipUpdate.c M src/hnbap/HNBAP_Cause.c M src/hnbap/HNBAP_CauseMisc.c M src/hnbap/HNBAP_CauseProtocol.c M src/hnbap/HNBAP_CauseRadioNetwork.c M src/hnbap/HNBAP_CauseTransport.c M src/hnbap/HNBAP_CellIdentity.c M src/hnbap/HNBAP_ConfigurationInformation.c M src/hnbap/HNBAP_Context-ID.c M src/hnbap/HNBAP_Criticality.c M src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c M src/hnbap/HNBAP_CriticalityDiagnostics.c M src/hnbap/HNBAP_ESN.c M src/hnbap/HNBAP_ErrorIndication.c M src/hnbap/HNBAP_GTP-TEI.c M src/hnbap/HNBAP_GeographicalCoordinates.c M src/hnbap/HNBAP_GeographicalLocation.c M src/hnbap/HNBAP_HNB-Cell-Access-Mode.c M src/hnbap/HNBAP_HNB-Cell-Identifier.c M src/hnbap/HNBAP_HNB-GWResponse.c M src/hnbap/HNBAP_HNB-Identity-Info.c M src/hnbap/HNBAP_HNB-Identity.c M src/hnbap/HNBAP_HNB-Location-Information.c M src/hnbap/HNBAP_HNB-RNL-Identity.c M src/hnbap/HNBAP_HNBAP-PDU.c M src/hnbap/HNBAP_HNBCapacity.c M src/hnbap/HNBAP_HNBConfigInfo.c M src/hnbap/HNBAP_HNBConfigTransferRequest.c M src/hnbap/HNBAP_HNBConfigTransferResponse.c M src/hnbap/HNBAP_HNBConfigurationInformationMissing.c M src/hnbap/HNBAP_HNBConfigurationInformationProvided.c M src/hnbap/HNBAP_HNBDe-Register.c M src/hnbap/HNBAP_HNBRegisterAccept.c M src/hnbap/HNBAP_HNBRegisterReject.c M src/hnbap/HNBAP_HNBRegisterRequest.c M src/hnbap/HNBAP_IE-Extensions.c M src/hnbap/HNBAP_IE.c M src/hnbap/HNBAP_IMEI.c M src/hnbap/HNBAP_IMSI.c M src/hnbap/HNBAP_IMSIDS41.c M src/hnbap/HNBAP_IMSIESN.c M src/hnbap/HNBAP_IP-Address.c M src/hnbap/HNBAP_InitiatingMessage.c M src/hnbap/HNBAP_Ipv4Address.c M src/hnbap/HNBAP_Ipv6Address.c M src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c M src/hnbap/HNBAP_LAC.c M src/hnbap/HNBAP_LAI.c M src/hnbap/HNBAP_MacroCellID.c M src/hnbap/HNBAP_MacroCoverageInformation.c M src/hnbap/HNBAP_MuxPortNumber.c M src/hnbap/HNBAP_NeighbourCellIdentityList.c M src/hnbap/HNBAP_NeighbourIdentity.c M src/hnbap/HNBAP_NeighbourInfoList.c M src/hnbap/HNBAP_NeighbourInfoRequestItem.c M src/hnbap/HNBAP_NeighbourInfoRequestList.c M src/hnbap/HNBAP_PLMNidentity.c M src/hnbap/HNBAP_PSC.c M src/hnbap/HNBAP_PTMSI.c M src/hnbap/HNBAP_PTMSIRAI.c M src/hnbap/HNBAP_Presence.c M src/hnbap/HNBAP_PrivateIE-ID.c M src/hnbap/HNBAP_PrivateMessage.c M src/hnbap/HNBAP_ProcedureCode.c M src/hnbap/HNBAP_ProtocolIE-ID.c M src/hnbap/HNBAP_RAB-ID.c M src/hnbap/HNBAP_RABList.c M src/hnbap/HNBAP_RABListItem.c M src/hnbap/HNBAP_RAC.c M src/hnbap/HNBAP_RAI.c M src/hnbap/HNBAP_RNC-ID.c M src/hnbap/HNBAP_Registration-Cause.c M src/hnbap/HNBAP_RelocationComplete.c M src/hnbap/HNBAP_S-RNTIPrefix.c M src/hnbap/HNBAP_SAC.c M src/hnbap/HNBAP_SuccessfulOutcome.c M src/hnbap/HNBAP_TMSIDS41.c M src/hnbap/HNBAP_TMSILAI.c M src/hnbap/HNBAP_TNLUpdateFailure.c M src/hnbap/HNBAP_TNLUpdateRequest.c M src/hnbap/HNBAP_TNLUpdateResponse.c M src/hnbap/HNBAP_TransportInfo.c M src/hnbap/HNBAP_TransportLayerAddress.c M src/hnbap/HNBAP_TriggeringMessage.c M src/hnbap/HNBAP_Tunnel-Information.c M src/hnbap/HNBAP_TypeOfError.c M src/hnbap/HNBAP_U-RNTI.c M src/hnbap/HNBAP_U-RNTIQueryRequest.c M src/hnbap/HNBAP_U-RNTIQueryResponse.c M src/hnbap/HNBAP_UDP-Port-Number.c M src/hnbap/HNBAP_UE-Capabilities.c M src/hnbap/HNBAP_UE-Identity.c M src/hnbap/HNBAP_UEDe-Register.c M src/hnbap/HNBAP_UERegisterAccept.c M src/hnbap/HNBAP_UERegisterReject.c M src/hnbap/HNBAP_UERegisterRequest.c M src/hnbap/HNBAP_URAIdentity.c M src/hnbap/HNBAP_URAIdentityList.c M src/hnbap/HNBAP_UTRANCellID.c M src/hnbap/HNBAP_UnknownU-RNTIIndication.c M src/hnbap/HNBAP_UnsuccessfulOutcome.c M src/hnbap/HNBAP_Update-cause.c M src/hnbap/Makefile.am 231 files changed, 231 insertions(+), 231 deletions(-) Approvals: pespin: Verified fixeria: Looks good to me, approved diff --git a/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h b/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h index 8722417..1aba84e 100644 --- a/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h +++ b/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Access_stratum_release_indicator_H_ diff --git a/include/osmocom/hnbap/HNBAP_AccessResult.h b/include/osmocom/hnbap/HNBAP_AccessResult.h index fdd9763..3d71d2d 100644 --- a/include/osmocom/hnbap/HNBAP_AccessResult.h +++ b/include/osmocom/hnbap/HNBAP_AccessResult.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_AccessResult_H_ diff --git a/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h b/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h index fbafb53..be2dd1f 100644 --- a/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h +++ b/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_AdditionalNeighbourInfoList_H_ diff --git a/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h b/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h index 20a7d58..5b406d8 100644 --- a/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h +++ b/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * >From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_AltitudeAndDirection_H_ diff --git a/include/osmocom/hnbap/HNBAP_BackoffTimer.h b/include/osmocom/hnbap/HNBAP_BackoffTimer.h index 033e4e0..03f64c9 100644 --- a/include/osmocom/hnbap/HNBAP_BackoffTimer.h +++ b/include/osmocom/hnbap/HNBAP_BackoffTimer.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_BackoffTimer_H_ diff --git a/include/osmocom/hnbap/HNBAP_BindingID.h b/include/osmocom/hnbap/HNBAP_BindingID.h index cf057bc..b5cdebc 100644 --- a/include/osmocom/hnbap/HNBAP_BindingID.h +++ b/include/osmocom/hnbap/HNBAP_BindingID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_BindingID_H_ diff --git a/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h b/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h index 71e26c1..864f6ce 100644 --- a/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h +++ b/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CELL_FACHMobilitySupport_H_ diff --git a/include/osmocom/hnbap/HNBAP_CGI.h b/include/osmocom/hnbap/HNBAP_CGI.h index 2e7c13a..657aff8 100644 --- a/include/osmocom/hnbap/HNBAP_CGI.h +++ b/include/osmocom/hnbap/HNBAP_CGI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CGI_H_ diff --git a/include/osmocom/hnbap/HNBAP_CI.h b/include/osmocom/hnbap/HNBAP_CI.h index ee0f6a2..637c9bd 100644 --- a/include/osmocom/hnbap/HNBAP_CI.h +++ b/include/osmocom/hnbap/HNBAP_CI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CI_H_ diff --git a/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h b/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h index 8bdc971..5128d5b 100644 --- a/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h +++ b/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CN_DomainIndicator_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSG-Capability.h b/include/osmocom/hnbap/HNBAP_CSG-Capability.h index a04ef21..57d6ee2 100644 --- a/include/osmocom/hnbap/HNBAP_CSG-Capability.h +++ b/include/osmocom/hnbap/HNBAP_CSG-Capability.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CSG_Capability_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSG-ID.h b/include/osmocom/hnbap/HNBAP_CSG-ID.h index 7ef09fa..d76f078 100644 --- a/include/osmocom/hnbap/HNBAP_CSG-ID.h +++ b/include/osmocom/hnbap/HNBAP_CSG-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CSG_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h b/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h index 94bfe3e..d83bd14 100644 --- a/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h +++ b/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CSGMembershipStatus_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h b/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h index 65331f1..035b331 100644 --- a/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h +++ b/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CSGMembershipUpdate_H_ diff --git a/include/osmocom/hnbap/HNBAP_Cause.h b/include/osmocom/hnbap/HNBAP_Cause.h index 8291d0b..e385b5f 100644 --- a/include/osmocom/hnbap/HNBAP_Cause.h +++ b/include/osmocom/hnbap/HNBAP_Cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Cause_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseMisc.h b/include/osmocom/hnbap/HNBAP_CauseMisc.h index a2d0e36..c53cafe 100644 --- a/include/osmocom/hnbap/HNBAP_CauseMisc.h +++ b/include/osmocom/hnbap/HNBAP_CauseMisc.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CauseMisc_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseProtocol.h b/include/osmocom/hnbap/HNBAP_CauseProtocol.h index 6650668..3416b47 100644 --- a/include/osmocom/hnbap/HNBAP_CauseProtocol.h +++ b/include/osmocom/hnbap/HNBAP_CauseProtocol.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CauseProtocol_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h b/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h index 1b19fe4..895ac69 100644 --- a/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h +++ b/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CauseRadioNetwork_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseTransport.h b/include/osmocom/hnbap/HNBAP_CauseTransport.h index 4d90428..d2e486e 100644 --- a/include/osmocom/hnbap/HNBAP_CauseTransport.h +++ b/include/osmocom/hnbap/HNBAP_CauseTransport.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CauseTransport_H_ diff --git a/include/osmocom/hnbap/HNBAP_CellIdentity.h b/include/osmocom/hnbap/HNBAP_CellIdentity.h index 7b17938..1b76f6b 100644 --- a/include/osmocom/hnbap/HNBAP_CellIdentity.h +++ b/include/osmocom/hnbap/HNBAP_CellIdentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CellIdentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h b/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h index 0f89163..7720b23 100644 --- a/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h +++ b/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_ConfigurationInformation_H_ diff --git a/include/osmocom/hnbap/HNBAP_Context-ID.h b/include/osmocom/hnbap/HNBAP_Context-ID.h index 64612ba..570e8cb 100644 --- a/include/osmocom/hnbap/HNBAP_Context-ID.h +++ b/include/osmocom/hnbap/HNBAP_Context-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Context_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_Criticality.h b/include/osmocom/hnbap/HNBAP_Criticality.h index 5081ab2..cbc4c01 100644 --- a/include/osmocom/hnbap/HNBAP_Criticality.h +++ b/include/osmocom/hnbap/HNBAP_Criticality.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Criticality_H_ diff --git a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h index ef7da79..db82056 100644 --- a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h +++ b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CriticalityDiagnostics_IE_List_H_ diff --git a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h index c64f89b..34d798d 100644 --- a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h +++ b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_CriticalityDiagnostics_H_ diff --git a/include/osmocom/hnbap/HNBAP_ESN.h b/include/osmocom/hnbap/HNBAP_ESN.h index 349fcf1..b1353ea 100644 --- a/include/osmocom/hnbap/HNBAP_ESN.h +++ b/include/osmocom/hnbap/HNBAP_ESN.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_ESN_H_ diff --git a/include/osmocom/hnbap/HNBAP_ErrorIndication.h b/include/osmocom/hnbap/HNBAP_ErrorIndication.h index 9fffa55..889cf08 100644 --- a/include/osmocom/hnbap/HNBAP_ErrorIndication.h +++ b/include/osmocom/hnbap/HNBAP_ErrorIndication.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_ErrorIndication_H_ diff --git a/include/osmocom/hnbap/HNBAP_GTP-TEI.h b/include/osmocom/hnbap/HNBAP_GTP-TEI.h index 56ee322..214964d 100644 --- a/include/osmocom/hnbap/HNBAP_GTP-TEI.h +++ b/include/osmocom/hnbap/HNBAP_GTP-TEI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_GTP_TEI_H_ diff --git a/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h b/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h index 1a8e237..6cdfdec 100644 --- a/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h +++ b/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_GeographicalCoordinates_H_ diff --git a/include/osmocom/hnbap/HNBAP_GeographicalLocation.h b/include/osmocom/hnbap/HNBAP_GeographicalLocation.h index a672cef..6311d85 100644 --- a/include/osmocom/hnbap/HNBAP_GeographicalLocation.h +++ b/include/osmocom/hnbap/HNBAP_GeographicalLocation.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_GeographicalLocation_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h b/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h index 9fa4304..2a6e05a 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNB_Cell_Access_Mode_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h b/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h index 5aa67ee..14d2850 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNB_Cell_Identifier_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h b/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h index b2835bb..cadd7e3 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h +++ b/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNB_GWResponse_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h b/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h index b160d0c..25606bd 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNB_Identity_Info_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Identity.h b/include/osmocom/hnbap/HNBAP_HNB-Identity.h index f127c54..ca28950 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Identity.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Identity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNB_Identity_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h b/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h index 79be0f2..f8a3769 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNB_Location_Information_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h b/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h index b2739ae..642e8e6 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h +++ b/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNB_RNL_Identity_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h b/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h index 91df4bc..48dac94 100644 --- a/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h +++ b/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBAP_PDU_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBCapacity.h b/include/osmocom/hnbap/HNBAP_HNBCapacity.h index fadb4fe..39e4f29 100644 --- a/include/osmocom/hnbap/HNBAP_HNBCapacity.h +++ b/include/osmocom/hnbap/HNBAP_HNBCapacity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBCapacity_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h b/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h index 4f73ed1..f0b6dc2 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBConfigInfo_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h b/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h index cc52dae..8ce6ca7 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBConfigTransferRequest_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h b/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h index 4ad79b6..81ec650 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBConfigTransferResponse_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h index dcc1001..42bafdb 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBConfigurationInformationMissing_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h index 012a595..2750038 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBConfigurationInformationProvided_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBDe-Register.h b/include/osmocom/hnbap/HNBAP_HNBDe-Register.h index a669e52..79d7bbe 100644 --- a/include/osmocom/hnbap/HNBAP_HNBDe-Register.h +++ b/include/osmocom/hnbap/HNBAP_HNBDe-Register.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBDe_Register_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h b/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h index 1b87860..83a48f8 100644 --- a/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h +++ b/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBRegisterAccept_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h b/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h index 5c8ff8c..2b203db 100644 --- a/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h +++ b/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBRegisterReject_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h b/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h index b1a99d6..1431432 100644 --- a/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h +++ b/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_HNBRegisterRequest_H_ diff --git a/include/osmocom/hnbap/HNBAP_IE-Extensions.h b/include/osmocom/hnbap/HNBAP_IE-Extensions.h index 34d481c..81ffb00 100644 --- a/include/osmocom/hnbap/HNBAP_IE-Extensions.h +++ b/include/osmocom/hnbap/HNBAP_IE-Extensions.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_IE_Extensions_H_ diff --git a/include/osmocom/hnbap/HNBAP_IE.h b/include/osmocom/hnbap/HNBAP_IE.h index 8029014..1abae50 100644 --- a/include/osmocom/hnbap/HNBAP_IE.h +++ b/include/osmocom/hnbap/HNBAP_IE.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_IE_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMEI.h b/include/osmocom/hnbap/HNBAP_IMEI.h index d541529..ff082a8 100644 --- a/include/osmocom/hnbap/HNBAP_IMEI.h +++ b/include/osmocom/hnbap/HNBAP_IMEI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_IMEI_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMSI.h b/include/osmocom/hnbap/HNBAP_IMSI.h index f71e390..98970ed 100644 --- a/include/osmocom/hnbap/HNBAP_IMSI.h +++ b/include/osmocom/hnbap/HNBAP_IMSI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_IMSI_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMSIDS41.h b/include/osmocom/hnbap/HNBAP_IMSIDS41.h index 7b3c2f4..94f35b9 100644 --- a/include/osmocom/hnbap/HNBAP_IMSIDS41.h +++ b/include/osmocom/hnbap/HNBAP_IMSIDS41.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_IMSIDS41_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMSIESN.h b/include/osmocom/hnbap/HNBAP_IMSIESN.h index 9671bd8..2178336 100644 --- a/include/osmocom/hnbap/HNBAP_IMSIESN.h +++ b/include/osmocom/hnbap/HNBAP_IMSIESN.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_IMSIESN_H_ diff --git a/include/osmocom/hnbap/HNBAP_IP-Address.h b/include/osmocom/hnbap/HNBAP_IP-Address.h index 1c4775d..8e6d119 100644 --- a/include/osmocom/hnbap/HNBAP_IP-Address.h +++ b/include/osmocom/hnbap/HNBAP_IP-Address.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_IP_Address_H_ diff --git a/include/osmocom/hnbap/HNBAP_InitiatingMessage.h b/include/osmocom/hnbap/HNBAP_InitiatingMessage.h index 9427640..1a7e6e3 100644 --- a/include/osmocom/hnbap/HNBAP_InitiatingMessage.h +++ b/include/osmocom/hnbap/HNBAP_InitiatingMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_InitiatingMessage_H_ diff --git a/include/osmocom/hnbap/HNBAP_Ipv4Address.h b/include/osmocom/hnbap/HNBAP_Ipv4Address.h index 94d9df4..eecb57a 100644 --- a/include/osmocom/hnbap/HNBAP_Ipv4Address.h +++ b/include/osmocom/hnbap/HNBAP_Ipv4Address.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Ipv4Address_H_ diff --git a/include/osmocom/hnbap/HNBAP_Ipv6Address.h b/include/osmocom/hnbap/HNBAP_Ipv6Address.h index 7bdbee3..319ee82 100644 --- a/include/osmocom/hnbap/HNBAP_Ipv6Address.h +++ b/include/osmocom/hnbap/HNBAP_Ipv6Address.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Ipv6Address_H_ diff --git a/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h b/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h index d64224f..f3e5f24 100644 --- a/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h +++ b/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Iurh_Signalling_TNL_AddressList_H_ diff --git a/include/osmocom/hnbap/HNBAP_LAC.h b/include/osmocom/hnbap/HNBAP_LAC.h index 5c9b0a1..66369cf 100644 --- a/include/osmocom/hnbap/HNBAP_LAC.h +++ b/include/osmocom/hnbap/HNBAP_LAC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_LAC_H_ diff --git a/include/osmocom/hnbap/HNBAP_LAI.h b/include/osmocom/hnbap/HNBAP_LAI.h index f1ec681..bc44334 100644 --- a/include/osmocom/hnbap/HNBAP_LAI.h +++ b/include/osmocom/hnbap/HNBAP_LAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_LAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_MacroCellID.h b/include/osmocom/hnbap/HNBAP_MacroCellID.h index 4d3730b..808e4cc 100644 --- a/include/osmocom/hnbap/HNBAP_MacroCellID.h +++ b/include/osmocom/hnbap/HNBAP_MacroCellID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_MacroCellID_H_ diff --git a/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h b/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h index 5396d74..8c58db7 100644 --- a/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h +++ b/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_MacroCoverageInformation_H_ diff --git a/include/osmocom/hnbap/HNBAP_MuxPortNumber.h b/include/osmocom/hnbap/HNBAP_MuxPortNumber.h index f8c1941..126423b 100644 --- a/include/osmocom/hnbap/HNBAP_MuxPortNumber.h +++ b/include/osmocom/hnbap/HNBAP_MuxPortNumber.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_MuxPortNumber_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h b/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h index b6b3c94..7b045bd 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_NeighbourCellIdentityList_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h b/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h index 7720cb0..a05d5c6 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_NeighbourIdentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h b/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h index ef0d1ad..c3ac952 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_NeighbourInfoList_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h index aa98850..babc581 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_NeighbourInfoRequestItem_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h index b0866c4..8ce71b4 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_NeighbourInfoRequestList_H_ diff --git a/include/osmocom/hnbap/HNBAP_PLMNidentity.h b/include/osmocom/hnbap/HNBAP_PLMNidentity.h index c6f52e9..eaae7fd 100644 --- a/include/osmocom/hnbap/HNBAP_PLMNidentity.h +++ b/include/osmocom/hnbap/HNBAP_PLMNidentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_PLMNidentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_PSC.h b/include/osmocom/hnbap/HNBAP_PSC.h index aad7859..a399947 100644 --- a/include/osmocom/hnbap/HNBAP_PSC.h +++ b/include/osmocom/hnbap/HNBAP_PSC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_PSC_H_ diff --git a/include/osmocom/hnbap/HNBAP_PTMSI.h b/include/osmocom/hnbap/HNBAP_PTMSI.h index b616e34..70a9d21 100644 --- a/include/osmocom/hnbap/HNBAP_PTMSI.h +++ b/include/osmocom/hnbap/HNBAP_PTMSI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_PTMSI_H_ diff --git a/include/osmocom/hnbap/HNBAP_PTMSIRAI.h b/include/osmocom/hnbap/HNBAP_PTMSIRAI.h index fed74f2..45396e0 100644 --- a/include/osmocom/hnbap/HNBAP_PTMSIRAI.h +++ b/include/osmocom/hnbap/HNBAP_PTMSIRAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_PTMSIRAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_Presence.h b/include/osmocom/hnbap/HNBAP_Presence.h index ca38181..60ec1f9 100644 --- a/include/osmocom/hnbap/HNBAP_Presence.h +++ b/include/osmocom/hnbap/HNBAP_Presence.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Presence_H_ diff --git a/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h b/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h index dd77956..78857d0 100644 --- a/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h +++ b/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_PrivateIE_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_PrivateMessage.h b/include/osmocom/hnbap/HNBAP_PrivateMessage.h index ecc092f..ee7faa4 100644 --- a/include/osmocom/hnbap/HNBAP_PrivateMessage.h +++ b/include/osmocom/hnbap/HNBAP_PrivateMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_PrivateMessage_H_ diff --git a/include/osmocom/hnbap/HNBAP_ProcedureCode.h b/include/osmocom/hnbap/HNBAP_ProcedureCode.h index fc6b2e8..84e1d41 100644 --- a/include/osmocom/hnbap/HNBAP_ProcedureCode.h +++ b/include/osmocom/hnbap/HNBAP_ProcedureCode.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_ProcedureCode_H_ diff --git a/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h b/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h index be1efe6..4ca0627 100644 --- a/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h +++ b/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_ProtocolIE_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_RAB-ID.h b/include/osmocom/hnbap/HNBAP_RAB-ID.h index 96612c0..45422f4 100644 --- a/include/osmocom/hnbap/HNBAP_RAB-ID.h +++ b/include/osmocom/hnbap/HNBAP_RAB-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_RAB_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_RABList.h b/include/osmocom/hnbap/HNBAP_RABList.h index 76d7a1a..50741e0 100644 --- a/include/osmocom/hnbap/HNBAP_RABList.h +++ b/include/osmocom/hnbap/HNBAP_RABList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_RABList_H_ diff --git a/include/osmocom/hnbap/HNBAP_RABListItem.h b/include/osmocom/hnbap/HNBAP_RABListItem.h index 11cc414..a041d25 100644 --- a/include/osmocom/hnbap/HNBAP_RABListItem.h +++ b/include/osmocom/hnbap/HNBAP_RABListItem.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_RABListItem_H_ diff --git a/include/osmocom/hnbap/HNBAP_RAC.h b/include/osmocom/hnbap/HNBAP_RAC.h index e1bae72..20534f8 100644 --- a/include/osmocom/hnbap/HNBAP_RAC.h +++ b/include/osmocom/hnbap/HNBAP_RAC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * >From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_RAC_H_ diff --git a/include/osmocom/hnbap/HNBAP_RAI.h b/include/osmocom/hnbap/HNBAP_RAI.h index eab28b0..0cc6985 100644 --- a/include/osmocom/hnbap/HNBAP_RAI.h +++ b/include/osmocom/hnbap/HNBAP_RAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_RAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_RNC-ID.h b/include/osmocom/hnbap/HNBAP_RNC-ID.h index d4c62a6..36c6644 100644 --- a/include/osmocom/hnbap/HNBAP_RNC-ID.h +++ b/include/osmocom/hnbap/HNBAP_RNC-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_RNC_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_Registration-Cause.h b/include/osmocom/hnbap/HNBAP_Registration-Cause.h index 9a5af41..8fc58bd 100644 --- a/include/osmocom/hnbap/HNBAP_Registration-Cause.h +++ b/include/osmocom/hnbap/HNBAP_Registration-Cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Registration_Cause_H_ diff --git a/include/osmocom/hnbap/HNBAP_RelocationComplete.h b/include/osmocom/hnbap/HNBAP_RelocationComplete.h index f61dbe7..8ab1e5a 100644 --- a/include/osmocom/hnbap/HNBAP_RelocationComplete.h +++ b/include/osmocom/hnbap/HNBAP_RelocationComplete.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_RelocationComplete_H_ diff --git a/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h b/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h index 6979520..a315b9a 100644 --- a/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h +++ b/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_S_RNTIPrefix_H_ diff --git a/include/osmocom/hnbap/HNBAP_SAC.h b/include/osmocom/hnbap/HNBAP_SAC.h index 98696ef..6b4bf11 100644 --- a/include/osmocom/hnbap/HNBAP_SAC.h +++ b/include/osmocom/hnbap/HNBAP_SAC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_SAC_H_ diff --git a/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h b/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h index 64f7b5d..97ddd2e 100644 --- a/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h +++ b/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_SuccessfulOutcome_H_ diff --git a/include/osmocom/hnbap/HNBAP_TMSIDS41.h b/include/osmocom/hnbap/HNBAP_TMSIDS41.h index 8f10577..ec40e84 100644 --- a/include/osmocom/hnbap/HNBAP_TMSIDS41.h +++ b/include/osmocom/hnbap/HNBAP_TMSIDS41.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TMSIDS41_H_ diff --git a/include/osmocom/hnbap/HNBAP_TMSILAI.h b/include/osmocom/hnbap/HNBAP_TMSILAI.h index 83f697c..de4101a 100644 --- a/include/osmocom/hnbap/HNBAP_TMSILAI.h +++ b/include/osmocom/hnbap/HNBAP_TMSILAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TMSILAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h b/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h index 44af731..73313fb 100644 --- a/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h +++ b/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TNLUpdateFailure_H_ diff --git a/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h b/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h index 61d77f6..11b1a36 100644 --- a/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h +++ b/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TNLUpdateRequest_H_ diff --git a/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h b/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h index 62b5e05..8aac76b 100644 --- a/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h +++ b/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TNLUpdateResponse_H_ diff --git a/include/osmocom/hnbap/HNBAP_TransportInfo.h b/include/osmocom/hnbap/HNBAP_TransportInfo.h index b20e0d6..8f0a5eb 100644 --- a/include/osmocom/hnbap/HNBAP_TransportInfo.h +++ b/include/osmocom/hnbap/HNBAP_TransportInfo.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TransportInfo_H_ diff --git a/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h b/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h index f66f2dc..4edd7b8 100644 --- a/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h +++ b/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TransportLayerAddress_H_ diff --git a/include/osmocom/hnbap/HNBAP_TriggeringMessage.h b/include/osmocom/hnbap/HNBAP_TriggeringMessage.h index 0d349ab..859dc12 100644 --- a/include/osmocom/hnbap/HNBAP_TriggeringMessage.h +++ b/include/osmocom/hnbap/HNBAP_TriggeringMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TriggeringMessage_H_ diff --git a/include/osmocom/hnbap/HNBAP_Tunnel-Information.h b/include/osmocom/hnbap/HNBAP_Tunnel-Information.h index f2ae37a..470420d 100644 --- a/include/osmocom/hnbap/HNBAP_Tunnel-Information.h +++ b/include/osmocom/hnbap/HNBAP_Tunnel-Information.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Tunnel_Information_H_ diff --git a/include/osmocom/hnbap/HNBAP_TypeOfError.h b/include/osmocom/hnbap/HNBAP_TypeOfError.h index c97e761..04771a3 100644 --- a/include/osmocom/hnbap/HNBAP_TypeOfError.h +++ b/include/osmocom/hnbap/HNBAP_TypeOfError.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_TypeOfError_H_ diff --git a/include/osmocom/hnbap/HNBAP_U-RNTI.h b/include/osmocom/hnbap/HNBAP_U-RNTI.h index 41ff48e..cf506b0 100644 --- a/include/osmocom/hnbap/HNBAP_U-RNTI.h +++ b/include/osmocom/hnbap/HNBAP_U-RNTI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_U_RNTI_H_ diff --git a/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h b/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h index 38fe28a..8714c55 100644 --- a/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h +++ b/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_U_RNTIQueryRequest_H_ diff --git a/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h b/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h index 9cc4f9a..2696f9b 100644 --- a/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h +++ b/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_U_RNTIQueryResponse_H_ diff --git a/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h b/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h index ecde6e3..9a8b675 100644 --- a/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h +++ b/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UDP_Port_Number_H_ diff --git a/include/osmocom/hnbap/HNBAP_UE-Capabilities.h b/include/osmocom/hnbap/HNBAP_UE-Capabilities.h index 86caf2e..38551d6 100644 --- a/include/osmocom/hnbap/HNBAP_UE-Capabilities.h +++ b/include/osmocom/hnbap/HNBAP_UE-Capabilities.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UE_Capabilities_H_ diff --git a/include/osmocom/hnbap/HNBAP_UE-Identity.h b/include/osmocom/hnbap/HNBAP_UE-Identity.h index ed2f3e0..8e63603 100644 --- a/include/osmocom/hnbap/HNBAP_UE-Identity.h +++ b/include/osmocom/hnbap/HNBAP_UE-Identity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UE_Identity_H_ diff --git a/include/osmocom/hnbap/HNBAP_UEDe-Register.h b/include/osmocom/hnbap/HNBAP_UEDe-Register.h index d67a461..5a0e298 100644 --- a/include/osmocom/hnbap/HNBAP_UEDe-Register.h +++ b/include/osmocom/hnbap/HNBAP_UEDe-Register.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UEDe_Register_H_ diff --git a/include/osmocom/hnbap/HNBAP_UERegisterAccept.h b/include/osmocom/hnbap/HNBAP_UERegisterAccept.h index bc7f077..8d2bec1 100644 --- a/include/osmocom/hnbap/HNBAP_UERegisterAccept.h +++ b/include/osmocom/hnbap/HNBAP_UERegisterAccept.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UERegisterAccept_H_ diff --git a/include/osmocom/hnbap/HNBAP_UERegisterReject.h b/include/osmocom/hnbap/HNBAP_UERegisterReject.h index 3c5e8ed..c30ffbe 100644 --- a/include/osmocom/hnbap/HNBAP_UERegisterReject.h +++ b/include/osmocom/hnbap/HNBAP_UERegisterReject.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UERegisterReject_H_ diff --git a/include/osmocom/hnbap/HNBAP_UERegisterRequest.h b/include/osmocom/hnbap/HNBAP_UERegisterRequest.h index 4f5ecc5..46778c8 100644 --- a/include/osmocom/hnbap/HNBAP_UERegisterRequest.h +++ b/include/osmocom/hnbap/HNBAP_UERegisterRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UERegisterRequest_H_ diff --git a/include/osmocom/hnbap/HNBAP_URAIdentity.h b/include/osmocom/hnbap/HNBAP_URAIdentity.h index c3514ab..6d4d582 100644 --- a/include/osmocom/hnbap/HNBAP_URAIdentity.h +++ b/include/osmocom/hnbap/HNBAP_URAIdentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_URAIdentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_URAIdentityList.h b/include/osmocom/hnbap/HNBAP_URAIdentityList.h index 3f4732a..b676efa 100644 --- a/include/osmocom/hnbap/HNBAP_URAIdentityList.h +++ b/include/osmocom/hnbap/HNBAP_URAIdentityList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_URAIdentityList_H_ diff --git a/include/osmocom/hnbap/HNBAP_UTRANCellID.h b/include/osmocom/hnbap/HNBAP_UTRANCellID.h index a75e4b5..d5105b3 100644 --- a/include/osmocom/hnbap/HNBAP_UTRANCellID.h +++ b/include/osmocom/hnbap/HNBAP_UTRANCellID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UTRANCellID_H_ diff --git a/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h b/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h index 89d7533..9f285f9 100644 --- a/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h +++ b/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UnknownU_RNTIIndication_H_ diff --git a/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h b/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h index ee74b17..b3d2a7e 100644 --- a/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h +++ b/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_UnsuccessfulOutcome_H_ diff --git a/include/osmocom/hnbap/HNBAP_Update-cause.h b/include/osmocom/hnbap/HNBAP_Update-cause.h index 0f8141d..601a34e 100644 --- a/include/osmocom/hnbap/HNBAP_Update-cause.h +++ b/include/osmocom/hnbap/HNBAP_Update-cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #ifndef _HNBAP_Update_cause_H_ diff --git a/src/hnbap/HNBAP_Access-stratum-release-indicator.c b/src/hnbap/HNBAP_Access-stratum-release-indicator.c index b94711d..fec27b8 100644 --- a/src/hnbap/HNBAP_Access-stratum-release-indicator.c +++ b/src/hnbap/HNBAP_Access-stratum-release-indicator.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_AccessResult.c b/src/hnbap/HNBAP_AccessResult.c index a8e7ee6..ef2d6db 100644 --- a/src/hnbap/HNBAP_AccessResult.c +++ b/src/hnbap/HNBAP_AccessResult.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c b/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c index 229f6e8..d19a303 100644 --- a/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c +++ b/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_AltitudeAndDirection.c b/src/hnbap/HNBAP_AltitudeAndDirection.c index 9b5558a..9995f74 100644 --- a/src/hnbap/HNBAP_AltitudeAndDirection.c +++ b/src/hnbap/HNBAP_AltitudeAndDirection.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_BackoffTimer.c b/src/hnbap/HNBAP_BackoffTimer.c index 059b2e5..097ce18 100644 --- a/src/hnbap/HNBAP_BackoffTimer.c +++ b/src/hnbap/HNBAP_BackoffTimer.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_BindingID.c b/src/hnbap/HNBAP_BindingID.c index 3635f35..105a6f8 100644 --- a/src/hnbap/HNBAP_BindingID.c +++ b/src/hnbap/HNBAP_BindingID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c b/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c index 96d5f30..a25797b 100644 --- a/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c +++ b/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CGI.c b/src/hnbap/HNBAP_CGI.c index 06b3732..fbf96b6 100644 --- a/src/hnbap/HNBAP_CGI.c +++ b/src/hnbap/HNBAP_CGI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CI.c b/src/hnbap/HNBAP_CI.c index 4143b8b..c4d20ea 100644 --- a/src/hnbap/HNBAP_CI.c +++ b/src/hnbap/HNBAP_CI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CN-DomainIndicator.c b/src/hnbap/HNBAP_CN-DomainIndicator.c index 3d556a2..158957d 100644 --- a/src/hnbap/HNBAP_CN-DomainIndicator.c +++ b/src/hnbap/HNBAP_CN-DomainIndicator.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CSG-Capability.c b/src/hnbap/HNBAP_CSG-Capability.c index 1e8548e..5bf3426 100644 --- a/src/hnbap/HNBAP_CSG-Capability.c +++ b/src/hnbap/HNBAP_CSG-Capability.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CSG-ID.c b/src/hnbap/HNBAP_CSG-ID.c index 7cbc3da..2000f51 100644 --- a/src/hnbap/HNBAP_CSG-ID.c +++ b/src/hnbap/HNBAP_CSG-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CSGMembershipStatus.c b/src/hnbap/HNBAP_CSGMembershipStatus.c index fc8132c..b49e7a8 100644 --- a/src/hnbap/HNBAP_CSGMembershipStatus.c +++ b/src/hnbap/HNBAP_CSGMembershipStatus.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CSGMembershipUpdate.c b/src/hnbap/HNBAP_CSGMembershipUpdate.c index 76dbeb4..1febe4f 100644 --- a/src/hnbap/HNBAP_CSGMembershipUpdate.c +++ b/src/hnbap/HNBAP_CSGMembershipUpdate.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Cause.c b/src/hnbap/HNBAP_Cause.c index 3e24ed6..e0db859 100644 --- a/src/hnbap/HNBAP_Cause.c +++ b/src/hnbap/HNBAP_Cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CauseMisc.c b/src/hnbap/HNBAP_CauseMisc.c index 08fd61d..a3c5752 100644 --- a/src/hnbap/HNBAP_CauseMisc.c +++ b/src/hnbap/HNBAP_CauseMisc.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CauseProtocol.c b/src/hnbap/HNBAP_CauseProtocol.c index 61e3a68..8893481 100644 --- a/src/hnbap/HNBAP_CauseProtocol.c +++ b/src/hnbap/HNBAP_CauseProtocol.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CauseRadioNetwork.c b/src/hnbap/HNBAP_CauseRadioNetwork.c index c12376b..2418a72 100644 --- a/src/hnbap/HNBAP_CauseRadioNetwork.c +++ b/src/hnbap/HNBAP_CauseRadioNetwork.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CauseTransport.c b/src/hnbap/HNBAP_CauseTransport.c index 0f14b33..6c37c66 100644 --- a/src/hnbap/HNBAP_CauseTransport.c +++ b/src/hnbap/HNBAP_CauseTransport.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CellIdentity.c b/src/hnbap/HNBAP_CellIdentity.c index 17f2f9d..3465697 100644 --- a/src/hnbap/HNBAP_CellIdentity.c +++ b/src/hnbap/HNBAP_CellIdentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_ConfigurationInformation.c b/src/hnbap/HNBAP_ConfigurationInformation.c index a8c9f71..6cf24b1 100644 --- a/src/hnbap/HNBAP_ConfigurationInformation.c +++ b/src/hnbap/HNBAP_ConfigurationInformation.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Context-ID.c b/src/hnbap/HNBAP_Context-ID.c index 8611b05..4d2a2b9 100644 --- a/src/hnbap/HNBAP_Context-ID.c +++ b/src/hnbap/HNBAP_Context-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Criticality.c b/src/hnbap/HNBAP_Criticality.c index 2c58963..de6fe43 100644 --- a/src/hnbap/HNBAP_Criticality.c +++ b/src/hnbap/HNBAP_Criticality.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c b/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c index 0c5be8c..f5aff57 100644 --- a/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c +++ b/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_CriticalityDiagnostics.c b/src/hnbap/HNBAP_CriticalityDiagnostics.c index a243ce4..5760e92 100644 --- a/src/hnbap/HNBAP_CriticalityDiagnostics.c +++ b/src/hnbap/HNBAP_CriticalityDiagnostics.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_ESN.c b/src/hnbap/HNBAP_ESN.c index c08c2af..d17f2ca 100644 --- a/src/hnbap/HNBAP_ESN.c +++ b/src/hnbap/HNBAP_ESN.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_ErrorIndication.c b/src/hnbap/HNBAP_ErrorIndication.c index dc70c9b..4babda2 100644 --- a/src/hnbap/HNBAP_ErrorIndication.c +++ b/src/hnbap/HNBAP_ErrorIndication.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_GTP-TEI.c b/src/hnbap/HNBAP_GTP-TEI.c index f8a08be..7d4b292 100644 --- a/src/hnbap/HNBAP_GTP-TEI.c +++ b/src/hnbap/HNBAP_GTP-TEI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_GeographicalCoordinates.c b/src/hnbap/HNBAP_GeographicalCoordinates.c index 1176be9..9607ebf 100644 --- a/src/hnbap/HNBAP_GeographicalCoordinates.c +++ b/src/hnbap/HNBAP_GeographicalCoordinates.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_GeographicalLocation.c b/src/hnbap/HNBAP_GeographicalLocation.c index bf002c0..6daa15a 100644 --- a/src/hnbap/HNBAP_GeographicalLocation.c +++ b/src/hnbap/HNBAP_GeographicalLocation.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c b/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c index adeef7d..5154bdf 100644 --- a/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c +++ b/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNB-Cell-Identifier.c b/src/hnbap/HNBAP_HNB-Cell-Identifier.c index e4e4ec1..cf2b620 100644 --- a/src/hnbap/HNBAP_HNB-Cell-Identifier.c +++ b/src/hnbap/HNBAP_HNB-Cell-Identifier.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNB-GWResponse.c b/src/hnbap/HNBAP_HNB-GWResponse.c index 84cf113..e48cada 100644 --- a/src/hnbap/HNBAP_HNB-GWResponse.c +++ b/src/hnbap/HNBAP_HNB-GWResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNB-Identity-Info.c b/src/hnbap/HNBAP_HNB-Identity-Info.c index 1adedba..1ac5789 100644 --- a/src/hnbap/HNBAP_HNB-Identity-Info.c +++ b/src/hnbap/HNBAP_HNB-Identity-Info.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNB-Identity.c b/src/hnbap/HNBAP_HNB-Identity.c index 6b59f7e..217b714 100644 --- a/src/hnbap/HNBAP_HNB-Identity.c +++ b/src/hnbap/HNBAP_HNB-Identity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNB-Location-Information.c b/src/hnbap/HNBAP_HNB-Location-Information.c index 42cee00..178ac0f 100644 --- a/src/hnbap/HNBAP_HNB-Location-Information.c +++ b/src/hnbap/HNBAP_HNB-Location-Information.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNB-RNL-Identity.c b/src/hnbap/HNBAP_HNB-RNL-Identity.c index 5c4cfb3..09d3c52 100644 --- a/src/hnbap/HNBAP_HNB-RNL-Identity.c +++ b/src/hnbap/HNBAP_HNB-RNL-Identity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBAP-PDU.c b/src/hnbap/HNBAP_HNBAP-PDU.c index c753d1c..2adb422 100644 --- a/src/hnbap/HNBAP_HNBAP-PDU.c +++ b/src/hnbap/HNBAP_HNBAP-PDU.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBCapacity.c b/src/hnbap/HNBAP_HNBCapacity.c index 617867c..3f9da47 100644 --- a/src/hnbap/HNBAP_HNBCapacity.c +++ b/src/hnbap/HNBAP_HNBCapacity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigInfo.c b/src/hnbap/HNBAP_HNBConfigInfo.c index 94b6cdf..402363d 100644 --- a/src/hnbap/HNBAP_HNBConfigInfo.c +++ b/src/hnbap/HNBAP_HNBConfigInfo.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigTransferRequest.c b/src/hnbap/HNBAP_HNBConfigTransferRequest.c index 7ed25d8..ff2b20f 100644 --- a/src/hnbap/HNBAP_HNBConfigTransferRequest.c +++ b/src/hnbap/HNBAP_HNBConfigTransferRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigTransferResponse.c b/src/hnbap/HNBAP_HNBConfigTransferResponse.c index ed63331..00e2d1f 100644 --- a/src/hnbap/HNBAP_HNBConfigTransferResponse.c +++ b/src/hnbap/HNBAP_HNBConfigTransferResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c b/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c index f189406..27e12fa 100644 --- a/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c +++ b/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c b/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c index 0af2a45..db68725 100644 --- a/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c +++ b/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * >From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBDe-Register.c b/src/hnbap/HNBAP_HNBDe-Register.c index a2ab5e8..d2ef818 100644 --- a/src/hnbap/HNBAP_HNBDe-Register.c +++ b/src/hnbap/HNBAP_HNBDe-Register.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBRegisterAccept.c b/src/hnbap/HNBAP_HNBRegisterAccept.c index d1d9c90..4b1afa0 100644 --- a/src/hnbap/HNBAP_HNBRegisterAccept.c +++ b/src/hnbap/HNBAP_HNBRegisterAccept.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBRegisterReject.c b/src/hnbap/HNBAP_HNBRegisterReject.c index 3a6a9da..ecab1d1 100644 --- a/src/hnbap/HNBAP_HNBRegisterReject.c +++ b/src/hnbap/HNBAP_HNBRegisterReject.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_HNBRegisterRequest.c b/src/hnbap/HNBAP_HNBRegisterRequest.c index 076aca5..3bf2278 100644 --- a/src/hnbap/HNBAP_HNBRegisterRequest.c +++ b/src/hnbap/HNBAP_HNBRegisterRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_IE-Extensions.c b/src/hnbap/HNBAP_IE-Extensions.c index a619037..603b933 100644 --- a/src/hnbap/HNBAP_IE-Extensions.c +++ b/src/hnbap/HNBAP_IE-Extensions.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_IE.c b/src/hnbap/HNBAP_IE.c index ce153c7..c57f924 100644 --- a/src/hnbap/HNBAP_IE.c +++ b/src/hnbap/HNBAP_IE.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_IMEI.c b/src/hnbap/HNBAP_IMEI.c index 0a513e5..b3c4406 100644 --- a/src/hnbap/HNBAP_IMEI.c +++ b/src/hnbap/HNBAP_IMEI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_IMSI.c b/src/hnbap/HNBAP_IMSI.c index 58421b8..9a3c757 100644 --- a/src/hnbap/HNBAP_IMSI.c +++ b/src/hnbap/HNBAP_IMSI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_IMSIDS41.c b/src/hnbap/HNBAP_IMSIDS41.c index 4171f72..10a7807 100644 --- a/src/hnbap/HNBAP_IMSIDS41.c +++ b/src/hnbap/HNBAP_IMSIDS41.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_IMSIESN.c b/src/hnbap/HNBAP_IMSIESN.c index a2379a8..1b9d9a6 100644 --- a/src/hnbap/HNBAP_IMSIESN.c +++ b/src/hnbap/HNBAP_IMSIESN.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_IP-Address.c b/src/hnbap/HNBAP_IP-Address.c index 8d86f45..6bc9d7f 100644 --- a/src/hnbap/HNBAP_IP-Address.c +++ b/src/hnbap/HNBAP_IP-Address.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_InitiatingMessage.c b/src/hnbap/HNBAP_InitiatingMessage.c index afea0ce..1b87f7d 100644 --- a/src/hnbap/HNBAP_InitiatingMessage.c +++ b/src/hnbap/HNBAP_InitiatingMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Ipv4Address.c b/src/hnbap/HNBAP_Ipv4Address.c index 78492db..f325ead 100644 --- a/src/hnbap/HNBAP_Ipv4Address.c +++ b/src/hnbap/HNBAP_Ipv4Address.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Ipv6Address.c b/src/hnbap/HNBAP_Ipv6Address.c index 9f0e34b..b0c9176 100644 --- a/src/hnbap/HNBAP_Ipv6Address.c +++ b/src/hnbap/HNBAP_Ipv6Address.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c b/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c index b618d52..79b4dad 100644 --- a/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c +++ b/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_LAC.c b/src/hnbap/HNBAP_LAC.c index 5e1229e..8f3d9f5 100644 --- a/src/hnbap/HNBAP_LAC.c +++ b/src/hnbap/HNBAP_LAC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_LAI.c b/src/hnbap/HNBAP_LAI.c index 2be18c8..bcfddde 100644 --- a/src/hnbap/HNBAP_LAI.c +++ b/src/hnbap/HNBAP_LAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_MacroCellID.c b/src/hnbap/HNBAP_MacroCellID.c index 1ede6cf..568e56a 100644 --- a/src/hnbap/HNBAP_MacroCellID.c +++ b/src/hnbap/HNBAP_MacroCellID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_MacroCoverageInformation.c b/src/hnbap/HNBAP_MacroCoverageInformation.c index e397ce5..83ae67b 100644 --- a/src/hnbap/HNBAP_MacroCoverageInformation.c +++ b/src/hnbap/HNBAP_MacroCoverageInformation.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_MuxPortNumber.c b/src/hnbap/HNBAP_MuxPortNumber.c index 6de4326..4c7ca42 100644 --- a/src/hnbap/HNBAP_MuxPortNumber.c +++ b/src/hnbap/HNBAP_MuxPortNumber.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_NeighbourCellIdentityList.c b/src/hnbap/HNBAP_NeighbourCellIdentityList.c index 5823068..e0f912c 100644 --- a/src/hnbap/HNBAP_NeighbourCellIdentityList.c +++ b/src/hnbap/HNBAP_NeighbourCellIdentityList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_NeighbourIdentity.c b/src/hnbap/HNBAP_NeighbourIdentity.c index 6a7b9f1..2e69f01 100644 --- a/src/hnbap/HNBAP_NeighbourIdentity.c +++ b/src/hnbap/HNBAP_NeighbourIdentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_NeighbourInfoList.c b/src/hnbap/HNBAP_NeighbourInfoList.c index 2646b0a..458a142 100644 --- a/src/hnbap/HNBAP_NeighbourInfoList.c +++ b/src/hnbap/HNBAP_NeighbourInfoList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_NeighbourInfoRequestItem.c b/src/hnbap/HNBAP_NeighbourInfoRequestItem.c index 3e7f416..42cd579 100644 --- a/src/hnbap/HNBAP_NeighbourInfoRequestItem.c +++ b/src/hnbap/HNBAP_NeighbourInfoRequestItem.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_NeighbourInfoRequestList.c b/src/hnbap/HNBAP_NeighbourInfoRequestList.c index 6a45cb3..738d5c2 100644 --- a/src/hnbap/HNBAP_NeighbourInfoRequestList.c +++ b/src/hnbap/HNBAP_NeighbourInfoRequestList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_PLMNidentity.c b/src/hnbap/HNBAP_PLMNidentity.c index 90c9095..cb6879b 100644 --- a/src/hnbap/HNBAP_PLMNidentity.c +++ b/src/hnbap/HNBAP_PLMNidentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_PSC.c b/src/hnbap/HNBAP_PSC.c index 1147efb..b696fc0 100644 --- a/src/hnbap/HNBAP_PSC.c +++ b/src/hnbap/HNBAP_PSC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_PTMSI.c b/src/hnbap/HNBAP_PTMSI.c index 273f421..23976ef 100644 --- a/src/hnbap/HNBAP_PTMSI.c +++ b/src/hnbap/HNBAP_PTMSI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_PTMSIRAI.c b/src/hnbap/HNBAP_PTMSIRAI.c index 422225a..dc17dd3 100644 --- a/src/hnbap/HNBAP_PTMSIRAI.c +++ b/src/hnbap/HNBAP_PTMSIRAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Presence.c b/src/hnbap/HNBAP_Presence.c index 550df56..a6e7286 100644 --- a/src/hnbap/HNBAP_Presence.c +++ b/src/hnbap/HNBAP_Presence.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_PrivateIE-ID.c b/src/hnbap/HNBAP_PrivateIE-ID.c index 0df265a..3bf3000 100644 --- a/src/hnbap/HNBAP_PrivateIE-ID.c +++ b/src/hnbap/HNBAP_PrivateIE-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_PrivateMessage.c b/src/hnbap/HNBAP_PrivateMessage.c index 6cc1ace..ebac795 100644 --- a/src/hnbap/HNBAP_PrivateMessage.c +++ b/src/hnbap/HNBAP_PrivateMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_ProcedureCode.c b/src/hnbap/HNBAP_ProcedureCode.c index ff34f8d..c32e9fb 100644 --- a/src/hnbap/HNBAP_ProcedureCode.c +++ b/src/hnbap/HNBAP_ProcedureCode.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_ProtocolIE-ID.c b/src/hnbap/HNBAP_ProtocolIE-ID.c index 2df4268..f4fc953 100644 --- a/src/hnbap/HNBAP_ProtocolIE-ID.c +++ b/src/hnbap/HNBAP_ProtocolIE-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_RAB-ID.c b/src/hnbap/HNBAP_RAB-ID.c index f9f1f3a..4dea280 100644 --- a/src/hnbap/HNBAP_RAB-ID.c +++ b/src/hnbap/HNBAP_RAB-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_RABList.c b/src/hnbap/HNBAP_RABList.c index 7a94a2d..fe478e2 100644 --- a/src/hnbap/HNBAP_RABList.c +++ b/src/hnbap/HNBAP_RABList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_RABListItem.c b/src/hnbap/HNBAP_RABListItem.c index 280fd8c..4fcf4aa 100644 --- a/src/hnbap/HNBAP_RABListItem.c +++ b/src/hnbap/HNBAP_RABListItem.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_RAC.c b/src/hnbap/HNBAP_RAC.c index d1b9947..6a6235c 100644 --- a/src/hnbap/HNBAP_RAC.c +++ b/src/hnbap/HNBAP_RAC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_RAI.c b/src/hnbap/HNBAP_RAI.c index 9f35417..c6bca5b 100644 --- a/src/hnbap/HNBAP_RAI.c +++ b/src/hnbap/HNBAP_RAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * >From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_RNC-ID.c b/src/hnbap/HNBAP_RNC-ID.c index 323944d..57da025 100644 --- a/src/hnbap/HNBAP_RNC-ID.c +++ b/src/hnbap/HNBAP_RNC-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Registration-Cause.c b/src/hnbap/HNBAP_Registration-Cause.c index 6d54bb2..8047241 100644 --- a/src/hnbap/HNBAP_Registration-Cause.c +++ b/src/hnbap/HNBAP_Registration-Cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_RelocationComplete.c b/src/hnbap/HNBAP_RelocationComplete.c index 33136bd..b939e69 100644 --- a/src/hnbap/HNBAP_RelocationComplete.c +++ b/src/hnbap/HNBAP_RelocationComplete.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_S-RNTIPrefix.c b/src/hnbap/HNBAP_S-RNTIPrefix.c index 1170eec..3d5394c 100644 --- a/src/hnbap/HNBAP_S-RNTIPrefix.c +++ b/src/hnbap/HNBAP_S-RNTIPrefix.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_SAC.c b/src/hnbap/HNBAP_SAC.c index ba4e4a9..6c2a1e2 100644 --- a/src/hnbap/HNBAP_SAC.c +++ b/src/hnbap/HNBAP_SAC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_SuccessfulOutcome.c b/src/hnbap/HNBAP_SuccessfulOutcome.c index ff6c35e..5adb2ab 100644 --- a/src/hnbap/HNBAP_SuccessfulOutcome.c +++ b/src/hnbap/HNBAP_SuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TMSIDS41.c b/src/hnbap/HNBAP_TMSIDS41.c index f78bd85..0f2e295 100644 --- a/src/hnbap/HNBAP_TMSIDS41.c +++ b/src/hnbap/HNBAP_TMSIDS41.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TMSILAI.c b/src/hnbap/HNBAP_TMSILAI.c index cd52d58..2fe80eb 100644 --- a/src/hnbap/HNBAP_TMSILAI.c +++ b/src/hnbap/HNBAP_TMSILAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TNLUpdateFailure.c b/src/hnbap/HNBAP_TNLUpdateFailure.c index b344711..0f01084 100644 --- a/src/hnbap/HNBAP_TNLUpdateFailure.c +++ b/src/hnbap/HNBAP_TNLUpdateFailure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TNLUpdateRequest.c b/src/hnbap/HNBAP_TNLUpdateRequest.c index 7ba5125..bdf5c00 100644 --- a/src/hnbap/HNBAP_TNLUpdateRequest.c +++ b/src/hnbap/HNBAP_TNLUpdateRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TNLUpdateResponse.c b/src/hnbap/HNBAP_TNLUpdateResponse.c index 41c26a8..8876313 100644 --- a/src/hnbap/HNBAP_TNLUpdateResponse.c +++ b/src/hnbap/HNBAP_TNLUpdateResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TransportInfo.c b/src/hnbap/HNBAP_TransportInfo.c index aeaf033..9e0f7a3 100644 --- a/src/hnbap/HNBAP_TransportInfo.c +++ b/src/hnbap/HNBAP_TransportInfo.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TransportLayerAddress.c b/src/hnbap/HNBAP_TransportLayerAddress.c index 27c7e92..9cc085f 100644 --- a/src/hnbap/HNBAP_TransportLayerAddress.c +++ b/src/hnbap/HNBAP_TransportLayerAddress.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TriggeringMessage.c b/src/hnbap/HNBAP_TriggeringMessage.c index 590b5d5..4485222 100644 --- a/src/hnbap/HNBAP_TriggeringMessage.c +++ b/src/hnbap/HNBAP_TriggeringMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Tunnel-Information.c b/src/hnbap/HNBAP_Tunnel-Information.c index 6c0d0ac..db3387e 100644 --- a/src/hnbap/HNBAP_Tunnel-Information.c +++ b/src/hnbap/HNBAP_Tunnel-Information.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_TypeOfError.c b/src/hnbap/HNBAP_TypeOfError.c index 3adc3c9..2d894f6 100644 --- a/src/hnbap/HNBAP_TypeOfError.c +++ b/src/hnbap/HNBAP_TypeOfError.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_U-RNTI.c b/src/hnbap/HNBAP_U-RNTI.c index 1b02864..438c32a 100644 --- a/src/hnbap/HNBAP_U-RNTI.c +++ b/src/hnbap/HNBAP_U-RNTI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_U-RNTIQueryRequest.c b/src/hnbap/HNBAP_U-RNTIQueryRequest.c index 8e2950c..f10d278 100644 --- a/src/hnbap/HNBAP_U-RNTIQueryRequest.c +++ b/src/hnbap/HNBAP_U-RNTIQueryRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_U-RNTIQueryResponse.c b/src/hnbap/HNBAP_U-RNTIQueryResponse.c index 6f34bcf..eda66b0 100644 --- a/src/hnbap/HNBAP_U-RNTIQueryResponse.c +++ b/src/hnbap/HNBAP_U-RNTIQueryResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UDP-Port-Number.c b/src/hnbap/HNBAP_UDP-Port-Number.c index 447f571..6a5ddb7 100644 --- a/src/hnbap/HNBAP_UDP-Port-Number.c +++ b/src/hnbap/HNBAP_UDP-Port-Number.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UE-Capabilities.c b/src/hnbap/HNBAP_UE-Capabilities.c index 1888d0e..903df3e 100644 --- a/src/hnbap/HNBAP_UE-Capabilities.c +++ b/src/hnbap/HNBAP_UE-Capabilities.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UE-Identity.c b/src/hnbap/HNBAP_UE-Identity.c index 4dfc5a9..8a820cc 100644 --- a/src/hnbap/HNBAP_UE-Identity.c +++ b/src/hnbap/HNBAP_UE-Identity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UEDe-Register.c b/src/hnbap/HNBAP_UEDe-Register.c index 80f6658..2e5d3ed 100644 --- a/src/hnbap/HNBAP_UEDe-Register.c +++ b/src/hnbap/HNBAP_UEDe-Register.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UERegisterAccept.c b/src/hnbap/HNBAP_UERegisterAccept.c index 898613f..02f5d5b 100644 --- a/src/hnbap/HNBAP_UERegisterAccept.c +++ b/src/hnbap/HNBAP_UERegisterAccept.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UERegisterReject.c b/src/hnbap/HNBAP_UERegisterReject.c index 39bd391..aab3e7f 100644 --- a/src/hnbap/HNBAP_UERegisterReject.c +++ b/src/hnbap/HNBAP_UERegisterReject.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UERegisterRequest.c b/src/hnbap/HNBAP_UERegisterRequest.c index 467978f..af2c267 100644 --- a/src/hnbap/HNBAP_UERegisterRequest.c +++ b/src/hnbap/HNBAP_UERegisterRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_URAIdentity.c b/src/hnbap/HNBAP_URAIdentity.c index aba49d8..4f9bff7 100644 --- a/src/hnbap/HNBAP_URAIdentity.c +++ b/src/hnbap/HNBAP_URAIdentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_URAIdentityList.c b/src/hnbap/HNBAP_URAIdentityList.c index cbc80bc..4530743 100644 --- a/src/hnbap/HNBAP_URAIdentityList.c +++ b/src/hnbap/HNBAP_URAIdentityList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UTRANCellID.c b/src/hnbap/HNBAP_UTRANCellID.c index a1c4237..28d69fe 100644 --- a/src/hnbap/HNBAP_UTRANCellID.c +++ b/src/hnbap/HNBAP_UTRANCellID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UnknownU-RNTIIndication.c b/src/hnbap/HNBAP_UnknownU-RNTIIndication.c index 9d82698..188dcbf 100644 --- a/src/hnbap/HNBAP_UnknownU-RNTIIndication.c +++ b/src/hnbap/HNBAP_UnknownU-RNTIIndication.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_UnsuccessfulOutcome.c b/src/hnbap/HNBAP_UnsuccessfulOutcome.c index 1fd4503..4b83dda 100644 --- a/src/hnbap/HNBAP_UnsuccessfulOutcome.c +++ b/src/hnbap/HNBAP_UnsuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/HNBAP_Update-cause.c b/src/hnbap/HNBAP_Update-cause.c index c1c5868..105e3b6 100644 --- a/src/hnbap/HNBAP_Update-cause.c +++ b/src/hnbap/HNBAP_Update-cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R -gen-PER` + * `asn1c -R` */ #include diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am index fc862d7..53dd609 100644 --- a/src/hnbap/Makefile.am +++ b/src/hnbap/Makefile.am @@ -243,7 +243,7 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - ASN1C_PREFIX="HNBAP_" asn1c -R -gen-PER -fnative-types $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn + ASN1C_PREFIX="HNBAP_" asn1c -R -gen-PER $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/hnbap $(ASN_MODULE_INC) # Finally copy *.c from buildir to srcdir: -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25986 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iccf81539a5045416185e619d24c3d542204437e6 Gerrit-Change-Number: 25986 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 15:53:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 15:53:57 +0000 Subject: Change in osmo-bsc[master]: bsc_subscr_conn_fsm: fix mgw-pool ref counting In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26011 ) Change subject: bsc_subscr_conn_fsm: fix mgw-pool ref counting ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/26011/1/src/osmo-bsc/bsc_subscr_conn_fsm.c File src/osmo-bsc/bsc_subscr_conn_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/26011/1/src/osmo-bsc/bsc_subscr_conn_fsm.c at 961 PS1, Line 961: mgcp_client = osmo_mgcpc_ep_client(conn->user_plane.mgw_endpoint); Could it be that conn->user_plane.mgw_endpoint or mgcp_client is NULL here? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5a7ce6a1880a1060df74d03dd4eb38b51fd85c69 Gerrit-Change-Number: 26011 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 15:53:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 16:11:57 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 28 Oct 2021 16:11:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: set band in f_TC_fh_params_set In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 to look at the new patch set (#3). Change subject: BSC_Tests: set band in f_TC_fh_params_set ...................................................................... BSC_Tests: set band in f_TC_fh_params_set The function f_TC_fh_params_set sets frequency hopping parameters. The ARFCN is also part of those parameters. However, this function does not set the respective band for the ARFCN that it configurs. This results in an invalid setting at the BSC that might cause unexpected behavior. Lets make sure we configure the band parameter correctly before setting the ARFCN Change-Id: I447e4145c68c62b11b818e28f0081c19e9107647 Related: SYS#5369 --- M bsc/BSC_Tests.ttcn 1 file changed, 39 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/28/25828/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I447e4145c68c62b11b818e28f0081c19e9107647 Gerrit-Change-Number: 25828 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 16:13:43 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 28 Oct 2021 16:13:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: set band in f_TC_fh_params_set In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 ) Change subject: BSC_Tests: set band in f_TC_fh_params_set ...................................................................... Patch Set 2: (3 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828/2/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828/2/bsc/BSC_Tests.ttcn at 8498 PS2, Line 8498: f_TC_set_band_by_arfcn > Also, I believe library/ would be a better place for this function. We have the band setting only in osmo-bsc. This is very osmo-bsc specific. It should be kept here. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828/2/bsc/BSC_Tests.ttcn at 8502 PS2, Line 8502: if (arfcn.arfcn >= 259 and arfcn.arfcn <= 293) { > Yep, you could use 'select' here: [?] Done https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828/2/bsc/BSC_Tests.ttcn at 8524 PS2, Line 8524: f_vty_transceive(BSCVTY, "exit"); > Just send 'end' command once instead of sending 'exit' three times. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I447e4145c68c62b11b818e28f0081c19e9107647 Gerrit-Change-Number: 25828 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 16:13:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 16:23:03 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 28 Oct 2021 16:23:03 +0000 Subject: Change in osmo-sip-connector[master]: sip: fix memory leak (x_gcr) in send_invite() In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25978 ) Change subject: sip: fix memory leak (x_gcr) in send_invite() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6a2e5e15061010f6e62d0f3b0acd2c040dbe3249 Gerrit-Change-Number: 25978 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 16:23:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 16:31:38 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 28 Oct 2021 16:31:38 +0000 Subject: Change in osmo-hnodeb[master]: main.c: Drop commented out code In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25998 ) Change subject: main.c: Drop commented out code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ea1e3b8692cc6e162962d2e812eb1342c100251 Gerrit-Change-Number: 25998 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Comment-Date: Thu, 28 Oct 2021 16:31:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:23:00 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Thu, 28 Oct 2021 17:23:00 +0000 Subject: Change in osmo-bsc[master]: bsc_subscr_conn_fsm: fix mgw-pool ref counting In-Reply-To: References: Message-ID: dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26011 ) Change subject: bsc_subscr_conn_fsm: fix mgw-pool ref counting ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/26011/1/src/osmo-bsc/bsc_subscr_conn_fsm.c File src/osmo-bsc/bsc_subscr_conn_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/26011/1/src/osmo-bsc/bsc_subscr_conn_fsm.c at 961 PS1, Line 961: mgcp_client = osmo_mgcpc_ep_client(conn->user_plane.mgw_endpoint); > Could it be that conn->user_plane. [?] Yes, it can, but osmo_mgcpc_ep_client and mgcp_client_pool_put are NULL pointer safe. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5a7ce6a1880a1060df74d03dd4eb38b51fd85c69 Gerrit-Change-Number: 26011 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 17:23:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:26:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 17:26:03 +0000 Subject: Change in osmo-sip-connector[master]: sip: fix memory leak (x_gcr) in send_invite() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25978 ) Change subject: sip: fix memory leak (x_gcr) in send_invite() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6a2e5e15061010f6e62d0f3b0acd2c040dbe3249 Gerrit-Change-Number: 25978 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 17:26:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:26:27 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 17:26:27 +0000 Subject: Change in osmo-sip-connector[master]: sip: use osmo_{enc, dec}_gcr() from libosmocore In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25979 ) Change subject: sip: use osmo_{enc,dec}_gcr() from libosmocore ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I46fa46fc79494d337f2f4657215b91c39207eea4 Gerrit-Change-Number: 25979 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 17:26:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:26:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 17:26:53 +0000 Subject: Change in osmo-sip-connector[master]: sip: fix memory leak (x_gcr) in send_invite() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25978 ) Change subject: sip: fix memory leak (x_gcr) in send_invite() ...................................................................... sip: fix memory leak (x_gcr) in send_invite() Change-Id: I6a2e5e15061010f6e62d0f3b0acd2c040dbe3249 Fixes: Id40d7e0fed9356f801b3627c118150055e7232b1 Related: OS#5164 --- M src/sip.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/sip.c b/src/sip.c index 684ef74..0e88716 100644 --- a/src/sip.c +++ b/src/sip.c @@ -692,6 +692,7 @@ talloc_free(from); talloc_free(to); talloc_free(sdp); + talloc_free(x_gcr); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I6a2e5e15061010f6e62d0f3b0acd2c040dbe3249 Gerrit-Change-Number: 25978 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:26:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 17:26:53 +0000 Subject: Change in osmo-sip-connector[master]: sip: use osmo_{enc, dec}_gcr() from libosmocore In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/25979 ) Change subject: sip: use osmo_{enc,dec}_gcr() from libosmocore ...................................................................... sip: use osmo_{enc,dec}_gcr() from libosmocore Change-Id: I46fa46fc79494d337f2f4657215b91c39207eea4 Depends: I06babb959fdc82f4e82d92260131d60c98b0abd2 Fixes: Id40d7e0fed9356f801b3627c118150055e7232b1 Related: OS#5164 --- M src/call.h M src/mncc.c M src/sip.c 3 files changed, 34 insertions(+), 63 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/call.h b/src/call.h index 8360711..a835f71 100644 --- a/src/call.h +++ b/src/call.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -31,7 +32,10 @@ const char *source; const char *dest; + + /* Global Call Reference */ struct osmo_gcr_parsed gcr; + bool gcr_present; }; enum { diff --git a/src/mncc.c b/src/mncc.c index fc99400..c8bf4bd 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -544,6 +544,7 @@ leg->state = MNCC_CC_INITIAL; leg->dir = MNCC_DIR_MO; leg->base.call->gcr = data->gcr; + leg->base.call->gcr_present = true; memcpy(&leg->called, called, sizeof(leg->called)); memcpy(&leg->calling, &data->calling, sizeof(leg->calling)); memcpy(&leg->imsi, data->imsi, sizeof(leg->imsi)); @@ -899,7 +900,8 @@ mncc.fields |= MNCC_F_CALLING; mncc.calling.plan = GSM48_NPI_ISDN_E164; - mncc.gcr = call->gcr; + if (call->gcr_present) + mncc.gcr = call->gcr; if (call->source && call->source[0] == '+') { mncc.calling.type = GSM48_TON_INTERNATIONAL; diff --git a/src/sip.c b/src/sip.c index 0e88716..9124752 100644 --- a/src/sip.c +++ b/src/sip.c @@ -107,34 +107,6 @@ nua_ack(leg->nua_handle, TAG_END()); } -int _osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len) -{ - uint16_t parsed = 1; /* account for length byte right away */ - - if (len < 13) - return -EBADMSG; - - gcr->net_len = elem[0]; - if (gcr->net_len < 3 || gcr->net_len > 5) - return -EINVAL; - - memcpy(gcr->net, elem + parsed, gcr->net_len); - /* +1 for ignored Node ID length field */ - parsed += (gcr->net_len + 1); - - gcr->node = osmo_load16be(elem + parsed); - parsed += 2; - - if (elem[parsed] != 5) /* see Table B 2.1.9.2 */ - return -ENOENT; - - parsed++; - - memcpy(gcr->cr, elem + parsed, 5); - - return parsed + 5; -} - static void new_call(struct sip_agent *agent, nua_handle_t *nh, const sip_t *sip) { @@ -142,15 +114,16 @@ struct sip_call_leg *leg; const char *from = NULL, *to = NULL; char ip_addr[INET6_ADDRSTRLEN]; - uint8_t gcr_back[28] = { 0 }; - + bool xgcr_hdr_present = false; + uint8_t xgcr_hdr[28] = { 0 }; LOGP(DSIP, LOGL_INFO, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh); sip_unknown_t *unknown_header = sip->sip_unknown; while (unknown_header != NULL) { if (!strcmp("X-Global-Call-Ref", unknown_header->un_name)) { - osmo_hexparse(unknown_header->un_value, gcr_back, sizeof(gcr_back)); + osmo_hexparse(unknown_header->un_value, xgcr_hdr, sizeof(xgcr_hdr)); + xgcr_hdr_present = true; break; } unknown_header = unknown_header->un_next; @@ -171,7 +144,16 @@ return; } - _osmo_dec_gcr(&call->gcr, gcr_back, sizeof(gcr_back)); + /* Decode Decode the Global Call Reference (if present) */ + if (xgcr_hdr_present) { + if (osmo_dec_gcr(&call->gcr, xgcr_hdr, sizeof(xgcr_hdr)) < 0) { + LOGP(DSIP, LOGL_ERROR, "Failed to parse X-Global-Call-Ref.\n"); + nua_respond(nh, SIP_406_NOT_ACCEPTABLE, TAG_END()); + nua_handle_destroy(nh); + return; + } + call->gcr_present = true; + } if (sip->sip_to) to = sip->sip_to->a_url->url_user; @@ -632,38 +614,10 @@ leg->state = SIP_CC_CONNECTED; } -/*! Encode Global Call Reference. */ -uint8_t _osmo_enc_gcr(uint8_t *buf, const struct osmo_gcr_parsed *g) -{ - uint8_t tmp[2]; - - if (!g) - return 0; - - if (g->net_len < 3 || g->net_len > 5) - return 0; - - buf = lv_put(buf, g->net_len, g->net); - osmo_store16be(g->node, &tmp); - buf = lv_put(buf, 2, tmp); - buf = lv_put(buf, 5, g->cr); - - /* Length: LV(Net) + LV(Node) + LV(CRef) - see 3GPP TS ?3.2.2.115 */ - return (g->net_len + 1) + (2 + 1) + (5 + 1); -} - static int send_invite(struct sip_agent *agent, struct sip_call_leg *leg, const char *calling_num, const char *called_num) { struct call_leg *other = leg->base.call->initial; - char gcr_hex[30]; - uint8_t data[15]; - - gcr_hex[0] = '\0'; - data[0] = '\0'; - uint8_t len = _osmo_enc_gcr(data, &leg->base.call->gcr); - if (len) - osmo_strlcpy(gcr_hex, osmo_hexdump_nospc(data, len*2+1), len*2+1); char *from = talloc_asprintf(leg, "sip:%s@%s:%d", calling_num, @@ -675,7 +629,18 @@ agent->app->sip.remote_port); char *sdp = sdp_create_file(leg, other, sdp_sendrecv); - char *x_gcr = talloc_asprintf(leg, "X-Global-Call-Ref: %s", gcr_hex); + /* Encode the Global Call Reference (if present) */ + char *x_gcr = NULL; + + if (leg->base.call->gcr_present) { + struct msgb *msg = msgb_alloc(16, "SIP GCR"); + + if (msg != NULL && osmo_enc_gcr(msg, &leg->base.call->gcr) > 0) + x_gcr = talloc_asprintf(leg, "X-Global-Call-Ref: %s", msgb_hexdump(msg)); + else + LOGP(DSIP, LOGL_ERROR, "Failed to encode GCR for leg(%p)\n", leg); + msgb_free(msg); + } leg->state = SIP_CC_INITIAL; leg->dir = SIP_DIR_MT; @@ -684,7 +649,7 @@ SIPTAG_TO_STR(to), NUTAG_MEDIA_ENABLE(0), SIPTAG_CONTENT_TYPE_STR("application/sdp"), - SIPTAG_HEADER_STR(x_gcr), + TAG_IF(x_gcr, SIPTAG_HEADER_STR(x_gcr)), SIPTAG_PAYLOAD_STR(sdp), TAG_END()); -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/25979 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: I46fa46fc79494d337f2f4657215b91c39207eea4 Gerrit-Change-Number: 25979 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: keith Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:27:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Thu, 28 Oct 2021 17:27:57 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: set band in f_TC_fh_params_set In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 ) Change subject: BSC_Tests: set band in f_TC_fh_params_set ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I447e4145c68c62b11b818e28f0081c19e9107647 Gerrit-Change-Number: 25828 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 17:27:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:28:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 17:28:56 +0000 Subject: Change in osmo-hnodeb[master]: main.c: Fix cap in naming for vty_info.name References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26012 ) Change subject: main.c: Fix cap in naming for vty_info.name ...................................................................... main.c: Fix cap in naming for vty_info.name It was decided the program name is OsmoHNodeB, and we already use that one everywhere. Change-Id: I8ce83aa17ad7dd3ec991e4d7d9cca01dc1bf4681 --- M src/osmo-hnodeb/main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/12/26012/1 diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c index 9c7a548..b2ce276 100644 --- a/src/osmo-hnodeb/main.c +++ b/src/osmo-hnodeb/main.c @@ -50,7 +50,7 @@ struct hnb *g_hnb; static struct vty_app_info vty_info = { - .name = "OsmohNodeB", + .name = "OsmoHNodeB", .version = "0", }; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I8ce83aa17ad7dd3ec991e4d7d9cca01dc1bf4681 Gerrit-Change-Number: 26012 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:28:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 17:28:56 +0000 Subject: Change in osmo-hnodeb[master]: More work on main.c to add osmocom functionalitites References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013 ) Change subject: More work on main.c to add osmocom functionalitites ...................................................................... More work on main.c to add osmocom functionalitites Change-Id: I61a5ee2e100f79cef7e42dbd981e308597c30900 --- M src/osmo-hnodeb/main.c 1 file changed, 203 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/13/26013/1 diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c index b2ce276..3d1d228 100644 --- a/src/osmo-hnodeb/main.c +++ b/src/osmo-hnodeb/main.c @@ -37,6 +37,9 @@ #include #include #include +#include +#include +#include #include /* ranap_set_log_area() */ @@ -46,44 +49,189 @@ #include #include +static const char * const osmohnodeb_copyright = + "OsmoHNodeB - Osmocom 3G Home NodeB implementation\r\n" + "Copyright (C) 2021 by sysmocom s.f.m.c. GmbH \r\n" + "Contributions by Daniel Willmann, Pau Espin Pedrol\r\n\r\n" + "License AGPLv3+: GNU AGPL version 3 or later \r\n" + "This is free software: you are free to change and redistribute it.\r\n" + "There is NO WARRANTY, to the extent permitted by law.\r\n"; + void *tall_hnb_ctx; struct hnb *g_hnb; +static struct { + const char *database_name; + const char *config_file; + int daemonize; + const char *mncc_sock_path; +} hnb_cmdline_config = { + .database_name = NULL, + .config_file = "osmo-hnodeb.cfg", +}; + static struct vty_app_info vty_info = { .name = "OsmoHNodeB", - .version = "0", + .version = PACKAGE_VERSION, }; +static void print_usage() +{ + printf("Usage: osmo-hnodeb\n"); +} + +static void print_help() +{ + printf("Some useful options:\n"); + printf(" -h --help This text.\n"); + printf(" -d option --debug=DCC:DMM:DRR: Enable debugging.\n"); + printf(" -D --daemonize Fork the process into a background daemon.\n"); + printf(" -c --config-file filename The config file to use.\n"); + printf(" -s --disable-color\n"); + printf(" -T --timestamp Prefix every log line with a timestamp.\n"); + printf(" -V --version Print the version of OsmoMSC.\n"); + printf(" -e --log-level number Set a global loglevel.\n"); + + printf("\nVTY reference generation:\n"); + printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); + printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); +} + +static void handle_long_options(const char *prog_name, const int long_option) +{ + static int vty_ref_mode = VTY_REF_GEN_MODE_DEFAULT; + + switch (long_option) { + case 1: + vty_ref_mode = get_string_value(vty_ref_gen_mode_names, optarg); + if (vty_ref_mode < 0) { + fprintf(stderr, "%s: Unknown VTY reference generation " + "mode '%s'\n", prog_name, optarg); + exit(2); + } + break; + case 2: + fprintf(stderr, "Generating the VTY reference in mode '%s' (%s)\n", + get_value_string(vty_ref_gen_mode_names, vty_ref_mode), + get_value_string(vty_ref_gen_mode_desc, vty_ref_mode)); + vty_dump_xml_ref_mode(stdout, (enum vty_ref_gen_mode) vty_ref_mode); + exit(0); + default: + fprintf(stderr, "%s: error parsing cmdline options\n", prog_name); + exit(2); + } +} + static void handle_options(int argc, char **argv) { while (1) { int idx = 0, c; + static int long_option = 0; static const struct option long_options[] = { + {"help", 0, 0, 'h'}, + {"debug", 1, 0, 'd'}, + {"daemonize", 0, 0, 'D'}, + {"config-file", 1, 0, 'c'}, + {"disable-color", 0, 0, 's'}, + {"timestamp", 0, 0, 'T'}, + {"version", 0, 0, 'V' }, + {"log-level", 1, 0, 'e'}, + {"vty-ref-mode", 1, &long_option, 1}, + {"vty-ref-xml", 0, &long_option, 2}, { "ues", 1, 0, 'u' }, { "gw-addr", 1, 0, 'g' }, { 0, 0, 0, 0 }, }; - c = getopt_long(argc, argv, "u:g:", long_options, &idx); + c = getopt_long(argc, argv, "hd:Dc:sTVe:u:g:", long_options, &idx); if (c == -1) break; switch (c) { + case 'h': + print_usage(); + print_help(); + exit(0); + case 0: + handle_long_options(argv[0], long_option); + break; + case 'd': + log_parse_category_mask(osmo_stderr_target, optarg); + break; + case 'D': + hnb_cmdline_config.daemonize = 1; + break; + case 'c': + hnb_cmdline_config.config_file = optarg; + break; + case 's': + log_set_use_color(osmo_stderr_target, 0); + break; + case 'T': + log_set_print_timestamp(osmo_stderr_target, 1); + break; + case 'V': + print_version(1); + exit(0); + break; + case 'e': + log_set_log_level(osmo_stderr_target, atoi(optarg)); + break; case 'u': g_hnb->ues = atoi(optarg); break; case 'g': g_hnb->gw_addr = optarg; break; + default: + /* catch unknown options *as well as* missing arguments. */ + fprintf(stderr, "Error in command line options. Exiting.\n"); + exit(-1); } } } +static void signal_handler(int signum) +{ + fprintf(stdout, "signal %u received\n", signum); + + switch (signum) { + case SIGINT: + case SIGTERM: + /* If SIGTERM was already sent before, just terminate immediately. */ + if (osmo_select_shutdown_requested()) + exit(-1); + osmo_select_shutdown_request(); + break; + case SIGABRT: + /* in case of abort, we want to obtain a talloc report and + * then run default SIGABRT handler, who will generate coredump + * and abort the process. abort() should do this for us after we + * return, but program wouldn't exit if an external SIGABRT is + * received. + */ + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(tall_hnb_ctx, stderr); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); + break; + case SIGUSR1: + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(tall_hnb_ctx, stderr); + break; + default: + break; + } +} + int main(int argc, char **argv) { int rc; + /* Track the use of talloc NULL memory contexts */ + talloc_enable_null_tracking(); + tall_hnb_ctx = talloc_named_const(NULL, 0, "hnb_context"); msgb_talloc_ctx_init(tall_hnb_ctx, 0); @@ -95,36 +243,76 @@ ranap_set_log_area(DRANAP); - log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); - log_set_use_color(osmo_stderr_target, 0); - log_set_print_category(osmo_stderr_target, 0); - log_set_print_category_hex(osmo_stderr_target, 0); + vty_info.copyright = osmohnodeb_copyright; + vty_info.tall_ctx = tall_hnb_ctx; + vty_init(&vty_info); + logging_vty_add_cmds(); + osmo_talloc_vty_add_cmds(); + osmo_cpu_sched_vty_init(tall_hnb_ctx); g_hnb = hnb_alloc(tall_hnb_ctx); - - vty_init(&vty_info); hnb_vty_init(); - rc = telnet_init_dynif(NULL, NULL, vty_get_bind_addr(), 2324); + handle_options(argc, argv); + + + rc = vty_read_config_file(hnb_cmdline_config.config_file, NULL); + if (rc < 0) { + fprintf(stderr, "Failed to parse the config file: '%s'\n", + hnb_cmdline_config.config_file); + exit(1); + } + + rc = telnet_init_dynif(tall_hnb_ctx, g_hnb, vty_get_bind_addr(), OSMO_VTY_PORT_HNODEB); if (rc < 0) { perror("Error binding VTY port"); exit(1); } - handle_options(argc, argv); - rc = hnb_connect(g_hnb); if (rc < 0) { perror("Error connecting to Iuh port"); exit(1); } - while (1) { - rc = osmo_select_main(0); - if (rc < 0) - exit(3); + signal(SIGINT, &signal_handler); + signal(SIGTERM, &signal_handler); + signal(SIGABRT, &signal_handler); + signal(SIGUSR1, &signal_handler); + signal(SIGUSR2, &signal_handler); + osmo_init_ignore_signals(); + + if (hnb_cmdline_config.daemonize) { + rc = osmo_daemonize(); + if (rc < 0) { + perror("Error during daemonize"); + return 6; + } } + while (!osmo_select_shutdown_done()) { + osmo_select_main_ctx(0); + } + + log_fini(); + + /** + * Report the heap state of root context, then free, + * so both ASAN and Valgrind are happy... + */ + talloc_report_full(tall_hnb_ctx, stderr); + talloc_free(tall_hnb_ctx); + + /* FIXME: VTY code still uses NULL-context */ + talloc_free(tall_vty_ctx); + + /** + * Report the heap state of NULL context, then free, + * so both ASAN and Valgrind are happy... + */ + talloc_report_full(NULL, stderr); + talloc_disable_null_tracking(); + /* not reached */ exit(0); } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I61a5ee2e100f79cef7e42dbd981e308597c30900 Gerrit-Change-Number: 26013 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:28:56 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 17:28:56 +0000 Subject: Change in osmo-hnodeb[master]: Set up Iuh conn params through VTY References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26014 ) Change subject: Set up Iuh conn params through VTY ...................................................................... Set up Iuh conn params through VTY Change-Id: Id5a17742643e8f02c22228e3055bcc213423a416 --- M include/osmocom/hnodeb/hnodeb.h M include/osmocom/hnodeb/vty.h M src/osmo-hnodeb/hnb.c M src/osmo-hnodeb/main.c M src/osmo-hnodeb/vty.c 5 files changed, 146 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/14/26014/1 diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h index 50432d1..effd1b8 100644 --- a/include/osmocom/hnodeb/hnodeb.h +++ b/include/osmocom/hnodeb/hnodeb.h @@ -70,8 +70,12 @@ }; struct hnb { - const char *gw_addr; - uint16_t gw_port; + struct { + char *local_addr; + uint16_t local_port; + char *remote_addr; + uint16_t remote_port; + } iuh; /*! SCTP listen socket for incoming connections */ struct osmo_fd conn_fd; @@ -91,8 +95,6 @@ uint32_t ctx_id; - int ues; - struct { struct hnb_chan *chan; } cs; diff --git a/include/osmocom/hnodeb/vty.h b/include/osmocom/hnodeb/vty.h index 7e3f29f..7144d3f 100644 --- a/include/osmocom/hnodeb/vty.h +++ b/include/osmocom/hnodeb/vty.h @@ -25,7 +25,10 @@ #include enum hnb_vty_nodes { - CHAN_NODE = _LAST_OSMOVTY_NODE, + HNODEB_NODE = _LAST_OSMOVTY_NODE, + IUH_NODE, + CHAN_NODE, }; void hnb_vty_init(void); +int hnb_vty_go_parent(struct vty *vty); diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c index 335fd3a..85ca937 100644 --- a/src/osmo-hnodeb/hnb.c +++ b/src/osmo-hnodeb/hnb.c @@ -137,8 +137,10 @@ if (!hnb) return NULL; - hnb->gw_addr = "127.0.0.1", - hnb->gw_port = IUH_DEFAULT_SCTP_PORT, + hnb->iuh.local_addr = NULL; + hnb->iuh.local_port = 0; + hnb->iuh.remote_addr = talloc_strdup(hnb, "127.0.0.1"); + hnb->iuh.remote_port = IUH_DEFAULT_SCTP_PORT; osmo_wqueue_init(&hnb->wqueue, 16); hnb->wqueue.bfd.data = hnb; @@ -151,9 +153,14 @@ int hnb_connect(struct hnb *hnb) { int rc; - rc = osmo_sock_init_ofd(&hnb->wqueue.bfd, AF_INET, SOCK_STREAM, - IPPROTO_SCTP, hnb->gw_addr, - hnb->gw_port, OSMO_SOCK_F_CONNECT); + + LOGP(DMAIN, LOGL_INFO, "Iuh Connect: %s[:%u] => %s[:%u]\n", + hnb->iuh.local_addr, hnb->iuh.local_port, hnb->iuh.remote_addr, hnb->iuh.remote_port); + + rc = osmo_sock_init2_ofd(&hnb->wqueue.bfd, AF_INET, SOCK_STREAM, IPPROTO_SCTP, + hnb->iuh.local_addr, hnb->iuh.local_port, + hnb->iuh.remote_addr, hnb->iuh.remote_port, + OSMO_SOCK_F_BIND |OSMO_SOCK_F_CONNECT); if (rc < 0) return rc; sctp_sock_init(hnb->wqueue.bfd.fd); diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c index 3d1d228..26d1005 100644 --- a/src/osmo-hnodeb/main.c +++ b/src/osmo-hnodeb/main.c @@ -73,6 +73,7 @@ static struct vty_app_info vty_info = { .name = "OsmoHNodeB", .version = PACKAGE_VERSION, + .go_parent_cb = hnb_vty_go_parent, }; static void print_usage() @@ -138,12 +139,10 @@ {"log-level", 1, 0, 'e'}, {"vty-ref-mode", 1, &long_option, 1}, {"vty-ref-xml", 0, &long_option, 2}, - { "ues", 1, 0, 'u' }, - { "gw-addr", 1, 0, 'g' }, { 0, 0, 0, 0 }, }; - c = getopt_long(argc, argv, "hd:Dc:sTVe:u:g:", long_options, &idx); + c = getopt_long(argc, argv, "hd:Dc:sTVe:", long_options, &idx); if (c == -1) break; @@ -178,12 +177,6 @@ case 'e': log_set_log_level(osmo_stderr_target, atoi(optarg)); break; - case 'u': - g_hnb->ues = atoi(optarg); - break; - case 'g': - g_hnb->gw_addr = optarg; - break; default: /* catch unknown options *as well as* missing arguments. */ fprintf(stderr, "Error in command line options. Exiting.\n"); diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c index 114f1c0..ab3b3fc 100644 --- a/src/osmo-hnodeb/vty.c +++ b/src/osmo-hnodeb/vty.c @@ -37,6 +37,119 @@ #include #include +int hnb_vty_go_parent(struct vty *vty) +{ + switch (vty->node) { + case IUH_NODE: + vty->node = HNODEB_NODE; + vty->index = g_hnb; + break; + case HNODEB_NODE: + vty->node = CONFIG_NODE; + vty->index = g_hnb; + break; + case CONFIG_NODE: + vty->node = ENABLE_NODE; + vty->index = NULL; + break; + default: + vty->node = CONFIG_NODE; + vty->index = NULL; + break; + } + + return vty->node; +} + +static struct cmd_node hnodeb_node = { + HNODEB_NODE, + "%s(config-hnodeb)# ", + 1, +}; + +#define HNODEB_STR "Configure the HNodeB\n" + +DEFUN(cfg_hnodeb, + cfg_hnodeb_cmd, + "hnodeb", HNODEB_STR) +{ + OSMO_ASSERT(g_hnb); + vty->index = g_hnb; + vty->node = HNODEB_NODE; + + return CMD_SUCCESS; +} + +static struct cmd_node iuh_node = { + IUH_NODE, + "%s(config-iuh)# ", + 1, +}; + +DEFUN(cfg_hnodeb_iuh, + cfg_hnodeb_iuh_cmd, + "iuh", "Configure Iuh options\n") +{ + OSMO_ASSERT(g_hnb); + vty->index = g_hnb; + vty->node = IUH_NODE; + + return CMD_SUCCESS; +} + +DEFUN(cfg_hnodeb_iuh_local_ip, cfg_hnodeb_iuh_local_ip_cmd, + "local-ip " VTY_IPV46_CMD, + "Bind Iuh connection on local IP address\n" + "Local interface IPv4 address\n" + "Local interface IPv6 address\n") +{ + osmo_talloc_replace_string(g_hnb, &g_hnb->iuh.local_addr, argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_hnodeb_iuh_local_port, cfg_hnodeb_iuh_local_port_cmd, + "local-port <1-65535>", + "Bind Iuh connection on local SCTP port\n" + "Local interface port\n") +{ + g_hnb->iuh.local_port = atoi(argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_hnodeb_iuh_remote_ip, cfg_hnodeb_iuh_remote_ip_cmd, + "remote-ip " VTY_IPV46_CMD, + "Connect to HNBGW over Iuh on remote IP address\n" + "Local interface IPv4 address\n" + "Local interface IPv6 address\n") +{ + osmo_talloc_replace_string(g_hnb, &g_hnb->iuh.remote_addr, argv[0]); + return CMD_SUCCESS; +} + +DEFUN(cfg_hnodeb_iuh_remote_port, cfg_hnodeb_iuh_remote_port_cmd, + "remote-port <1-65535>", + "Connect to HNBGW over Iuh on remote SCTP port\n" + "Local interface port (default: "OSMO_STRINGIFY_VAL(IUH_DEFAULT_SCTP_PORT) ")\n") +{ + g_hnb->iuh.remote_port = atoi(argv[0]); + return CMD_SUCCESS; +} + + +static int config_write_hnodeb(struct vty *vty) +{ + vty_out(vty, "hnodeb%s", VTY_NEWLINE); + vty_out(vty, " iuh%s", VTY_NEWLINE); + if (g_hnb->iuh.local_addr) + vty_out(vty, " local-ip %s%s", g_hnb->iuh.local_addr, VTY_NEWLINE); + if (g_hnb->iuh.local_port) + vty_out(vty, " local-port %u%s", g_hnb->iuh.local_port, VTY_NEWLINE); + vty_out(vty, " remote-ip %s%s", g_hnb->iuh.remote_addr, VTY_NEWLINE); + vty_out(vty, " remote-port %u%s", g_hnb->iuh.remote_port, VTY_NEWLINE); + return CMD_SUCCESS; +} + + static struct cmd_node chan_node = { CHAN_NODE, "%s(chan)> ", @@ -139,6 +252,15 @@ void hnb_vty_init(void) { + install_element(CONFIG_NODE, &cfg_hnodeb_cmd); + install_node(&hnodeb_node, config_write_hnodeb); + install_element(HNODEB_NODE, &cfg_hnodeb_iuh_cmd); + install_node(&iuh_node, NULL); + install_element(IUH_NODE, &cfg_hnodeb_iuh_local_ip_cmd); + install_element(IUH_NODE, &cfg_hnodeb_iuh_local_port_cmd); + install_element(IUH_NODE, &cfg_hnodeb_iuh_remote_ip_cmd); + install_element(IUH_NODE, &cfg_hnodeb_iuh_remote_port_cmd); + install_element_ve(&asn_dbg_cmd); install_element_ve(&hnb_register_cmd); install_element_ve(&hnb_deregister_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Id5a17742643e8f02c22228e3055bcc213423a416 Gerrit-Change-Number: 26014 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:28:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 17:28:57 +0000 Subject: Change in osmo-hnodeb[master]: Drop unused fields in struct hnb References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 ) Change subject: Drop unused fields in struct hnb ...................................................................... Drop unused fields in struct hnb Change-Id: Ia981d99bf521eb8b79bdf8d7f81ca50f6cdeba8c --- M include/osmocom/hnodeb/hnodeb.h 1 file changed, 0 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/15/26015/1 diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h index effd1b8..33375f6 100644 --- a/include/osmocom/hnodeb/hnodeb.h +++ b/include/osmocom/hnodeb/hnodeb.h @@ -76,20 +76,8 @@ char *remote_addr; uint16_t remote_port; } iuh; - /*! SCTP listen socket for incoming connections */ - struct osmo_fd conn_fd; - /*! SCTP socket + write queue for Iuh to this specific HNB */ struct osmo_wqueue wqueue; - /*! copied from HNB-Identity-Info IE */ - char identity_info[256]; - /*! copied from Cell Identity IE */ - struct umts_cell_id id; - - /*! SCTP stream ID for HNBAP */ - uint16_t hnbap_stream; - /*! SCTP stream ID for RUA */ - uint16_t rua_stream; uint16_t rnc_id; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ia981d99bf521eb8b79bdf8d7f81ca50f6cdeba8c Gerrit-Change-Number: 26015 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:28:57 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 17:28:57 +0000 Subject: Change in osmo-hnodeb[master]: hnb: Move wqueue to .iuh, add wrapper to use it References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26016 ) Change subject: hnb: Move wqueue to .iuh, add wrapper to use it ...................................................................... hnb: Move wqueue to .iuh, add wrapper to use it Change-Id: I38498858fc315ad3d57644d7b905f5393f43e884 --- M include/osmocom/hnodeb/hnodeb.h M src/osmo-hnodeb/hnb.c M src/osmo-hnodeb/hnbap.c M src/osmo-hnodeb/rua.c M src/osmo-hnodeb/vty.c 5 files changed, 27 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/16/26016/1 diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h index 33375f6..d036bb2 100644 --- a/include/osmocom/hnodeb/hnodeb.h +++ b/include/osmocom/hnodeb/hnodeb.h @@ -75,9 +75,9 @@ uint16_t local_port; char *remote_addr; uint16_t remote_port; + /*! SCTP socket + write queue for Iuh to this specific HNB */ + struct osmo_wqueue wqueue; } iuh; - /*! SCTP socket + write queue for Iuh to this specific HNB */ - struct osmo_wqueue wqueue; uint16_t rnc_id; @@ -90,5 +90,7 @@ struct hnb *hnb_alloc(void *tall_ctx); int hnb_connect(struct hnb *hnb); +int hnb_iuh_send(struct hnb *hnb, struct msgb *msg); + extern void *tall_hnb_ctx; extern struct hnb *g_hnb; diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c index 85ca937..145c021 100644 --- a/src/osmo-hnodeb/hnb.c +++ b/src/osmo-hnodeb/hnb.c @@ -49,7 +49,7 @@ return rc; } -static int hnb_read_cb(struct osmo_fd *fd) +static int hnb_iuh_read_cb(struct osmo_fd *fd) { struct hnb *hnb = fd->data; struct sctp_sndrcvinfo sinfo; @@ -114,7 +114,7 @@ return rc; } -static int hnb_write_cb(struct osmo_fd *fd, struct msgb *msg) +static int hnb_iuh_write_cb(struct osmo_fd *fd, struct msgb *msg) { /* struct hnb *ctx = fd->data; */ struct sctp_sndrcvinfo sinfo = { @@ -142,10 +142,10 @@ hnb->iuh.remote_addr = talloc_strdup(hnb, "127.0.0.1"); hnb->iuh.remote_port = IUH_DEFAULT_SCTP_PORT; - osmo_wqueue_init(&hnb->wqueue, 16); - hnb->wqueue.bfd.data = hnb; - hnb->wqueue.read_cb = hnb_read_cb; - hnb->wqueue.write_cb = hnb_write_cb; + osmo_wqueue_init(&hnb->iuh.wqueue, 16); + hnb->iuh.wqueue.bfd.data = hnb; + hnb->iuh.wqueue.read_cb = hnb_iuh_read_cb; + hnb->iuh.wqueue.write_cb = hnb_iuh_write_cb; return hnb; } @@ -157,12 +157,21 @@ LOGP(DMAIN, LOGL_INFO, "Iuh Connect: %s[:%u] => %s[:%u]\n", hnb->iuh.local_addr, hnb->iuh.local_port, hnb->iuh.remote_addr, hnb->iuh.remote_port); - rc = osmo_sock_init2_ofd(&hnb->wqueue.bfd, AF_INET, SOCK_STREAM, IPPROTO_SCTP, + rc = osmo_sock_init2_ofd(&hnb->iuh.wqueue.bfd, AF_INET, SOCK_STREAM, IPPROTO_SCTP, hnb->iuh.local_addr, hnb->iuh.local_port, hnb->iuh.remote_addr, hnb->iuh.remote_port, OSMO_SOCK_F_BIND |OSMO_SOCK_F_CONNECT); if (rc < 0) return rc; - sctp_sock_init(hnb->wqueue.bfd.fd); + sctp_sock_init(hnb->iuh.wqueue.bfd.fd); return 0; } + +int hnb_iuh_send(struct hnb *hnb, struct msgb *msg) +{ + int rc; + rc = osmo_wqueue_enqueue(&hnb->iuh.wqueue, msg); + if (rc < 0) + msgb_free(msg); + return rc; +} diff --git a/src/osmo-hnodeb/hnbap.c b/src/osmo-hnodeb/hnbap.c index 7e54004..7cd9cd6 100644 --- a/src/osmo-hnodeb/hnbap.c +++ b/src/osmo-hnodeb/hnbap.c @@ -145,7 +145,7 @@ msgb_sctp_ppid(msg) = IUH_PPI_HNBAP; - return osmo_wqueue_enqueue(&hnb->wqueue, msg); + return hnb_iuh_send(hnb, msg); } void hnb_send_register_req(struct hnb *hnb) @@ -194,7 +194,7 @@ msgb_sctp_ppid(msg) = IUH_PPI_HNBAP; - osmo_wqueue_enqueue(&hnb->wqueue, msg); + hnb_iuh_send(hnb, msg); } void hnb_send_deregister_req(struct hnb *hnb) @@ -222,5 +222,5 @@ msgb_sctp_ppid(msg) = IUH_PPI_HNBAP; - osmo_wqueue_enqueue(&hnb->wqueue, msg); + hnb_iuh_send(hnb, msg); } diff --git a/src/osmo-hnodeb/rua.c b/src/osmo-hnodeb/rua.c index 229df30..d7352b6 100644 --- a/src/osmo-hnodeb/rua.c +++ b/src/osmo-hnodeb/rua.c @@ -41,7 +41,7 @@ } rua = rua_new_dt(chan->is_ps, chan->conn_id, txm); - osmo_wqueue_enqueue(&hnb->wqueue, rua); + hnb_iuh_send(hnb, rua); return 0; } diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c index ab3b3fc..5dd849c 100644 --- a/src/osmo-hnodeb/vty.c +++ b/src/osmo-hnodeb/vty.c @@ -211,7 +211,7 @@ msg = ranap_new_msg_reset(is_ps, &cause); rua = rua_new_udt(msg); //msgb_free(msg); - osmo_wqueue_enqueue(&g_hnb->wqueue, rua); + hnb_iuh_send(g_hnb, rua); return CMD_SUCCESS; } @@ -238,7 +238,7 @@ msg = gen_initue_lu(chan->is_ps, chan->conn_id, chan->imsi); rua = rua_new_conn(chan->is_ps, chan->conn_id, msg); - osmo_wqueue_enqueue(&g_hnb->wqueue, rua); + hnb_iuh_send(g_hnb, rua); vty->index = chan; vty->node = CHAN_NODE; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I38498858fc315ad3d57644d7b905f5393f43e884 Gerrit-Change-Number: 26016 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:28:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 17:28:58 +0000 Subject: Change in osmo-hnodeb[master]: Use osmocom logging in non-main files References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017 ) Change subject: Use osmocom logging in non-main files ...................................................................... Use osmocom logging in non-main files Change-Id: I649b17803aeffd20354aa76dde61094959f08e43 --- M include/osmocom/hnodeb/hnodeb.h M src/osmo-hnodeb/debug.c M src/osmo-hnodeb/hnb.c M src/osmo-hnodeb/hnbap.c M src/osmo-hnodeb/nas.c M src/osmo-hnodeb/ranap.c M src/osmo-hnodeb/rua.c 7 files changed, 64 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/17/26017/1 diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h index d036bb2..13fbc85 100644 --- a/include/osmocom/hnodeb/hnodeb.h +++ b/include/osmocom/hnodeb/hnodeb.h @@ -31,6 +31,7 @@ DHNBAP, DRUA, DRANAP, + DNAS, }; extern const struct log_info hnb_log_info; diff --git a/src/osmo-hnodeb/debug.c b/src/osmo-hnodeb/debug.c index 69c369e..f50d8b0 100644 --- a/src/osmo-hnodeb/debug.c +++ b/src/osmo-hnodeb/debug.c @@ -23,25 +23,30 @@ static const struct log_info_cat log_cat[] = { [DMAIN] = { - .name = "DMAIN", .loglevel = LOGL_INFO, .enabled = 1, + .name = "DMAIN", .loglevel = LOGL_NOTICE, .enabled = 1, .color = "", .description = "Main program", }, [DHNBAP] = { - .name = "DHNBAP", .loglevel = LOGL_DEBUG, .enabled = 1, - .color = "", + .name = "DHNBAP", .loglevel = LOGL_NOTICE, .enabled = 1, + .color = "\033[1;33m", .description = "Home Node B Application Part", }, [DRANAP] = { - .name = "RANAP", .loglevel = LOGL_DEBUG, .enabled = 1, - .color = "", + .name = "RANAP", .loglevel = LOGL_NOTICE, .enabled = 1, + .color = "\033[1;34m", .description = "RAN Application Part", }, [DRUA] = { - .name = "RUA", .loglevel = LOGL_DEBUG, .enabled = 1, - .color = "", + .name = "RUA", .loglevel = LOGL_NOTICE, .enabled = 1, + .color = "\033[1;35m", .description = "RANAP User Adaptation", }, + [DNAS] = { + .name = "NAS", .loglevel = LOGL_NOTICE, .enabled = 1, + .color = "\033[1;32m", + .description = "Non-Access Stratum", + }, }; const struct log_info hnb_log_info = { diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c index 145c021..9a86019 100644 --- a/src/osmo-hnodeb/hnb.c +++ b/src/osmo-hnodeb/hnb.c @@ -89,11 +89,11 @@ switch (sinfo.sinfo_ppid) { case IUH_PPI_HNBAP: - printf("HNBAP message received\n"); + LOGP(DHNBAP, LOGL_INFO, "HNBAP message received\n"); rc = hnb_hnbap_rx(hnb, msg); break; case IUH_PPI_RUA: - printf("RUA message received\n"); + LOGP(DRUA, LOGL_INFO, "RUA message received\n"); rc = hnb_rua_rx(hnb, msg); break; case IUH_PPI_SABP: @@ -123,7 +123,7 @@ }; int rc; - printf("Sending: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); + LOGP(DMAIN, LOGL_DEBUG, "Sending: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); rc = sctp_send(fd->fd, msgb_data(msg), msgb_length(msg), &sinfo, 0); /* we don't need to msgb_free(), write_queue does this for us */ diff --git a/src/osmo-hnodeb/hnbap.c b/src/osmo-hnodeb/hnbap.c index 7cd9cd6..ef459f2 100644 --- a/src/osmo-hnodeb/hnbap.c +++ b/src/osmo-hnodeb/hnbap.c @@ -43,7 +43,7 @@ } hnb->rnc_id = accept.rnc_id; - printf("HNB Register accept with RNC ID %u\n", hnb->rnc_id); + LOGP(DHNBAP, LOGL_INFO, "HNB Register accept with RNC ID %u\n", hnb->rnc_id); hnbap_free_hnbregisteraccepties(&accept); return 0; @@ -62,7 +62,7 @@ } if (accept.uE_Identity.present != HNBAP_UE_Identity_PR_iMSI) { - printf("Wrong type in UE register accept\n"); + LOGP(DHNBAP, LOGL_INFO, "Wrong type in UE register accept\n"); return -1; } @@ -70,7 +70,7 @@ ranap_bcd_decode(imsi, sizeof(imsi), accept.uE_Identity.choice.iMSI.buf, accept.uE_Identity.choice.iMSI.size); - printf("UE Register accept for IMSI %s, context %u\n", imsi, ctx_id); + LOGP(DHNBAP, LOGL_INFO, "UE Register accept for IMSI %s, context %u\n", imsi, ctx_id); hnb->ctx_id = ctx_id; hnbap_free_ueregisteraccepties(&accept); @@ -93,7 +93,7 @@ } if (pdu->present != HNBAP_HNBAP_PDU_PR_successfulOutcome) { - printf("Unexpected HNBAP message received\n"); + LOGP(DHNBAP, LOGL_INFO, "Unexpected HNBAP message received\n"); } switch (pdu->choice.successfulOutcome.procedureCode) { @@ -183,7 +183,7 @@ memset(&request_out, 0, sizeof(request_out)); rc = hnbap_encode_hnbregisterrequesties(&request_out, &request); if (rc < 0) { - printf("Could not encode HNB register request IEs\n"); + LOGP(DHNBAP, LOGL_INFO, "Could not encode HNB register request IEs\n"); } msg = hnbap_generate_initiating_message(HNBAP_ProcedureCode_id_HNBRegister, @@ -212,7 +212,7 @@ memset(&request_out, 0, sizeof(request_out)); rc = hnbap_encode_hnbde_registeries(&request_out, &request); if (rc < 0) { - printf("Could not encode HNB deregister request IEs\n"); + LOGP(DHNBAP, LOGL_INFO, "Could not encode HNB deregister request IEs\n"); } msg = hnbap_generate_initiating_message(HNBAP_ProcedureCode_id_HNBDe_Register, diff --git a/src/osmo-hnodeb/nas.c b/src/osmo-hnodeb/nas.c index 163f458..c3ede88 100644 --- a/src/osmo-hnodeb/nas.c +++ b/src/osmo-hnodeb/nas.c @@ -87,7 +87,7 @@ parse_res = tlv_parse(&tp, &gsm48_mm_att_tlvdef, &gh->data[0], len, 0, 0); if (parse_res <= 0) { uint8_t msg_type = gsm48_hdr_msg_type(gh); - printf("Error parsing MM message 0x%hhx: %d\n", msg_type, parse_res); + LOGP(DNAS, LOGL_INFO, "Error parsing MM message 0x%hhx: %d\n", msg_type, parse_res); return NULL; } @@ -96,14 +96,14 @@ int hnb_nas_rx_lu_accept(struct gsm48_hdr *gh, int len, int *sent_tmsi) { - printf(" :D Location Update Accept :D\n"); + LOGP(DNAS, LOGL_INFO, " :D Location Update Accept :D\n"); struct gsm48_loc_area_id *lai; lai = (struct gsm48_loc_area_id *)&gh->data[0]; struct osmo_location_area_id laid; gsm48_decode_lai2(lai, &laid); - printf("LU: mcc %s mnc %s lac %hd\n", + LOGP(DNAS, LOGL_INFO, "LU: mcc %s mnc %s lac %hd\n", osmo_mcc_name(laid.plmn.mcc), osmo_mnc_name(laid.plmn.mnc, laid.plmn.mnc_3_digits), laid.lac); @@ -113,7 +113,7 @@ len -= (const char *)&gh->data[0] - (const char *)gh; parse_res = tlv_parse(&tp, &gsm48_mm_att_tlvdef, &gh->data[0], len, 0, 0); if (parse_res <= 0) { - printf("Error parsing Location Update Accept message: %d\n", parse_res); + LOGP(DNAS, LOGL_INFO, "Error parsing Location Update Accept message: %d\n", parse_res); return -1; } @@ -128,7 +128,7 @@ void hnb_nas_rx_mm_info(struct gsm48_hdr *gh, int len) { - printf(" :) MM Info :)\n"); + LOGP(DNAS, LOGL_INFO, " :) MM Info :)\n"); struct tlv_parsed *tp = parse_mm(gh, len); if (!tp) return; @@ -138,7 +138,7 @@ gsm_7bit_decode_n(name, 127, TLVP_VAL(tp, GSM48_IE_NAME_SHORT)+1, (TLVP_LEN(tp, GSM48_IE_NAME_SHORT)-1)*8/7); - printf("Info: Short Network Name: %s\n", name); + LOGP(DNAS, LOGL_INFO, "Info: Short Network Name: %s\n", name); } if (TLVP_PRESENT(tp, GSM48_IE_NAME_LONG)) { @@ -146,7 +146,7 @@ gsm_7bit_decode_n(name, 127, TLVP_VAL(tp, GSM48_IE_NAME_LONG)+1, (TLVP_LEN(tp, GSM48_IE_NAME_LONG)-1)*8/7); - printf("Info: Long Network Name: %s\n", name); + LOGP(DNAS, LOGL_INFO, "Info: Long Network Name: %s\n", name); } } @@ -158,11 +158,11 @@ len -= (const char *)&gh->data[0] - (const char *)gh; if (len < sizeof(*ar)) { - printf("GSM48 Auth Req does not fit.\n"); + LOGP(DNAS, LOGL_INFO, "GSM48 Auth Req does not fit.\n"); return -1; } - printf(" :) Authentication Request :)\n"); + LOGP(DNAS, LOGL_INFO, " :) Authentication Request :)\n"); ar = (struct gsm48_auth_req*) &gh->data[0]; int seq = ar->key_seq; @@ -183,9 +183,9 @@ memset(&vec, 0, sizeof(vec)); osmo_auth_gen_vec(&vec, &auth, ar->rand); - printf("seq %d rand %s", + LOGP(DNAS, LOGL_INFO, "seq %d rand %s", seq, osmo_hexdump(ar->rand, sizeof(ar->rand))); - printf(" --> sres %s\n", + LOGP(DNAS, LOGL_INFO, " --> sres %s\n", osmo_hexdump(vec.sres, 4)); return hnb_tx_dt(hnb, gen_nas_auth_resp(vec.sres)); @@ -197,7 +197,7 @@ chan = hnb->cs.chan; if (!chan) { - printf("hnb_nas_rx_mm(): No CS channel established yet.\n"); + LOGP(DNAS, LOGL_INFO, "hnb_nas_rx_mm(): No CS channel established yet.\n"); return -1; } @@ -219,7 +219,7 @@ return 0; case GSM48_MT_MM_LOC_UPD_REJECT: - printf("Received Location Update Reject\n"); + LOGP(DNAS, LOGL_INFO, "Received Location Update Reject\n"); return 0; case GSM48_MT_MM_INFO: @@ -231,7 +231,7 @@ return hnb_nas_rx_auth_req(hnb, gh, len); default: - printf("04.08 message type not handled by hnb-test: 0x%x\n", + LOGP(DNAS, LOGL_INFO, "04.08 message type not handled by hnb-test: 0x%x\n", msg_type); return 0; } @@ -241,14 +241,14 @@ void hnb_nas_rx_dtap(struct hnb *hnb, void *data, int len) { int rc; - printf("got %d bytes: %s\n", len, osmo_hexdump(data, len)); + LOGP(DNAS, LOGL_INFO, "got %d bytes: %s\n", len, osmo_hexdump(data, len)); // nas_pdu == '05 08 12' ==> IMEI Identity request // '05 04 0d' ==> LU reject struct gsm48_hdr *gh = data; if (len < sizeof(*gh)) { - printf("hnb_nas_rx_dtap(): NAS PDU is too short: %d. Ignoring.\n", + LOGP(DNAS, LOGL_INFO, "hnb_nas_rx_dtap(): NAS PDU is too short: %d. Ignoring.\n", len); return; } @@ -258,10 +258,10 @@ case GSM48_PDISC_MM: rc = hnb_nas_rx_mm(hnb, gh, len); if (rc != 0) - printf("Error receiving MM message: %d\n", rc); + LOGP(DNAS, LOGL_INFO, "Error receiving MM message: %d\n", rc); return; default: - printf("04.08 discriminator not handled by hnb-test: %d\n", + LOGP(DNAS, LOGL_INFO, "04.08 discriminator not handled by hnb-test: %d\n", pdisc); return; } diff --git a/src/osmo-hnodeb/ranap.c b/src/osmo-hnodeb/ranap.c index 8f1b9c0..fae87b7 100644 --- a/src/osmo-hnodeb/ranap.c +++ b/src/osmo-hnodeb/ranap.c @@ -35,7 +35,7 @@ } #define PP(octet_string_t) \ - printf(#octet_string_t " = %s\n",\ + LOGP(DRANAP, LOGL_INFO, #octet_string_t " = %s\n",\ printstr(&octet_string_t)) void hnb_rua_dt_handle_ranap(struct hnb *hnb, @@ -46,12 +46,12 @@ RANAP_PermittedIntegrityProtectionAlgorithms_t *algs; RANAP_IntegrityProtectionAlgorithm_t *first_alg; - printf("rx ranap_msg->procedureCode %d\n", + LOGP(DRANAP, LOGL_INFO, "rx ranap_msg->procedureCode %d\n", ranap_msg->procedureCode); switch (ranap_msg->procedureCode) { case RANAP_ProcedureCode_id_DirectTransfer: - printf("rx DirectTransfer: presence = %hx\n", + LOGP(DRANAP, LOGL_INFO, "rx DirectTransfer: presence = %hx\n", ranap_msg->msg.directTransferIEs.presenceMask); PP(ranap_msg->msg.directTransferIEs.nas_pdu); @@ -62,14 +62,14 @@ return; case RANAP_ProcedureCode_id_SecurityModeControl: - printf("rx SecurityModeControl: presence = %hx\n", + LOGP(DRANAP, LOGL_INFO, "rx SecurityModeControl: presence = %hx\n", ranap_msg->msg.securityModeCommandIEs.presenceMask); /* Just pick the first available IP alg, don't care about * encryption (yet?) */ algs = &ranap_msg->msg.securityModeCommandIEs.integrityProtectionInformation.permittedAlgorithms; if (algs->list.count < 1) { - printf("Security Mode Command: No permitted algorithms.\n"); + LOGP(DRANAP, LOGL_INFO, "Security Mode Command: No permitted algorithms.\n"); return; } first_alg = *algs->list.array; @@ -88,7 +88,7 @@ { char imsi[16]; - printf("rx ranap_msg->procedureCode %d\n", + LOGP(DRANAP, LOGL_INFO, "rx ranap_msg->procedureCode %d\n", ranap_msg->procedureCode); switch (ranap_msg->procedureCode) { @@ -99,7 +99,7 @@ ranap_msg->msg.pagingIEs.permanentNAS_UE_ID.choice.iMSI.size); } else imsi[0] = '\0'; - printf("rx Paging: presence=%hx domain=%ld IMSI=%s\n", + LOGP(DRANAP, LOGL_INFO, "rx Paging: presence=%hx domain=%ld IMSI=%s\n", ranap_msg->msg.pagingIEs.presenceMask, ranap_msg->msg.pagingIEs.cN_DomainIndicator, imsi @@ -158,7 +158,7 @@ void hnb_rx_secmode_cmd(struct hnb *hnb, long ip_alg) { - printf(" :) Security Mode Command :)\n"); + LOGP(DRANAP, LOGL_INFO, " :) Security Mode Command :)\n"); /* not caring about encryption yet, just pass 0 for No Encryption. */ hnb_tx_dt(hnb, ranap_new_msg_sec_mod_compl(ip_alg, 0)); } @@ -170,6 +170,6 @@ void hnb_rx_paging(struct hnb *hnb, const char *imsi) { - printf(" :) Paging Request for %s :)\n", imsi); + LOGP(DRANAP, LOGL_INFO, " :) Paging Request for %s :)\n", imsi); /* TODO reply */ } diff --git a/src/osmo-hnodeb/rua.c b/src/osmo-hnodeb/rua.c index d7352b6..0dd8c3a 100644 --- a/src/osmo-hnodeb/rua.c +++ b/src/osmo-hnodeb/rua.c @@ -36,7 +36,7 @@ chan = hnb->cs.chan; if (!chan) { - printf("hnb_nas_tx_tmsi_realloc_compl(): No CS channel established yet.\n"); + LOGP(DRUA, LOGL_INFO, "hnb_nas_tx_tmsi_realloc_compl(): No CS channel established yet.\n"); return -1; } @@ -52,7 +52,7 @@ rc = rua_decode_directtransferies(&ies, in); if (rc < 0) { - printf("failed to decode RUA DT IEs\n"); + LOGP(DRUA, LOGL_INFO, "failed to decode RUA DT IEs\n"); return; } @@ -69,7 +69,7 @@ rc = rua_decode_connectionlesstransferies(&ies, in); if (rc < 0) { - printf("failed to decode RUA CL IEs\n"); + LOGP(DRUA, LOGL_INFO, "failed to decode RUA CL IEs\n"); return; } @@ -94,45 +94,45 @@ switch (pdu->present) { case RUA_RUA_PDU_PR_successfulOutcome: - printf("RUA_RUA_PDU_PR_successfulOutcome\n"); + LOGP(DRUA, LOGL_INFO, "RUA_RUA_PDU_PR_successfulOutcome\n"); break; case RUA_RUA_PDU_PR_initiatingMessage: - printf("RUA_RUA_PDU_PR_initiatingMessage\n"); + LOGP(DRUA, LOGL_INFO, "RUA_RUA_PDU_PR_initiatingMessage\n"); break; case RUA_RUA_PDU_PR_NOTHING: - printf("RUA_RUA_PDU_PR_NOTHING\n"); + LOGP(DRUA, LOGL_INFO, "RUA_RUA_PDU_PR_NOTHING\n"); break; case RUA_RUA_PDU_PR_unsuccessfulOutcome: - printf("RUA_RUA_PDU_PR_unsuccessfulOutcome\n"); + LOGP(DRUA, LOGL_INFO, "RUA_RUA_PDU_PR_unsuccessfulOutcome\n"); break; default: - printf("Unexpected RUA message received\n"); + LOGP(DRUA, LOGL_INFO, "Unexpected RUA message received\n"); break; } switch (pdu->choice.successfulOutcome.procedureCode) { case RUA_ProcedureCode_id_ConnectionlessTransfer: - printf("RUA rx Connectionless Transfer\n"); + LOGP(DRUA, LOGL_INFO, "RUA rx Connectionless Transfer\n"); hnb_rua_cl_handle(hnb, &pdu->choice.successfulOutcome.value); break; case RUA_ProcedureCode_id_Connect: - printf("RUA rx Connect\n"); + LOGP(DRUA, LOGL_INFO, "RUA rx Connect\n"); break; case RUA_ProcedureCode_id_DirectTransfer: - printf("RUA rx DirectTransfer\n"); + LOGP(DRUA, LOGL_INFO, "RUA rx DirectTransfer\n"); hnb_rua_dt_handle(hnb, &pdu->choice.successfulOutcome.value); break; case RUA_ProcedureCode_id_Disconnect: - printf("RUA rx Disconnect\n"); + LOGP(DRUA, LOGL_INFO, "RUA rx Disconnect\n"); break; case RUA_ProcedureCode_id_ErrorIndication: - printf("RUA rx ErrorIndication\n"); + LOGP(DRUA, LOGL_INFO, "RUA rx ErrorIndication\n"); break; case RUA_ProcedureCode_id_privateMessage: - printf("RUA rx privateMessage\n"); + LOGP(DRUA, LOGL_INFO, "RUA rx privateMessage\n"); break; default: - printf("RUA rx unknown message\n"); + LOGP(DRUA, LOGL_INFO, "RUA rx unknown message\n"); break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I649b17803aeffd20354aa76dde61094959f08e43 Gerrit-Change-Number: 26017 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:28:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 17:28:58 +0000 Subject: Change in osmo-hnodeb[master]: use osmo_stream_cli to manage sctp Iuh conn References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26018 ) Change subject: use osmo_stream_cli to manage sctp Iuh conn ...................................................................... use osmo_stream_cli to manage sctp Iuh conn Let's use already available functionality to handle the conn for us. This is specially useful since we gain a connect_cb. Change-Id: I9d884231577aa47af22cd6319130ca5c9e595d61 --- M include/osmocom/hnodeb/hnodeb.h M src/osmo-hnodeb/hnb.c 2 files changed, 45 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/18/26018/1 diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h index 13fbc85..d4fbff1 100644 --- a/include/osmocom/hnodeb/hnodeb.h +++ b/include/osmocom/hnodeb/hnodeb.h @@ -76,8 +76,7 @@ uint16_t local_port; char *remote_addr; uint16_t remote_port; - /*! SCTP socket + write queue for Iuh to this specific HNB */ - struct osmo_wqueue wqueue; + struct osmo_stream_cli *client; } iuh; uint16_t rnc_id; @@ -89,6 +88,7 @@ } cs; }; struct hnb *hnb_alloc(void *tall_ctx); +void hnb_free(struct hnb *hnb); int hnb_connect(struct hnb *hnb); int hnb_iuh_send(struct hnb *hnb, struct msgb *msg); diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c index 9a86019..e77f1aa 100644 --- a/src/osmo-hnodeb/hnb.c +++ b/src/osmo-hnodeb/hnb.c @@ -36,22 +36,10 @@ #include #include -static int sctp_sock_init(int fd) +static int hnb_iuh_read_cb(struct osmo_stream_cli *conn) { - struct sctp_event_subscribe event; - int rc; - - /* subscribe for all events */ - memset((uint8_t *)&event, 1, sizeof(event)); - rc = setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, - &event, sizeof(event)); - - return rc; -} - -static int hnb_iuh_read_cb(struct osmo_fd *fd) -{ - struct hnb *hnb = fd->data; + struct osmo_fd *fd = osmo_stream_cli_get_ofd(conn); + struct hnb *hnb = osmo_stream_cli_get_data(conn); struct sctp_sndrcvinfo sinfo; struct msgb *msg = msgb_alloc(IUH_MSGB_SIZE, "Iuh rx"); int flags = 0; @@ -65,15 +53,11 @@ if (rc < 0) { LOGP(DMAIN, LOGL_ERROR, "Error during sctp_recvmsg()\n"); /* FIXME: clean up after disappeared HNB */ - close(fd->fd); - osmo_fd_unregister(fd); + osmo_stream_cli_close(conn); return rc; } else if (rc == 0) { LOGP(DMAIN, LOGL_INFO, "Connection to HNB closed\n"); - close(fd->fd); - osmo_fd_unregister(fd); - fd->fd = -1; - + osmo_stream_cli_close(conn); return -1; } else { msgb_put(msg, rc); @@ -114,42 +98,48 @@ return rc; } -static int hnb_iuh_write_cb(struct osmo_fd *fd, struct msgb *msg) +static int hnb_iuh_connect_cb(struct osmo_stream_cli *cli) { - /* struct hnb *ctx = fd->data; */ - struct sctp_sndrcvinfo sinfo = { - .sinfo_ppid = htonl(msgb_sctp_ppid(msg)), - .sinfo_stream = 0, - }; - int rc; - - LOGP(DMAIN, LOGL_DEBUG, "Sending: %s\n", osmo_hexdump(msgb_data(msg), msgb_length(msg))); - rc = sctp_send(fd->fd, msgb_data(msg), msgb_length(msg), - &sinfo, 0); - /* we don't need to msgb_free(), write_queue does this for us */ - return rc; + LOGP(DMAIN, LOGL_NOTICE, "Iuh connected to HNBGW\n"); + return 0; } struct hnb *hnb_alloc(void *tall_ctx) { struct hnb *hnb; + struct osmo_stream_cli *cli; + hnb = talloc_zero(tall_ctx, struct hnb); if (!hnb) return NULL; - hnb->iuh.local_addr = NULL; + hnb->iuh.local_addr = talloc_strdup(hnb, "0.0.0.0"); hnb->iuh.local_port = 0; hnb->iuh.remote_addr = talloc_strdup(hnb, "127.0.0.1"); hnb->iuh.remote_port = IUH_DEFAULT_SCTP_PORT; - osmo_wqueue_init(&hnb->iuh.wqueue, 16); - hnb->iuh.wqueue.bfd.data = hnb; - hnb->iuh.wqueue.read_cb = hnb_iuh_read_cb; - hnb->iuh.wqueue.write_cb = hnb_iuh_write_cb; + cli = osmo_stream_cli_create(hnb); + OSMO_ASSERT(cli); + hnb->iuh.client = cli; + osmo_stream_cli_set_nodelay(cli, true); + osmo_stream_cli_set_proto(cli, IPPROTO_SCTP); + osmo_stream_cli_set_reconnect_timeout(cli, 5); + osmo_stream_cli_set_connect_cb(cli, hnb_iuh_connect_cb); + osmo_stream_cli_set_read_cb(cli, hnb_iuh_read_cb); + osmo_stream_cli_set_data(cli, hnb); return hnb; } +void hnb_free(struct hnb *hnb) +{ + if (hnb->iuh.client) { + osmo_stream_cli_destroy(hnb->iuh.client); + hnb->iuh.client = NULL; + } + talloc_free(hnb); +} + int hnb_connect(struct hnb *hnb) { int rc; @@ -157,21 +147,23 @@ LOGP(DMAIN, LOGL_INFO, "Iuh Connect: %s[:%u] => %s[:%u]\n", hnb->iuh.local_addr, hnb->iuh.local_port, hnb->iuh.remote_addr, hnb->iuh.remote_port); - rc = osmo_sock_init2_ofd(&hnb->iuh.wqueue.bfd, AF_INET, SOCK_STREAM, IPPROTO_SCTP, - hnb->iuh.local_addr, hnb->iuh.local_port, - hnb->iuh.remote_addr, hnb->iuh.remote_port, - OSMO_SOCK_F_BIND |OSMO_SOCK_F_CONNECT); - if (rc < 0) - return rc; - sctp_sock_init(hnb->iuh.wqueue.bfd.fd); + osmo_stream_cli_set_addrs(hnb->iuh.client, (const char**)&hnb->iuh.remote_addr, 1); + osmo_stream_cli_set_port(hnb->iuh.client, hnb->iuh.remote_port); + osmo_stream_cli_set_local_addrs(hnb->iuh.client, (const char**)&hnb->iuh.local_addr, 1); + osmo_stream_cli_set_local_port(hnb->iuh.client, hnb->iuh.local_port); + rc = osmo_stream_cli_open(hnb->iuh.client); + if (rc < 0) { + LOGP(DMAIN, LOGL_ERROR, "Unable to open stream client for Iuh %s[:%u] => %s[:%u]\n", + hnb->iuh.local_addr, hnb->iuh.local_port, hnb->iuh.remote_addr, hnb->iuh.remote_port); + /* we don't return error in here because osmo_stream_cli_open() + will continue to retry (due to timeout being explicitly set with + osmo_stream_cli_set_reconnect_timeout() above) to connect so the error is transient */ + } return 0; } int hnb_iuh_send(struct hnb *hnb, struct msgb *msg) { - int rc; - rc = osmo_wqueue_enqueue(&hnb->iuh.wqueue, msg); - if (rc < 0) - msgb_free(msg); - return rc; + osmo_stream_cli_send(hnb->iuh.client, msg); + return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I9d884231577aa47af22cd6319130ca5c9e595d61 Gerrit-Change-Number: 26018 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:28:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 17:28:59 +0000 Subject: Change in osmo-hnodeb[master]: Send HnbRegisterRequest when HnodeB connects on Iuh References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26019 ) Change subject: Send HnbRegisterRequest when HnodeB connects on Iuh ...................................................................... Send HnbRegisterRequest when HnodeB connects on Iuh Change-Id: I901fd456221a3bdc3f4f95b7fd3b9484c7830f24 --- M src/osmo-hnodeb/hnb.c 1 file changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/19/26019/1 diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c index e77f1aa..d7dde7b 100644 --- a/src/osmo-hnodeb/hnb.c +++ b/src/osmo-hnodeb/hnb.c @@ -98,9 +98,12 @@ return rc; } -static int hnb_iuh_connect_cb(struct osmo_stream_cli *cli) +static int hnb_iuh_connect_cb(struct osmo_stream_cli *conn) { LOGP(DMAIN, LOGL_NOTICE, "Iuh connected to HNBGW\n"); + struct hnb *hnb = osmo_stream_cli_get_data(conn); + + hnb_send_register_req(hnb); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I901fd456221a3bdc3f4f95b7fd3b9484c7830f24 Gerrit-Change-Number: 26019 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:28:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 17:28:59 +0000 Subject: Change in osmo-hnodeb[master]: Configure PLMN over VTY and use it in HnbRegisterRequest References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26020 ) Change subject: Configure PLMN over VTY and use it in HnbRegisterRequest ...................................................................... Configure PLMN over VTY and use it in HnbRegisterRequest Change-Id: I6d67aa547d5496fe1407744e1dde07d2a41df500 --- M include/osmocom/hnodeb/hnodeb.h M src/osmo-hnodeb/hnb.c M src/osmo-hnodeb/hnbap.c M src/osmo-hnodeb/vty.c 4 files changed, 62 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/20/26020/1 diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h index d4fbff1..0928bdd 100644 --- a/include/osmocom/hnodeb/hnodeb.h +++ b/include/osmocom/hnodeb/hnodeb.h @@ -25,6 +25,7 @@ #include #include #include +#include enum { DMAIN, @@ -71,6 +72,7 @@ }; struct hnb { + struct osmo_plmn_id plmn; struct { char *local_addr; uint16_t local_port; diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c index d7dde7b..b0628e5 100644 --- a/src/osmo-hnodeb/hnb.c +++ b/src/osmo-hnodeb/hnb.c @@ -116,6 +116,11 @@ if (!hnb) return NULL; + hnb->plmn = (struct osmo_plmn_id){ + .mcc = 1, + .mnc = 1, + }; + hnb->iuh.local_addr = talloc_strdup(hnb, "0.0.0.0"); hnb->iuh.local_port = 0; hnb->iuh.remote_addr = talloc_strdup(hnb, "127.0.0.1"); diff --git a/src/osmo-hnodeb/hnbap.c b/src/osmo-hnodeb/hnbap.c index ef459f2..f70f2bb 100644 --- a/src/osmo-hnodeb/hnbap.c +++ b/src/osmo-hnodeb/hnbap.c @@ -156,7 +156,7 @@ uint16_t lac, sac; uint8_t rac; uint32_t cid; - uint8_t plmn[] = {0x09, 0xf1, 0x99}; + uint8_t plmn[3]; char identity[50] = "ATestHNB@"; HNBAP_HNBRegisterRequestIEs_t request; @@ -175,10 +175,9 @@ request.hnB_Identity.hNB_Identity_Info.buf = (uint8_t*) identity; request.hnB_Identity.hNB_Identity_Info.size = strlen(identity); + osmo_plmn_to_bcd(plmn, &hnb->plmn); request.plmNidentity.buf = plmn; - request.plmNidentity.size = 3; - - + request.plmNidentity.size = sizeof(plmn); memset(&request_out, 0, sizeof(request_out)); rc = hnbap_encode_hnbregisterrequesties(&request_out, &request); diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c index 5dd849c..cdc57e9 100644 --- a/src/osmo-hnodeb/vty.c +++ b/src/osmo-hnodeb/vty.c @@ -68,6 +68,7 @@ }; #define HNODEB_STR "Configure the HNodeB\n" +#define CODE_CMD_STR "Code commands\n" DEFUN(cfg_hnodeb, cfg_hnodeb_cmd, @@ -80,6 +81,52 @@ return CMD_SUCCESS; } +DEFUN_USRATTR(cfg_hnodeb_ncc, + cfg_hnodeb_ncc_cmd, + 0, + "network country code <1-999>", + "Set the GSM network country code\n" + "Country commands\n" + CODE_CMD_STR + "Network Country Code to use\n") +{ + struct hnb *hnb = (struct hnb *)vty->index; + uint16_t mcc; + + if (osmo_mcc_from_str(argv[0], &mcc)) { + vty_out(vty, "%% Error decoding MCC: %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + hnb->plmn.mcc = mcc; + + return CMD_SUCCESS; +} + +DEFUN_USRATTR(cfg_hnodeb_mnc, + cfg_hnodeb_mnc_cmd, + 0, + "mobile network code <0-999>", + "Set the GSM mobile network code\n" + "Network Commands\n" + CODE_CMD_STR + "Mobile Network Code to use\n") +{ + struct hnb *hnb = (struct hnb *)vty->index; + uint16_t mnc; + bool mnc_3_digits; + + if (osmo_mnc_from_str(argv[0], &mnc, &mnc_3_digits)) { + vty_out(vty, "%% Error decoding MNC: %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + hnb->plmn.mnc = mnc; + hnb->plmn.mnc_3_digits = mnc_3_digits; + + return CMD_SUCCESS; +} + static struct cmd_node iuh_node = { IUH_NODE, "%s(config-iuh)# ", @@ -139,6 +186,9 @@ static int config_write_hnodeb(struct vty *vty) { vty_out(vty, "hnodeb%s", VTY_NEWLINE); + vty_out(vty, " network country code %s%s", osmo_mcc_name(g_hnb->plmn.mcc), VTY_NEWLINE); + vty_out(vty, " mobile network code %s%s", + osmo_mnc_name(g_hnb->plmn.mnc, g_hnb->plmn.mnc_3_digits), VTY_NEWLINE); vty_out(vty, " iuh%s", VTY_NEWLINE); if (g_hnb->iuh.local_addr) vty_out(vty, " local-ip %s%s", g_hnb->iuh.local_addr, VTY_NEWLINE); @@ -254,6 +304,8 @@ { install_element(CONFIG_NODE, &cfg_hnodeb_cmd); install_node(&hnodeb_node, config_write_hnodeb); + install_element(HNODEB_NODE, &cfg_hnodeb_ncc_cmd); + install_element(HNODEB_NODE, &cfg_hnodeb_mnc_cmd); install_element(HNODEB_NODE, &cfg_hnodeb_iuh_cmd); install_node(&iuh_node, NULL); install_element(IUH_NODE, &cfg_hnodeb_iuh_local_ip_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6d67aa547d5496fe1407744e1dde07d2a41df500 Gerrit-Change-Number: 26020 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:28:59 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 17:28:59 +0000 Subject: Change in osmo-hnodeb[master]: Configure CI, LAC, RAC, SAC over VTY and use it in HnbRegisterRequest References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021 ) Change subject: Configure CI,LAC,RAC,SAC over VTY and use it in HnbRegisterRequest ...................................................................... Configure CI,LAC,RAC,SAC over VTY and use it in HnbRegisterRequest Change-Id: I06f21758e361b7d4d7141086d758893bee434e5c --- M include/osmocom/hnodeb/hnodeb.h M src/osmo-hnodeb/hnbap.c M src/osmo-hnodeb/vty.c 3 files changed, 69 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/21/26021/1 diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h index 0928bdd..a9da991 100644 --- a/include/osmocom/hnodeb/hnodeb.h +++ b/include/osmocom/hnodeb/hnodeb.h @@ -73,6 +73,10 @@ struct hnb { struct osmo_plmn_id plmn; + uint16_t cell_identity; + uint16_t lac; + uint8_t rac; + uint16_t sac; struct { char *local_addr; uint16_t local_port; diff --git a/src/osmo-hnodeb/hnbap.c b/src/osmo-hnodeb/hnbap.c index f70f2bb..8e0bfa6 100644 --- a/src/osmo-hnodeb/hnbap.c +++ b/src/osmo-hnodeb/hnbap.c @@ -162,15 +162,10 @@ HNBAP_HNBRegisterRequestIEs_t request; memset(&request, 0, sizeof(request)); - lac = 0xc0fe; - sac = 0xabab; - rac = 0x42; - cid = 0xadceaab; - - asn1_u16_to_str(&request.lac, &lac, lac); - asn1_u16_to_str(&request.sac, &sac, sac); - asn1_u8_to_str(&request.rac, &rac, rac); - asn1_u28_to_bitstring(&request.cellIdentity, &cid, cid); + asn1_u16_to_str(&request.lac, &lac, hnb->lac); + asn1_u16_to_str(&request.sac, &sac, hnb->sac); + asn1_u8_to_str(&request.rac, &rac, hnb->rac); + asn1_u28_to_bitstring(&request.cellIdentity, &cid, hnb->cell_identity); request.hnB_Identity.hNB_Identity_Info.buf = (uint8_t*) identity; request.hnB_Identity.hNB_Identity_Info.size = strlen(identity); diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c index cdc57e9..6be938e 100644 --- a/src/osmo-hnodeb/vty.c +++ b/src/osmo-hnodeb/vty.c @@ -27,6 +27,8 @@ #include #include +#include + #include #include @@ -127,6 +129,57 @@ return CMD_SUCCESS; } +DEFUN_USRATTR(cfg_hnodeb_ci, + cfg_hnodeb_ci_cmd, + 0, + "cell_identity <0-65535>", + "Set the Cell identity of this HnodeB\n" "Cell Identity\n") +{ + struct hnb *hnb = (struct hnb *)vty->index; + hnb->cell_identity = atoi(argv[0]); + return CMD_SUCCESS; +} + +DEFUN_USRATTR(cfg_hnodeb_lac, + cfg_hnodeb_lac_cmd, + 0, + "location_area_code <0-65535>", + "Set the Location Area Code (LAC) of this HnodeB\n" "LAC\n") +{ + struct hnb *hnb = (struct hnb *)vty->index; + int lac = atoi(argv[0]); + + if (lac == GSM_LAC_RESERVED_DETACHED || lac == GSM_LAC_RESERVED_ALL_BTS) { + vty_out(vty, "%% LAC %d is reserved by GSM 04.08%s", + lac, VTY_NEWLINE); + return CMD_WARNING; + } + hnb->lac = lac; + return CMD_SUCCESS; +} + +DEFUN_USRATTR(cfg_hnodeb_rac, + cfg_hnodeb_rac_cmd, + 0, + "routing_area_code <0-255>", + "Set the Routing Area Code (RAC) of this HnodeB\n" "RAC\n") +{ + struct hnb *hnb = (struct hnb *)vty->index; + hnb->rac = atoi(argv[0]); + return CMD_SUCCESS; +} + +DEFUN_USRATTR(cfg_hnodeb_sac, + cfg_hnodeb_sac_cmd, + 0, + "service_area_code <0-255>", + "Set the Service Area Code (RAC) of this HnodeB\n" "SAC\n") +{ + struct hnb *hnb = (struct hnb *)vty->index; + hnb->sac = atoi(argv[0]); + return CMD_SUCCESS; +} + static struct cmd_node iuh_node = { IUH_NODE, "%s(config-iuh)# ", @@ -189,6 +242,10 @@ vty_out(vty, " network country code %s%s", osmo_mcc_name(g_hnb->plmn.mcc), VTY_NEWLINE); vty_out(vty, " mobile network code %s%s", osmo_mnc_name(g_hnb->plmn.mnc, g_hnb->plmn.mnc_3_digits), VTY_NEWLINE); + vty_out(vty, " cell_identity %u%s", g_hnb->cell_identity, VTY_NEWLINE); + vty_out(vty, " location_area_code %u%s", g_hnb->lac, VTY_NEWLINE); + vty_out(vty, " routing_area_code %u%s", g_hnb->rac, VTY_NEWLINE); + vty_out(vty, " service_area_code %u%s", g_hnb->sac, VTY_NEWLINE); vty_out(vty, " iuh%s", VTY_NEWLINE); if (g_hnb->iuh.local_addr) vty_out(vty, " local-ip %s%s", g_hnb->iuh.local_addr, VTY_NEWLINE); @@ -306,6 +363,10 @@ install_node(&hnodeb_node, config_write_hnodeb); install_element(HNODEB_NODE, &cfg_hnodeb_ncc_cmd); install_element(HNODEB_NODE, &cfg_hnodeb_mnc_cmd); + install_element(HNODEB_NODE, &cfg_hnodeb_ci_cmd); + install_element(HNODEB_NODE, &cfg_hnodeb_lac_cmd); + install_element(HNODEB_NODE, &cfg_hnodeb_rac_cmd); + install_element(HNODEB_NODE, &cfg_hnodeb_sac_cmd); install_element(HNODEB_NODE, &cfg_hnodeb_iuh_cmd); install_node(&iuh_node, NULL); install_element(IUH_NODE, &cfg_hnodeb_iuh_local_ip_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I06f21758e361b7d4d7141086d758893bee434e5c Gerrit-Change-Number: 26021 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:29:00 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 17:29:00 +0000 Subject: Change in osmo-hnodeb[master]: Configure HNB-Identity over VTY and use it in HnbRegisterRequest References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26022 ) Change subject: Configure HNB-Identity over VTY and use it in HnbRegisterRequest ...................................................................... Configure HNB-Identity over VTY and use it in HnbRegisterRequest Change-Id: Ida47bbb85b5438a2ec9805005bc2ab834c79b765 --- M include/osmocom/hnodeb/hnodeb.h M src/osmo-hnodeb/hnb.c M src/osmo-hnodeb/hnbap.c M src/osmo-hnodeb/vty.c 4 files changed, 17 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/22/26022/1 diff --git a/include/osmocom/hnodeb/hnodeb.h b/include/osmocom/hnodeb/hnodeb.h index a9da991..7bb1511 100644 --- a/include/osmocom/hnodeb/hnodeb.h +++ b/include/osmocom/hnodeb/hnodeb.h @@ -72,6 +72,7 @@ }; struct hnb { + char *identity; /* HNB-Identity */ struct osmo_plmn_id plmn; uint16_t cell_identity; uint16_t lac; diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c index b0628e5..34ff426 100644 --- a/src/osmo-hnodeb/hnb.c +++ b/src/osmo-hnodeb/hnb.c @@ -116,6 +116,7 @@ if (!hnb) return NULL; + hnb->identity = talloc_strdup(hnb, "OsmoHNodeB"); hnb->plmn = (struct osmo_plmn_id){ .mcc = 1, .mnc = 1, diff --git a/src/osmo-hnodeb/hnbap.c b/src/osmo-hnodeb/hnbap.c index 8e0bfa6..5b901ac 100644 --- a/src/osmo-hnodeb/hnbap.c +++ b/src/osmo-hnodeb/hnbap.c @@ -157,7 +157,6 @@ uint8_t rac; uint32_t cid; uint8_t plmn[3]; - char identity[50] = "ATestHNB@"; HNBAP_HNBRegisterRequestIEs_t request; memset(&request, 0, sizeof(request)); @@ -167,8 +166,8 @@ asn1_u8_to_str(&request.rac, &rac, hnb->rac); asn1_u28_to_bitstring(&request.cellIdentity, &cid, hnb->cell_identity); - request.hnB_Identity.hNB_Identity_Info.buf = (uint8_t*) identity; - request.hnB_Identity.hNB_Identity_Info.size = strlen(identity); + request.hnB_Identity.hNB_Identity_Info.buf = (uint8_t*) hnb->identity; + request.hnB_Identity.hNB_Identity_Info.size = strlen(hnb->identity); osmo_plmn_to_bcd(plmn, &hnb->plmn); request.plmNidentity.buf = plmn; diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c index 6be938e..8824b77 100644 --- a/src/osmo-hnodeb/vty.c +++ b/src/osmo-hnodeb/vty.c @@ -83,6 +83,17 @@ return CMD_SUCCESS; } +DEFUN_USRATTR(cfg_hnodeb_identity, + cfg_hnodeb_identity_cmd, + 0, + "identity TEXT", + "Set the HNB-identity of this HnodeB\n" "HNB-Identity\n") +{ + struct hnb *hnb = (struct hnb *)vty->index; + osmo_talloc_replace_string(g_hnb, &hnb->identity, argv[0]); + return CMD_SUCCESS; +} + DEFUN_USRATTR(cfg_hnodeb_ncc, cfg_hnodeb_ncc_cmd, 0, @@ -239,6 +250,7 @@ static int config_write_hnodeb(struct vty *vty) { vty_out(vty, "hnodeb%s", VTY_NEWLINE); + vty_out(vty, " identity %s%s", g_hnb->identity, VTY_NEWLINE); vty_out(vty, " network country code %s%s", osmo_mcc_name(g_hnb->plmn.mcc), VTY_NEWLINE); vty_out(vty, " mobile network code %s%s", osmo_mnc_name(g_hnb->plmn.mnc, g_hnb->plmn.mnc_3_digits), VTY_NEWLINE); @@ -361,6 +373,7 @@ { install_element(CONFIG_NODE, &cfg_hnodeb_cmd); install_node(&hnodeb_node, config_write_hnodeb); + install_element(HNODEB_NODE, &cfg_hnodeb_identity_cmd); install_element(HNODEB_NODE, &cfg_hnodeb_ncc_cmd); install_element(HNODEB_NODE, &cfg_hnodeb_mnc_cmd); install_element(HNODEB_NODE, &cfg_hnodeb_ci_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ida47bbb85b5438a2ec9805005bc2ab834c79b765 Gerrit-Change-Number: 26022 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:30:53 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 17:30:53 +0000 Subject: Change in osmo-bsc[master]: bsc_subscr_conn_fsm: fix mgw-pool ref counting In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26011 ) Change subject: bsc_subscr_conn_fsm: fix mgw-pool ref counting ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/26011/1/src/osmo-bsc/bsc_subscr_conn_fsm.c File src/osmo-bsc/bsc_subscr_conn_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/26011/1/src/osmo-bsc/bsc_subscr_conn_fsm.c at 961 PS1, Line 961: mgcp_client = osmo_mgcpc_ep_client(conn->user_plane.mgw_endpoint); > Yes, it can, but osmo_mgcpc_ep_client and mgcp_client_pool_put are NULL pointer safe. IMHO one shouldn't rely on non *_free() functions being null pointer, I'd do proper checks here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5a7ce6a1880a1060df74d03dd4eb38b51fd85c69 Gerrit-Change-Number: 26011 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 17:30:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 17:48:52 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 17:48:52 +0000 Subject: Change in osmo-hnodeb[master]: Generate proper rnc_id and plmn in LuRequest References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26023 ) Change subject: Generate proper rnc_id and plmn in LuRequest ...................................................................... Generate proper rnc_id and plmn in LuRequest Change-Id: Ib40b5eb96b7cc13c424076a4ca725019514d52af --- M include/osmocom/hnodeb/ranap.h M src/osmo-hnodeb/ranap.c M src/osmo-hnodeb/vty.c 3 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/23/26023/1 diff --git a/include/osmocom/hnodeb/ranap.h b/include/osmocom/hnodeb/ranap.h index df756b1..ff324d4 100644 --- a/include/osmocom/hnodeb/ranap.h +++ b/include/osmocom/hnodeb/ranap.h @@ -30,4 +30,4 @@ void hnb_rua_dt_handle_ranap(struct hnb *hnb, struct ranap_message_s *ranap_msg); void hnb_rua_cl_handle_ranap(struct hnb *hnb, struct ranap_message_s *ranap_msg); void hnb_tx_iu_release_req(struct hnb *hnb); -struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi); +struct msgb *gen_initue_lu(struct hnb *hnb, int is_ps, uint32_t conn_id, const char *imsi); diff --git a/src/osmo-hnodeb/ranap.c b/src/osmo-hnodeb/ranap.c index fae87b7..9b82e2c 100644 --- a/src/osmo-hnodeb/ranap.c +++ b/src/osmo-hnodeb/ranap.c @@ -110,16 +110,17 @@ } } -struct msgb *gen_initue_lu(int is_ps, uint32_t conn_id, const char *imsi) +struct msgb *gen_initue_lu(struct hnb *hnb, int is_ps, uint32_t conn_id, const char *imsi) { uint8_t lu[] = { GSM48_PDISC_MM, GSM48_MT_MM_LOC_UPD_REQUEST, 0x70, 0x62, 0xf2, 0x30, 0xff, 0xf3, 0x57, /* len, IMSI/type, IMSI-------------------------------- */ 0x08, 0x29, 0x26, 0x24, 0x10, 0x32, 0x54, 0x76, 0x98, 0x33, 0x03, 0x57, 0x18 , 0xb2 }; - uint8_t plmn_id[] = { 0x09, 0x01, 0x99 }; + uint8_t plmn_id[3]; + osmo_plmn_to_bcd(plmn_id, &hnb->plmn); RANAP_GlobalRNC_ID_t rnc_id = { - .rNC_ID = 23, + .rNC_ID = g_hnb->rnc_id, .pLMNidentity.buf = plmn_id, .pLMNidentity.size = sizeof(plmn_id), }; diff --git a/src/osmo-hnodeb/vty.c b/src/osmo-hnodeb/vty.c index 8824b77..5430065 100644 --- a/src/osmo-hnodeb/vty.c +++ b/src/osmo-hnodeb/vty.c @@ -354,7 +354,7 @@ chan->conn_id = conn_id; conn_id++; - msg = gen_initue_lu(chan->is_ps, chan->conn_id, chan->imsi); + msg = gen_initue_lu(g_hnb, chan->is_ps, chan->conn_id, chan->imsi); rua = rua_new_conn(chan->is_ps, chan->conn_id, msg); hnb_iuh_send(g_hnb, rua); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ib40b5eb96b7cc13c424076a4ca725019514d52af Gerrit-Change-Number: 26023 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 19:17:09 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 19:17:09 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BSC_Tests: set band in f_TC_fh_params_set In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 ) Change subject: BSC_Tests: set band in f_TC_fh_params_set ...................................................................... Patch Set 3: (3 comments) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828/3/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828/3/bsc/BSC_Tests.ttcn at 8579 PS3, Line 8579: var GsmBandArfcn arfcn_ := valueof(ts_GsmBandArfcn(arfcn.arfcn, arfcn.pcs, false)); Could you please explain why you're doing this? I guess this has something to do with the 'uplink' argument. If my guess is correct, then why not to ensure that it's set to false by the caller, rather than setting it here? https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828/3/bsc/BSC_Tests.ttcn at 8581 PS3, Line 8581: select (arfcn_) { The 'case' statements should be inline with the 'select', similar to 'switch' in C. Also, why you mix up tabs and spaces? Let's use one tab here. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828/3/bsc/BSC_Tests.ttcn at 8582 PS3, Line 8582: ? Not critical, but this argument can be omitted here (and below) because '?' is the default value. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25828 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I447e4145c68c62b11b818e28f0081c19e9107647 Gerrit-Change-Number: 25828 Gerrit-PatchSet: 3 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 19:17:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 19:25:41 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 19:25:41 +0000 Subject: Change in osmo-bsc[master]: bsc_subscr_conn_fsm: fix mgw-pool ref counting In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26011 ) Change subject: bsc_subscr_conn_fsm: fix mgw-pool ref counting ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5a7ce6a1880a1060df74d03dd4eb38b51fd85c69 Gerrit-Change-Number: 26011 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 19:25:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 19:26:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 19:26:21 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: remove unused option -t --testmode In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26004 ) Change subject: osmo_bsc_main: remove unused option -t --testmode ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie11173f5a7aab568b9a25102ad7dcf37fd49f318 Gerrit-Change-Number: 26004 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 19:26:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 20:20:00 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 20:20:00 +0000 Subject: Change in osmo-bts[master]: l1sap: make 'l1sap' argument of process_l1sap_meas_data() const References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/26024 ) Change subject: l1sap: make 'l1sap' argument of process_l1sap_meas_data() const ...................................................................... l1sap: make 'l1sap' argument of process_l1sap_meas_data() const Change-Id: Idc3004b0c74f7b98c96f20560c8b60a1fb4eb9c8 --- M src/common/l1sap.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/24/26024/1 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 47ba663..f983b62 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -695,13 +695,13 @@ /* measurement information received from bts model */ static void process_l1sap_meas_data(struct gsm_lchan *lchan, - struct osmo_phsap_prim *l1sap, + const struct osmo_phsap_prim *l1sap, enum osmo_ph_prim ind_type) { struct bts_ul_meas ulm; - struct info_meas_ind_param *info_meas_ind; - struct ph_data_param *ph_data_ind; - struct ph_tch_param *ph_tch_ind; + const struct info_meas_ind_param *info_meas_ind; + const struct ph_data_param *ph_data_ind; + const struct ph_tch_param *ph_tch_ind; uint32_t fn; const char *ind_name; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idc3004b0c74f7b98c96f20560c8b60a1fb4eb9c8 Gerrit-Change-Number: 26024 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 20:20:00 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Thu, 28 Oct 2021 20:20:00 +0000 Subject: Change in osmo-bts[master]: rsl: fix a memory leak in handle_gprs_susp_req() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/26025 ) Change subject: rsl: fix a memory leak in handle_gprs_susp_req() ...................................................................... rsl: fix a memory leak in handle_gprs_susp_req() Change-Id: I65d9c12888aa5e5112680b3b3f38817e322ecc1c --- M src/common/rsl.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/25/26025/1 diff --git a/src/common/rsl.c b/src/common/rsl.c index a952d25..2d00005 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3454,6 +3454,7 @@ if (!gh || msgb_l3len(msg) < sizeof(*gh)+sizeof(*gsr)) { LOGP(DRSL, LOGL_NOTICE, "%s Short GPRS SUSPEND REQ received, ignoring\n", gsm_lchan_name(msg->lchan)); + msgb_free(msg); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I65d9c12888aa5e5112680b3b3f38817e322ecc1c Gerrit-Change-Number: 26025 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Thu Oct 28 21:32:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Thu, 28 Oct 2021 21:32:29 +0000 Subject: Change in osmo-bts[master]: l1sap: make 'l1sap' argument of process_l1sap_meas_data() const In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26024 ) Change subject: l1sap: make 'l1sap' argument of process_l1sap_meas_data() const ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idc3004b0c74f7b98c96f20560c8b60a1fb4eb9c8 Gerrit-Change-Number: 26024 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Thu, 28 Oct 2021 21:32:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Fri Oct 29 00:38:24 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 00:38:24 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <617b42857b0a1_7eae2af57036c5f03204dd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 150s] intention of the Shared Library Policy is to allow parallel installation of [ 150s] multiple versions of the same shared library, hard dependencies likely make [ 150s] that impossible. Please remove this dependency and instead move it to the [ 150s] runtime uses of your library. [ 150s] [ 150s] osmo-iuh.x86_64: W: suse-missing-rclink osmo-hnbgw [ 150s] The package contains an init script or systemd service file but lacks the [ 150s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 150s] [ 150s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 150s] libosmo-rua0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 150s] This package contains a library and provides no %post scriptlet containing a [ 150s] call to ldconfig. [ 150s] [ 150s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 150s] libosmo-rua0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 150s] This package contains a library and provides no %postun scriptlet containing a [ 150s] call to ldconfig. [ 150s] [ 150s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 150s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 150s] [ 150s] ### VM INTERACTION START ### [ 153s] [ 144.450763] sysrq: Power Off [ 153s] [ 144.459891] reboot: Power down [ 153s] ### VM INTERACTION END ### [ 153s] [ 153s] sheep87 failed "build osmo-iuh.spec" at Fri Oct 29 00:38:16 UTC 2021. [ 153s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 00:39:49 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 00:39:49 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <617b42e0e065e_7eae2af57036c5f03207a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 144s] intention of the Shared Library Policy is to allow parallel installation of [ 144s] multiple versions of the same shared library, hard dependencies likely make [ 144s] that impossible. Please remove this dependency and instead move it to the [ 144s] runtime uses of your library. [ 144s] [ 144s] osmo-iuh.x86_64: W: suse-missing-rclink osmo-hnbgw [ 144s] The package contains an init script or systemd service file but lacks the [ 144s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 144s] [ 144s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 144s] libosmo-rua0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 144s] This package contains a library and provides no %post scriptlet containing a [ 144s] call to ldconfig. [ 144s] [ 144s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 144s] libosmo-rua0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 144s] This package contains a library and provides no %postun scriptlet containing a [ 144s] call to ldconfig. [ 144s] [ 144s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 144s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 144s] [ 144s] ### VM INTERACTION START ### [ 147s] [ 138.218026] sysrq: SysRq : Power Off [ 147s] [ 138.220751] reboot: Power down [ 147s] ### VM INTERACTION END ### [ 147s] [ 147s] hci-cnode2-m0 failed "build osmo-iuh.spec" at Fri Oct 29 00:39:38 UTC 2021. [ 147s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 01:34:15 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 01:34:15 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1_ARM/armv7l In-Reply-To: References: Message-ID: <617b4fa4b8bf0_7eae2af57036c5f03295e1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1_ARM/armv7l Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 829s] intention of the Shared Library Policy is to allow parallel installation of [ 829s] multiple versions of the same shared library, hard dependencies likely make [ 829s] that impossible. Please remove this dependency and instead move it to the [ 829s] runtime uses of your library. [ 829s] [ 829s] osmo-iuh.armv7hl: W: suse-missing-rclink osmo-hnbgw [ 829s] The package contains an init script or systemd service file but lacks the [ 829s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 829s] [ 829s] libosmo-hnbap0.armv7hl: E: library-without-ldconfig-postin (Badness: 300) /usr/lib/libosmo-hnbap.so.0.0.0 [ 829s] libosmo-rua0.armv7hl: E: library-without-ldconfig-postin (Badness: 300) /usr/lib/libosmo-rua.so.0.0.0 [ 829s] This package contains a library and provides no %post scriptlet containing a [ 829s] call to ldconfig. [ 829s] [ 829s] libosmo-hnbap0.armv7hl: E: library-without-ldconfig-postun (Badness: 300) /usr/lib/libosmo-hnbap.so.0.0.0 [ 829s] libosmo-rua0.armv7hl: E: library-without-ldconfig-postun (Badness: 300) /usr/lib/libosmo-rua.so.0.0.0 [ 829s] This package contains a library and provides no %postun scriptlet containing a [ 829s] call to ldconfig. [ 829s] [ 829s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 829s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 829s] [ 829s] ### VM INTERACTION START ### [ 832s] [ 811.653076] sysrq: SysRq : Power Off [ 832s] [ 811.660675] reboot: Power down [ 832s] ### VM INTERACTION END ### [ 832s] [ 832s] obs-arm-5 failed "build osmo-iuh.spec" at Fri Oct 29 01:34:04 UTC 2021. [ 832s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 01:48:59 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 01:48:59 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <617b530ca1b2f_7eae2af57036c5f03330b5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 1004s] intention of the Shared Library Policy is to allow parallel installation of [ 1004s] multiple versions of the same shared library, hard dependencies likely make [ 1004s] that impossible. Please remove this dependency and instead move it to the [ 1004s] runtime uses of your library. [ 1004s] [ 1004s] osmo-iuh.aarch64: W: suse-missing-rclink osmo-hnbgw [ 1004s] The package contains an init script or systemd service file but lacks the [ 1004s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 1004s] [ 1004s] libosmo-hnbap0.aarch64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 1004s] libosmo-rua0.aarch64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 1004s] This package contains a library and provides no %post scriptlet containing a [ 1004s] call to ldconfig. [ 1004s] [ 1004s] libosmo-hnbap0.aarch64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 1004s] libosmo-rua0.aarch64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 1004s] This package contains a library and provides no %postun scriptlet containing a [ 1004s] call to ldconfig. [ 1004s] [ 1004s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 1004s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 1004s] [ 1004s] ### VM INTERACTION START ### [ 1007s] [ 972.856859] sysrq: SysRq : Power Off [ 1007s] [ 972.867788] reboot: Power down [ 1007s] ### VM INTERACTION END ### [ 1007s] [ 1007s] obs-arm-3 failed "build osmo-iuh.spec" at Fri Oct 29 01:48:47 UTC 2021. [ 1007s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:06:05 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:06:05 +0000 Subject: Change in osmo-hnodeb[master]: Import hnb-test from osmo-iuh.git In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25995 ) Change subject: Import hnb-test from osmo-iuh.git ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I36fd4aa5d39222371bd36e9f540b91e36a26de43 Gerrit-Change-Number: 25995 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 05:06:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:08:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:08:53 +0000 Subject: Change in osmo-hnodeb[master]: Move existing vty code to its own cty.c/h file In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25997 ) Change subject: Move existing vty code to its own cty.c/h file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I88107e9ed03ff8f807b57a3ea0d189fd70864861 Gerrit-Change-Number: 25997 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 05:08:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:09:09 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:09:09 +0000 Subject: Change in osmo-hnodeb[master]: main.c: Drop commented out code In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25998 ) Change subject: main.c: Drop commented out code ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ea1e3b8692cc6e162962d2e812eb1342c100251 Gerrit-Change-Number: 25998 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 05:09:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:09:53 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:09:53 +0000 Subject: Change in osmo-hnodeb[master]: Move rua related code to rua.c/h In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25999 ) Change subject: Move rua related code to rua.c/h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ibefe952fe1b642cab5c4abe36383a7ebb05f39c3 Gerrit-Change-Number: 25999 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 05:09:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:11:27 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:11:27 +0000 Subject: Change in osmo-hnodeb[master]: Move hnbap related code to hnbap.c/h In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26000 ) Change subject: Move hnbap related code to hnbap.c/h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26000 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I8356421169bebe1d411b05b19241ea639dc3f733 Gerrit-Change-Number: 26000 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 05:11:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:15:38 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:15:38 +0000 Subject: Change in osmo-hnodeb[master]: Allocate g_hnb as a pointer, move code to hnb.c/h In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26001 ) Change subject: Allocate g_hnb as a pointer, move code to hnb.c/h ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-hnodeb/+/26001/1/src/osmo-hnodeb/hnb.c File src/osmo-hnodeb/hnb.c: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26001/1/src/osmo-hnodeb/hnb.c at 65 PS1, Line 65: if (rc < 0) { BTW (I know you're just moving stuff around), we have msg leak here. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I5ec61d2a72d55d182e1498939209b30b6e652467 Gerrit-Change-Number: 26001 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 05:15:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:19:11 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:19:11 +0000 Subject: Change in osmo-hnodeb[master]: Move protocol related code in main.c to related proto files In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26002 ) Change subject: Move protocol related code in main.c to related proto files ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-hnodeb/+/26002/1/include/osmocom/hnodeb/ranap.h File include/osmocom/hnodeb/ranap.h: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26002/1/include/osmocom/hnodeb/ranap.h at 22 PS1, Line 22: struct hnb; Isn't it defined in ? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I771b3d3f61207137477eed2b316a5f670fb79ef2 Gerrit-Change-Number: 26002 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 05:19:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:19:33 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:19:33 +0000 Subject: Change in osmo-hnodeb[master]: main.c: Fix cap in naming for vty_info.name In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26012 ) Change subject: main.c: Fix cap in naming for vty_info.name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I8ce83aa17ad7dd3ec991e4d7d9cca01dc1bf4681 Gerrit-Change-Number: 26012 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 05:19:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:27:37 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:27:37 +0000 Subject: Change in osmo-hnodeb[master]: More work on main.c to add osmocom functionalitites In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013 ) Change subject: More work on main.c to add osmocom functionalitites ...................................................................... Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013/1/src/osmo-hnodeb/main.c File src/osmo-hnodeb/main.c: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013/1/src/osmo-hnodeb/main.c at 55 PS1, Line 55: Contributions by Daniel Willmann AFAIU, it's _based on_ work by Daniel, so maybe write it this way? https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013/1/src/osmo-hnodeb/main.c at 92 PS1, Line 92: OsmoMSC FIXME https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013/1/src/osmo-hnodeb/main.c at 306 PS1, Line 306: FIXME: VTY code still uses NULL-context Is it also the case here? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I61a5ee2e100f79cef7e42dbd981e308597c30900 Gerrit-Change-Number: 26013 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 05:27:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:31:40 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:31:40 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25991 ) Change subject: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: > I'd rather have a bit longer names than really having to waste hours playing tetris with header files and source files. Having these patches solves the build problems in osmo-hnodeb and whoever wishes to use this library. BTW, none of our code outside osmo-iuh really uses those structures being used, so nothing breaks, and we don't really care if they are longer because we don't use a lot of them in any place. I would like to see one real-world example where we actually run into such clashes. As far as I recall, I have written osmo-hnbgw without the need to do so, and I currently don't see the difference to osmo-hnodeb. IMHO, code that implements HNBAP doesn't have anything do with RANAP nor RUA. And code implementing RUA should have a clean layer separation to RANAP, too. Those are different layers, stacked on top of each other. like BSSMAP in SCCP. RUA contains an octetstring, and that octetstring contains RANAP. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1bcbe047d233684647d6ffe9febb14a12c579696 Gerrit-Change-Number: 25991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 29 Oct 2021 05:31:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:33:26 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:33:26 +0000 Subject: Change in osmo-hnodeb[master]: Set up Iuh conn params through VTY In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26014 ) Change subject: Set up Iuh conn params through VTY ...................................................................... Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/c/osmo-hnodeb/+/26014/1/src/osmo-hnodeb/vty.c File src/osmo-hnodeb/vty.c: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26014/1/src/osmo-hnodeb/vty.c at 122 PS1, Line 122: Local Remote https://gerrit.osmocom.org/c/osmo-hnodeb/+/26014/1/src/osmo-hnodeb/vty.c at 132 PS1, Line 132: Local Remote -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Id5a17742643e8f02c22228e3055bcc213423a416 Gerrit-Change-Number: 26014 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 05:33:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:33:41 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:33:41 +0000 Subject: Change in osmo-hnodeb[master]: Drop unused fields in struct hnb In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 ) Change subject: Drop unused fields in struct hnb ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ia981d99bf521eb8b79bdf8d7f81ca50f6cdeba8c Gerrit-Change-Number: 26015 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 05:33:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:33:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:33:53 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25991 ) Change subject: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1bcbe047d233684647d6ffe9febb14a12c579696 Gerrit-Change-Number: 25991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 29 Oct 2021 05:33:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:33:58 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:33:58 +0000 Subject: Change in osmo-iuh[master]: rua: Use asn1c flag -fcompound-names to avoid name collisions with ot... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25992 ) Change subject: rua: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Id4e337cdc82c26922b7ca7f0fe8af523e9a0945c Gerrit-Change-Number: 25992 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 29 Oct 2021 05:33:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:34:04 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:34:04 +0000 Subject: Change in osmo-iuh[master]: sabp: Use asn1c flag -fcompound-names to avoid name collisions with o... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25993 ) Change subject: sabp: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I10ce4a9414768cdcf850feeca4088296e339919f Gerrit-Change-Number: 25993 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 29 Oct 2021 05:34:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:34:10 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:34:10 +0000 Subject: Change in osmo-iuh[master]: ranap: Use asn1c flag -fcompound-names to avoid name collisions with ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25994 ) Change subject: ranap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iba106dcc18e3d429b4b9808610a44ac29b798172 Gerrit-Change-Number: 25994 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 29 Oct 2021 05:34:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:34:55 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:34:55 +0000 Subject: Change in osmo-hnodeb[master]: hnb: Move wqueue to .iuh, add wrapper to use it In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26016 ) Change subject: hnb: Move wqueue to .iuh, add wrapper to use it ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I38498858fc315ad3d57644d7b905f5393f43e884 Gerrit-Change-Number: 26016 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 05:34:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:35:46 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:35:46 +0000 Subject: Change in osmo-hnodeb[master]: main.c: Drop commented out code In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25998 ) Change subject: main.c: Drop commented out code ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6ea1e3b8692cc6e162962d2e812eb1342c100251 Gerrit-Change-Number: 25998 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:35:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:35:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:35:52 +0000 Subject: Change in osmo-hnodeb[master]: Move rua related code to rua.c/h In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25999 ) Change subject: Move rua related code to rua.c/h ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25999 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ibefe952fe1b642cab5c4abe36383a7ebb05f39c3 Gerrit-Change-Number: 25999 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:35:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:35:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:35:56 +0000 Subject: Change in osmo-hnodeb[master]: Move existing vty code to its own cty.c/h file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25997 ) Change subject: Move existing vty code to its own cty.c/h file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I88107e9ed03ff8f807b57a3ea0d189fd70864861 Gerrit-Change-Number: 25997 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:35:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:37:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:37:23 +0000 Subject: Change in osmo-hnodeb[master]: Move protocol related code in main.c to related proto files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26002 ) Change subject: Move protocol related code in main.c to related proto files ...................................................................... Patch Set 1: well, all of this NAS/DTAP code doesn't really have any right to exist inside a real hnodeb. This is actually emulating an UE. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I771b3d3f61207137477eed2b316a5f670fb79ef2 Gerrit-Change-Number: 26002 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:37:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:37:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:37:35 +0000 Subject: Change in osmo-hnodeb[master]: main.c: Fix cap in naming for vty_info.name In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26012 ) Change subject: main.c: Fix cap in naming for vty_info.name ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I8ce83aa17ad7dd3ec991e4d7d9cca01dc1bf4681 Gerrit-Change-Number: 26012 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:37:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:39:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:39:13 +0000 Subject: Change in osmo-hnodeb[master]: More work on main.c to add osmocom functionalitites In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013 ) Change subject: More work on main.c to add osmocom functionalitites ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013/1/src/osmo-hnodeb/main.c File src/osmo-hnodeb/main.c: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013/1/src/osmo-hnodeb/main.c at 55 PS1, Line 55: Contributions by Daniel Willmann > AFAIU, it's _based on_ work by Daniel, so maybe write it this way? most of those messages are out of date these days, we'd need some kind of general solution to that. but the Copyright statement likely clearly is wrong,as the existing code is not from 2021 but from much earlier. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I61a5ee2e100f79cef7e42dbd981e308597c30900 Gerrit-Change-Number: 26013 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:39:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:40:48 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:40:48 +0000 Subject: Change in osmo-hnodeb[master]: Use osmocom logging in non-main files In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017 ) Change subject: Use osmocom logging in non-main files ...................................................................... Patch Set 1: Code-Review-1 (14 comments) Please revisit logging levels. Using INFO everywhere is not a good idea. https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/debug.c File src/osmo-hnodeb/debug.c: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/debug.c at 26 PS1, Line 26: loglevel = LOGL_NOTICE FYI: if 'loglevel' is not set explicitly, libosmocore itself would set it to LOGL_NOTICE. https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/hnbap.c File src/osmo-hnodeb/hnbap.c: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/hnbap.c at 65 PS1, Line 65: LOGL_INFO NOTICE/ERROR? https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/hnbap.c at 96 PS1, Line 96: LOGL_INFO NOTICE/ERROR? https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/hnbap.c at 186 PS1, Line 186: LOGL_INFO NOTICE/ERROR? https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/hnbap.c at 215 PS1, Line 215: LOGL_INFO NOTICE/ERROR? https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/nas.c File src/osmo-hnodeb/nas.c: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/nas.c at 90 PS1, Line 90: LOGL_INFO NOTICE/ERROR? https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/nas.c at 116 PS1, Line 116: LOGL_INFO NOTICE/ERROR? https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/nas.c at 161 PS1, Line 161: LOGL_INFO NOTICE/ERROR? https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/nas.c at 186 PS1, Line 186: LOGL_INFO DEBUG? https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/nas.c at 200 PS1, Line 200: LOGL_INFO NOTICE/ERROR? https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/nas.c at 234 PS1, Line 234: LOGL_INFO NOTICE/ERROR? https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/nas.c at 251 PS1, Line 251: LOGL_INFO NOTICE/ERROR? https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/nas.c at 261 PS1, Line 261: LOGL_INFO NOTICE/ERROR? https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017/1/src/osmo-hnodeb/nas.c at 264 PS1, Line 264: LOGL_INFO NOTICE/ERROR? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I649b17803aeffd20354aa76dde61094959f08e43 Gerrit-Change-Number: 26017 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 05:40:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:41:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:41:07 +0000 Subject: Change in osmo-hnodeb[master]: Drop unused fields in struct hnb In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 ) Change subject: Drop unused fields in struct hnb ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015/1/include/osmocom/hnodeb/hnodeb.h File include/osmocom/hnodeb/hnodeb.h: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015/1/include/osmocom/hnodeb/hnodeb.h at a85 PS1, Line 85: char identity_info[256]; : /*! copied from Cell Identity IE */ : struct umts_cell_id id; I'd say the proper fix is to make those identifiers vty-configurable, store them here and then use them from here when registering to the HNBGW. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ia981d99bf521eb8b79bdf8d7f81ca50f6cdeba8c Gerrit-Change-Number: 26015 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:41:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:41:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:41:24 +0000 Subject: Change in osmo-hnodeb[master]: hnb: Move wqueue to .iuh, add wrapper to use it In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26016 ) Change subject: hnb: Move wqueue to .iuh, add wrapper to use it ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I38498858fc315ad3d57644d7b905f5393f43e884 Gerrit-Change-Number: 26016 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:41:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:41:55 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:41:55 +0000 Subject: Change in osmo-hnodeb[master]: use osmo_stream_cli to manage sctp Iuh conn In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26018 ) Change subject: use osmo_stream_cli to manage sctp Iuh conn ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I9d884231577aa47af22cd6319130ca5c9e595d61 Gerrit-Change-Number: 26018 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:41:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:42:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:42:14 +0000 Subject: Change in osmo-hnodeb[master]: Send HnbRegisterRequest when HnodeB connects on Iuh In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26019 ) Change subject: Send HnbRegisterRequest when HnodeB connects on Iuh ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I901fd456221a3bdc3f4f95b7fd3b9484c7830f24 Gerrit-Change-Number: 26019 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:42:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:42:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:42:34 +0000 Subject: Change in osmo-hnodeb[master]: Configure PLMN over VTY and use it in HnbRegisterRequest In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26020 ) Change subject: Configure PLMN over VTY and use it in HnbRegisterRequest ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6d67aa547d5496fe1407744e1dde07d2a41df500 Gerrit-Change-Number: 26020 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:42:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:42:39 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:42:39 +0000 Subject: Change in osmo-hnodeb[master]: use osmo_stream_cli to manage sctp Iuh conn In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26018 ) Change subject: use osmo_stream_cli to manage sctp Iuh conn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I9d884231577aa47af22cd6319130ca5c9e595d61 Gerrit-Change-Number: 26018 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:42:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:43:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:43:21 +0000 Subject: Change in osmo-hnodeb[master]: Send HnbRegisterRequest when HnodeB connects on Iuh In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26019 ) Change subject: Send HnbRegisterRequest when HnodeB connects on Iuh ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I901fd456221a3bdc3f4f95b7fd3b9484c7830f24 Gerrit-Change-Number: 26019 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:43:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:43:32 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:43:32 +0000 Subject: Change in osmo-hnodeb[master]: Configure CI, LAC, RAC, SAC over VTY and use it in HnbRegisterRequest In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021 ) Change subject: Configure CI,LAC,RAC,SAC over VTY and use it in HnbRegisterRequest ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021/1/src/osmo-hnodeb/vty.c File src/osmo-hnodeb/vty.c: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021/1/src/osmo-hnodeb/vty.c at 245 PS1, Line 245: vty_out(vty, " cell_identity %u%s", g_hnb->cell_identity, VTY_NEWLINE); you're adding one indent level here without entering a new vty node? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I06f21758e361b7d4d7141086d758893bee434e5c Gerrit-Change-Number: 26021 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:43:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:44:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:44:01 +0000 Subject: Change in osmo-hnodeb[master]: Configure HNB-Identity over VTY and use it in HnbRegisterRequest In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26022 ) Change subject: Configure HNB-Identity over VTY and use it in HnbRegisterRequest ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ida47bbb85b5438a2ec9805005bc2ab834c79b765 Gerrit-Change-Number: 26022 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:44:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:44:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:44:25 +0000 Subject: Change in osmo-hnodeb[master]: Generate proper rnc_id and plmn in LuRequest In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26023 ) Change subject: Generate proper rnc_id and plmn in LuRequest ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-hnodeb/+/26023/1/include/osmocom/hnodeb/ranap.h File include/osmocom/hnodeb/ranap.h: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26023/1/include/osmocom/hnodeb/ranap.h at 33 PS1, Line 33: struct msgb *gen_initue_lu(struct hnb *hnb, int is_ps, uint32_t conn_id, const char *imsi); const? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ib40b5eb96b7cc13c424076a4ca725019514d52af Gerrit-Change-Number: 26023 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:44:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:45:13 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:45:13 +0000 Subject: Change in osmo-bts[master]: l1sap: make 'l1sap' argument of process_l1sap_meas_data() const In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26024 ) Change subject: l1sap: make 'l1sap' argument of process_l1sap_meas_data() const ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idc3004b0c74f7b98c96f20560c8b60a1fb4eb9c8 Gerrit-Change-Number: 26024 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 29 Oct 2021 05:45:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:46:38 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:46:38 +0000 Subject: Change in osmo-bts[master]: rsl: fix a memory leak in handle_gprs_susp_req() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26025 ) Change subject: rsl: fix a memory leak in handle_gprs_susp_req() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I65d9c12888aa5e5112680b3b3f38817e322ecc1c Gerrit-Change-Number: 26025 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:46:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:47:05 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:47:05 +0000 Subject: Change in libosmocore[master]: Revert "Prevent GCR encoder/decoder functions from being used directly" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25981 ) Change subject: Revert "Prevent GCR encoder/decoder functions from being used directly" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I06babb959fdc82f4e82d92260131d60c98b0abd2 Gerrit-Change-Number: 25981 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 29 Oct 2021 05:47:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:47:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:47:09 +0000 Subject: Change in libosmocore[master]: Revert "Prevent GCR encoder/decoder functions from being used directly" In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/25981 ) Change subject: Revert "Prevent GCR encoder/decoder functions from being used directly" ...................................................................... Revert "Prevent GCR encoder/decoder functions from being used directly" We need this API for communicating GCR over the MNCC and SIP. Change-Id: I06babb959fdc82f4e82d92260131d60c98b0abd2 Related: OS#5164 --- M include/osmocom/gsm/gsm29205.h 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm29205.h b/include/osmocom/gsm/gsm29205.h index 9575456..f93e34a 100644 --- a/include/osmocom/gsm/gsm29205.h +++ b/include/osmocom/gsm/gsm29205.h @@ -37,6 +37,6 @@ uint8_t cr[5]; /** Call Reference ID */ }; -uint8_t osmo_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g) OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; -int osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len) OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; +uint8_t osmo_enc_gcr(struct msgb *msg, const struct osmo_gcr_parsed *g); +int osmo_dec_gcr(struct osmo_gcr_parsed *gcr, const uint8_t *elem, uint8_t len); bool osmo_gcr_eq(const struct osmo_gcr_parsed *gcr1, const struct osmo_gcr_parsed *gcr2); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/25981 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I06babb959fdc82f4e82d92260131d60c98b0abd2 Gerrit-Change-Number: 25981 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:47:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:47:18 +0000 Subject: Change in osmo-bsc[master]: osmo_bsc_main: remove unused option -t --testmode In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26004 ) Change subject: osmo_bsc_main: remove unused option -t --testmode ...................................................................... osmo_bsc_main: remove unused option -t --testmode The option -t --testmode is defined, but not evaluated. It seems that the code of this option was removed long ago. Lets remove it now. Change-Id: Ie11173f5a7aab568b9a25102ad7dcf37fd49f318 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 92b7475..17196e9 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -108,7 +108,6 @@ printf(" -c --config-file filename The config file to use.\n"); printf(" -e --log-level number Set a global loglevel.\n"); printf(" -r --rf-ctl NAME A unix domain socket to listen for cmds.\n"); - printf(" -t --testmode A special mode to provoke failures at the MSC.\n"); printf("\nVTY reference generation:\n"); printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); @@ -155,13 +154,12 @@ {"version", 0, 0, 'V' }, {"log-level", 1, 0, 'e'}, {"rf-ctl", 1, 0, 'r'}, - {"testmode", 0, 0, 't'}, {"vty-ref-mode", 1, &long_option, 1}, {"vty-ref-xml", 0, &long_option, 2}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "hd:DsTVc:e:r:t", + c = getopt_long(argc, argv, "hd:DsTVc:e:r:", long_options, &option_index); if (c == -1) break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26004 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie11173f5a7aab568b9a25102ad7dcf37fd49f318 Gerrit-Change-Number: 26004 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:48:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:48:29 +0000 Subject: Change in osmo-bsc[master]: bsc_subscr_conn_fsm: fix mgw-pool ref counting In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26011 ) Change subject: bsc_subscr_conn_fsm: fix mgw-pool ref counting ...................................................................... Patch Set 1: Code-Review+2 (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/26011/1/src/osmo-bsc/bsc_subscr_conn_fsm.c File src/osmo-bsc/bsc_subscr_conn_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/26011/1/src/osmo-bsc/bsc_subscr_conn_fsm.c at 961 PS1, Line 961: mgcp_client = osmo_mgcpc_ep_client(conn->user_plane.mgw_endpoint); > IMHO one shouldn't rely on non *_free() functions being null pointer, I'd do proper checks here. I think all functions with _free() must be NULL pointer safe, otherwise you don't call the function _free() as this is what people expect when you call it that way. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5a7ce6a1880a1060df74d03dd4eb38b51fd85c69 Gerrit-Change-Number: 26011 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 29 Oct 2021 05:48:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:48:43 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Fri, 29 Oct 2021 05:48:43 +0000 Subject: Change in osmo-bsc[master]: bsc_subscr_conn_fsm: fix mgw-pool ref counting In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26011 ) Change subject: bsc_subscr_conn_fsm: fix mgw-pool ref counting ...................................................................... bsc_subscr_conn_fsm: fix mgw-pool ref counting When the gsm_subscr_conn_fsm (GSCO) terminates abormally it might not go through the forget-mgw-endpoint mechanism. It might be terminated forcefully, which means only the pre_term callback runs. The pre_term callback clears the endpoint, but it does not put the mgcp_client reference back into the pool. This results into a wrong ref-count in the mgw-pool. Change-Id: I5a7ce6a1880a1060df74d03dd4eb38b51fd85c69 Related: SYS#5675 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 1e61d3f..c18079f 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -955,8 +955,14 @@ static void gscon_pre_term(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { struct gsm_subscriber_connection *conn = fi->priv; + struct mgcp_client *mgcp_client; + + /* Put MGCP client back into MGW pool */ + mgcp_client = osmo_mgcpc_ep_client(conn->user_plane.mgw_endpoint); + mgcp_client_pool_put(mgcp_client); osmo_mgcpc_ep_clear(conn->user_plane.mgw_endpoint); + conn->user_plane.mgw_endpoint = NULL; if (conn->lcls.fi) { /* request termination of LCLS FSM */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5a7ce6a1880a1060df74d03dd4eb38b51fd85c69 Gerrit-Change-Number: 26011 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:54:26 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:54:26 +0000 Subject: Change in osmo-hnodeb[master]: Configure PLMN over VTY and use it in HnbRegisterRequest In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26020 ) Change subject: Configure PLMN over VTY and use it in HnbRegisterRequest ...................................................................... Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-hnodeb/+/26020/1/src/osmo-hnodeb/vty.c File src/osmo-hnodeb/vty.c: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26020/1/src/osmo-hnodeb/vty.c at 87 PS1, Line 87: network country code I guess we want to be consistent with osmo-{msc,bsc} here, but I also don't like having three separate VTY vectors here ('network-country-code' would be better). -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6d67aa547d5496fe1407744e1dde07d2a41df500 Gerrit-Change-Number: 26020 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:54:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 05:59:51 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 05:59:51 +0000 Subject: Change in osmo-hnodeb[master]: Configure CI, LAC, RAC, SAC over VTY and use it in HnbRegisterRequest In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021 ) Change subject: Configure CI,LAC,RAC,SAC over VTY and use it in HnbRegisterRequest ...................................................................... Patch Set 1: Code-Review-1 (2 comments) CR-1 for the indention in 'show running-config'. https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021/1/src/osmo-hnodeb/vty.c File src/osmo-hnodeb/vty.c: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021/1/src/osmo-hnodeb/vty.c at 135 PS1, Line 135: cell_identity Do we want to inherit this inconsistency from osmo-{bsc,msc}? 'foo-bar' (preferred) 'foo_bar' 'foo bar' I vote for having one consistent naming style. https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021/1/src/osmo-hnodeb/vty.c at 245 PS1, Line 245: vty_out(vty, " cell_identity %u%s", g_hnb->cell_identity, VTY_NEWLINE); > you're adding one indent level here without entering a new vty node? Ack, something is wrong here. Time to add the VTY transcript tests? -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I06f21758e361b7d4d7141086d758893bee434e5c Gerrit-Change-Number: 26021 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 05:59:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 06:00:56 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 06:00:56 +0000 Subject: Change in osmo-hnodeb[master]: Configure HNB-Identity over VTY and use it in HnbRegisterRequest In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26022 ) Change subject: Configure HNB-Identity over VTY and use it in HnbRegisterRequest ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ida47bbb85b5438a2ec9805005bc2ab834c79b765 Gerrit-Change-Number: 26022 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 06:00:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 09:51:23 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 29 Oct 2021 09:51:23 +0000 Subject: Change in simtrace2[master]: firmware: add bootloader update "app" References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26026 ) Change subject: firmware: add bootloader update "app" ...................................................................... firmware: add bootloader update "app" This bl updater can be flashed as app and will update the bootloader and then delete itself before resetting the sam3, so the device will end up in the newly updated dfu bootloader afterwards, without having to press the bootloader button or requring any other manual interaction, ready to receive a new application image. Building the blupdater requires a previously built dfu-flash bootloader bin file that will then be embedded into the app during building. Related: OS#1704 Related: SYS5061 Change-Id: I53dea57bba790a2ab3245d9483e0ff1c8d19d5e3 --- M Makefile M firmware/Makefile A firmware/apps/blupdate/Makefile A firmware/apps/blupdate/main.c M firmware/libboard/common/resources/sam3s4/dfu.ld 5 files changed, 187 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/26/26026/1 diff --git a/Makefile b/Makefile index b15f38d..9951e54 100644 --- a/Makefile +++ b/Makefile @@ -8,16 +8,23 @@ endef $(eval $(call RULES,simtrace,dfu)) +$(eval $(call RULES,simtrace,blupdate)) $(eval $(call RULES,simtrace,trace)) $(eval $(call RULES,simtrace,cardem)) $(eval $(call RULES,qmod,dfu)) +$(eval $(call RULES,qmod,blupdate)) $(eval $(call RULES,qmod,cardem)) $(eval $(call RULES,ngff_cardem,dfu)) +$(eval $(call RULES,ngff_cardem,blupdate)) $(eval $(call RULES,ngff_cardem,trace)) $(eval $(call RULES,ngff_cardem,cardem)) -fw-clean: fw-simtrace-dfu-clean fw-simtrace-trace-clean fw-simtrace-cardem-clean fw-qmod-dfu-clean fw-qmod-cardem-clean -fw: fw-simtrace-dfu fw-simtrace-trace fw-simtrace-cardem fw-qmod-dfu fw-qmod-cardem fw-ngff_cardem-dfu fw-ngff_cardem-trace fw-ngff_cardem-cardem +fw-clean: fw-simtrace-dfu-clean fw-simtrace-blupdate-clean fw-simtrace-trace-clean fw-simtrace-cardem-clean \ + fw-qmod-dfu-clean fw-qmod-blupdate-clean fw-qmod-cardem-clean \ + fw-ngff_cardem-dfu-clean fw-ngff_cardem-blupdate-clean fw-ngff_cardem-trace-clean fw-ngff_cardem-cardem-clean +fw: fw-simtrace-dfu fw-simtrace-blupdate fw-simtrace-trace fw-simtrace-cardem \ + fw-qmod-dfu fw-qmod-blupdate fw-qmod-cardem \ + fw-ngff_cardem-dfu fw-ngff_cardem-blupdate fw-ngff_cardem-trace fw-ngff_cardem-cardem utils: (cd host && \ diff --git a/firmware/Makefile b/firmware/Makefile index bfe2c9d..810c7f3 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -245,12 +245,13 @@ define RULES C_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(C_OBJECTS)) ASM_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(ASM_OBJECTS)) +EXTRA_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(EXTRA_OBJECTS)) -$(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1)) - $(SILENT)$(CC) $(CFLAGS) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS) - $(SILENT)$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt - $(SILENT)$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin - $(SILENT)$(SIZE) $$^ $(OUTPUT)-$$@.elf +build_$(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1)) $$(EXTRA_OBJECTS_$(1)) + $(SILENT)$(CC) $(CFLAGS) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$(1).ld" -Wl,-Map,$(OUTPUT)-$(1).map -o $(OUTPUT)-$(1).elf $$^ $(LIBS) + $(SILENT)$(NM) $(OUTPUT)-$(1).elf >$(OUTPUT)-$(1).elf.txt + $(SILENT)$(OBJCOPY) -O binary $(OUTPUT)-$(1).elf $(OUTPUT)-$(1).bin + $(SILENT)$(SIZE) $$^ $(OUTPUT)-$(1).elf $$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN) @echo [COMPILING $$<] @@ -258,13 +259,34 @@ $$(ASM_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.S Makefile $(OBJ) $(BIN) @echo [ASSEMBLING $$@] - $(SILENT)@$(CC) $(ASFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$< + $(SILENT)$(CC) $(ASFLAGS) -DENVIRONMENT_$(1) -DENVIRONMENT=\"$(1)\" -c -o $$@ $$< debug_$(1): $(1) $(GDB) -x "$(BOARD_LIB)/resources/gcc/$(BOARD)_$(1).gdb" -ex "reset" -readnow -se $(OUTPUT)-$(1).elf endef -$(foreach MEMORY, $(MEMORIES), $(eval $(call RULES,$(MEMORY)))) +ALL_MEMORIES = dfu flash ram +$(foreach MEMORY, $(ALL_MEMORIES), $(eval $(call RULES,$(MEMORY)))) + +# files with those names do exist.. +.PHONY: ram +.PHONY: dfu +.PHONY: flash +ram: build_ram +dfu: build_dfu +ifeq ($(APP), blupdate) + $(info updating updater section with padded bootloader file..) + $(SILENT)dd if=/dev/zero bs=16384 count=1 of=$(BIN)/$(BOARD)-dfu-flash-padded.bin + $(SILENT)dd if=$(BIN)/$(BOARD)-dfu-flash.bin conv=notrunc of=$(BIN)/$(BOARD)-dfu-flash-padded.bin + $(SILENT)$(OBJCOPY) --update-section .blupdate=bin/$(BOARD)-dfu-flash-padded.bin bin/$(BOARD)-blupdate-dfu.elf + $(SILENT)$(OBJCOPY) -O binary bin/$(BOARD)-blupdate-dfu.elf bin/$(BOARD)-blupdate-dfu.bin +endif +flash: build_flash +#alternate way of embedding: obj file +#ifeq ($(APP), dfu) +# $(info bootloader bin file to obj..) +# $(SILENT)$(OBJCOPY) --rename-section .data=.fwupdate -I binary -O elf32-littlearm bin/$(BOARD)-dfu-flash.bin $(OBJ)/flash_fwupdate.o +#endif program: openocd -f openocd/openocd.cfg -c "init" -c "halt" -c "flash write_bank 0 ./bin/project-flash.bin 0" -c "reset" -c "shutdown" diff --git a/firmware/apps/blupdate/Makefile b/firmware/apps/blupdate/Makefile new file mode 100644 index 0000000..141b01f --- /dev/null +++ b/firmware/apps/blupdate/Makefile @@ -0,0 +1,12 @@ + +C_FILES += $(C_LIBUSB_DFU) + +# Trace level used for compilation +# (can be overriden by adding TRACE_LEVEL=#number to the command-line) +# TRACE_LEVEL_DEBUG 5 +# TRACE_LEVEL_INFO 4 +# TRACE_LEVEL_WARNING 3 +# TRACE_LEVEL_ERROR 2 +# TRACE_LEVEL_FATAL 1 +# TRACE_LEVEL_NO_TRACE 0 +TRACE_LEVEL ?= 3 diff --git a/firmware/apps/blupdate/main.c b/firmware/apps/blupdate/main.c new file mode 100644 index 0000000..21dbb5b --- /dev/null +++ b/firmware/apps/blupdate/main.c @@ -0,0 +1,129 @@ +/* SIMtrace 2 firmware USB DFU bootloader + * + * (C) 2015-2017 by Harald Welte + * (C) 2018-2019 by sysmocom -s.f.m.c. GmbH, Author: Kevin Redon + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +#include "board.h" +#include "core_cm3.h" +#include "flashd.h" +#include "utils.h" +#include "usb/device/dfu/dfu.h" +#include "usb/common/dfu/usb_dfu.h" +#include "manifest.h" +#include "USBD_HAL.h" + +#include + +/* actual section content must be replaced with the padded bootloader by running objcopy! */ +const uint32_t bl_update_data[BOARD_DFU_BOOT_SIZE/sizeof(uint32_t)] __attribute__ ((section(".fwupdate"))) = {0xFF}; + +unsigned int g_unique_id[4]; +/* remember if the watchdog has been configured in the main loop so we can kick it in the ISR */ +static bool watchdog_configured = false; + +extern uint32_t _end; +extern uint32_t _srelocate; +extern uint32_t _etext; + +void DFURT_SwitchToDFU(void) {} +void USBDFU_Runtime_RequestHandler(const USBGenericRequest *request) {} +int USBDFU_handle_dnload(uint8_t altif, unsigned int offset, + uint8_t *data, unsigned int len) {return 0;} +int USBDFU_handle_upload(uint8_t altif, unsigned int offset, + uint8_t *data, unsigned int req_len) {return 0;} +int USBDFU_OverrideEnterDFU(void) {return 0;} + +__attribute__ ((section(".ramfunc"), noinline)) +static uint32_t flash_wait_ready() +{ + Efc* efc = EFC; + uint32_t dwStatus ; + + do + { + dwStatus = efc->EEFC_FSR ; + } + while ( (dwStatus & EEFC_FSR_FRDY) != EEFC_FSR_FRDY ) ; + return ( dwStatus & (EEFC_FSR_FLOCKE | EEFC_FSR_FCMDE) ) ; +} + +__attribute__ ((section(".ramfunc"), noinline)) +static void flash_cmd(uint32_t dwCommand, uint32_t dwArgument) +{ + Efc* efc = EFC; + uint32_t dwStatus ; + efc->EEFC_FCR = EEFC_FCR_FKEY(0x5A) | EEFC_FCR_FARG(dwArgument) | EEFC_FCR_FCMD(dwCommand) ; +} + +__attribute__ ((section(".ramfunc"), noinline, noreturn)) +static void erase_first_app_sector() { + + /* page 64 */ + uint32_t first_app_page = (BOARD_DFU_BOOT_SIZE / IFLASH_PAGE_SIZE); + uint32_t* first_app_address = (uint32_t*) (IFLASH_ADDR + first_app_page * IFLASH_PAGE_SIZE + 0); + +#if 1 + /* overwrite first app sector so we don't keep booting this */ + for (int i = 0 ; i < IFLASH_PAGE_SIZE/4; i++) + first_app_address[i] = 0xffffffff; + + flash_cmd(EFC_FCMD_EWP, first_app_page); +#else + /* why does erasing the whole flash with a protected bootloader not work at all? */ + flash_cmd(EFC_FCMD_EA, 0); +#endif + flash_wait_ready(); + for(;;) + NVIC_SystemReset(); +} + +#define MAX_USB_ITER BOARD_MCK/72 // This should be around a second +extern int main(void) +{ + uint8_t isUsbConnected = 0; + unsigned int i = 0; + uint32_t reset_cause = (RSTC->RSTC_SR & RSTC_SR_RSTTYP_Msk) >> RSTC_SR_RSTTYP_Pos; + + /* Enable watchdog for 2000ms, with no window */ + WDT_Enable(WDT, WDT_MR_WDRSTEN | WDT_MR_WDDBGHLT | WDT_MR_WDIDLEHLT | + (WDT_GetPeriod(2000) << 16) | WDT_GetPeriod(2000)); + watchdog_configured = true; + + EEFC_ReadUniqueID(g_unique_id); + + printf("\n\r\n\r"); + printf("bootloader updater %s for board %s\n\r" + "(C) 2010-2017 by Harald Welte, 2018-2019 by Kevin Redon\n\r", + manifest_revision, manifest_board); + + /* clear g_dfu on power-up reset */ + memset(g_dfu, 0, sizeof(*g_dfu)); + + TRACE_INFO("USB init...\n\r"); + /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */ + USBD_Disconnect(); + + /* Initialize the flash to be able to write it, using the IAP ROM code */ + FLASHD_Initialize(BOARD_MCK, 1); + + __disable_irq(); + FLASHD_Unlock(IFLASH_ADDR, IFLASH_ADDR + IFLASH_SIZE-1, 0 ,0); + FLASHD_Write(IFLASH_ADDR, bl_update_data, BOARD_DFU_BOOT_SIZE); + + erase_first_app_sector(); + +} diff --git a/firmware/libboard/common/resources/sam3s4/dfu.ld b/firmware/libboard/common/resources/sam3s4/dfu.ld index db747fa..7d896c6 100644 --- a/firmware/libboard/common/resources/sam3s4/dfu.ld +++ b/firmware/libboard/common/resources/sam3s4/dfu.ld @@ -101,6 +101,14 @@ *(.ARM.exidx) } + .blupdate : + { + . = ALIGN(4); + _blupdate_start = .; + KEEP(*(.fwupdate .fwupdate.*)); + _blupdate_end = .; + } > rom + . = ALIGN(4); _etext = .; -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I53dea57bba790a2ab3245d9483e0ff1c8d19d5e3 Gerrit-Change-Number: 26026 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 09:51:24 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 29 Oct 2021 09:51:24 +0000 Subject: Change in simtrace2[master]: firmware: remove usb pullup that dates back to simtrace1 References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26027 ) Change subject: firmware: remove usb pullup that dates back to simtrace1 ...................................................................... firmware: remove usb pullup that dates back to simtrace1 All the parts are DNP and never existed on the simtrace2 with sam3; the sam3 has internal pullups that are part of the usb peripheral. Change-Id: I04a703a2eba6ff1dc64692c089213389d0c1066d --- M firmware/apps/dfu/main.c M firmware/libboard/octsimtest/include/board.h M firmware/libboard/sam3p256/include/board.h M firmware/libboard/simtrace/include/board.h M firmware/libcommon/source/usb.c 5 files changed, 0 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/27/26027/1 diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index d5a6fa6..4813881 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -342,16 +342,7 @@ TRACE_INFO("USB init...\n\r"); /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */ USBD_Disconnect(); -#ifdef PIN_USB_PULLUP - const Pin usb_dp_pullup = PIN_USB_PULLUP; - PIO_Configure(&usb_dp_pullup, 1); - PIO_Set(&usb_dp_pullup); -#endif mdelay(50); -#ifdef PIN_USB_PULLUP - PIO_Clear(&usb_dp_pullup); -#endif - USBDFU_Initialize(&dfu_descriptors); while (USBD_GetState() < USBD_STATE_CONFIGURED) { diff --git a/firmware/libboard/octsimtest/include/board.h b/firmware/libboard/octsimtest/include/board.h index 530f27b..697619c 100644 --- a/firmware/libboard/octsimtest/include/board.h +++ b/firmware/libboard/octsimtest/include/board.h @@ -87,11 +87,6 @@ /* SPI flash write protect pin (active low, pulled low) */ #define PIN_SPI_WP {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} -/** Pin configuration to control USB pull-up on D+ - * @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high - */ -#define PIN_USB_PULLUP {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} - /** USB definitions */ /* OpenMoko SIMtrace 2 USB vendor ID */ #define BOARD_USB_VENDOR_ID USB_VENDOR_OPENMOKO diff --git a/firmware/libboard/sam3p256/include/board.h b/firmware/libboard/sam3p256/include/board.h index 58e8a24..06cfdce 100644 --- a/firmware/libboard/sam3p256/include/board.h +++ b/firmware/libboard/sam3p256/include/board.h @@ -135,11 +135,6 @@ #define PIN_SPI_WP {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} #endif -/** Pin configuration to control USB pull-up on D+ - * @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high - */ -#define PIN_USB_PULLUP {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} - /** USB definitions */ /* OpenMoko SIMtrace 2 USB vendor ID */ #define BOARD_USB_VENDOR_ID USB_VENDOR_OPENMOKO diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h index be18f64..6e4cd98 100644 --- a/firmware/libboard/simtrace/include/board.h +++ b/firmware/libboard/simtrace/include/board.h @@ -134,11 +134,6 @@ /* SPI flash write protect pin (active low, pulled low) */ #define PIN_SPI_WP {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} -/** Pin configuration to control USB pull-up on D+ - * @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high - */ -#define PIN_USB_PULLUP {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} - /** USB definitions */ /* OpenMoko SIMtrace 2 USB vendor ID */ #define BOARD_USB_VENDOR_ID USB_VENDOR_OPENMOKO diff --git a/firmware/libcommon/source/usb.c b/firmware/libcommon/source/usb.c index e75646e..0868263 100644 --- a/firmware/libcommon/source/usb.c +++ b/firmware/libcommon/source/usb.c @@ -689,16 +689,8 @@ { unsigned int i; /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */ -#ifdef PIN_USB_PULLUP - const Pin usb_dp_pullup = PIN_USB_PULLUP; - PIO_Configure(&usb_dp_pullup, 1); - PIO_Set(&usb_dp_pullup); -#endif USBD_HAL_Suspend(); mdelay(20); -#ifdef PIN_USB_PULLUP - PIO_Clear(&usb_dp_pullup); -#endif USBD_HAL_Activate(); // Get std USB driver -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I04a703a2eba6ff1dc64692c089213389d0c1066d Gerrit-Change-Number: 26027 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 09:51:25 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 29 Oct 2021 09:51:25 +0000 Subject: Change in simtrace2[master]: firmware: increase reset delay before usb reattach References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26028 ) Change subject: firmware: increase reset delay before usb reattach ...................................................................... firmware: increase reset delay before usb reattach The previous value was way too low and led to reenumeration issues when switching from app to bl because the hosts are fairly lenient and feature long delays until they accept disappearing devices as gone for good instead of ignoring a presuambly flaky usb cable or connection. Related: SYS5061 Change-Id: I9b8c8bf794ad5b94fc7ea2a01d1ebf4e36862c36 --- M firmware/apps/dfu/main.c M firmware/libcommon/source/usb.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/28/26028/1 diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c index 4813881..48ba879 100644 --- a/firmware/apps/dfu/main.c +++ b/firmware/apps/dfu/main.c @@ -342,7 +342,7 @@ TRACE_INFO("USB init...\n\r"); /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */ USBD_Disconnect(); - mdelay(50); + mdelay(500); USBDFU_Initialize(&dfu_descriptors); while (USBD_GetState() < USBD_STATE_CONFIGURED) { diff --git a/firmware/libcommon/source/usb.c b/firmware/libcommon/source/usb.c index 0868263..d86fc92 100644 --- a/firmware/libcommon/source/usb.c +++ b/firmware/libcommon/source/usb.c @@ -690,7 +690,7 @@ unsigned int i; /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */ USBD_HAL_Suspend(); - mdelay(20); + mdelay(500); USBD_HAL_Activate(); // Get std USB driver -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9b8c8bf794ad5b94fc7ea2a01d1ebf4e36862c36 Gerrit-Change-Number: 26028 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 09:51:25 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 29 Oct 2021 09:51:25 +0000 Subject: Change in simtrace2[master]: firmware: drop cref printing References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26029 ) Change subject: firmware: drop cref printing ...................................................................... firmware: drop cref printing No one reads this, no one wants to know this. Change-Id: Ie2281e207164f82d8ee29bd596a5593c22aaf198 --- M firmware/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/29/26029/1 diff --git a/firmware/Makefile b/firmware/Makefile index 810c7f3..f6e8316 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -205,7 +205,7 @@ endif ASFLAGS = -mcpu=cortex-m3 -mthumb -Wall -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -D__ASSEMBLY__ -LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--no-undefined $(LIB) +LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--no-undefined $(LIB) ifeq ("$(USE_CLANG)","0") LDFLAGS += -Wl,--warn-section-align -Wl,--print-memory-usage endif -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie2281e207164f82d8ee29bd596a5593c22aaf198 Gerrit-Change-Number: 26029 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 10:13:32 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 29 Oct 2021 10:13:32 +0000 Subject: Change in simtrace2[master]: firmware: add bootloader update "app" In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/26026 to look at the new patch set (#2). Change subject: firmware: add bootloader update "app" ...................................................................... firmware: add bootloader update "app" This bl updater can be flashed as app and will update the bootloader and then delete itself before resetting the sam3, so the device will end up in the newly updated dfu bootloader afterwards, without having to press the bootloader button or requring any other manual interaction, ready to receive a new application image. Building the blupdater requires a previously built dfu-flash bootloader bin file that will then be embedded into the app during building. Related: OS#1704 Related: SYS5061 Change-Id: I53dea57bba790a2ab3245d9483e0ff1c8d19d5e3 --- M Makefile M firmware/Makefile A firmware/apps/blupdate/Makefile A firmware/apps/blupdate/main.c M firmware/libboard/common/resources/sam3s4/dfu.ld 5 files changed, 192 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/26/26026/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I53dea57bba790a2ab3245d9483e0ff1c8d19d5e3 Gerrit-Change-Number: 26026 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 10:13:32 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 29 Oct 2021 10:13:32 +0000 Subject: Change in simtrace2[master]: firmware: remove usb pullup that dates back to simtrace1 In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/26027 to look at the new patch set (#2). Change subject: firmware: remove usb pullup that dates back to simtrace1 ...................................................................... firmware: remove usb pullup that dates back to simtrace1 All the parts are DNP and never existed on the simtrace2 with sam3; the sam3 has internal pullups that are part of the usb peripheral. Change-Id: I04a703a2eba6ff1dc64692c089213389d0c1066d --- M firmware/apps/blupdate/main.c M firmware/apps/dfu/main.c M firmware/libboard/octsimtest/include/board.h M firmware/libboard/sam3p256/include/board.h M firmware/libboard/simtrace/include/board.h M firmware/libcommon/source/usb.c 6 files changed, 37 insertions(+), 74 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/27/26027/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I04a703a2eba6ff1dc64692c089213389d0c1066d Gerrit-Change-Number: 26027 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 10:13:32 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 29 Oct 2021 10:13:32 +0000 Subject: Change in simtrace2[master]: firmware: increase reset delay before usb reattach In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/26028 to look at the new patch set (#2). Change subject: firmware: increase reset delay before usb reattach ...................................................................... firmware: increase reset delay before usb reattach The previous value was way too low and led to reenumeration issues when switching from app to bl because the hosts are fairly lenient and feature long delays until they accept disappearing devices as gone for good instead of ignoring a presuambly flaky usb cable or connection. Related: SYS5061 Change-Id: I9b8c8bf794ad5b94fc7ea2a01d1ebf4e36862c36 --- M firmware/apps/dfu/main.c M firmware/libcommon/source/usb.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/28/26028/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9b8c8bf794ad5b94fc7ea2a01d1ebf4e36862c36 Gerrit-Change-Number: 26028 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 10:13:32 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 29 Oct 2021 10:13:32 +0000 Subject: Change in simtrace2[master]: firmware: drop cref printing In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/26029 to look at the new patch set (#2). Change subject: firmware: drop cref printing ...................................................................... firmware: drop cref printing No one reads this, no one wants to know this. Change-Id: Ie2281e207164f82d8ee29bd596a5593c22aaf198 --- M firmware/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/29/26029/2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie2281e207164f82d8ee29bd596a5593c22aaf198 Gerrit-Change-Number: 26029 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 10:17:01 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 29 Oct 2021 10:17:01 +0000 Subject: Change in simtrace2[master]: firmware: add bootloader update "app" In-Reply-To: References: Message-ID: Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26026 ) Change subject: firmware: add bootloader update "app" ...................................................................... Patch Set 2: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I53dea57bba790a2ab3245d9483e0ff1c8d19d5e3 Gerrit-Change-Number: 26026 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Fri, 29 Oct 2021 10:17:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 10:31:14 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 29 Oct 2021 10:31:14 +0000 Subject: Change in simtrace2[master]: firmware: add bootloader update "app" In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/26026 to look at the new patch set (#3). Change subject: firmware: add bootloader update "app" ...................................................................... firmware: add bootloader update "app" This bl updater can be flashed as app and will update the bootloader and then delete itself before resetting the sam3, so the device will end up in the newly updated dfu bootloader afterwards, without having to press the bootloader button or requring any other manual interaction, ready to receive a new application image. Building the blupdater requires a previously built dfu-flash bootloader bin file that will then be embedded into the app during building. Related: OS#1704 Related: SYS5061 Change-Id: I53dea57bba790a2ab3245d9483e0ff1c8d19d5e3 --- M Makefile M firmware/Makefile A firmware/apps/blupdate/Makefile A firmware/apps/blupdate/main.c M firmware/libboard/common/resources/sam3s4/dfu.ld 5 files changed, 192 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/26/26026/3 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I53dea57bba790a2ab3245d9483e0ff1c8d19d5e3 Gerrit-Change-Number: 26026 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 10:31:14 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 29 Oct 2021 10:31:14 +0000 Subject: Change in simtrace2[master]: firmware: remove usb pullup that dates back to simtrace1 In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/simtrace2/+/26027 to look at the new patch set (#3). Change subject: firmware: remove usb pullup that dates back to simtrace1 ...................................................................... firmware: remove usb pullup that dates back to simtrace1 All the parts are DNP and never existed on the simtrace2 with sam3; the sam3 has internal pullups that are part of the usb peripheral. Change-Id: I04a703a2eba6ff1dc64692c089213389d0c1066d --- M firmware/apps/dfu/main.c M firmware/libboard/octsimtest/include/board.h M firmware/libboard/sam3p256/include/board.h M firmware/libboard/simtrace/include/board.h M firmware/libcommon/source/usb.c 5 files changed, 0 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/27/26027/3 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I04a703a2eba6ff1dc64692c089213389d0c1066d Gerrit-Change-Number: 26027 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 10:31:16 2021 From: gerrit-no-reply at lists.osmocom.org (Hoernchen) Date: Fri, 29 Oct 2021 10:31:16 +0000 Subject: Change in simtrace2[master]: add our default clang-format file References: Message-ID: Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/26030 ) Change subject: add our default clang-format file ...................................................................... add our default clang-format file Change-Id: I77aab70400bdbb46cbdd83e428e2a28ebf29b8dd --- A .clang-format 1 file changed, 563 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/30/26030/1 diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..5d4791c --- /dev/null +++ b/.clang-format @@ -0,0 +1,563 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# clang-format configuration file. Intended for clang-format >= 4. +# +# For more information, see: +# +# Documentation/process/clang-format.rst +# https://clang.llvm.org/docs/ClangFormat.html +# https://clang.llvm.org/docs/ClangFormatStyleOptions.html +# +--- +AccessModifierOffset: -4 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +#AlignEscapedNewlines: Left # Unknown to clang-format-4.0 +AlignOperands: true +AlignTrailingComments: false +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: None +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: false +BinPackArguments: true +BinPackParameters: true +BraceWrapping: + AfterClass: false + AfterControlStatement: false + AfterEnum: false + AfterFunction: true + AfterNamespace: true + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + #AfterExternBlock: false # Unknown to clang-format-5.0 + BeforeCatch: false + BeforeElse: false + IndentBraces: false + #SplitEmptyFunction: true # Unknown to clang-format-4.0 + #SplitEmptyRecord: true # Unknown to clang-format-4.0 + #SplitEmptyNamespace: true # Unknown to clang-format-4.0 +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Custom +#BreakBeforeInheritanceComma: false # Unknown to clang-format-4.0 +BreakBeforeTernaryOperators: false +BreakConstructorInitializersBeforeComma: false +#BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0 +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: false +ColumnLimit: 120 +CommentPragmas: '^ IWYU pragma:' +#CompactNamespaces: false # Unknown to clang-format-4.0 +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 8 +ContinuationIndentWidth: 8 +Cpp11BracedListStyle: false +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +#FixNamespaceComments: false # Unknown to clang-format-4.0 + +# Taken from: +# git grep -h '^#define [^[:space:]]*for_each[^[:space:]]*(' include/ \ +# | sed "s,^#define \([^[:space:]]*for_each[^[:space:]]*\)(.*$, - '\1'," \ +# | sort | uniq +ForEachMacros: + - 'apei_estatus_for_each_section' + - 'ata_for_each_dev' + - 'ata_for_each_link' + - '__ata_qc_for_each' + - 'ata_qc_for_each' + - 'ata_qc_for_each_raw' + - 'ata_qc_for_each_with_internal' + - 'ax25_for_each' + - 'ax25_uid_for_each' + - '__bio_for_each_bvec' + - 'bio_for_each_bvec' + - 'bio_for_each_bvec_all' + - 'bio_for_each_integrity_vec' + - '__bio_for_each_segment' + - 'bio_for_each_segment' + - 'bio_for_each_segment_all' + - 'bio_list_for_each' + - 'bip_for_each_vec' + - 'bitmap_for_each_clear_region' + - 'bitmap_for_each_set_region' + - 'blkg_for_each_descendant_post' + - 'blkg_for_each_descendant_pre' + - 'blk_queue_for_each_rl' + - 'bond_for_each_slave' + - 'bond_for_each_slave_rcu' + - 'bpf_for_each_spilled_reg' + - 'btree_for_each_safe128' + - 'btree_for_each_safe32' + - 'btree_for_each_safe64' + - 'btree_for_each_safel' + - 'card_for_each_dev' + - 'cgroup_taskset_for_each' + - 'cgroup_taskset_for_each_leader' + - 'cpufreq_for_each_entry' + - 'cpufreq_for_each_entry_idx' + - 'cpufreq_for_each_valid_entry' + - 'cpufreq_for_each_valid_entry_idx' + - 'css_for_each_child' + - 'css_for_each_descendant_post' + - 'css_for_each_descendant_pre' + - 'device_for_each_child_node' + - 'displayid_iter_for_each' + - 'dma_fence_chain_for_each' + - 'do_for_each_ftrace_op' + - 'drm_atomic_crtc_for_each_plane' + - 'drm_atomic_crtc_state_for_each_plane' + - 'drm_atomic_crtc_state_for_each_plane_state' + - 'drm_atomic_for_each_plane_damage' + - 'drm_client_for_each_connector_iter' + - 'drm_client_for_each_modeset' + - 'drm_connector_for_each_possible_encoder' + - 'drm_for_each_bridge_in_chain' + - 'drm_for_each_connector_iter' + - 'drm_for_each_crtc' + - 'drm_for_each_crtc_reverse' + - 'drm_for_each_encoder' + - 'drm_for_each_encoder_mask' + - 'drm_for_each_fb' + - 'drm_for_each_legacy_plane' + - 'drm_for_each_plane' + - 'drm_for_each_plane_mask' + - 'drm_for_each_privobj' + - 'drm_mm_for_each_hole' + - 'drm_mm_for_each_node' + - 'drm_mm_for_each_node_in_range' + - 'drm_mm_for_each_node_safe' + - 'flow_action_for_each' + - 'for_each_acpi_dev_match' + - 'for_each_active_dev_scope' + - 'for_each_active_drhd_unit' + - 'for_each_active_iommu' + - 'for_each_aggr_pgid' + - 'for_each_available_child_of_node' + - 'for_each_bio' + - 'for_each_board_func_rsrc' + - 'for_each_bvec' + - 'for_each_card_auxs' + - 'for_each_card_auxs_safe' + - 'for_each_card_components' + - 'for_each_card_dapms' + - 'for_each_card_pre_auxs' + - 'for_each_card_prelinks' + - 'for_each_card_rtds' + - 'for_each_card_rtds_safe' + - 'for_each_card_widgets' + - 'for_each_card_widgets_safe' + - 'for_each_cgroup_storage_type' + - 'for_each_child_of_node' + - 'for_each_clear_bit' + - 'for_each_clear_bit_from' + - 'for_each_cmsghdr' + - 'for_each_compatible_node' + - 'for_each_component_dais' + - 'for_each_component_dais_safe' + - 'for_each_comp_order' + - 'for_each_console' + - 'for_each_cpu' + - 'for_each_cpu_and' + - 'for_each_cpu_not' + - 'for_each_cpu_wrap' + - 'for_each_dapm_widgets' + - 'for_each_dev_addr' + - 'for_each_dev_scope' + - 'for_each_dma_cap_mask' + - 'for_each_dpcm_be' + - 'for_each_dpcm_be_rollback' + - 'for_each_dpcm_be_safe' + - 'for_each_dpcm_fe' + - 'for_each_drhd_unit' + - 'for_each_dss_dev' + - 'for_each_dtpm_table' + - 'for_each_efi_memory_desc' + - 'for_each_efi_memory_desc_in_map' + - 'for_each_element' + - 'for_each_element_extid' + - 'for_each_element_id' + - 'for_each_endpoint_of_node' + - 'for_each_evictable_lru' + - 'for_each_fib6_node_rt_rcu' + - 'for_each_fib6_walker_rt' + - 'for_each_free_mem_pfn_range_in_zone' + - 'for_each_free_mem_pfn_range_in_zone_from' + - 'for_each_free_mem_range' + - 'for_each_free_mem_range_reverse' + - 'for_each_func_rsrc' + - 'for_each_hstate' + - 'for_each_if' + - 'for_each_iommu' + - 'for_each_ip_tunnel_rcu' + - 'for_each_irq_nr' + - 'for_each_link_codecs' + - 'for_each_link_cpus' + - 'for_each_link_platforms' + - 'for_each_lru' + - 'for_each_matching_node' + - 'for_each_matching_node_and_match' + - 'for_each_member' + - 'for_each_memcg_cache_index' + - 'for_each_mem_pfn_range' + - '__for_each_mem_range' + - 'for_each_mem_range' + - '__for_each_mem_range_rev' + - 'for_each_mem_range_rev' + - 'for_each_mem_region' + - 'for_each_migratetype_order' + - 'for_each_msi_entry' + - 'for_each_msi_entry_safe' + - 'for_each_msi_vector' + - 'for_each_net' + - 'for_each_net_continue_reverse' + - 'for_each_netdev' + - 'for_each_netdev_continue' + - 'for_each_netdev_continue_rcu' + - 'for_each_netdev_continue_reverse' + - 'for_each_netdev_feature' + - 'for_each_netdev_in_bond_rcu' + - 'for_each_netdev_rcu' + - 'for_each_netdev_reverse' + - 'for_each_netdev_safe' + - 'for_each_net_rcu' + - 'for_each_new_connector_in_state' + - 'for_each_new_crtc_in_state' + - 'for_each_new_mst_mgr_in_state' + - 'for_each_new_plane_in_state' + - 'for_each_new_private_obj_in_state' + - 'for_each_node' + - 'for_each_node_by_name' + - 'for_each_node_by_type' + - 'for_each_node_mask' + - 'for_each_node_state' + - 'for_each_node_with_cpus' + - 'for_each_node_with_property' + - 'for_each_nonreserved_multicast_dest_pgid' + - 'for_each_of_allnodes' + - 'for_each_of_allnodes_from' + - 'for_each_of_cpu_node' + - 'for_each_of_pci_range' + - 'for_each_old_connector_in_state' + - 'for_each_old_crtc_in_state' + - 'for_each_old_mst_mgr_in_state' + - 'for_each_oldnew_connector_in_state' + - 'for_each_oldnew_crtc_in_state' + - 'for_each_oldnew_mst_mgr_in_state' + - 'for_each_oldnew_plane_in_state' + - 'for_each_oldnew_plane_in_state_reverse' + - 'for_each_oldnew_private_obj_in_state' + - 'for_each_old_plane_in_state' + - 'for_each_old_private_obj_in_state' + - 'for_each_online_cpu' + - 'for_each_online_node' + - 'for_each_online_pgdat' + - 'for_each_pci_bridge' + - 'for_each_pci_dev' + - 'for_each_pci_msi_entry' + - 'for_each_pcm_streams' + - 'for_each_physmem_range' + - 'for_each_populated_zone' + - 'for_each_possible_cpu' + - 'for_each_present_cpu' + - 'for_each_prime_number' + - 'for_each_prime_number_from' + - 'for_each_process' + - 'for_each_process_thread' + - 'for_each_prop_codec_conf' + - 'for_each_prop_dai_codec' + - 'for_each_prop_dai_cpu' + - 'for_each_prop_dlc_codecs' + - 'for_each_prop_dlc_cpus' + - 'for_each_prop_dlc_platforms' + - 'for_each_property_of_node' + - 'for_each_registered_fb' + - 'for_each_requested_gpio' + - 'for_each_requested_gpio_in_range' + - 'for_each_reserved_mem_range' + - 'for_each_reserved_mem_region' + - 'for_each_rtd_codec_dais' + - 'for_each_rtd_components' + - 'for_each_rtd_cpu_dais' + - 'for_each_rtd_dais' + - 'for_each_set_bit' + - 'for_each_set_bit_from' + - 'for_each_set_clump8' + - 'for_each_sg' + - 'for_each_sg_dma_page' + - 'for_each_sg_page' + - 'for_each_sgtable_dma_page' + - 'for_each_sgtable_dma_sg' + - 'for_each_sgtable_page' + - 'for_each_sgtable_sg' + - 'for_each_sibling_event' + - 'for_each_subelement' + - 'for_each_subelement_extid' + - 'for_each_subelement_id' + - '__for_each_thread' + - 'for_each_thread' + - 'for_each_unicast_dest_pgid' + - 'for_each_vsi' + - 'for_each_wakeup_source' + - 'for_each_zone' + - 'for_each_zone_zonelist' + - 'for_each_zone_zonelist_nodemask' + - 'fwnode_for_each_available_child_node' + - 'fwnode_for_each_child_node' + - 'fwnode_graph_for_each_endpoint' + - 'gadget_for_each_ep' + - 'genradix_for_each' + - 'genradix_for_each_from' + - 'hash_for_each' + - 'hash_for_each_possible' + - 'hash_for_each_possible_rcu' + - 'hash_for_each_possible_rcu_notrace' + - 'hash_for_each_possible_safe' + - 'hash_for_each_rcu' + - 'hash_for_each_safe' + - 'hctx_for_each_ctx' + - 'hlist_bl_for_each_entry' + - 'hlist_bl_for_each_entry_rcu' + - 'hlist_bl_for_each_entry_safe' + - 'hlist_for_each' + - 'hlist_for_each_entry' + - 'hlist_for_each_entry_continue' + - 'hlist_for_each_entry_continue_rcu' + - 'hlist_for_each_entry_continue_rcu_bh' + - 'hlist_for_each_entry_from' + - 'hlist_for_each_entry_from_rcu' + - 'hlist_for_each_entry_rcu' + - 'hlist_for_each_entry_rcu_bh' + - 'hlist_for_each_entry_rcu_notrace' + - 'hlist_for_each_entry_safe' + - 'hlist_for_each_entry_srcu' + - '__hlist_for_each_rcu' + - 'hlist_for_each_safe' + - 'hlist_nulls_for_each_entry' + - 'hlist_nulls_for_each_entry_from' + - 'hlist_nulls_for_each_entry_rcu' + - 'hlist_nulls_for_each_entry_safe' + - 'i3c_bus_for_each_i2cdev' + - 'i3c_bus_for_each_i3cdev' + - 'ide_host_for_each_port' + - 'ide_port_for_each_dev' + - 'ide_port_for_each_present_dev' + - 'idr_for_each_entry' + - 'idr_for_each_entry_continue' + - 'idr_for_each_entry_continue_ul' + - 'idr_for_each_entry_ul' + - 'in_dev_for_each_ifa_rcu' + - 'in_dev_for_each_ifa_rtnl' + - 'inet_bind_bucket_for_each' + - 'inet_lhash2_for_each_icsk_rcu' + - 'key_for_each' + - 'key_for_each_safe' + - 'klp_for_each_func' + - 'klp_for_each_func_safe' + - 'klp_for_each_func_static' + - 'klp_for_each_object' + - 'klp_for_each_object_safe' + - 'klp_for_each_object_static' + - 'kunit_suite_for_each_test_case' + - 'kvm_for_each_memslot' + - 'kvm_for_each_vcpu' + - 'list_for_each' + - 'list_for_each_codec' + - 'list_for_each_codec_safe' + - 'list_for_each_continue' + - 'list_for_each_entry' + - 'list_for_each_entry_continue' + - 'list_for_each_entry_continue_rcu' + - 'list_for_each_entry_continue_reverse' + - 'list_for_each_entry_from' + - 'list_for_each_entry_from_rcu' + - 'list_for_each_entry_from_reverse' + - 'list_for_each_entry_lockless' + - 'list_for_each_entry_rcu' + - 'list_for_each_entry_reverse' + - 'list_for_each_entry_safe' + - 'list_for_each_entry_safe_continue' + - 'list_for_each_entry_safe_from' + - 'list_for_each_entry_safe_reverse' + - 'list_for_each_entry_srcu' + - 'list_for_each_prev' + - 'list_for_each_prev_safe' + - 'list_for_each_safe' + - 'llist_for_each' + - 'llist_for_each_entry' + - 'llist_for_each_entry_safe' + - 'llist_for_each_safe' + - 'mci_for_each_dimm' + - 'media_device_for_each_entity' + - 'media_device_for_each_intf' + - 'media_device_for_each_link' + - 'media_device_for_each_pad' + - 'nanddev_io_for_each_page' + - 'netdev_for_each_lower_dev' + - 'netdev_for_each_lower_private' + - 'netdev_for_each_lower_private_rcu' + - 'netdev_for_each_mc_addr' + - 'netdev_for_each_uc_addr' + - 'netdev_for_each_upper_dev_rcu' + - 'netdev_hw_addr_list_for_each' + - 'nft_rule_for_each_expr' + - 'nla_for_each_attr' + - 'nla_for_each_nested' + - 'nlmsg_for_each_attr' + - 'nlmsg_for_each_msg' + - 'nr_neigh_for_each' + - 'nr_neigh_for_each_safe' + - 'nr_node_for_each' + - 'nr_node_for_each_safe' + - 'of_for_each_phandle' + - 'of_property_for_each_string' + - 'of_property_for_each_u32' + - 'pci_bus_for_each_resource' + - 'pcl_for_each_chunk' + - 'pcl_for_each_segment' + - 'pcm_for_each_format' + - 'ping_portaddr_for_each_entry' + - 'plist_for_each' + - 'plist_for_each_continue' + - 'plist_for_each_entry' + - 'plist_for_each_entry_continue' + - 'plist_for_each_entry_safe' + - 'plist_for_each_safe' + - 'pnp_for_each_card' + - 'pnp_for_each_dev' + - 'protocol_for_each_card' + - 'protocol_for_each_dev' + - 'queue_for_each_hw_ctx' + - 'radix_tree_for_each_slot' + - 'radix_tree_for_each_tagged' + - 'rb_for_each' + - 'rbtree_postorder_for_each_entry_safe' + - 'rdma_for_each_block' + - 'rdma_for_each_port' + - 'rdma_umem_for_each_dma_block' + - 'resource_list_for_each_entry' + - 'resource_list_for_each_entry_safe' + - 'rhl_for_each_entry_rcu' + - 'rhl_for_each_rcu' + - 'rht_for_each' + - 'rht_for_each_entry' + - 'rht_for_each_entry_from' + - 'rht_for_each_entry_rcu' + - 'rht_for_each_entry_rcu_from' + - 'rht_for_each_entry_safe' + - 'rht_for_each_from' + - 'rht_for_each_rcu' + - 'rht_for_each_rcu_from' + - '__rq_for_each_bio' + - 'rq_for_each_bvec' + - 'rq_for_each_segment' + - 'scsi_for_each_prot_sg' + - 'scsi_for_each_sg' + - 'sctp_for_each_hentry' + - 'sctp_skb_for_each' + - 'shdma_for_each_chan' + - '__shost_for_each_device' + - 'shost_for_each_device' + - 'sk_for_each' + - 'sk_for_each_bound' + - 'sk_for_each_entry_offset_rcu' + - 'sk_for_each_from' + - 'sk_for_each_rcu' + - 'sk_for_each_safe' + - 'sk_nulls_for_each' + - 'sk_nulls_for_each_from' + - 'sk_nulls_for_each_rcu' + - 'snd_array_for_each' + - 'snd_pcm_group_for_each_entry' + - 'snd_soc_dapm_widget_for_each_path' + - 'snd_soc_dapm_widget_for_each_path_safe' + - 'snd_soc_dapm_widget_for_each_sink_path' + - 'snd_soc_dapm_widget_for_each_source_path' + - 'tb_property_for_each' + - 'tcf_exts_for_each_action' + - 'udp_portaddr_for_each_entry' + - 'udp_portaddr_for_each_entry_rcu' + - 'usb_hub_for_each_child' + - 'v4l2_device_for_each_subdev' + - 'v4l2_m2m_for_each_dst_buf' + - 'v4l2_m2m_for_each_dst_buf_safe' + - 'v4l2_m2m_for_each_src_buf' + - 'v4l2_m2m_for_each_src_buf_safe' + - 'virtio_device_for_each_vq' + - 'while_for_each_ftrace_op' + - 'xa_for_each' + - 'xa_for_each_marked' + - 'xa_for_each_range' + - 'xa_for_each_start' + - 'xas_for_each' + - 'xas_for_each_conflict' + - 'xas_for_each_marked' + - 'xbc_array_for_each_value' + - 'xbc_for_each_key_value' + - 'xbc_node_for_each_array_value' + - 'xbc_node_for_each_child' + - 'xbc_node_for_each_key_value' + - 'zorro_for_each_dev' + - 'for_each_line' + - 'for_each_non_empty_line' + +#IncludeBlocks: Preserve # Unknown to clang-format-5.0 +IncludeCategories: + - Regex: '.*' + Priority: 1 +IncludeIsMainRegex: '(Test)?$' +IndentCaseLabels: false +#IndentPPDirectives: None # Unknown to clang-format-5.0 +IndentWidth: 8 +IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: false +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: None +#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0 +ObjCBlockIndentWidth: 8 +ObjCSpaceAfterProperty: true +ObjCSpaceBeforeProtocolList: true + +# Taken from git's rules +#PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0 +PenaltyBreakBeforeFirstCallParameter: 30 +PenaltyBreakComment: 10 +PenaltyBreakFirstLessLess: 0 +PenaltyBreakString: 10 +PenaltyExcessCharacter: 100 +PenaltyReturnTypeOnItsOwnLine: 60 + +PointerAlignment: Right +ReflowComments: false +SortIncludes: false +#SortUsingDeclarations: false # Unknown to clang-format-4.0 +SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: true +SpaceBeforeAssignmentOperators: true +#SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0 +#SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0 +SpaceBeforeParens: ControlStatements +#SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0 +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: false +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp03 +TabWidth: 8 +UseTab: Always +... -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I77aab70400bdbb46cbdd83e428e2a28ebf29b8dd Gerrit-Change-Number: 26030 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 11:11:54 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 11:11:54 +0000 Subject: Change in osmo-hnodeb[master]: Drop unused fields in struct hnb In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 ) Change subject: Drop unused fields in struct hnb ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ia981d99bf521eb8b79bdf8d7f81ca50f6cdeba8c Gerrit-Change-Number: 26015 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 11:11:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 12:48:30 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 12:48:30 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with ... In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25991 ) Change subject: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: > Patch Set 1: > > > I'd rather have a bit longer names than really having to waste hours playing tetris with header files and source files. Having these patches solves the build problems in osmo-hnodeb and whoever wishes to use this library. BTW, none of our code outside osmo-iuh really uses those structures being used, so nothing breaks, and we don't really care if they are longer because we don't use a lot of them in any place. > > I would like to see one real-world example where we actually run into such clashes. Take osmo-iuh.git master, take osmo-hnodeb.git with all the current patches. > > IMHO, code that implements HNBAP doesn't have anything do with RANAP nor RUA. And code implementing RUA should have a clean layer separation to RANAP, too. Those are different layers, stacked on top of each other. like BSSMAP in SCCP. RUA contains an octetstring, and that octetstring contains RANAP. So being different layers means we mandate the user to use different C files and make him play tetris to make sure no headers are imported incorrectly? Why if someone wants to write a quick test/tool in one file? I see no point in mandating the use of different C files, and trying to do so just to avoid having a bit longer names goes the opposite way to what we do with other libraries, where we explicitly want to have an osmo_ prefix in order to avoid clashes with other libs. -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1bcbe047d233684647d6ffe9febb14a12c579696 Gerrit-Change-Number: 25991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 29 Oct 2021 12:48:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 12:51:15 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 12:51:15 +0000 Subject: Change in osmo-bts[master]: rsl: fix a memory leak in handle_gprs_susp_req() In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26025 ) Change subject: rsl: fix a memory leak in handle_gprs_susp_req() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I65d9c12888aa5e5112680b3b3f38817e322ecc1c Gerrit-Change-Number: 26025 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 29 Oct 2021 12:51:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 12:52:29 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 12:52:29 +0000 Subject: Change in osmo-bsc[master]: bsc_subscr_conn_fsm: fix mgw-pool ref counting In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26011 ) Change subject: bsc_subscr_conn_fsm: fix mgw-pool ref counting ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/26011/1/src/osmo-bsc/bsc_subscr_conn_fsm.c File src/osmo-bsc/bsc_subscr_conn_fsm.c: https://gerrit.osmocom.org/c/osmo-bsc/+/26011/1/src/osmo-bsc/bsc_subscr_conn_fsm.c at 961 PS1, Line 961: mgcp_client = osmo_mgcpc_ep_client(conn->user_plane.mgw_endpoint); > I think all functions with _free() must be NULL pointer safe, otherwise you don't call the function [?] That's exactly what I said. But this is non a _free() function, so I wouldn't expect it to be null safe, even if it is implementation wise to be more secure. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5a7ce6a1880a1060df74d03dd4eb38b51fd85c69 Gerrit-Change-Number: 26011 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 29 Oct 2021 12:52:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: pespin Comment-In-Reply-To: dexter Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 12:54:46 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 12:54:46 +0000 Subject: Change in osmo-hnodeb[master]: Drop unused fields in struct hnb In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 ) Change subject: Drop unused fields in struct hnb ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015/1/include/osmocom/hnodeb/hnodeb.h File include/osmocom/hnodeb/hnodeb.h: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015/1/include/osmocom/hnodeb/hnodeb.h at a85 PS1, Line 85: char identity_info[256]; : /*! copied from Cell Identity IE */ : struct umts_cell_id id; > I'd say the proper fix is to make those identifiers vty-configurable, store them here and then use t [?] That's what I'm doing in follow up patches. I think I can get rid of struct umts_cell_id id defintiion in this patch too, I'm not using it. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ia981d99bf521eb8b79bdf8d7f81ca50f6cdeba8c Gerrit-Change-Number: 26015 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 12:54:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 13:08:35 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 13:08:35 +0000 Subject: Change in osmo-bts[master]: l1sap: make 'l1sap' argument of process_l1sap_meas_data() const In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26024 ) Change subject: l1sap: make 'l1sap' argument of process_l1sap_meas_data() const ...................................................................... l1sap: make 'l1sap' argument of process_l1sap_meas_data() const Change-Id: Idc3004b0c74f7b98c96f20560c8b60a1fb4eb9c8 --- M src/common/l1sap.c 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 47ba663..f983b62 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -695,13 +695,13 @@ /* measurement information received from bts model */ static void process_l1sap_meas_data(struct gsm_lchan *lchan, - struct osmo_phsap_prim *l1sap, + const struct osmo_phsap_prim *l1sap, enum osmo_ph_prim ind_type) { struct bts_ul_meas ulm; - struct info_meas_ind_param *info_meas_ind; - struct ph_data_param *ph_data_ind; - struct ph_tch_param *ph_tch_ind; + const struct info_meas_ind_param *info_meas_ind; + const struct ph_data_param *ph_data_ind; + const struct ph_tch_param *ph_tch_ind; uint32_t fn; const char *ind_name; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26024 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idc3004b0c74f7b98c96f20560c8b60a1fb4eb9c8 Gerrit-Change-Number: 26024 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 13:08:36 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 13:08:36 +0000 Subject: Change in osmo-bts[master]: rsl: fix a memory leak in handle_gprs_susp_req() In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26025 ) Change subject: rsl: fix a memory leak in handle_gprs_susp_req() ...................................................................... rsl: fix a memory leak in handle_gprs_susp_req() Change-Id: I65d9c12888aa5e5112680b3b3f38817e322ecc1c --- M src/common/rsl.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/common/rsl.c b/src/common/rsl.c index a952d25..2d00005 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3454,6 +3454,7 @@ if (!gh || msgb_l3len(msg) < sizeof(*gh)+sizeof(*gsr)) { LOGP(DRSL, LOGL_NOTICE, "%s Short GPRS SUSPEND REQ received, ignoring\n", gsm_lchan_name(msg->lchan)); + msgb_free(msg); return -EINVAL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26025 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I65d9c12888aa5e5112680b3b3f38817e322ecc1c Gerrit-Change-Number: 26025 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 13:45:36 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 13:45:36 +0000 Subject: Change in osmo-iuh[master]: hnb-test: Fix memleak in hnb_read_cb References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26031 ) Change subject: hnb-test: Fix memleak in hnb_read_cb ...................................................................... hnb-test: Fix memleak in hnb_read_cb Change-Id: I6ecbce6aab11e1382ff9f71d901e1c6ac145f835 --- M src/tests/hnb-test.c 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/31/26031/1 diff --git a/src/tests/hnb-test.c b/src/tests/hnb-test.c index 02af4d9..2c73fed 100644 --- a/src/tests/hnb-test.c +++ b/src/tests/hnb-test.c @@ -583,22 +583,22 @@ /* FIXME: clean up after disappeared HNB */ close(fd->fd); osmo_fd_unregister(fd); - return rc; + goto free_ret; } else if (rc == 0) { LOGP(DMAIN, LOGL_INFO, "Connection to HNB closed\n"); close(fd->fd); osmo_fd_unregister(fd); fd->fd = -1; - - return -1; + rc = -1; + goto free_ret; } else { msgb_put(msg, rc); } if (flags & MSG_NOTIFICATION) { LOGP(DMAIN, LOGL_DEBUG, "Ignoring SCTP notification\n"); - msgb_free(msg); - return 0; + rc = 0; + goto free_ret; } sinfo.sinfo_ppid = ntohl(sinfo.sinfo_ppid); @@ -626,6 +626,7 @@ break; } +free_ret: msgb_free(msg); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6ecbce6aab11e1382ff9f71d901e1c6ac145f835 Gerrit-Change-Number: 26031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 13:49:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 13:49:54 +0000 Subject: Change in osmo-hnodeb[master]: hnb.c: Fix memleak in hnb_iuh_read_cb References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26032 ) Change subject: hnb.c: Fix memleak in hnb_iuh_read_cb ...................................................................... hnb.c: Fix memleak in hnb_iuh_read_cb Port from osmo-iuh.git Change-Id I6ecbce6aab11e1382ff9f71d901e1c6ac145f835. Change-Id: If5d5d41693e26f485aa5372129dccf0dcfb7fa6c --- M src/osmo-hnodeb/hnb.c 1 file changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/32/26032/1 diff --git a/src/osmo-hnodeb/hnb.c b/src/osmo-hnodeb/hnb.c index 34ff426..420095d 100644 --- a/src/osmo-hnodeb/hnb.c +++ b/src/osmo-hnodeb/hnb.c @@ -54,19 +54,20 @@ LOGP(DMAIN, LOGL_ERROR, "Error during sctp_recvmsg()\n"); /* FIXME: clean up after disappeared HNB */ osmo_stream_cli_close(conn); - return rc; + goto free_ret; } else if (rc == 0) { LOGP(DMAIN, LOGL_INFO, "Connection to HNB closed\n"); osmo_stream_cli_close(conn); - return -1; + rc = -1; + goto free_ret; } else { msgb_put(msg, rc); } if (flags & MSG_NOTIFICATION) { LOGP(DMAIN, LOGL_DEBUG, "Ignoring SCTP notification\n"); - msgb_free(msg); - return 0; + rc = 0; + goto free_ret; } sinfo.sinfo_ppid = ntohl(sinfo.sinfo_ppid); @@ -94,6 +95,7 @@ break; } +free_ret: msgb_free(msg); return rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: If5d5d41693e26f485aa5372129dccf0dcfb7fa6c Gerrit-Change-Number: 26032 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 13:50:42 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 13:50:42 +0000 Subject: Change in osmo-hnodeb[master]: Allocate g_hnb as a pointer, move code to hnb.c/h In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26001 ) Change subject: Allocate g_hnb as a pointer, move code to hnb.c/h ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-hnodeb/+/26001/1/src/osmo-hnodeb/hnb.c File src/osmo-hnodeb/hnb.c: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26001/1/src/osmo-hnodeb/hnb.c at 65 PS1, Line 65: if (rc < 0) { > BTW (I know you're just moving stuff around), we have msg leak here. Fixed here: https://gerrit.osmocom.org/c/osmo-iuh/+/26031 hnb-test: Fix memleak in hnb_read_cb https://gerrit.osmocom.org/c/osmo-hnodeb/+/26032 hnb.c: Fix memleak in hnb_iuh_read_cb -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26001 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I5ec61d2a72d55d182e1498939209b30b6e652467 Gerrit-Change-Number: 26001 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 13:50:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 15:17:58 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 15:17:58 +0000 Subject: Change in osmo-hnodeb[master]: Move protocol related code in main.c to related proto files In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26002 ) Change subject: Move protocol related code in main.c to related proto files ...................................................................... Patch Set 1: > Patch Set 1: > > well, all of this NAS/DTAP code doesn't really have any right to exist inside a real hnodeb. This is actually emulating an UE. For now it helps testing stuff, we can later remove the nas file completely then. I'm just sorting out code around here. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I771b3d3f61207137477eed2b316a5f670fb79ef2 Gerrit-Change-Number: 26002 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 15:17:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 15:25:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 15:25:31 +0000 Subject: Change in osmo-hnodeb[master]: More work on main.c to add osmocom functionalitites In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013 ) Change subject: More work on main.c to add osmocom functionalitites ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013/1/src/osmo-hnodeb/main.c File src/osmo-hnodeb/main.c: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013/1/src/osmo-hnodeb/main.c at 306 PS1, Line 306: FIXME: VTY code still uses NULL-context > Is it also the case here? Yes src/vty/vty.c: 1847: tall_vty_ctx = talloc_named_const(NULL, 0, "vty"); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I61a5ee2e100f79cef7e42dbd981e308597c30900 Gerrit-Change-Number: 26013 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 15:25:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 15:34:41 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 15:34:41 +0000 Subject: Change in osmo-hnodeb[master]: Configure PLMN over VTY and use it in HnbRegisterRequest In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26020 ) Change subject: Configure PLMN over VTY and use it in HnbRegisterRequest ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-hnodeb/+/26020/1/src/osmo-hnodeb/vty.c File src/osmo-hnodeb/vty.c: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26020/1/src/osmo-hnodeb/vty.c at 87 PS1, Line 87: network country code > I guess we want to be consistent with osmo-{msc,bsc} here, but I also don't like having three separa [?] I added it this way in orer to be consistent with osmo-bsc/msc indeed. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I6d67aa547d5496fe1407744e1dde07d2a41df500 Gerrit-Change-Number: 26020 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 15:34:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 15:37:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 15:37:49 +0000 Subject: Change in osmo-hnodeb[master]: Configure CI, LAC, RAC, SAC over VTY and use it in HnbRegisterRequest In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021 ) Change subject: Configure CI,LAC,RAC,SAC over VTY and use it in HnbRegisterRequest ...................................................................... Patch Set 1: (2 comments) https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021/1/src/osmo-hnodeb/vty.c File src/osmo-hnodeb/vty.c: https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021/1/src/osmo-hnodeb/vty.c at 135 PS1, Line 135: cell_identity > Do we want to inherit this inconsistency from osmo-{bsc,msc}? [?] I have no hard opinion on this, I simply kept them as we have them in osmo-bsc/msc/... for consistency. @laforge? In any case this can be changed as a follow up patch if we want to do so. https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021/1/src/osmo-hnodeb/vty.c at 245 PS1, Line 245: vty_out(vty, " cell_identity %u%s", g_hnb->cell_identity, VTY_NEWLINE); > Ack, something is wrong here. [?] Maybe as a follow up patch, once we merge the bulk of changes. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I06f21758e361b7d4d7141086d758893bee434e5c Gerrit-Change-Number: 26021 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Fri, 29 Oct 2021 15:37:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 15:41:02 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 15:41:02 +0000 Subject: Change in osmo-iuh[master]: hnb-test: Fix memleak in hnb_read_cb In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26031 ) Change subject: hnb-test: Fix memleak in hnb_read_cb ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26031 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6ecbce6aab11e1382ff9f71d901e1c6ac145f835 Gerrit-Change-Number: 26031 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 15:41:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 15:41:22 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 15:41:22 +0000 Subject: Change in osmo-hnodeb[master]: hnb.c: Fix memleak in hnb_iuh_read_cb In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26032 ) Change subject: hnb.c: Fix memleak in hnb_iuh_read_cb ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: If5d5d41693e26f485aa5372129dccf0dcfb7fa6c Gerrit-Change-Number: 26032 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 15:41:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 15:43:14 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 15:43:14 +0000 Subject: Change in osmo-hnodeb[master]: Import hnb-test from osmo-iuh.git In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25995 ) Change subject: Import hnb-test from osmo-iuh.git ...................................................................... Patch Set 3: linter doesn't apply here, I'm simply importing code from somewhere else. Most patches here are moving code around, so I'll skip linter in general to avoid messing the patches. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I36fd4aa5d39222371bd36e9f540b91e36a26de43 Gerrit-Change-Number: 25995 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 15:43:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 15:43:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 15:43:19 +0000 Subject: Change in osmo-hnodeb[master]: More work on main.c to add osmocom functionalitites In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013 to look at the new patch set (#2). Change subject: More work on main.c to add osmocom functionalitites ...................................................................... More work on main.c to add osmocom functionalitites Change-Id: I61a5ee2e100f79cef7e42dbd981e308597c30900 --- M src/osmo-hnodeb/main.c 1 file changed, 205 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/13/26013/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I61a5ee2e100f79cef7e42dbd981e308597c30900 Gerrit-Change-Number: 26013 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 15:43:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 15:43:19 +0000 Subject: Change in osmo-hnodeb[master]: Set up Iuh conn params through VTY In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26014 to look at the new patch set (#2). Change subject: Set up Iuh conn params through VTY ...................................................................... Set up Iuh conn params through VTY Change-Id: Id5a17742643e8f02c22228e3055bcc213423a416 --- M include/osmocom/hnodeb/hnodeb.h M include/osmocom/hnodeb/vty.h M src/osmo-hnodeb/hnb.c M src/osmo-hnodeb/main.c M src/osmo-hnodeb/vty.c 5 files changed, 146 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/14/26014/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Id5a17742643e8f02c22228e3055bcc213423a416 Gerrit-Change-Number: 26014 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 15:43:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 15:43:19 +0000 Subject: Change in osmo-hnodeb[master]: Drop unused fields in struct hnb In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 to look at the new patch set (#2). Change subject: Drop unused fields in struct hnb ...................................................................... Drop unused fields in struct hnb Change-Id: Ia981d99bf521eb8b79bdf8d7f81ca50f6cdeba8c --- M include/osmocom/hnodeb/hnodeb.h 1 file changed, 0 insertions(+), 29 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/15/26015/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ia981d99bf521eb8b79bdf8d7f81ca50f6cdeba8c Gerrit-Change-Number: 26015 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 15:43:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 15:43:19 +0000 Subject: Change in osmo-hnodeb[master]: Use osmocom logging in non-main files In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017 to look at the new patch set (#2). Change subject: Use osmocom logging in non-main files ...................................................................... Use osmocom logging in non-main files Change-Id: I649b17803aeffd20354aa76dde61094959f08e43 --- M include/osmocom/hnodeb/hnodeb.h M src/osmo-hnodeb/debug.c M src/osmo-hnodeb/hnb.c M src/osmo-hnodeb/hnbap.c M src/osmo-hnodeb/nas.c M src/osmo-hnodeb/ranap.c M src/osmo-hnodeb/rua.c 7 files changed, 64 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/17/26017/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I649b17803aeffd20354aa76dde61094959f08e43 Gerrit-Change-Number: 26017 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 15:43:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 15:43:19 +0000 Subject: Change in osmo-hnodeb[master]: Configure CI, LAC, RAC, SAC over VTY and use it in HnbRegisterRequest In-Reply-To: References: Message-ID: Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021 to look at the new patch set (#2). Change subject: Configure CI,LAC,RAC,SAC over VTY and use it in HnbRegisterRequest ...................................................................... Configure CI,LAC,RAC,SAC over VTY and use it in HnbRegisterRequest Change-Id: I06f21758e361b7d4d7141086d758893bee434e5c --- M include/osmocom/hnodeb/hnodeb.h M src/osmo-hnodeb/hnbap.c M src/osmo-hnodeb/vty.c 3 files changed, 69 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/21/26021/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I06f21758e361b7d4d7141086d758893bee434e5c Gerrit-Change-Number: 26021 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 15:43:19 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 15:43:19 +0000 Subject: Change in osmo-hnodeb[master]: Generate proper rnc_id and plmn in LuRequest In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26023 to look at the new patch set (#2). Change subject: Generate proper rnc_id and plmn in LuRequest ...................................................................... Generate proper rnc_id and plmn in LuRequest Change-Id: Ib40b5eb96b7cc13c424076a4ca725019514d52af --- M include/osmocom/hnodeb/ranap.h M src/osmo-hnodeb/ranap.c M src/osmo-hnodeb/vty.c 3 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/23/26023/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ib40b5eb96b7cc13c424076a4ca725019514d52af Gerrit-Change-Number: 26023 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 15:53:13 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 15:53:13 +0000 Subject: Change in simtrace2[master]: firmware: add bootloader update "app" In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26026 ) Change subject: firmware: add bootloader update "app" ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/simtrace2/+/26026/3//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/simtrace2/+/26026/3//COMMIT_MSG at 9 PS3, Line 9: This bl updater can be flashed as app and will update the bootloader and What's wrong with this commit message? Not a merge blocker, but... I find it hard to read. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I53dea57bba790a2ab3245d9483e0ff1c8d19d5e3 Gerrit-Change-Number: 26026 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Fri, 29 Oct 2021 15:53:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 16:13:22 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 29 Oct 2021 16:13:22 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: Fix crash when configuring an existing ns bind References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/26033 ) Change subject: gprs_bssgp_pcu: Fix crash when configuring an existing ns bind ...................................................................... gprs_bssgp_pcu: Fix crash when configuring an existing ns bind ns_configure_nse() only sets bind when it doesn't exist yet. If it already exists bind[i] stays NULL and causes a segfault in gprs_ns2_is_ip_bind() later on. This patch ensures bind[i] is either created of set to the existing bind. Change-Id: I103e82e6c64324c087a4ff325a83eeab0e5a4ee9 Related: SYS#4971 --- M src/gprs_bssgp_pcu.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/33/26033/1 diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c index 1fcacdb..0dd6cdc 100644 --- a/src/gprs_bssgp_pcu.c +++ b/src/gprs_bssgp_pcu.c @@ -1118,7 +1118,8 @@ if (!(valid & (1 << i))) continue; - if (!gprs_ns2_ip_bind_by_sockaddr(the_pcu->nsi, &local[i])) { + bind[i] = gprs_ns2_ip_bind_by_sockaddr(the_pcu->nsi, &local[i]); + if (!bind[i]) { snprintf(name, sizeof(name), "pcu%u", i); rc = gprs_ns2_ip_bind(the_pcu->nsi, name, &local[i], 0, &bind[i]); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/26033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I103e82e6c64324c087a4ff325a83eeab0e5a4ee9 Gerrit-Change-Number: 26033 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 16:14:51 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 16:14:51 +0000 Subject: Change in osmo-hnodeb[master]: ranap: Fix compiler warnings passing func callback References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26034 ) Change subject: ranap: Fix compiler warnings passing func callback ...................................................................... ranap: Fix compiler warnings passing func callback Fixes following warning types: "passing argument 1 of ?ranap_cn_rx_co? from incompatible pointer type [-Wincompatible-pointer-types]" Change-Id: If80b57a8d36c28dee7db28cb36a88ed41e0a7328 --- M include/osmocom/hnodeb/ranap.h M src/osmo-hnodeb/ranap.c 2 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/34/26034/1 diff --git a/include/osmocom/hnodeb/ranap.h b/include/osmocom/hnodeb/ranap.h index 7864c69..15e0609 100644 --- a/include/osmocom/hnodeb/ranap.h +++ b/include/osmocom/hnodeb/ranap.h @@ -27,7 +27,7 @@ void hnb_rx_paging(struct hnb *hnb, const char *imsi); void hnb_rx_secmode_cmd(struct hnb *hnb, long ip_alg); -void hnb_rua_dt_handle_ranap(struct hnb *hnb, struct ranap_message_s *ranap_msg); -void hnb_rua_cl_handle_ranap(struct hnb *hnb, struct ranap_message_s *ranap_msg); +void hnb_rua_dt_handle_ranap(void *ctx, struct ranap_message_s *ranap_msg); +void hnb_rua_cl_handle_ranap(void *ctx, struct ranap_message_s *ranap_msg); void hnb_tx_iu_release_req(struct hnb *hnb); struct msgb *gen_initue_lu(const struct hnb *hnb, int is_ps, uint32_t conn_id, const char *imsi); diff --git a/src/osmo-hnodeb/ranap.c b/src/osmo-hnodeb/ranap.c index 3dd759f..b5b7b9c 100644 --- a/src/osmo-hnodeb/ranap.c +++ b/src/osmo-hnodeb/ranap.c @@ -38,9 +38,9 @@ LOGP(DRANAP, LOGL_INFO, #octet_string_t " = %s\n",\ printstr(&octet_string_t)) -void hnb_rua_dt_handle_ranap(struct hnb *hnb, - struct ranap_message_s *ranap_msg) +void hnb_rua_dt_handle_ranap(void *ctx, struct ranap_message_s *ranap_msg) { + struct hnb *hnb = (struct hnb *)ctx; int len; uint8_t *data; RANAP_PermittedIntegrityProtectionAlgorithms_t *algs; @@ -83,9 +83,9 @@ } } -void hnb_rua_cl_handle_ranap(struct hnb *hnb, - struct ranap_message_s *ranap_msg) +void hnb_rua_cl_handle_ranap(void *ctx, struct ranap_message_s *ranap_msg) { + struct hnb *hnb = (struct hnb *)ctx; char imsi[16]; LOGP(DRANAP, LOGL_INFO, "rx ranap_msg->procedureCode %d\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: If80b57a8d36c28dee7db28cb36a88ed41e0a7328 Gerrit-Change-Number: 26034 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 16:15:49 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 16:15:49 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: Fix crash when configuring an existing ns bind In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/26033 ) Change subject: gprs_bssgp_pcu: Fix crash when configuring an existing ns bind ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/26033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I103e82e6c64324c087a4ff325a83eeab0e5a4ee9 Gerrit-Change-Number: 26033 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Fri, 29 Oct 2021 16:15:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 16:33:12 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 16:33:12 +0000 Subject: Change in osmo-hnodeb[master]: configure: link against libsctp References: Message-ID: pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26035 ) Change subject: configure: link against libsctp ...................................................................... configure: link against libsctp osmo-hnodeb calls sctp_recvmsg directly, which is provided by libsctp. Hence, we need to depend and link on it. Change-Id: I793d6fe8601cf9a8dd72bf6884b469204b513c11 --- M configure.ac M src/osmo-hnodeb/Makefile.am 2 files changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnodeb refs/changes/35/26035/1 diff --git a/configure.ac b/configure.ac index 750b5e9..5b4ca8b 100644 --- a/configure.ac +++ b/configure.ac @@ -44,6 +44,16 @@ dnl checks for libraries AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DL="$LIBS";LIBS=""]) AC_SUBST(LIBRARY_DL) +old_LIBS=$LIBS +AC_SEARCH_LIBS([sctp_recvmsg], [sctp], [ + AC_DEFINE(HAVE_LIBSCTP, 1, [Define 1 to enable SCTP support]) + AC_SUBST(HAVE_LIBSCTP, [1]) + if test -n "$ac_lib"; then + AC_SUBST(LIBSCTP_LIBS, [-l$ac_lib]) + fi + ], [ + AC_MSG_ERROR([sctp_recvmsg not found in searched libs])]) +LIBS=$old_LIBS PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.30) PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.5.0) diff --git a/src/osmo-hnodeb/Makefile.am b/src/osmo-hnodeb/Makefile.am index fd18233..139b6b0 100644 --- a/src/osmo-hnodeb/Makefile.am +++ b/src/osmo-hnodeb/Makefile.am @@ -52,4 +52,5 @@ $(LIBOSMORUA_LIBS) \ $(LIBOSMORANAP_LIBS) \ $(LIBOSMOHNBAP_LIBS) \ + $(LIBSCTP_LIBS) \ $(NULL) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I793d6fe8601cf9a8dd72bf6884b469204b513c11 Gerrit-Change-Number: 26035 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 16:46:26 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 29 Oct 2021 16:46:26 +0000 Subject: Change in pysim[master]: pySim-shell: do not use usim/isim APDUs in the beginnning In-Reply-To: References: Message-ID: dexter has abandoned this change. ( https://gerrit.osmocom.org/c/pysim/+/25804 ) Change subject: pySim-shell: do not use usim/isim APDUs in the beginnning ...................................................................... Abandoned This is probably a wrong solution based on false assumptions. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/25804 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I985261a1bddae60ffeaccb9c8d8d1b8a2ae4d0fc Gerrit-Change-Number: 25804 Gerrit-PatchSet: 2 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 17:08:29 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 29 Oct 2021 17:08:29 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Route STATUS in PtP-BVC by TLLI/TMSI as well References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/26036 ) Change subject: gbproxy: Route STATUS in PtP-BVC by TLLI/TMSI as well ...................................................................... gbproxy: Route STATUS in PtP-BVC by TLLI/TMSI as well Related: SYS#5235, OS#4892 Change-Id: Ib31c60ba840522719f307df089efeb8f4da1d9ae --- M src/gb_proxy.c 1 file changed, 21 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/36/26036/1 diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 18e0efb..7333e80 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -380,6 +380,8 @@ return gbprox_relay2peer(msg, sgsn_bvc, sig_bvci ? 0 : sgsn_bvc->bvci); } +static int gbproxy_tlli_from_status_pdu(struct tlv_parsed *tp, uint32_t *tlli, char *log_pfx); + /* Receive an incoming PTP message from a BSS-side NS-VC */ static int gbprox_rx_ptp_from_bss(struct gbproxy_nse *nse, struct msgb *msg, uint16_t ns_bvci) { @@ -496,12 +498,28 @@ osmo_fsm_inst_dispatch(bss_bvc->fi, BSSGP_BVCFSM_E_RX_FC_BVC, msg); break; case BSSGP_PDUT_STATUS: - /* TODO: Implement by inspecting the contained PDU */ - if (!TLVP_PRESENT(&tp, BSSGP_IE_PDU_IN_ERROR)) + { + struct gbproxy_sgsn *sgsn; + /* Check if the status needs to be terminated locally */ + uint8_t cause = *TLVP_VAL(&tp, BSSGP_IE_CAUSE); + + LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s)\n", cause, + bssgp_cause_str(cause)); + + if (gbproxy_tlli_from_status_pdu(&tp, &tlli, log_pfx) == 0) + sgsn = gbproxy_select_sgsn(nse->cfg, &tlli); + else + sgsn = gbproxy_select_sgsn(nse->cfg, NULL); + + if (!sgsn) { + rc = -EINVAL; break; - LOGPBVC(bss_bvc, LOGL_ERROR, "Rx %s: Implementation missing\n", pdut_name); + } + + rc = gbprox_relay2nse(msg, sgsn->nse, ns_bvci); break; } + } return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/26036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib31c60ba840522719f307df089efeb8f4da1d9ae Gerrit-Change-Number: 26036 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 17:08:30 2021 From: gerrit-no-reply at lists.osmocom.org (daniel) Date: Fri, 29 Oct 2021 17:08:30 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Correctly extract TLLI from DL/UL unitdata References: Message-ID: daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/26037 ) Change subject: gbproxy: Correctly extract TLLI from DL/UL unitdata ...................................................................... gbproxy: Correctly extract TLLI from DL/UL unitdata The unitdata PDUs have a different header structure so then need to be parsed differently. Fixes TTCN3 test TC_status_ptp_ul_tlli Related: SYS#5235, OS#4892 Change-Id: I76896f2eee588c9a286b87b69b5b58232759a6d5 --- M src/gb_proxy.c 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/37/26037/1 diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 7333e80..2be4b6b 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -1017,8 +1017,20 @@ struct tlv_parsed tp_inner[2]; /* TODO: Parse partial messages as well */ - rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp_inner, ARRAY_SIZE(tp_inner), bgph->pdu_type, bgph->data, - pdu_len - sizeof(*bgph), 0, 0, DGPRS, log_pfx); + if (bgph->pdu_type == BSSGP_PDUT_UL_UNITDATA || bgph->pdu_type == BSSGP_PDUT_DL_UNITDATA) { + const struct bssgp_ud_hdr *budh = (struct bssgp_ud_hdr *) (struct bssgp_ud_hdr *)pdu_data; + if (pdu_len < sizeof(*budh)) + return -EINVAL; + rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp_inner, ARRAY_SIZE(tp_inner), bgph->pdu_type, budh->data, + pdu_len - sizeof(*budh), 0, 0, DGPRS, log_pfx); + /* populate TLLI from the fixed headser into the TLV-parsed array so later code + * doesn't have to worry where the TLLI came from */ + tp_inner[0].lv[BSSGP_IE_TLLI].len = 4; + tp_inner[0].lv[BSSGP_IE_TLLI].val = (const uint8_t *) &budh->tlli; + } else { + rc = osmo_tlv_prot_parse(&osmo_pdef_bssgp, tp_inner, ARRAY_SIZE(tp_inner), bgph->pdu_type, bgph->data, + pdu_len - sizeof(*bgph), 0, 0, DGPRS, log_pfx); + } if (rc < 0) return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/26037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I76896f2eee588c9a286b87b69b5b58232759a6d5 Gerrit-Change-Number: 26037 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 17:23:57 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 29 Oct 2021 17:23:57 +0000 Subject: Change in pysim[master]: cards: use python style commends to describe methods References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/26038 ) Change subject: cards: use python style commends to describe methods ...................................................................... cards: use python style commends to describe methods Change-Id: Iae862d8f0a191c7015a94f9516ef5804265f7a82 --- M pySim/cards.py 1 file changed, 7 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/38/26038/1 diff --git a/pySim/cards.py b/pySim/cards.py index 95352ff..1a86b14 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -74,9 +74,7 @@ return True def verify_adm(self, key): - ''' - Authenticate with ADM key - ''' + """Authenticate with ADM key""" (res, sw) = self._scc.verify_chv(self._adm_chv_num, key) return sw @@ -135,10 +133,7 @@ return (None, sw) def update_oplmn_act(self, mcc, mnc, access_tech='FFFF'): - """ - See note in update_hplmn_act() - """ - # get size and write EF.OPLMNwAcT + """get size and write EF.OPLMNwAcT, See note in update_hplmn_act()""" data = self._scc.read_binary(EF['OPLMNwAcT'], length=None, offset=0) size = len(data[0]) // 2 hplmn = enc_plmn(mcc, mnc) @@ -154,10 +149,7 @@ return (None, sw) def update_plmn_act(self, mcc, mnc, access_tech='FFFF'): - """ - See note in update_hplmn_act() - """ - # get size and write EF.PLMNwAcT + """get size and write EF.PLMNwAcT, See note in update_hplmn_act()""" data = self._scc.read_binary(EF['PLMNwAcT'], length=None, offset=0) size = len(data[0]) // 2 hplmn = enc_plmn(mcc, mnc) @@ -265,8 +257,8 @@ else: return (None, sw) - # Fetch all the AIDs present on UICC def read_aids(self): + """Fetch all the AIDs present on UICC""" self._aids = [] try: # Find out how many records the EF.DIR has @@ -282,8 +274,8 @@ self._aids = [] return self._aids - # Select ADF.U/ISIM in the Card using its full AID def select_adf_by_aid(self, adf="usim"): + """Select ADF.U/ISIM in the Card using its full AID""" # Find full AID by partial AID: if is_hex(adf): for aid in self._aids: @@ -300,13 +292,13 @@ return self._scc.select_adf(aid) return (None, None) - # Erase the contents of a file def erase_binary(self, ef): + """Erase the contents of a file""" len = self._scc.binary_size(ef) self._scc.update_binary(ef, "ff" * len, offset=0, verify=True) - # Erase the contents of a single record def erase_record(self, ef, rec_no): + """Erase the contents of a single record""" len = self._scc.record_size(ef) self._scc.update_record(ef, rec_no, "ff" * len, force_len=False, verify=True) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iae862d8f0a191c7015a94f9516ef5804265f7a82 Gerrit-Change-Number: 26038 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 17:23:57 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 29 Oct 2021 17:23:57 +0000 Subject: Change in pysim[master]: commands: use python style commends to describe methods References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/26039 ) Change subject: commands: use python style commends to describe methods ...................................................................... commands: use python style commends to describe methods Change-Id: Iccc9f01769ee9274d01036d3fbbc161d8bca7628 --- M pySim/commands.py 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/39/26039/1 diff --git a/pySim/commands.py b/pySim/commands.py index 7d09fa9..805fe61 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -283,9 +283,8 @@ pdu = '80cb000000' return self._tp.send_apdu_checksw(pdu) - # TS 102 221 Section 11.3.1 def retrieve_data(self, ef, tag:int): - """Execute RETRIEVE DATA. + """Execute RETRIEVE DATA, see also TS 102 221 Section 11.3.1. Args ef : string or list of strings indicating name or path of transparent EF -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iccc9f01769ee9274d01036d3fbbc161d8bca7628 Gerrit-Change-Number: 26039 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 17:23:58 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 29 Oct 2021 17:23:58 +0000 Subject: Change in pysim[master]: cards: add method to modify APDU parameters (cla, sel_ctrl) References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/26040 ) Change subject: cards: add method to modify APDU parameters (cla, sel_ctrl) ...................................................................... cards: add method to modify APDU parameters (cla, sel_ctrl) There are situations where it is necessary to modify the class byte and the selection control bytes of a card at runtime. This should not be done by accessing the properties of the _scc object directly. The modification of those properties should be done via a set method instead. Change-Id: Ifd8aa2660e44a18d28945d070419612eff443e78 --- M pySim/cards.py 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/40/26040/1 diff --git a/pySim/cards.py b/pySim/cards.py index 1a86b14..4511271 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -302,6 +302,15 @@ len = self._scc.record_size(ef) self._scc.update_record(ef, rec_no, "ff" * len, force_len=False, verify=True) + def set_apdu_parameter(self, cla, sel_ctrl): + """Set apdu parameters (class byte and selection control bytes)""" + self._scc.cla_byte = cla + self._scc.sel_ctrl = sel_ctrl + + def get_apdu_parameter(self): + """Get apdu parameters (class byte and selection control bytes)""" + return (self._scc.cla_byte, self._scc.sel_ctrl) + class UsimCard(SimCard): name = 'USIM' -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ifd8aa2660e44a18d28945d070419612eff443e78 Gerrit-Change-Number: 26040 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 17:23:59 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 29 Oct 2021 17:23:59 +0000 Subject: Change in pysim[master]: filesystem: fix reset mechanism References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/26041 ) Change subject: filesystem: fix reset mechanism ...................................................................... filesystem: fix reset mechanism Currently we call the reset_card and get_atr methods directly at the transport layer via the private _scc and _tp object of the card. This is a violation. Fix and use the reset methods that are already in the SimCard object. Change-Id: I0e9d2a62a42a7387e7ca69d2ae830782a61aed89 --- M pySim/cards.py M pySim/filesystem.py 2 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/26041/1 diff --git a/pySim/cards.py b/pySim/cards.py index 4511271..8f5004e 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -60,7 +60,11 @@ self._aids = [] def reset(self): - self._scc.reset_card() + rc = self._scc.reset_card() + if rc is 1: + return self._scc.get_atr() + else: + return None def erase(self): print("warning: erasing is not supported for specified card type!") diff --git a/pySim/filesystem.py b/pySim/filesystem.py index cc9176f..dcc2608 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1068,8 +1068,7 @@ Args: cmd_app : Command Application State (for unregistering old file commands) """ - self.card._scc._tp.reset_card() - atr = i2h(self.card._scc._tp.get_atr()) + atr = i2h(self.card.reset()) # select MF to reset internal state and to verify card really works self.select('MF', cmd_app) return atr -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0e9d2a62a42a7387e7ca69d2ae830782a61aed89 Gerrit-Change-Number: 26041 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 17:24:00 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 29 Oct 2021 17:24:00 +0000 Subject: Change in pysim[master]: ts_51_011: implement CardProfileSIM as a class References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/26042 ) Change subject: ts_51_011: implement CardProfileSIM as a class ...................................................................... ts_51_011: implement CardProfileSIM as a class CardProfileSIM is currenty instantiated directly. However, it should be implemented as class and then instaniated later like CardProfileUICC Change-Id: I37d49b11a07ce5a80d1a703fab4620b7d1ecb25b --- M pySim/ts_51_011.py 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/42/26042/1 diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 3492a8d..743c14b 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -980,4 +980,6 @@ return ret -CardProfileSIM = CardProfile('SIM', desc='GSM SIM Card', files_in_mf=[DF_TELECOM(), DF_GSM()]) +class CardProfileSIM(CardProfile): + def __init__(self): + super().__init__('SIM', desc='GSM SIM Card', files_in_mf=[DF_TELECOM(), DF_GSM()]) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I37d49b11a07ce5a80d1a703fab4620b7d1ecb25b Gerrit-Change-Number: 26042 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 17:24:00 2021 From: gerrit-no-reply at lists.osmocom.org (dexter) Date: Fri, 29 Oct 2021 17:24:00 +0000 Subject: Change in pysim[master]: pySim-shell: add method to probe for UICC References: Message-ID: dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/26043 ) Change subject: pySim-shell: add method to probe for UICC ...................................................................... pySim-shell: add method to probe for UICC UICC and old SIM cards can be difficult to tell apart without prior knowledge of the card. The ATR won't tell if the card is UICC or not. The only remaining option is to try out if the card is able to handle UICC APDUs. The same is true for 2G SIM cards. It is not guranteed that every UICC card will have 2G functionality. Lets add functionality that probes the card type and then decide which profile is suitable. Change-Id: I535bef35847140e611d4fa95ed2859ee81cce605 Related: OS#5274 --- M pySim-shell.py M pySim/filesystem.py A pySim/probe.py M pySim/ts_102_221.py M pySim/ts_51_011.py 5 files changed, 119 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/43/26043/1 diff --git a/pySim-shell.py b/pySim-shell.py index 3fc5859..555ddac 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -58,6 +58,8 @@ from pySim.card_key_provider import CardKeyProviderCsv, card_key_provider_register, card_key_provider_get_field +from pySim.probe import probe_card + def init_card(sl): """ Detect card in reader and setup card profile and runtime state. This @@ -79,19 +81,36 @@ card = card_detect("auto", scc) if card is None: - print("Could not detect card type!") - return None, None; + print("Warning: Could not detect card type - assuming a generic card type...") + card = SimCard(scc); + + card_is_uicc = probe_card(card, ['UICC']) + card_is_sim = probe_card(card, ['SIM']) + + if card_is_uicc: + if card_is_sim: + print("Info: Card is of type SIM and UICC") + else: + print("Info: Card is of type UICC") + profile = CardProfileUICC() + profile.add_application(CardApplicationUSIM()) + profile.add_application(CardApplicationISIM()) + elif card_is_sim: + print("Info: Card is of type SIM") + profile = CardProfileSIM() + else: + print("Unsupported card type!") + return None, None # Create runtime state with card profile - profile = CardProfileUICC() - profile.add_application(CardApplicationUSIM()) - profile.add_application(CardApplicationISIM()) rs = RuntimeState(card, profile) - # FIXME: do this dynamically - rs.mf.add_file(DF_TELECOM()) - rs.mf.add_file(DF_GSM()) - rs.mf.add_file(DF_EIRENE()) + # The card is an UICC, but can also be used a 2G SIM, so we must add the SIM + # SIM related bits manaully because they are not part of the UICC profile + if card_is_uicc and card_is_sim: + rs.mf.add_file(DF_TELECOM()) + rs.mf.add_file(DF_GSM()) + rs.mf.add_file(DF_EIRENE()) CardModel.apply_matching_models(scc, rs) diff --git a/pySim/filesystem.py b/pySim/filesystem.py index dcc2608..bf4025c 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1033,6 +1033,11 @@ self.card = card self.selected_file = self.mf # type: CardDF self.profile = profile + + # make sure the class and selection control bytes, which are specified + # by the card profile are used + self.card.set_apdu_parameter(cla=self.profile.cla, sel_ctrl=self.profile.sel_ctrl) + # add application ADFs + MF-files from profile apps = self._match_applications() for a in apps: @@ -1042,11 +1047,22 @@ self.mf.add_file(f) self.conserve_write = True + # make sure that when the runtime state is created, the card is also + # in a defined state. + self.reset() + def _match_applications(self): """match the applications from the profile with applications on the card""" apps_profile = self.profile.applications - aids_card = self.card.read_aids() apps_taken = [] + + # When the profile does not feature any applications, then we are done already + if not apps_profile: + return [] + + # Read AIDs from card and match them against the applications defined by the + # card profile + aids_card = self.card.read_aids() if aids_card: aids_taken = [] print("AIDs on card:") @@ -1407,6 +1423,8 @@ applications : List of CardApplications present on card sw : List of status word definitions shell_cmdsets : List of cmd2 shell command sets of profile-specific commands + cla : class byte that should be used with cards of this profile + sel_ctrl : selection control bytes class byte that should be used with cards of this profile """ self.name = name self.desc = kw.get("desc", None) @@ -1414,6 +1432,8 @@ self.sw = kw.get("sw", []) self.applications = kw.get("applications", []) self.shell_cmdsets = kw.get("shell_cmdsets", []) + self.cla = kw.get("cla", "00") + self.sel_ctrl = kw.get("sel_ctrl", "0004") def __str__(self): return self.name diff --git a/pySim/probe.py b/pySim/probe.py new file mode 100644 index 0000000..4348c21 --- /dev/null +++ b/pySim/probe.py @@ -0,0 +1,68 @@ +# -*- coding: utf-8 -*- + +""" pySim: tell old 2G SIMs apart from UICC +""" + +# +# (C) 2021 by Sysmocom s.f.m.c. GmbH +# All Rights Reserved +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +from pySim.cards import SimCard + +def _test_ts_11_11_apdu(card:SimCard) -> bool: + """ Try to access MF via 2G APDUs (3GPP TS 11.11) """ + card.set_apdu_parameter(cla="a0", sel_ctrl="0000") + card.reset() + try: + card._scc.select_file('3f00') + except: + return False + + return True + +def _test_uicc_apdu(card:SimCard) -> bool: + """ Try to access MF via UICC APDUs """ + card.set_apdu_parameter(cla="00", sel_ctrl="0004") + card.reset() + try: + card._scc.select_file('3f00') + except: + return False + + return True + +def probe_card(card:SimCard, card_is:list=['SIM','UICC']) -> bool: + """ Find out whether the card is of type UICC """ + + rc = [] + + # back up CLA byte and SEL control bytes + cla_byte_bak, sel_ctrl_bak = card.get_apdu_parameter() + + if 'SIM' in card_is: + rc.append(_test_ts_11_11_apdu(card)) + if 'UICC' in card_is: + rc.append(_test_uicc_apdu(card)) + + # Leave with a defined state + card.reset() + card.set_apdu_parameter(cla=cla_byte_bak, sel_ctrl=sel_ctrl_bak) + + if False in rc: + return False + + return True diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 3665939..403daec 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -683,4 +683,4 @@ }, } - super().__init__('UICC', desc='ETSI TS 102 221', files_in_mf=files, sw=sw) + super().__init__('UICC', desc='ETSI TS 102 221', cla="00", sel_ctrl="0004", files_in_mf=files, sw=sw) diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 743c14b..fa70661 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -982,4 +982,4 @@ class CardProfileSIM(CardProfile): def __init__(self): - super().__init__('SIM', desc='GSM SIM Card', files_in_mf=[DF_TELECOM(), DF_GSM()]) + super().__init__('SIM', desc='GSM SIM Card', cla="a0", sel_ctrl="0000", files_in_mf=[DF_TELECOM(), DF_GSM()]) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I535bef35847140e611d4fa95ed2859ee81cce605 Gerrit-Change-Number: 26043 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 17:28:05 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 17:28:05 +0000 Subject: Change in libosmocore[master]: gsm/protocol/gsm_44_004.h: fix missing include of 'endian.h' References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/26044 ) Change subject: gsm/protocol/gsm_44_004.h: fix missing include of 'endian.h' ...................................................................... gsm/protocol/gsm_44_004.h: fix missing include of 'endian.h' Without this header, both OSMO_IS_{BIG,LITTLE}_ENDIAN macros are not defined, and thus the 'struct gsm_sacch_l1_hdr' is empty. Change-Id: I2c14a1b898fdb743191dab0e6be157ce916e8161 --- M include/osmocom/gsm/protocol/gsm_44_004.h 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/26044/1 diff --git a/include/osmocom/gsm/protocol/gsm_44_004.h b/include/osmocom/gsm/protocol/gsm_44_004.h index 83be9bf..32ef24e 100644 --- a/include/osmocom/gsm/protocol/gsm_44_004.h +++ b/include/osmocom/gsm/protocol/gsm_44_004.h @@ -1,5 +1,7 @@ #pragma once +#include + /* TS 44.004 Section 7.1 */ struct gsm_sacch_l1_hdr { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c14a1b898fdb743191dab0e6be157ce916e8161 Gerrit-Change-Number: 26044 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 17:55:31 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 17:55:31 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Route STATUS in PtP-BVC by TLLI/TMSI as well In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/26036 ) Change subject: gbproxy: Route STATUS in PtP-BVC by TLLI/TMSI as well ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/26036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib31c60ba840522719f307df089efeb8f4da1d9ae Gerrit-Change-Number: 26036 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 29 Oct 2021 17:55:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 17:56:38 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 17:56:38 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Correctly extract TLLI from DL/UL unitdata In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/26037 ) Change subject: gbproxy: Correctly extract TLLI from DL/UL unitdata ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gbproxy/+/26037/1/src/gb_proxy.c File src/gb_proxy.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/26037/1/src/gb_proxy.c at 1028 PS1, Line 1028: tp_inner[0].lv[BSSGP_IE_TLLI].len = 4; this looks really hacky, I'd simply store stuff into *tlli and be done with it... -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/26037 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I76896f2eee588c9a286b87b69b5b58232759a6d5 Gerrit-Change-Number: 26037 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 29 Oct 2021 17:56:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 17:56:54 2021 From: gerrit-no-reply at lists.osmocom.org (pespin) Date: Fri, 29 Oct 2021 17:56:54 +0000 Subject: Change in libosmocore[master]: gsm/protocol/gsm_44_004.h: fix missing include of 'endian.h' In-Reply-To: References: Message-ID: pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26044 ) Change subject: gsm/protocol/gsm_44_004.h: fix missing include of 'endian.h' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c14a1b898fdb743191dab0e6be157ce916e8161 Gerrit-Change-Number: 26044 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 29 Oct 2021 17:56:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 22:10:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 22:10:28 +0000 Subject: Change in osmo-ci[master]: scripts: add a script for checking presence of References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/26045 ) Change subject: scripts: add a script for checking presence of ...................................................................... scripts: add a script for checking presence of Change-Id: I6a1e7fc2e96f42fc596f47b4d7f1ac6c61d834b6 --- A scripts/verify_endian_header.sh 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/45/26045/1 diff --git a/scripts/verify_endian_header.sh b/scripts/verify_endian_header.sh new file mode 100755 index 0000000..9dcbc0e --- /dev/null +++ b/scripts/verify_endian_header.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +# Usage: ./verify_endian_header.sh $(find . -name "*.[hc]") + +HEADER="osmocom/core/endian.h" +COUNT=0 + +for f in $*; do + # Obviously, ignore the header file defining the macros + if [ $(basename $f) = $(basename $HEADER) ]; then + continue + fi + # Match files using either of OSMO_IS_{LITTLE,BIG}_ENDIAN + if grep -q "OSMO_IS_\(LITTLE\|BIG\)_ENDIAN" $f; then + # The header file must be included + if ! grep -q "#include <$HEADER>" $f; then + echo "File '$f' does not #include <$HEADER>" + COUNT=$((COUNT + 1)) + fi + fi +done + +exit $COUNT -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6a1e7fc2e96f42fc596f47b4d7f1ac6c61d834b6 Gerrit-Change-Number: 26045 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Fri Oct 29 22:12:14 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Fri, 29 Oct 2021 22:12:14 +0000 Subject: Change in libosmocore[master]: gsm/protocol/gsm_44_004.h: fix missing include of 'endian.h' In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26044 ) Change subject: gsm/protocol/gsm_44_004.h: fix missing include of 'endian.h' ...................................................................... Patch Set 1: I wrote a simple script to catch missing #include of automatically: https://gerrit.osmocom.org/c/osmo-ci/+/26045 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c14a1b898fdb743191dab0e6be157ce916e8161 Gerrit-Change-Number: 26044 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 29 Oct 2021 22:12:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Fri Oct 29 22:50:43 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 22:50:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7ac97eebc_11002ae3d3bb26002231c4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 308s] # in ... [ 308s] TEXINPUTS=".." \ [ 308s] a2x -vv -L --asciidoc-opts="-f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/tests' -a commondir='../common'" --dblatex-opts="-s ../build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" test-usermanual.adoc [ 308s] Traceback (most recent call last): [ 308s] File "/usr/bin/a2x", line 33, in [ 308s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 308s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 308s] for entry_point in distribution(dist_name).entry_points [ 308s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 308s] return Distribution.from_name(distribution_name) [ 308s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 308s] raise PackageNotFoundError(name) [ 308s] importlib.metadata.PackageNotFoundError: asciidoc [ 308s] make[3]: *** [../build/Makefile.asciidoc.inc:70: test-usermanual.pdf] Error 1 [ 308s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 308s] make[2]: *** [Makefile:439: all-recursive] Error 1 [ 308s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 308s] make[1]: *** [Makefile:363: all] Error 2 [ 308s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 308s] dh_auto_build: error: make -j1 returned exit code 2 [ 308s] make: *** [debian/rules:5: binary] Error 25 [ 308s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 308s] ### VM INTERACTION START ### [ 309s] Powering off. [ 309s] [ 293.393432] reboot: Power down [ 309s] ### VM INTERACTION END ### [ 309s] [ 309s] build84 failed "build osmo-gsm-manuals-dev_1.1.0.dsc" at Fri Oct 29 22:50:37 UTC 2021. [ 309s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 22:51:51 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 22:51:51 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7b212870a_11002ae3d3bb2600223491@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 370s] # in ... [ 370s] TEXINPUTS=".." \ [ 370s] a2x -vv -L --asciidoc-opts="-f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/tests' -a commondir='../common'" --dblatex-opts="-s ../build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" test-usermanual.adoc [ 370s] Traceback (most recent call last): [ 370s] File "/usr/bin/a2x", line 33, in [ 370s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 370s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 370s] for entry_point in distribution(dist_name).entry_points [ 370s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 370s] return Distribution.from_name(distribution_name) [ 370s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 370s] raise PackageNotFoundError(name) [ 370s] importlib.metadata.PackageNotFoundError: asciidoc [ 370s] make[3]: *** [../build/Makefile.asciidoc.inc:70: test-usermanual.pdf] Error 1 [ 370s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 370s] make[2]: *** [Makefile:439: all-recursive] Error 1 [ 370s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 370s] make[1]: *** [Makefile:363: all] Error 2 [ 370s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 370s] dh_auto_build: error: make -j1 returned exit code 2 [ 370s] make: *** [debian/rules:5: binary] Error 25 [ 370s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 370s] ### VM INTERACTION START ### [ 371s] Powering off. [ 371s] [ 353.882302] reboot: Power down [ 371s] ### VM INTERACTION END ### [ 371s] [ 371s] lamb07 failed "build osmo-gsm-manuals-dev_1.1.0.17.b92c.202110290026.dsc" at Fri Oct 29 22:51:41 UTC 2021. [ 371s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 22:55:49 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 22:55:49 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gbproxy in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7c131234a_11002ae3d3bb2600223650@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gbproxy/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-gbproxy failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gbproxy Last lines of build log: [ 227s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmogbproxy-usermanual.adoc [ 227s] Traceback (most recent call last): [ 227s] File "/usr/bin/a2x", line 33, in [ 227s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 227s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 227s] for entry_point in distribution(dist_name).entry_points [ 227s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 227s] return Distribution.from_name(distribution_name) [ 227s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 227s] raise PackageNotFoundError(name) [ 227s] importlib.metadata.PackageNotFoundError: asciidoc [ 227s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmogbproxy-usermanual.pdf] Error 1 [ 227s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 227s] make[3]: *** [Makefile:376: all-recursive] Error 1 [ 227s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 227s] make[2]: *** [Makefile:445: all-recursive] Error 1 [ 227s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 227s] make[1]: *** [Makefile:377: all] Error 2 [ 227s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 227s] dh_auto_build: error: make -j1 returned exit code 2 [ 227s] make: *** [debian/rules:45: build] Error 25 [ 227s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 227s] ### VM INTERACTION START ### [ 228s] Powering off. [ 228s] [ 217.925878] reboot: Power down [ 228s] ### VM INTERACTION END ### [ 228s] [ 228s] goat19 failed "build osmo-gbproxy_0.1.0.43.6ec5f.202110290026.dsc" at Fri Oct 29 22:55:40 UTC 2021. [ 228s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 22:56:06 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 22:56:06 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7c13a2d87_11002ae3d3bb2600223746@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 303s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmomgw-usermanual.adoc [ 303s] Traceback (most recent call last): [ 303s] File "/usr/bin/a2x", line 33, in [ 303s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 303s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 303s] for entry_point in distribution(dist_name).entry_points [ 303s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 303s] return Distribution.from_name(distribution_name) [ 303s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 303s] raise PackageNotFoundError(name) [ 303s] importlib.metadata.PackageNotFoundError: asciidoc [ 303s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmomgw-usermanual.pdf] Error 1 [ 303s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 303s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 303s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 303s] make[2]: *** [Makefile:514: all-recursive] Error 1 [ 303s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 303s] make[1]: *** [Makefile:423: all] Error 2 [ 303s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 303s] dh_auto_build: error: make -j1 returned exit code 2 [ 303s] make: *** [debian/rules:17: build] Error 25 [ 303s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 303s] ### VM INTERACTION START ### [ 304s] Powering off. [ 304s] [ 290.575115] reboot: Power down [ 304s] ### VM INTERACTION END ### [ 304s] [ 304s] sheep82 failed "build osmo-mgw_1.8.1.dsc" at Fri Oct 29 22:56:03 UTC 2021. [ 304s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 22:56:06 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 22:56:06 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7c13dd4ff_11002ae3d3bb2600223814@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 295s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmobts-usermanual.adoc [ 295s] Traceback (most recent call last): [ 295s] File "/usr/bin/a2x", line 33, in [ 295s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 295s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 295s] for entry_point in distribution(dist_name).entry_points [ 295s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 295s] return Distribution.from_name(distribution_name) [ 295s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 295s] raise PackageNotFoundError(name) [ 295s] importlib.metadata.PackageNotFoundError: asciidoc [ 295s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmobts-usermanual.pdf] Error 1 [ 295s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 295s] make[3]: *** [Makefile:380: all-recursive] Error 1 [ 295s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 295s] make[2]: *** [Makefile:439: all-recursive] Error 1 [ 295s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 295s] make[1]: *** [Makefile:371: all] Error 2 [ 295s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 295s] dh_auto_build: error: make -j1 returned exit code 2 [ 295s] make: *** [debian/rules:12: build] Error 25 [ 295s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 295s] ### VM INTERACTION START ### [ 296s] Powering off. [ 296s] [ 279.254893] reboot: Power down [ 296s] ### VM INTERACTION END ### [ 296s] [ 296s] goat03 failed "build osmo-bts_1.3.3.dsc" at Fri Oct 29 22:55:49 UTC 2021. [ 296s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 22:56:23 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 22:56:23 +0000 Subject: Build failure of network:osmocom:nightly/osmo-ggsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7c2d543d1_11002ae3d3bb26002239b4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-ggsn/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-ggsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-ggsn Last lines of build log: [ 262s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmoggsn-usermanual.adoc [ 262s] Traceback (most recent call last): [ 262s] File "/usr/bin/a2x", line 33, in [ 262s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 262s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 262s] for entry_point in distribution(dist_name).entry_points [ 262s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 262s] return Distribution.from_name(distribution_name) [ 262s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 262s] raise PackageNotFoundError(name) [ 262s] importlib.metadata.PackageNotFoundError: asciidoc [ 262s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmoggsn-usermanual.pdf] Error 1 [ 262s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 262s] make[3]: *** [Makefile:447: all-recursive] Error 1 [ 262s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 262s] make[2]: *** [Makefile:487: all-recursive] Error 1 [ 262s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 262s] make[1]: *** [Makefile:392: all] Error 2 [ 262s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 262s] dh_auto_build: error: make -j1 returned exit code 2 [ 262s] make: *** [debian/rules:15: build] Error 25 [ 262s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 262s] ### VM INTERACTION START ### [ 263s] Powering off. [ 263s] [ 248.611362] reboot: Power down [ 264s] ### VM INTERACTION END ### [ 264s] [ 264s] goat03 failed "build osmo-ggsn_1.7.1.20.8cbd.202110290026.dsc" at Fri Oct 29 22:56:15 UTC 2021. [ 264s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 22:56:23 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 22:56:23 +0000 Subject: Build failure of network:osmocom:latest/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7c2db46d0_11002ae3d3bb26002240d6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-hlr Last lines of build log: [ 316s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmohlr-usermanual.adoc [ 316s] Traceback (most recent call last): [ 316s] File "/usr/bin/a2x", line 33, in [ 316s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 316s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 316s] for entry_point in distribution(dist_name).entry_points [ 316s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 316s] return Distribution.from_name(distribution_name) [ 316s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 316s] raise PackageNotFoundError(name) [ 316s] importlib.metadata.PackageNotFoundError: asciidoc [ 316s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmohlr-usermanual.pdf] Error 1 [ 316s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 316s] make[3]: *** [Makefile:382: all-recursive] Error 1 [ 316s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 316s] make[2]: *** [Makefile:488: all-recursive] Error 1 [ 316s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 316s] make[1]: *** [Makefile:410: all] Error 2 [ 316s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 316s] dh_auto_build: error: make -j1 returned exit code 2 [ 316s] make: *** [debian/rules:7: build] Error 25 [ 316s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 316s] ### VM INTERACTION START ### [ 318s] Powering off. [ 318s] [ 288.332322] reboot: Power down [ 318s] ### VM INTERACTION END ### [ 318s] [ 318s] goat09 failed "build osmo-hlr_1.3.1.dsc" at Fri Oct 29 22:56:08 UTC 2021. [ 318s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 22:56:57 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 22:56:57 +0000 Subject: Build failure of network:osmocom:latest/osmo-sip-connector in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7c4c90686_11002ae3d3bb26002242d1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sip-connector/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sip-connector failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sip-connector Last lines of build log: [ 339s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmosipconnector-usermanual.adoc [ 339s] Traceback (most recent call last): [ 339s] File "/usr/bin/a2x", line 33, in [ 339s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 339s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 339s] for entry_point in distribution(dist_name).entry_points [ 339s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 339s] return Distribution.from_name(distribution_name) [ 339s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 339s] raise PackageNotFoundError(name) [ 339s] importlib.metadata.PackageNotFoundError: asciidoc [ 339s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmosipconnector-usermanual.pdf] Error 1 [ 339s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 339s] make[3]: *** [Makefile:335: all-recursive] Error 1 [ 339s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 339s] make[2]: *** [Makefile:371: all-recursive] Error 1 [ 339s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 339s] make[1]: *** [Makefile:327: all] Error 2 [ 339s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 339s] dh_auto_build: error: make -j1 returned exit code 2 [ 339s] make: *** [debian/rules:12: build] Error 25 [ 339s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 339s] ### VM INTERACTION START ### [ 340s] Powering off. [ 340s] [ 321.707505] reboot: Power down [ 340s] ### VM INTERACTION END ### [ 340s] [ 340s] sheep87 failed "build osmo-sip-connector_1.5.1.dsc" at Fri Oct 29 22:56:40 UTC 2021. [ 340s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 22:57:14 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 22:57:14 +0000 Subject: Build failure of network:osmocom:nightly/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7c4d2499e_11002ae3d3bb2600224437@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:nightly/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-sccp Last lines of build log: [ 315s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmostp-usermanual.adoc [ 315s] Traceback (most recent call last): [ 315s] File "/usr/bin/a2x", line 33, in [ 315s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 315s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 315s] for entry_point in distribution(dist_name).entry_points [ 315s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 315s] return Distribution.from_name(distribution_name) [ 315s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 315s] raise PackageNotFoundError(name) [ 315s] importlib.metadata.PackageNotFoundError: asciidoc [ 315s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmostp-usermanual.pdf] Error 1 [ 315s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 315s] make[3]: *** [Makefile:377: all-recursive] Error 1 [ 315s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 315s] make[2]: *** [Makefile:508: all-recursive] Error 1 [ 315s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 315s] make[1]: *** [Makefile:403: all] Error 2 [ 315s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 315s] dh_auto_build: error: make -j1 returned exit code 2 [ 315s] make: *** [debian/rules:12: build] Error 25 [ 315s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 315s] ### VM INTERACTION START ### [ 316s] Powering off. [ 316s] [ 301.984421] reboot: Power down [ 316s] ### VM INTERACTION END ### [ 316s] [ 316s] goat09 failed "build libosmo-sccp_1.4.0.34.8aa6.202110290026.dsc" at Fri Oct 29 22:57:06 UTC 2021. [ 316s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 22:57:49 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 22:57:49 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sip-connector in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7c71daad3_11002ae3d3bb26002248bb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sip-connector/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-sip-connector failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sip-connector Last lines of build log: [ 335s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmosipconnector-usermanual.adoc [ 335s] Traceback (most recent call last): [ 335s] File "/usr/bin/a2x", line 33, in [ 335s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 335s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 335s] for entry_point in distribution(dist_name).entry_points [ 335s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 335s] return Distribution.from_name(distribution_name) [ 335s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 335s] raise PackageNotFoundError(name) [ 335s] importlib.metadata.PackageNotFoundError: asciidoc [ 335s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmosipconnector-usermanual.pdf] Error 1 [ 335s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 335s] make[3]: *** [Makefile:335: all-recursive] Error 1 [ 335s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 335s] make[2]: *** [Makefile:371: all-recursive] Error 1 [ 335s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 335s] make[1]: *** [Makefile:327: all] Error 2 [ 335s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 335s] dh_auto_build: error: make -j1 returned exit code 2 [ 335s] make: *** [debian/rules:12: build] Error 25 [ 335s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 335s] ### VM INTERACTION START ### [ 337s] Powering off. [ 337s] [ 323.207345] reboot: Power down [ 337s] ### VM INTERACTION END ### [ 337s] [ 337s] goat13 failed "build osmo-sip-connector_1.5.0.7.f3eb.202110290026.dsc" at Fri Oct 29 22:57:32 UTC 2021. [ 337s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 22:58:06 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 22:58:06 +0000 Subject: Build failure of network:osmocom:latest/osmo-ggsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7c8b3807d_11002ae3d3bb26002249f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-ggsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-ggsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-ggsn Last lines of build log: [ 415s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmoggsn-usermanual.adoc [ 415s] Traceback (most recent call last): [ 415s] File "/usr/bin/a2x", line 33, in [ 415s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 415s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 415s] for entry_point in distribution(dist_name).entry_points [ 415s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 415s] return Distribution.from_name(distribution_name) [ 415s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 415s] raise PackageNotFoundError(name) [ 415s] importlib.metadata.PackageNotFoundError: asciidoc [ 415s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmoggsn-usermanual.pdf] Error 1 [ 415s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 415s] make[3]: *** [Makefile:447: all-recursive] Error 1 [ 415s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 415s] make[2]: *** [Makefile:487: all-recursive] Error 1 [ 415s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 415s] make[1]: *** [Makefile:392: all] Error 2 [ 415s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 415s] dh_auto_build: error: make -j1 returned exit code 2 [ 415s] make: *** [debian/rules:15: build] Error 25 [ 415s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 415s] ### VM INTERACTION START ### [ 416s] Powering off. [ 416s] [ 396.720364] reboot: Power down [ 416s] ### VM INTERACTION END ### [ 416s] [ 416s] lamb14 failed "build osmo-ggsn_1.7.1.dsc" at Fri Oct 29 22:57:56 UTC 2021. [ 416s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 22:58:06 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 22:58:06 +0000 Subject: Build failure of network:osmocom:latest/osmo-gbproxy in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7c8bb96c4_11002ae3d3bb26002250c6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gbproxy/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-gbproxy failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gbproxy Last lines of build log: [ 418s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmogbproxy-usermanual.adoc [ 418s] Traceback (most recent call last): [ 418s] File "/usr/bin/a2x", line 33, in [ 418s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 418s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 418s] for entry_point in distribution(dist_name).entry_points [ 418s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 418s] return Distribution.from_name(distribution_name) [ 418s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 418s] raise PackageNotFoundError(name) [ 418s] importlib.metadata.PackageNotFoundError: asciidoc [ 418s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmogbproxy-usermanual.pdf] Error 1 [ 418s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 418s] make[3]: *** [Makefile:376: all-recursive] Error 1 [ 418s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 418s] make[2]: *** [Makefile:445: all-recursive] Error 1 [ 418s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 418s] make[1]: *** [Makefile:377: all] Error 2 [ 418s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 418s] dh_auto_build: error: make -j1 returned exit code 2 [ 418s] make: *** [debian/rules:45: build] Error 25 [ 418s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 418s] ### VM INTERACTION START ### [ 419s] Powering off. [ 419s] [ 397.339082] reboot: Power down [ 419s] ### VM INTERACTION END ### [ 419s] [ 419s] sheep86 failed "build osmo-gbproxy_0.1.2.dsc" at Fri Oct 29 22:58:03 UTC 2021. [ 419s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 22:58:23 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 22:58:23 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7ca5b0d2a_11002ae3d3bb26002252c3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 427s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmo-remsim-usermanual.adoc [ 428s] Traceback (most recent call last): [ 428s] File "/usr/bin/a2x", line 33, in [ 428s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 428s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 428s] for entry_point in distribution(dist_name).entry_points [ 428s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 428s] return Distribution.from_name(distribution_name) [ 428s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 428s] raise PackageNotFoundError(name) [ 428s] importlib.metadata.PackageNotFoundError: asciidoc [ 428s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmo-remsim-usermanual.pdf] Error 1 [ 428s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 428s] make[3]: *** [Makefile:377: all-recursive] Error 1 [ 428s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 428s] make[2]: *** [Makefile:463: all-recursive] Error 1 [ 428s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 428s] make[1]: *** [Makefile:387: all] Error 2 [ 428s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 428s] dh_auto_build: error: make -j1 returned exit code 2 [ 428s] make: *** [debian/rules:12: build] Error 25 [ 428s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 428s] ### VM INTERACTION START ### [ 429s] Powering off. [ 429s] [ 406.437861] reboot: Power down [ 429s] ### VM INTERACTION END ### [ 429s] [ 429s] old-cirrus3 failed "build osmo-remsim_0.2.4.dsc" at Fri Oct 29 22:58:14 UTC 2021. [ 429s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:00:05 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:00:05 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcu in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7d02b8aac_11002ae3d3bb26002256f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcu/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-pcu failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-pcu Last lines of build log: [ 505s] # in /usr/share/osmo-gsm-manuals. [ 505s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 505s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmopcu-usermanual.adoc [ 505s] Traceback (most recent call last): [ 505s] File "/usr/bin/a2x", line 33, in [ 505s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 505s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 505s] for entry_point in distribution(dist_name).entry_points [ 505s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 505s] return Distribution.from_name(distribution_name) [ 505s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 505s] raise PackageNotFoundError(name) [ 505s] importlib.metadata.PackageNotFoundError: asciidoc [ 505s] make[3]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmopcu-usermanual.pdf] Error 1 [ 505s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 505s] make[2]: *** [Makefile:384: all-recursive] Error 1 [ 505s] make[2]: Leaving directory '/usr/src/packages/BUILD/doc' [ 505s] make[1]: *** [Makefile:420: all-recursive] Error 1 [ 505s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 505s] dh_auto_build: error: make -j1 returned exit code 2 [ 505s] make: *** [debian/rules:12: build] Error 25 [ 505s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 505s] ### VM INTERACTION START ### [ 506s] Powering off. [ 506s] [ 486.221227] reboot: Power down [ 506s] ### VM INTERACTION END ### [ 506s] [ 506s] lamb09 failed "build osmo-pcu_0.9.1.dsc" at Fri Oct 29 22:59:50 UTC 2021. [ 506s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:00:22 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:00:22 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7d21c78cb_11002ae3d3bb26002257f9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 545s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmostp-usermanual.adoc [ 545s] Traceback (most recent call last): [ 545s] File "/usr/bin/a2x", line 33, in [ 545s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 545s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 545s] for entry_point in distribution(dist_name).entry_points [ 545s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 545s] return Distribution.from_name(distribution_name) [ 545s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 545s] raise PackageNotFoundError(name) [ 545s] importlib.metadata.PackageNotFoundError: asciidoc [ 545s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmostp-usermanual.pdf] Error 1 [ 545s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 545s] make[3]: *** [Makefile:377: all-recursive] Error 1 [ 545s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 545s] make[2]: *** [Makefile:508: all-recursive] Error 1 [ 545s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 545s] make[1]: *** [Makefile:403: all] Error 2 [ 545s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 545s] dh_auto_build: error: make -j1 returned exit code 2 [ 545s] make: *** [debian/rules:12: build] Error 25 [ 545s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 545s] ### VM INTERACTION START ### [ 547s] Powering off. [ 547s] [ 471.721918] reboot: Power down [ 547s] ### VM INTERACTION END ### [ 547s] [ 547s] cloud132 failed "build libosmo-sccp_1.4.0.dsc" at Fri Oct 29 23:00:19 UTC 2021. [ 547s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:02:04 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:02:04 +0000 Subject: Build failure of network:osmocom:nightly/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7d7960d43_11002ae3d3bb260022603a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-trx Last lines of build log: [ 592s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmotrx-usermanual.adoc [ 592s] Traceback (most recent call last): [ 592s] File "/usr/bin/a2x", line 33, in [ 592s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 592s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 592s] for entry_point in distribution(dist_name).entry_points [ 592s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 592s] return Distribution.from_name(distribution_name) [ 592s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 592s] raise PackageNotFoundError(name) [ 592s] importlib.metadata.PackageNotFoundError: asciidoc [ 592s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmotrx-usermanual.pdf] Error 1 [ 592s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 592s] make[3]: *** [Makefile:398: all-recursive] Error 1 [ 592s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 592s] make[2]: *** [Makefile:521: all-recursive] Error 1 [ 592s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 592s] make[1]: *** [Makefile:452: all] Error 2 [ 592s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 592s] dh_auto_build: error: make -j1 returned exit code 2 [ 592s] make: *** [debian/rules:6: build] Error 25 [ 592s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 592s] ### VM INTERACTION START ### [ 593s] Powering off. [ 593s] [ 572.622954] reboot: Power down [ 593s] ### VM INTERACTION END ### [ 593s] [ 593s] lamb11 failed "build osmo-trx_1.3.1.28.019d.202110290026.dsc" at Fri Oct 29 23:01:54 UTC 2021. [ 593s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:04:03 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:04:03 +0000 Subject: Build failure of network:osmocom:nightly/osmo-smlc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7def7c732_11002ae3d3bb260022628c@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-smlc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-smlc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-smlc Last lines of build log: [ 385s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmosmlc-usermanual.adoc [ 385s] Traceback (most recent call last): [ 385s] File "/usr/bin/a2x", line 33, in [ 385s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 385s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 385s] for entry_point in distribution(dist_name).entry_points [ 385s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 385s] return Distribution.from_name(distribution_name) [ 385s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 385s] raise PackageNotFoundError(name) [ 385s] importlib.metadata.PackageNotFoundError: asciidoc [ 385s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmosmlc-usermanual.pdf] Error 1 [ 385s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 385s] make[3]: *** [Makefile:376: all-recursive] Error 1 [ 385s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 385s] make[2]: *** [Makefile:445: all-recursive] Error 1 [ 385s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 385s] make[1]: *** [Makefile:377: all] Error 2 [ 385s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 385s] dh_auto_build: error: make -j1 returned exit code 2 [ 385s] make: *** [debian/rules:45: build] Error 25 [ 385s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 385s] ### VM INTERACTION START ### [ 386s] Powering off. [ 386s] [ 365.664949] reboot: Power down [ 386s] ### VM INTERACTION END ### [ 386s] [ 386s] old-cirrus3 failed "build osmo-smlc_0.2.0.1.44a2.202110290026.dsc" at Fri Oct 29 23:03:46 UTC 2021. [ 386s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:04:03 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:04:03 +0000 Subject: Build failure of network:osmocom:nightly/osmo-mgw in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7defe1bab_11002ae3d3bb2600226340@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-mgw/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-mgw failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-mgw Last lines of build log: [ 708s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmomgw-usermanual.adoc [ 708s] Traceback (most recent call last): [ 708s] File "/usr/bin/a2x", line 33, in [ 708s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 708s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 708s] for entry_point in distribution(dist_name).entry_points [ 708s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 708s] return Distribution.from_name(distribution_name) [ 708s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 708s] raise PackageNotFoundError(name) [ 708s] importlib.metadata.PackageNotFoundError: asciidoc [ 708s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmomgw-usermanual.pdf] Error 1 [ 708s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 708s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 708s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 708s] make[2]: *** [Makefile:514: all-recursive] Error 1 [ 708s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 708s] make[1]: *** [Makefile:423: all] Error 2 [ 708s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 708s] dh_auto_build: error: make -j1 returned exit code 2 [ 708s] make: *** [debian/rules:17: build] Error 25 [ 708s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 708s] ### VM INTERACTION START ### [ 709s] Powering off. [ 709s] [ 659.802400] reboot: Power down [ 709s] ### VM INTERACTION END ### [ 709s] [ 709s] lamb57 failed "build osmo-mgw_1.8.1.85.0c04.202110290026.dsc" at Fri Oct 29 23:03:59 UTC 2021. [ 709s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:04:37 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:04:37 +0000 Subject: Build failure of network:osmocom:nightly/osmo-pcu in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7e0f205ea_11002ae3d3bb2600226462@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-pcu/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-pcu failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-pcu Last lines of build log: [ 736s] # in /usr/share/osmo-gsm-manuals. [ 736s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 736s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmopcu-usermanual.adoc [ 736s] Traceback (most recent call last): [ 736s] File "/usr/bin/a2x", line 33, in [ 736s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 736s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 736s] for entry_point in distribution(dist_name).entry_points [ 736s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 736s] return Distribution.from_name(distribution_name) [ 736s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 736s] raise PackageNotFoundError(name) [ 736s] importlib.metadata.PackageNotFoundError: asciidoc [ 736s] make[3]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmopcu-usermanual.pdf] Error 1 [ 736s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 736s] make[2]: *** [Makefile:384: all-recursive] Error 1 [ 736s] make[2]: Leaving directory '/usr/src/packages/BUILD/doc' [ 736s] make[1]: *** [Makefile:420: all-recursive] Error 1 [ 736s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 736s] dh_auto_build: error: make -j1 returned exit code 2 [ 736s] make: *** [debian/rules:12: build] Error 25 [ 736s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 736s] ### VM INTERACTION START ### [ 737s] Powering off. [ 737s] [ 658.026416] reboot: Power down [ 737s] ### VM INTERACTION END ### [ 737s] [ 737s] lamb06 failed "build osmo-pcu_0.9.0.233.9ecd.202110290026.dsc" at Fri Oct 29 23:04:28 UTC 2021. [ 737s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:04:54 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:04:54 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7e2dc1bbc_11002ae3d3bb260022659e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 811s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmocbc-usermanual.adoc [ 811s] Traceback (most recent call last): [ 811s] File "/usr/bin/a2x", line 33, in [ 811s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 811s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 811s] for entry_point in distribution(dist_name).entry_points [ 811s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 811s] return Distribution.from_name(distribution_name) [ 811s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 811s] raise PackageNotFoundError(name) [ 811s] importlib.metadata.PackageNotFoundError: asciidoc [ 811s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmocbc-usermanual.pdf] Error 1 [ 811s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 811s] make[3]: *** [Makefile:381: all-recursive] Error 1 [ 811s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 811s] make[2]: *** [Makefile:421: all-recursive] Error 1 [ 811s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 811s] make[1]: *** [Makefile:368: all] Error 2 [ 811s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 811s] dh_auto_build: error: make -j1 returned exit code 2 [ 811s] make: *** [debian/rules:45: build] Error 25 [ 811s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 811s] ### VM INTERACTION START ### [ 812s] Powering off. [ 812s] [ 687.685839] reboot: Power down [ 813s] ### VM INTERACTION END ### [ 813s] [ 813s] cloud126 failed "build osmo-cbc_0.2.2.dsc" at Fri Oct 29 23:04:49 UTC 2021. [ 813s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:05:11 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:05:11 +0000 Subject: Build failure of network:osmocom:nightly/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7e2e9a0a5_11002ae3d3bb26002266af@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-hlr Last lines of build log: [ 773s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmohlr-usermanual.adoc [ 773s] Traceback (most recent call last): [ 773s] File "/usr/bin/a2x", line 33, in [ 773s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 773s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 773s] for entry_point in distribution(dist_name).entry_points [ 773s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 773s] return Distribution.from_name(distribution_name) [ 773s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 773s] raise PackageNotFoundError(name) [ 773s] importlib.metadata.PackageNotFoundError: asciidoc [ 773s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmohlr-usermanual.pdf] Error 1 [ 773s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 773s] make[3]: *** [Makefile:382: all-recursive] Error 1 [ 773s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 773s] make[2]: *** [Makefile:488: all-recursive] Error 1 [ 773s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 773s] make[1]: *** [Makefile:410: all] Error 2 [ 773s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 773s] dh_auto_build: error: make -j1 returned exit code 2 [ 773s] make: *** [debian/rules:7: build] Error 25 [ 773s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 773s] ### VM INTERACTION START ### [ 774s] Powering off. [ 774s] [ 660.821166] reboot: Power down [ 775s] ### VM INTERACTION END ### [ 775s] [ 775s] lamb20 failed "build osmo-hlr_1.3.0.7.bfee.202110290026.dsc" at Fri Oct 29 23:05:09 UTC 2021. [ 775s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:06:53 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:06:53 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7ea4cabc7_11002ae3d3bb26002268ca@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 364s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmobsc-usermanual.adoc [ 364s] Traceback (most recent call last): [ 364s] File "/usr/bin/a2x", line 33, in [ 364s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 364s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 364s] for entry_point in distribution(dist_name).entry_points [ 364s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 364s] return Distribution.from_name(distribution_name) [ 364s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 364s] raise PackageNotFoundError(name) [ 364s] importlib.metadata.PackageNotFoundError: asciidoc [ 364s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmobsc-usermanual.pdf] Error 1 [ 364s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 364s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 364s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 364s] make[2]: *** [Makefile:456: all-recursive] Error 1 [ 364s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 364s] make[1]: *** [Makefile:388: all] Error 2 [ 364s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 364s] dh_auto_build: error: make -j1 returned exit code 2 [ 364s] make: *** [debian/rules:45: build] Error 25 [ 364s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 364s] ### VM INTERACTION START ### [ 365s] Powering off. [ 365s] [ 346.698272] reboot: Power down [ 365s] ### VM INTERACTION END ### [ 365s] [ 365s] sheep85 failed "build osmo-bsc_1.7.2.dsc" at Fri Oct 29 23:06:42 UTC 2021. [ 365s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:07:10 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:07:10 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7ea5b69c8_11002ae3d3bb260022709b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 933s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmotrx-usermanual.adoc [ 933s] Traceback (most recent call last): [ 933s] File "/usr/bin/a2x", line 33, in [ 933s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 933s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 933s] for entry_point in distribution(dist_name).entry_points [ 933s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 933s] return Distribution.from_name(distribution_name) [ 933s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 933s] raise PackageNotFoundError(name) [ 933s] importlib.metadata.PackageNotFoundError: asciidoc [ 933s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmotrx-usermanual.pdf] Error 1 [ 933s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 933s] make[3]: *** [Makefile:398: all-recursive] Error 1 [ 933s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 933s] make[2]: *** [Makefile:521: all-recursive] Error 1 [ 933s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 933s] make[1]: *** [Makefile:452: all] Error 2 [ 933s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 933s] dh_auto_build: error: make -j1 returned exit code 2 [ 933s] make: *** [debian/rules:6: build] Error 25 [ 933s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 934s] ### VM INTERACTION START ### [ 935s] Powering off. [ 935s] [ 853.746170] reboot: Power down [ 935s] ### VM INTERACTION END ### [ 935s] [ 935s] lamb15 failed "build osmo-trx_1.3.1.dsc" at Fri Oct 29 23:07:04 UTC 2021. [ 935s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:09:27 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:09:27 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7f3a34d89_11002ae3d3bb26002271d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 712s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmohnbgw-usermanual.adoc [ 712s] Traceback (most recent call last): [ 712s] File "/usr/bin/a2x", line 33, in [ 712s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 712s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 712s] for entry_point in distribution(dist_name).entry_points [ 712s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 712s] return Distribution.from_name(distribution_name) [ 712s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 712s] raise PackageNotFoundError(name) [ 712s] importlib.metadata.PackageNotFoundError: asciidoc [ 712s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmohnbgw-usermanual.pdf] Error 1 [ 712s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 712s] make[3]: *** [Makefile:383: all-recursive] Error 1 [ 712s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 712s] make[2]: *** [Makefile:475: all-recursive] Error 1 [ 712s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 712s] make[1]: *** [Makefile:393: all] Error 2 [ 712s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 712s] dh_auto_build: error: make -j1 returned exit code 2 [ 712s] make: *** [debian/rules:9: build] Error 25 [ 712s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 712s] ### VM INTERACTION START ### [ 713s] Powering off. [ 713s] [ 700.319517] reboot: Power down [ 713s] ### VM INTERACTION END ### [ 713s] [ 713s] goat13 failed "build osmo-iuh_0.7.0.20.02de.202110290026.dsc" at Fri Oct 29 23:09:10 UTC 2021. [ 713s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:09:27 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:09:27 +0000 Subject: Build failure of network:osmocom:latest/osmo-smlc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7f3aedb65_11002ae3d3bb260022725a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-smlc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-smlc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-smlc Last lines of build log: [ 517s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmosmlc-usermanual.adoc [ 517s] Traceback (most recent call last): [ 517s] File "/usr/bin/a2x", line 33, in [ 517s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 517s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 517s] for entry_point in distribution(dist_name).entry_points [ 517s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 517s] return Distribution.from_name(distribution_name) [ 517s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 517s] raise PackageNotFoundError(name) [ 517s] importlib.metadata.PackageNotFoundError: asciidoc [ 517s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmosmlc-usermanual.pdf] Error 1 [ 517s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 517s] make[3]: *** [Makefile:376: all-recursive] Error 1 [ 517s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 517s] make[2]: *** [Makefile:445: all-recursive] Error 1 [ 517s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 517s] make[1]: *** [Makefile:377: all] Error 2 [ 517s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 517s] dh_auto_build: error: make -j1 returned exit code 2 [ 517s] make: *** [debian/rules:45: build] Error 25 [ 517s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 517s] ### VM INTERACTION START ### [ 518s] Powering off. [ 518s] [ 459.746652] reboot: Power down [ 519s] ### VM INTERACTION END ### [ 519s] [ 519s] cloud125 failed "build osmo-smlc_0.2.0.dsc" at Fri Oct 29 23:09:23 UTC 2021. [ 519s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:10:18 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:10:18 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7f78722f0_11002ae3d3bb2600227417@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bts Last lines of build log: [ 1076s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmobts-usermanual.adoc [ 1076s] Traceback (most recent call last): [ 1076s] File "/usr/bin/a2x", line 33, in [ 1076s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 1076s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 1076s] for entry_point in distribution(dist_name).entry_points [ 1076s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 1076s] return Distribution.from_name(distribution_name) [ 1076s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 1076s] raise PackageNotFoundError(name) [ 1076s] importlib.metadata.PackageNotFoundError: asciidoc [ 1076s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmobts-usermanual.pdf] Error 1 [ 1076s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 1076s] make[3]: *** [Makefile:384: all-recursive] Error 1 [ 1076s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 1076s] make[2]: *** [Makefile:443: all-recursive] Error 1 [ 1076s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1076s] make[1]: *** [Makefile:375: all] Error 2 [ 1076s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1076s] dh_auto_build: error: make -j1 returned exit code 2 [ 1076s] make: *** [debian/rules:12: build] Error 25 [ 1076s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1076s] ### VM INTERACTION START ### [ 1077s] Powering off. [ 1077s] [ 1018.507819] reboot: Power down [ 1077s] ### VM INTERACTION END ### [ 1077s] [ 1077s] lamb54 failed "build osmo-bts_1.3.0.327.3606.202110290026.dsc" at Fri Oct 29 23:10:08 UTC 2021. [ 1077s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:10:35 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:10:35 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c7f79437bd_11002ae3d3bb2600227534@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 595s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmohnbgw-usermanual.adoc [ 595s] Traceback (most recent call last): [ 595s] File "/usr/bin/a2x", line 33, in [ 595s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 595s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 595s] for entry_point in distribution(dist_name).entry_points [ 595s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 595s] return Distribution.from_name(distribution_name) [ 595s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 595s] raise PackageNotFoundError(name) [ 595s] importlib.metadata.PackageNotFoundError: asciidoc [ 595s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmohnbgw-usermanual.pdf] Error 1 [ 595s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 595s] make[3]: *** [Makefile:383: all-recursive] Error 1 [ 595s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 595s] make[2]: *** [Makefile:469: all-recursive] Error 1 [ 595s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 595s] make[1]: *** [Makefile:391: all] Error 2 [ 595s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 595s] dh_auto_build: error: make -j1 returned exit code 2 [ 595s] make: *** [debian/rules:9: build] Error 25 [ 595s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 596s] ### VM INTERACTION START ### [ 597s] Powering off. [ 597s] [ 578.933635] reboot: Power down [ 597s] ### VM INTERACTION END ### [ 597s] [ 597s] sheep87 failed "build osmo-iuh_1.0.0.dsc" at Fri Oct 29 23:10:33 UTC 2021. [ 597s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:12:51 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:12:51 +0000 Subject: Build failure of network:osmocom:nightly/osmo-cbc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c800d7e146_11002ae3d3bb26002277a4@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-cbc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-cbc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-cbc Last lines of build log: [ 1232s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmocbc-usermanual.adoc [ 1232s] Traceback (most recent call last): [ 1232s] File "/usr/bin/a2x", line 33, in [ 1232s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 1232s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 1232s] for entry_point in distribution(dist_name).entry_points [ 1232s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 1232s] return Distribution.from_name(distribution_name) [ 1232s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 1232s] raise PackageNotFoundError(name) [ 1232s] importlib.metadata.PackageNotFoundError: asciidoc [ 1232s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmocbc-usermanual.pdf] Error 1 [ 1232s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 1232s] make[3]: *** [Makefile:381: all-recursive] Error 1 [ 1232s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 1232s] make[2]: *** [Makefile:421: all-recursive] Error 1 [ 1232s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1232s] make[1]: *** [Makefile:368: all] Error 2 [ 1232s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1232s] dh_auto_build: error: make -j1 returned exit code 2 [ 1232s] make: *** [debian/rules:45: build] Error 25 [ 1232s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1232s] ### VM INTERACTION START ### [ 1233s] Powering off. [ 1233s] [ 1135.091998] reboot: Power down [ 1233s] ### VM INTERACTION END ### [ 1233s] [ 1233s] lamb62 failed "build osmo-cbc_0.2.2.1.cf3c.202110290026.dsc" at Fri Oct 29 23:12:43 UTC 2021. [ 1233s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:14:50 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:14:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c80888069c_11002ae3d3bb2600227979@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-bsc Last lines of build log: [ 617s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmobsc-usermanual.adoc [ 617s] Traceback (most recent call last): [ 617s] File "/usr/bin/a2x", line 33, in [ 617s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 617s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 617s] for entry_point in distribution(dist_name).entry_points [ 617s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 617s] return Distribution.from_name(distribution_name) [ 617s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 617s] raise PackageNotFoundError(name) [ 617s] importlib.metadata.PackageNotFoundError: asciidoc [ 617s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmobsc-usermanual.pdf] Error 1 [ 617s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 617s] make[3]: *** [Makefile:385: all-recursive] Error 1 [ 617s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 617s] make[2]: *** [Makefile:454: all-recursive] Error 1 [ 617s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 617s] make[1]: *** [Makefile:386: all] Error 2 [ 617s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 617s] dh_auto_build: error: make -j1 returned exit code 2 [ 617s] make: *** [debian/rules:45: build] Error 25 [ 617s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 617s] ### VM INTERACTION START ### [ 618s] Powering off. [ 618s] [ 596.599196] reboot: Power down [ 619s] ### VM INTERACTION END ### [ 619s] [ 619s] old-cirrus4 failed "build osmo-bsc_1.7.0.303.7be36.202110290026.dsc" at Fri Oct 29 23:14:37 UTC 2021. [ 619s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:14:50 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:14:50 +0000 Subject: Build failure of network:osmocom:nightly/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c8088dfc6f_11002ae3d3bb26002280b7@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-sgsn Last lines of build log: [ 312s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmosgsn-usermanual.adoc [ 312s] Traceback (most recent call last): [ 312s] File "/usr/bin/a2x", line 33, in [ 312s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 312s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 312s] for entry_point in distribution(dist_name).entry_points [ 312s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 312s] return Distribution.from_name(distribution_name) [ 312s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 312s] raise PackageNotFoundError(name) [ 312s] importlib.metadata.PackageNotFoundError: asciidoc [ 312s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmosgsn-usermanual.pdf] Error 1 [ 312s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 312s] make[3]: *** [Makefile:393: all-recursive] Error 1 [ 312s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 312s] make[2]: *** [Makefile:462: all-recursive] Error 1 [ 312s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 312s] make[1]: *** [Makefile:394: all] Error 2 [ 312s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 312s] dh_auto_build: error: make -j1 returned exit code 2 [ 312s] make: *** [debian/rules:45: build] Error 25 [ 312s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 312s] ### VM INTERACTION START ### [ 313s] Powering off. [ 313s] [ 298.218346] reboot: Power down [ 313s] ### VM INTERACTION END ### [ 313s] [ 313s] sheep83 failed "build osmo-sgsn_1.7.0.26.6cee1.202110290026.dsc" at Fri Oct 29 23:14:42 UTC 2021. [ 313s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:15:07 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:15:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c808957685_11002ae3d3bb260022813b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-remsim Last lines of build log: [ 1362s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmo-remsim-usermanual.adoc [ 1362s] Traceback (most recent call last): [ 1362s] File "/usr/bin/a2x", line 33, in [ 1362s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 1362s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 1362s] for entry_point in distribution(dist_name).entry_points [ 1362s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 1362s] return Distribution.from_name(distribution_name) [ 1362s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 1362s] raise PackageNotFoundError(name) [ 1362s] importlib.metadata.PackageNotFoundError: asciidoc [ 1363s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmo-remsim-usermanual.pdf] Error 1 [ 1363s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 1363s] make[3]: *** [Makefile:386: all-recursive] Error 1 [ 1363s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 1363s] make[2]: *** [Makefile:484: all-recursive] Error 1 [ 1363s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1363s] make[1]: *** [Makefile:408: all] Error 2 [ 1363s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1363s] dh_auto_build: error: make -j1 returned exit code 2 [ 1363s] make: *** [debian/rules:14: build] Error 25 [ 1363s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1363s] ### VM INTERACTION START ### [ 1364s] Powering off. [ 1364s] [ 1291.632863] reboot: Power down [ 1364s] ### VM INTERACTION END ### [ 1364s] [ 1364s] lamb04 failed "build osmo-remsim_0.2.2.113.eb9f.202110290026.dsc" at Fri Oct 29 23:14:50 UTC 2021. [ 1364s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:16:15 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:16:15 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c80c33f7c9_11002ae3d3bb260022830@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 316s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmosgsn-usermanual.adoc [ 316s] Traceback (most recent call last): [ 316s] File "/usr/bin/a2x", line 33, in [ 316s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 316s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 316s] for entry_point in distribution(dist_name).entry_points [ 316s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 316s] return Distribution.from_name(distribution_name) [ 316s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 316s] raise PackageNotFoundError(name) [ 316s] importlib.metadata.PackageNotFoundError: asciidoc [ 316s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmosgsn-usermanual.pdf] Error 1 [ 316s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 316s] make[3]: *** [Makefile:393: all-recursive] Error 1 [ 316s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 316s] make[2]: *** [Makefile:462: all-recursive] Error 1 [ 316s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 316s] make[1]: *** [Makefile:394: all] Error 2 [ 316s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 316s] dh_auto_build: error: make -j1 returned exit code 2 [ 316s] make: *** [debian/rules:45: build] Error 25 [ 316s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 316s] ### VM INTERACTION START ### [ 317s] Powering off. [ 317s] [ 305.994730] reboot: Power down [ 317s] ### VM INTERACTION END ### [ 317s] [ 317s] goat17 failed "build osmo-sgsn_1.7.1.dsc" at Fri Oct 29 23:16:07 UTC 2021. [ 317s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:16:32 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:16:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c80e1d887f_11002ae3d3bb2600228465@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-msc Last lines of build log: [ 415s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmomsc-usermanual.adoc [ 415s] Traceback (most recent call last): [ 415s] File "/usr/bin/a2x", line 33, in [ 415s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 415s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 415s] for entry_point in distribution(dist_name).entry_points [ 415s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 415s] return Distribution.from_name(distribution_name) [ 415s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 415s] raise PackageNotFoundError(name) [ 415s] importlib.metadata.PackageNotFoundError: asciidoc [ 415s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmomsc-usermanual.pdf] Error 1 [ 415s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 415s] make[3]: *** [Makefile:402: all-recursive] Error 1 [ 415s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 415s] make[2]: *** [Makefile:470: all-recursive] Error 1 [ 415s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 415s] make[1]: *** [Makefile:402: all] Error 2 [ 415s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 415s] dh_auto_build: error: make -j1 returned exit code 2 [ 415s] make: *** [debian/rules:45: build] Error 25 [ 415s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 415s] ### VM INTERACTION START ### [ 416s] Powering off. [ 416s] [ 396.262977] reboot: Power down [ 416s] ### VM INTERACTION END ### [ 416s] [ 416s] lamb09 failed "build osmo-msc_1.7.0.34.97b8e.202110290026.dsc" at Fri Oct 29 23:16:22 UTC 2021. [ 416s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Fri Oct 29 23:32:58 2021 From: noreply at opensuse.org (OBS Notification) Date: Fri, 29 Oct 2021 23:32:58 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c84bca1cf4_11002ae3d3bb2600239427@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 1298s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmomsc-usermanual.adoc [ 1298s] Traceback (most recent call last): [ 1298s] File "/usr/bin/a2x", line 33, in [ 1298s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 1298s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 1298s] for entry_point in distribution(dist_name).entry_points [ 1298s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 1298s] return Distribution.from_name(distribution_name) [ 1298s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 1298s] raise PackageNotFoundError(name) [ 1298s] importlib.metadata.PackageNotFoundError: asciidoc [ 1298s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmomsc-usermanual.pdf] Error 1 [ 1298s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 1298s] make[3]: *** [Makefile:402: all-recursive] Error 1 [ 1298s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 1298s] make[2]: *** [Makefile:470: all-recursive] Error 1 [ 1298s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1298s] make[1]: *** [Makefile:402: all] Error 2 [ 1298s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1298s] dh_auto_build: error: make -j1 returned exit code 2 [ 1298s] make: *** [debian/rules:45: build] Error 25 [ 1298s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1299s] ### VM INTERACTION START ### [ 1300s] Powering off. [ 1300s] [ 1249.839983] reboot: Power down [ 1300s] ### VM INTERACTION END ### [ 1300s] [ 1300s] lamb54 failed "build osmo-msc_1.7.1.dsc" at Fri Oct 29 23:32:41 UTC 2021. [ 1300s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Oct 30 00:03:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 30 Oct 2021 00:03:04 +0000 Subject: Change in osmo-bts[master]: l1sap: rework handling of DATA.ind on SACCH References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/26046 ) Change subject: l1sap: rework handling of DATA.ind on SACCH ...................................................................... l1sap: rework handling of DATA.ind on SACCH Change-Id: Ifed91f87fd653debc87a09da3fd31ad64a13f330 --- M include/osmo-bts/measurement.h M src/common/l1sap.c M src/common/measurement.c M src/common/rsl.c 4 files changed, 83 insertions(+), 72 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/46/26046/1 diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h index f63a05a..ad86d8d 100644 --- a/include/osmo-bts/measurement.h +++ b/include/osmo-bts/measurement.h @@ -20,8 +20,6 @@ int is_meas_complete(struct gsm_lchan *lchan, uint32_t fn); -int handle_ms_meas_report(struct gsm_lchan *lchan, - const struct gsm48_hdr *gh, - unsigned int len); +void lchan_meas_handle_sacch(struct gsm_lchan *lchan, struct msgb *msg); #endif diff --git a/src/common/l1sap.c b/src/common/l1sap.c index f983b62..10b8401 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -1470,7 +1470,6 @@ uint8_t tn; uint32_t fn; enum osmo_ph_pres_info_type pr_info = data_ind->pdch_presence_info; - struct gsm_sacch_l1_hdr *l1_hdr; chan_nr = data_ind->chan_nr; link_id = data_ind->link_id; @@ -1529,48 +1528,33 @@ if (bts_internal_flag_get(trx->bts, BTS_INTERNAL_FLAG_MEAS_PAYLOAD_COMB)) process_l1sap_meas_data(lchan, l1sap, PRIM_PH_DATA); - if (L1SAP_IS_LINK_SACCH(link_id)) + if (L1SAP_IS_LINK_SACCH(link_id)) { repeated_ul_sacch_active_decision(lchan, data_ind->ber10k); - /* bad frame */ - if (len == 0) { - if (L1SAP_IS_LINK_SACCH(link_id)) { - /* In case we loose a SACCH block, we must take care - * that the related measurement report is sent via RSL. - * This is a fallback method. The report will also - * lack the measurement report from the MS side. See - * also rsl.c:lapdm_rll_tx_cb() */ - LOGPGT(DL1P, LOGL_INFO, &g_time, "Lost SACCH block, faking meas reports and ms pwr\n"); - handle_ms_meas_report(lchan, NULL, 0); - + /* Radio Link Timeout counter */ + if (len == 0) { + LOGPGT(DL1P, LOGL_INFO, &g_time, "%s Lost SACCH block\n", + gsm_lchan_name(lchan)); radio_link_timeout(lchan, true); + } else { + radio_link_timeout(lchan, false); } - return -EINVAL; + + /* Trigger the measurement reporting/processing logic */ + lchan_meas_handle_sacch(lchan, msg); } + /* bad frame */ + if (len == 0) + return -EINVAL; + /* report first valid received frame to handover process */ if (lchan->ho.active == HANDOVER_WAIT_FRAME) handover_frame(lchan); - if (L1SAP_IS_LINK_SACCH(link_id)) { - radio_link_timeout(lchan, false); + if (L1SAP_IS_LINK_SACCH(link_id)) le = &lchan->lapdm_ch.lapdm_acch; - /* save the SACCH L1 header in the lchan struct for RSL MEAS RES */ - if (len != GSM_MACBLOCK_LEN) { - LOGPGT(DL1P, LOGL_NOTICE, &g_time, "SACCH with odd len=%u!?!\n", len); - return -EINVAL; - } - /* Some brilliant engineer decided that the ordering of - * fields on the Um interface is different from the - * order of fields in RSL. See 3GPP TS 44.004 (section 7.2) - * vs. 3GPP TS 48.058 (section 9.3.10). */ - l1_hdr = (struct gsm_sacch_l1_hdr*)data; - lchan->meas.l1_info.ms_pwr = l1_hdr->ms_pwr; - lchan->meas.l1_info.fpc_epc = l1_hdr->fpc_epc; - lchan->meas.l1_info.srr_sro = l1_hdr->srr_sro; - lchan->meas.l1_info.ta = l1_hdr->ta; - lchan->meas.flags |= LC_UL_M_F_L1_VALID; - } else + else le = &lchan->lapdm_ch.lapdm_dcch; if (check_for_first_ciphrd(lchan, data, len)) diff --git a/src/common/measurement.c b/src/common/measurement.c index a83be34..e4d950e 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -2,8 +2,11 @@ #include #include -#include #include +#include + +#include +#include #include #include @@ -865,12 +868,35 @@ LOGPLCHAN(lchan, DL1P, LOGL_DEBUG, "DL-FACCH repetition: active => inactive\n"); } -/* Called every time a Measurement Result (TS 08.58 8.4.8) is received from - * lower layers and has to be forwarded to BSC */ -int handle_ms_meas_report(struct gsm_lchan *lchan, - const struct gsm48_hdr *gh, - unsigned int len) +static bool data_is_rr_meas_rep(const uint8_t *data) { + const struct gsm48_hdr *gh = (void *)(data + 5); + const uint8_t *lapdm_hdr = (void *)(data + 2); + + /* LAPDm address field: SAPI=0, C/R=0, EA=1 */ + if (lapdm_hdr[0] != 0x01) + return false; + /* LAPDm control field: U, func=UI */ + if (lapdm_hdr[1] != 0x03) + return false; + /* Protocol discriminator: RR */ + if (gh->proto_discr != GSM48_PDISC_RR) + return false; + + switch (gh->msg_type) { + case GSM48_MT_RR_EXT_MEAS_REP: + case GSM48_MT_RR_MEAS_REP: + return true; + default: + return false; + } +} + +/* Called every time a SACCH block is received from lower layers */ +void lchan_meas_handle_sacch(struct gsm_lchan *lchan, struct msgb *msg) +{ + const struct gsm48_meas_res *mr = NULL; + const struct gsm48_hdr *gh = NULL; int timing_offset, rc; struct lapdm_entity *le; bool dtxu_used; @@ -879,10 +905,37 @@ int8_t ul_rssi; int16_t ul_ci_cb; + if (msgb_l2len(msg) == GSM_MACBLOCK_LEN) { + /* Some brilliant engineer decided that the ordering of + * fields on the Um interface is different from the + * order of fields in RSL. See 3GPP TS 44.004 (section 7.2) + * vs. 3GPP TS 48.058 (section 9.3.10). */ + const struct gsm_sacch_l1_hdr *l1h = msgb_l2(msg); + lchan->meas.l1_info.ms_pwr = l1h->ms_pwr; + lchan->meas.l1_info.fpc_epc = l1h->fpc_epc; + lchan->meas.l1_info.srr_sro = l1h->srr_sro; + lchan->meas.l1_info.ta = l1h->ta; + lchan->meas.flags |= LC_UL_M_F_L1_VALID; + + /* Check if this is a Measurement Report */ + if (data_is_rr_meas_rep(msgb_l2(msg))) { + /* Skip both L1 SACCH and LAPDm headers */ + msg->l3h = (void *)(msg->l2h + 2 + 3); + gh = msgb_l3(msg); + } + + ms_pwr = lchan->meas.l1_info.ms_pwr; + ms_ta = lchan->meas.l1_info.ta; + } else { + lchan->meas.flags &= ~LC_UL_M_F_L1_VALID; + ms_pwr = lchan->ms_power_ctrl.current; + ms_ta = lchan->ta_ctrl.current; + } + le = &lchan->lapdm_ch.lapdm_acch; timing_offset = ms_to_valid(lchan) ? ms_to2rsl(lchan, le) : -1; - rc = rsl_tx_meas_res(lchan, (const uint8_t *)gh, len, timing_offset); + rc = rsl_tx_meas_res(lchan, msgb_l3(msg), msgb_l3len(msg), timing_offset); if (rc == 0) /* Count successful transmissions */ lchan->meas.res_nr++; @@ -896,25 +949,9 @@ * feed the Control Loop with the measurements for the same * period (the previous one), which is stored in lchan->meas(.ul_res): */ - if (len == 0) { - dtxu_used = true; - ms_ta = lchan->ta_ctrl.current; - ms_pwr = lchan->ms_power_ctrl.current; - } else { - /* if len!=0, it means we were able to parse L1Header in UL SACCH: */ - OSMO_ASSERT(lchan->meas.flags & LC_UL_M_F_L1_VALID); - - ms_ta = lchan->meas.l1_info.ta; - ms_pwr = lchan->meas.l1_info.ms_pwr; - switch (gh->msg_type) { - case GSM48_MT_RR_MEAS_REP: - dtxu_used = (len > sizeof(*gh) + 1) && !!(gh->data[0] & 0x40); - break; - case GSM48_MT_RR_EXT_MEAS_REP: - default: - dtxu_used = true; /* FIXME: not implemented */ - break; - } + if (gh && gh->msg_type == GSM48_MT_RR_MEAS_REP) { + mr = (const struct gsm48_meas_res *)gh->data; + dtxu_used = mr->dtx_used; } if (dtxu_used) { @@ -934,8 +971,6 @@ /* Reset state for next iteration */ lchan->tch.dtx.dl_active = false; lchan->meas.flags &= ~LC_UL_M_F_OSMO_EXT_VALID; - lchan->meas.flags &= ~LC_UL_M_F_L1_VALID; lchan->ms_t_offs = -1; lchan->p_offs = -1; - return rc; } diff --git a/src/common/rsl.c b/src/common/rsl.c index 2d00005..5d069c2 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -3566,17 +3566,11 @@ msg->trx = lchan->ts->trx; msg->lchan = lchan; - /* check if this is a measurement report from SACCH which needs special - * processing before forwarding */ + /* If this is a Measurement Report, then we simply ignore it, + * because it has already been processed in l1sap_ph_data_ind(). */ if (rslms_is_meas_rep(msg)) { - int rc; - - LOGPLCHAN(lchan, DRSL, LOGL_INFO, "Handing RLL msg %s from LAPDm to MEAS REP\n", - rsl_msg_name(rh->msg_type)); - - rc = handle_ms_meas_report(lchan, (struct gsm48_hdr *)msgb_l3(msg), msgb_l3len(msg)); msgb_free(msg); - return rc; + return 0; } else if (rslms_is_gprs_susp_req(msg)) { return handle_gprs_susp_req(msg); } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifed91f87fd653debc87a09da3fd31ad64a13f330 Gerrit-Change-Number: 26046 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 30 00:03:06 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 30 Oct 2021 00:03:06 +0000 Subject: Change in osmo-bts[master]: lchan_meas_handle_sacch(): check if Measurement Result is valid References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/26047 ) Change subject: lchan_meas_handle_sacch(): check if Measurement Result is valid ...................................................................... lchan_meas_handle_sacch(): check if Measurement Result is valid Change-Id: I4aaac742674ce3ac15e9a4a32fe7c72db81d32d2 --- M src/common/measurement.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/26047/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index e4d950e..124e6e5 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -951,7 +951,8 @@ */ if (gh && gh->msg_type == GSM48_MT_RR_MEAS_REP) { mr = (const struct gsm48_meas_res *)gh->data; - dtxu_used = mr->dtx_used; + if (mr->meas_valid != 0) /* 0 = valid */ + dtxu_used = mr->dtx_used; } if (dtxu_used) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4aaac742674ce3ac15e9a4a32fe7c72db81d32d2 Gerrit-Change-Number: 26047 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 30 00:03:07 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 30 Oct 2021 00:03:07 +0000 Subject: Change in osmo-bts[master]: measurement: pass *mr to repeated_dl_facch_active_decision() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/26048 ) Change subject: measurement: pass *mr to repeated_dl_facch_active_decision() ...................................................................... measurement: pass *mr to repeated_dl_facch_active_decision() Change-Id: Idbf5f95d632aa2270c49b351ad5561ca2182bf9a --- M src/common/measurement.c 1 file changed, 3 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/26048/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index 124e6e5..b25104e 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -795,9 +795,8 @@ /* Decide if repeated FACCH should be applied or not. If RXQUAL level, that the * MS reports is high enough, FACCH repetition is not needed. */ static void repeated_dl_facch_active_decision(struct gsm_lchan *lchan, - const struct gsm48_hdr *gh) + const struct gsm48_meas_res *meas_res) { - const struct gsm48_meas_res *meas_res; uint8_t upper; uint8_t lower; uint8_t rxqual; @@ -828,14 +827,8 @@ } /* Parse MS measurement results */ - if (gh == NULL) + if (meas_res == NULL) goto out; - /* Check if this is a Measurement Report */ - if (gh->proto_discr != GSM48_PDISC_RR) - goto out; - if (gh->msg_type != GSM48_MT_RR_MEAS_REP) - goto out; - meas_res = (const struct gsm48_meas_res *) gh->data; if (meas_res->meas_valid != 0) /* 0 = valid */ goto out; @@ -967,7 +960,7 @@ if (gh) lchan_bs_pwr_ctrl(lchan, gh); - repeated_dl_facch_active_decision(lchan, gh); + repeated_dl_facch_active_decision(lchan, mr); /* Reset state for next iteration */ lchan->tch.dtx.dl_active = false; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idbf5f95d632aa2270c49b351ad5561ca2182bf9a Gerrit-Change-Number: 26048 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 30 00:03:07 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 30 Oct 2021 00:03:07 +0000 Subject: Change in osmo-bts[master]: measurement: pass *mr to lchan_bs_pwr_ctrl() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/26049 ) Change subject: measurement: pass *mr to lchan_bs_pwr_ctrl() ...................................................................... measurement: pass *mr to lchan_bs_pwr_ctrl() Change-Id: I937117cf26fb718d57920382f6972390ad498c51 --- M include/osmo-bts/power_control.h M src/common/measurement.c M src/common/power_control.c M tests/power/bs_power_loop_test.c M tests/power/bs_power_loop_test.ok 5 files changed, 26 insertions(+), 61 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/49/26049/1 diff --git a/include/osmo-bts/power_control.h b/include/osmo-bts/power_control.h index e8b035d..0764ba7 100644 --- a/include/osmo-bts/power_control.h +++ b/include/osmo-bts/power_control.h @@ -87,4 +87,4 @@ const int16_t ul_lqual_cb); int lchan_bs_pwr_ctrl(struct gsm_lchan *lchan, - const struct gsm48_hdr *gh); + const struct gsm48_meas_res *mr); diff --git a/src/common/measurement.c b/src/common/measurement.c index b25104e..52243fe 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -957,8 +957,8 @@ } lchan_ms_ta_ctrl(lchan, ms_ta, lchan->meas.ms_toa256); lchan_ms_pwr_ctrl(lchan, ms_pwr, ul_rssi, ul_ci_cb); - if (gh) - lchan_bs_pwr_ctrl(lchan, gh); + if (mr) + lchan_bs_pwr_ctrl(lchan, mr); repeated_dl_facch_active_decision(lchan, mr); diff --git a/src/common/power_control.c b/src/common/power_control.c index a81000e..73a30da 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -314,43 +314,30 @@ * \param[in] gh pointer to the beginning of (presumably) a Measurement Report. */ int lchan_bs_pwr_ctrl(struct gsm_lchan *lchan, - const struct gsm48_hdr *gh) + const struct gsm48_meas_res *mr) { struct lchan_power_ctrl_state *state = &lchan->bs_power_ctrl; const struct gsm_power_ctrl_params *params = state->dpc_params; - uint8_t rxqual_full, rxqual_sub; - uint8_t rxlev_full, rxlev_sub; uint8_t rxqual, rxqual_avg, rxlev, rxlev_avg; int new_att; /* Check if dynamic BS Power Control is enabled */ if (params == NULL) return 0; - /* Check if this is a Measurement Report */ - if (gh->proto_discr != GSM48_PDISC_RR) - return 0; - if (gh->msg_type != GSM48_MT_RR_MEAS_REP) - return 0; /* Check if the measurement results are valid */ - if ((gh->data[1] & 0x40) == 0x40) { + if (mr->meas_valid != 0) { /* 0 = valid */ LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "The measurement results are not valid\n"); return 0; } - /* See 3GPP TS 44.018, section 10.5.2.20 */ - rxqual_full = (gh->data[2] >> 4) & 0x7; - rxqual_sub = (gh->data[2] >> 1) & 0x7; - - rxlev_full = gh->data[0] & 0x3f; - rxlev_sub = gh->data[1] & 0x3f; - LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Rx DL Measurement Report: " "RXLEV-FULL(%02u), RXQUAL-FULL(%u), " "RXLEV-SUB(%02u), RXQUAL-SUB(%u), " "DTx is %s => using %s\n", - rxlev_full, rxqual_full, rxlev_sub, rxqual_sub, + mr->rxlev_full, mr->rxqual_full, + mr->rxlev_sub, mr->rxqual_sub, lchan->tch.dtx.dl_active ? "enabled" : "disabled", lchan->tch.dtx.dl_active ? "SUB" : "FULL"); @@ -360,11 +347,11 @@ /* If DTx is active on Downlink, use the '-SUB' */ if (lchan->tch.dtx.dl_active) { - rxqual = rxqual_sub; - rxlev = rxlev_sub; + rxqual = mr->rxqual_sub; + rxlev = mr->rxlev_sub; } else { /* ... otherwise use the '-FULL' */ - rxqual = rxqual_full; - rxlev = rxlev_full; + rxqual = mr->rxqual_full; + rxlev = mr->rxlev_full; } rxlev_avg = do_avg_algo(¶ms->rxlev_meas, &state->rxlev_meas_proc, rxlev); diff --git a/tests/power/bs_power_loop_test.c b/tests/power/bs_power_loop_test.c index 6b67ba2..b5e5264 100644 --- a/tests/power/bs_power_loop_test.c +++ b/tests/power/bs_power_loop_test.c @@ -54,7 +54,6 @@ enum power_test_step_type { PWR_TEST_ST_IND_MEAS = 0, - PWR_TEST_ST_IND_DUMMY, PWR_TEST_ST_SET_STATE, PWR_TEST_ST_SET_CTRL_INTERVAL, PWR_TEST_ST_SET_STEP_SIZE, @@ -123,15 +122,10 @@ printf("\nStarting test case '%s'\n", name); } -static void enc_meas_rep(struct gsm48_hdr *gh, +static void enc_meas_rep(struct gsm48_meas_res *mr, const unsigned int n, const struct power_test_step *step) { - struct gsm48_meas_res *mr = (struct gsm48_meas_res *) gh->data; - - gh->proto_discr = GSM48_PDISC_RR; - gh->msg_type = GSM48_MT_RR_MEAS_REP; - *mr = (struct gsm48_meas_res) { .rxlev_full = step->meas.rxlev_full, .rxlev_sub = step->meas.rxlev_sub, @@ -153,11 +147,8 @@ const unsigned int n, const struct power_test_step *step) { - struct gsm48_hdr *gh; + struct gsm48_meas_res mr; uint8_t old, new; - uint8_t buf[18]; - - gh = (struct gsm48_hdr *) buf; switch (step->type) { case PWR_TEST_ST_SET_STATE: @@ -192,20 +183,16 @@ printf("#%02u %s() <- Enable DTXd\n", n, __func__); lchan->tch.dtx.dl_active = true; return 0; /* we're done */ - case PWR_TEST_ST_IND_DUMMY: - printf("#%02u %s() <- Dummy block\n", n, __func__); - memset(buf, 0x2b, sizeof(buf)); - break; case PWR_TEST_ST_IND_MEAS: - enc_meas_rep(gh, n, step); + enc_meas_rep(&mr, n, step); break; } - printf("#%02u lchan_bs_pwr_ctrl() <- UL SACCH: %s\n", - n, osmo_hexdump(buf, sizeof(buf))); + printf("#%02u lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 %s\n", + n, osmo_hexdump((void *)&mr, sizeof(mr))); old = lchan->bs_power_ctrl.current; - lchan_bs_pwr_ctrl(lchan, gh); + lchan_bs_pwr_ctrl(lchan, &mr); new = lchan->bs_power_ctrl.current; printf("#%02u lchan_bs_pwr_ctrl() -> BS power reduction: " @@ -406,8 +393,8 @@ { .meas = DL_MEAS_FULL_SUB(7, PWR_TEST_RXLEV_TARGET) }, /* max */ }; -/* Verify that invalid and dummy SACCH blocks are ignored. */ -static const struct power_test_step TC_inval_dummy[] = { +/* Verify that invalid measurement results are ignored. */ +static const struct power_test_step TC_inval_meas[] = { /* Initial state: 16 dB, up to 20 dB */ { .type = PWR_TEST_ST_SET_STATE, .state = { .current = 16, .max = 2 * 10 } }, @@ -416,12 +403,9 @@ { .meas = DL_MEAS_FULL_SUB_INV(7, 63), .exp_txred = 16 }, { .meas = DL_MEAS_FULL_SUB_INV(0, 0), .exp_txred = 16 }, - /* Let's say SMS (SAPI=3) blocks substitute some of the reports */ - { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET), .exp_txred = 16 }, - { .type = PWR_TEST_ST_IND_DUMMY, /* not a report */ .exp_txred = 16 }, - { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET), .exp_txred = 16 }, - { .type = PWR_TEST_ST_IND_DUMMY, /* not a report */ .exp_txred = 16 }, - { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET), .exp_txred = 16 }, + { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET), .exp_txred = 16 }, + { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET), .exp_txred = 16 }, + { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET), .exp_txred = 16 }, }; /* Verify handling of optional power control interval (P_Con_INTERVAL). */ @@ -545,7 +529,7 @@ exec_test(TC_dtxd_mode); exec_test(TC_rxqual_ber); - exec_test(TC_inval_dummy); + exec_test(TC_inval_meas); exec_test(TC_ctrl_interval); exec_test(TC_rxlev_hyst); diff --git a/tests/power/bs_power_loop_test.ok b/tests/power/bs_power_loop_test.ok index 2c12392..1001ba1 100644 --- a/tests/power/bs_power_loop_test.ok +++ b/tests/power/bs_power_loop_test.ok @@ -243,7 +243,7 @@ #16 lchan_bs_pwr_ctrl() -> BS power reduction: 0 -> 0 (expected 0) Test case verdict: SUCCESS -Starting test case 'TC_inval_dummy' +Starting test case 'TC_inval_meas' #00 exec_power_step() <- State (re)set (current 16 dB, max 20 dB) #01 enc_meas_rep() -> Measurement Results (invalid): RXLEV-FULL(63), RXQUAL-FULL(7), RXLEV-SUB(63), RXQUAL-SUB(7) #01 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3f 7f 7e 00 00 00 00 00 00 00 00 00 00 00 00 00 @@ -254,18 +254,12 @@ #03 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(30), RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0) #03 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 1e 1e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 #03 lchan_bs_pwr_ctrl() -> BS power reduction: 16 -> 16 (expected 16) -#04 exec_power_step() <- Dummy block -#04 lchan_bs_pwr_ctrl() <- UL SACCH: 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b +#04 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(30), RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0) +#04 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 1e 1e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 #04 lchan_bs_pwr_ctrl() -> BS power reduction: 16 -> 16 (expected 16) #05 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(30), RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0) #05 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 1e 1e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 #05 lchan_bs_pwr_ctrl() -> BS power reduction: 16 -> 16 (expected 16) -#06 exec_power_step() <- Dummy block -#06 lchan_bs_pwr_ctrl() <- UL SACCH: 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b -#06 lchan_bs_pwr_ctrl() -> BS power reduction: 16 -> 16 (expected 16) -#07 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(30), RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0) -#07 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 1e 1e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -#07 lchan_bs_pwr_ctrl() -> BS power reduction: 16 -> 16 (expected 16) Test case verdict: SUCCESS Starting test case 'TC_ctrl_interval' -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I937117cf26fb718d57920382f6972390ad498c51 Gerrit-Change-Number: 26049 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 30 00:03:07 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 30 Oct 2021 00:03:07 +0000 Subject: Change in osmo-bts[master]: measurement: call lchan_bs_pwr_ctrl() iff *mr is valid References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/26050 ) Change subject: measurement: call lchan_bs_pwr_ctrl() iff *mr is valid ...................................................................... measurement: call lchan_bs_pwr_ctrl() iff *mr is valid Change-Id: I125aab5224e25585cbfbe1550d2d52d62ba198bb --- M src/common/measurement.c M src/common/power_control.c M tests/power/bs_power_loop_test.c M tests/power/bs_power_loop_test.err M tests/power/bs_power_loop_test.ok 5 files changed, 3 insertions(+), 61 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/50/26050/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index 52243fe..45b7fa9 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -957,7 +957,7 @@ } lchan_ms_ta_ctrl(lchan, ms_ta, lchan->meas.ms_toa256); lchan_ms_pwr_ctrl(lchan, ms_pwr, ul_rssi, ul_ci_cb); - if (mr) + if (mr && !mr->meas_valid) /* 0 = valid */ lchan_bs_pwr_ctrl(lchan, mr); repeated_dl_facch_active_decision(lchan, mr); diff --git a/src/common/power_control.c b/src/common/power_control.c index 73a30da..2979eff 100644 --- a/src/common/power_control.c +++ b/src/common/power_control.c @@ -325,13 +325,6 @@ if (params == NULL) return 0; - /* Check if the measurement results are valid */ - if (mr->meas_valid != 0) { /* 0 = valid */ - LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, - "The measurement results are not valid\n"); - return 0; - } - LOGPLCHAN(lchan, DLOOP, LOGL_DEBUG, "Rx DL Measurement Report: " "RXLEV-FULL(%02u), RXQUAL-FULL(%u), " "RXLEV-SUB(%02u), RXQUAL-SUB(%u), " diff --git a/tests/power/bs_power_loop_test.c b/tests/power/bs_power_loop_test.c index b5e5264..06fe3ed 100644 --- a/tests/power/bs_power_loop_test.c +++ b/tests/power/bs_power_loop_test.c @@ -47,11 +47,6 @@ { DL_MEAS_FULL(rxqual, rxlev), \ DL_MEAS_SUB(rxqual, rxlev) } -#define DL_MEAS_FULL_SUB_INV(rxqual, rxlev) \ - { DL_MEAS_FULL(rxqual, rxlev), \ - DL_MEAS_SUB(rxqual, rxlev), \ - .invalid = true } - enum power_test_step_type { PWR_TEST_ST_IND_MEAS = 0, PWR_TEST_ST_SET_STATE, @@ -77,7 +72,6 @@ uint8_t rxqual_sub; uint8_t rxlev_full; uint8_t rxlev_sub; - bool invalid; } meas; /* Increase / reduce step size */ struct { @@ -131,14 +125,12 @@ .rxlev_sub = step->meas.rxlev_sub, .rxqual_full = step->meas.rxqual_full, .rxqual_sub = step->meas.rxqual_sub, - /* NOTE: inversed logic (1 means invalid) */ - .meas_valid = step->meas.invalid, }; - printf("#%02u %s() -> Measurement Results (%svalid): " + printf("#%02u %s() -> Measurement Results (valid): " "RXLEV-FULL(%02u), RXQUAL-FULL(%u), " "RXLEV-SUB(%02u), RXQUAL-SUB(%u)\n", - n, __func__, step->meas.invalid ? "in" : "", + n, __func__, mr->rxlev_full, mr->rxqual_full, mr->rxlev_sub, mr->rxqual_sub); } @@ -393,21 +385,6 @@ { .meas = DL_MEAS_FULL_SUB(7, PWR_TEST_RXLEV_TARGET) }, /* max */ }; -/* Verify that invalid measurement results are ignored. */ -static const struct power_test_step TC_inval_meas[] = { - /* Initial state: 16 dB, up to 20 dB */ - { .type = PWR_TEST_ST_SET_STATE, - .state = { .current = 16, .max = 2 * 10 } }, - - /* MS sends invalid measurement results which must be ignored */ - { .meas = DL_MEAS_FULL_SUB_INV(7, 63), .exp_txred = 16 }, - { .meas = DL_MEAS_FULL_SUB_INV(0, 0), .exp_txred = 16 }, - - { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET), .exp_txred = 16 }, - { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET), .exp_txred = 16 }, - { .meas = DL_MEAS_FULL_SUB(0, PWR_TEST_RXLEV_TARGET), .exp_txred = 16 }, -}; - /* Verify handling of optional power control interval (P_Con_INTERVAL). */ static const struct power_test_step TC_ctrl_interval[] = { /* Initial state: 0 dB, up to 20 dB */ @@ -529,7 +506,6 @@ exec_test(TC_dtxd_mode); exec_test(TC_rxqual_ber); - exec_test(TC_inval_meas); exec_test(TC_ctrl_interval); exec_test(TC_rxlev_hyst); diff --git a/tests/power/bs_power_loop_test.err b/tests/power/bs_power_loop_test.err index dc4f411..24107ba 100644 --- a/tests/power/bs_power_loop_test.err +++ b/tests/power/bs_power_loop_test.err @@ -130,14 +130,6 @@ (bts=0,trx=0,ts=0,ss=0) Keeping DL attenuation at 0 dB: max 20 dB, RSSI[curr -80, avg -80, thresh -80..-80] dBm, RxQual[curr 7, avg 7, thresh 3..0] (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(30), RXQUAL-FULL(7), RXLEV-SUB(30), RXQUAL-SUB(7), DTx is disabled => using FULL (bts=0,trx=0,ts=0,ss=0) Keeping DL attenuation at 0 dB: max 20 dB, RSSI[curr -80, avg -80, thresh -80..-80] dBm, RxQual[curr 7, avg 7, thresh 3..0] -(bts=0,trx=0,ts=0,ss=0) The measurement results are not valid -(bts=0,trx=0,ts=0,ss=0) The measurement results are not valid -(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(30), RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0), DTx is disabled => using FULL -(bts=0,trx=0,ts=0,ss=0) Keeping DL attenuation at 16 dB: max 20 dB, RSSI[curr -80, avg -80, thresh -80..-80] dBm, RxQual[curr 0, avg 0, thresh 3..0] -(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(30), RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0), DTx is disabled => using FULL -(bts=0,trx=0,ts=0,ss=0) Keeping DL attenuation at 16 dB: max 20 dB, RSSI[curr -80, avg -80, thresh -80..-80] dBm, RxQual[curr 0, avg 0, thresh 3..0] -(bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(30), RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0), DTx is disabled => using FULL -(bts=0,trx=0,ts=0,ss=0) Keeping DL attenuation at 16 dB: max 20 dB, RSSI[curr -80, avg -80, thresh -80..-80] dBm, RxQual[curr 0, avg 0, thresh 3..0] (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL (bts=0,trx=0,ts=0,ss=0) Raising DL attenuation 0 dB => 2 dB:max 20 dB, RSSI[curr -50, avg -50, thresh -80..-80] dBm, RxQual[curr 0, avg 0, thresh 3..0] (bts=0,trx=0,ts=0,ss=0) Rx DL Measurement Report: RXLEV-FULL(60), RXQUAL-FULL(0), RXLEV-SUB(60), RXQUAL-SUB(0), DTx is disabled => using FULL diff --git a/tests/power/bs_power_loop_test.ok b/tests/power/bs_power_loop_test.ok index 1001ba1..18a94ba 100644 --- a/tests/power/bs_power_loop_test.ok +++ b/tests/power/bs_power_loop_test.ok @@ -243,25 +243,6 @@ #16 lchan_bs_pwr_ctrl() -> BS power reduction: 0 -> 0 (expected 0) Test case verdict: SUCCESS -Starting test case 'TC_inval_meas' -#00 exec_power_step() <- State (re)set (current 16 dB, max 20 dB) -#01 enc_meas_rep() -> Measurement Results (invalid): RXLEV-FULL(63), RXQUAL-FULL(7), RXLEV-SUB(63), RXQUAL-SUB(7) -#01 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 3f 7f 7e 00 00 00 00 00 00 00 00 00 00 00 00 00 -#01 lchan_bs_pwr_ctrl() -> BS power reduction: 16 -> 16 (expected 16) -#02 enc_meas_rep() -> Measurement Results (invalid): RXLEV-FULL(00), RXQUAL-FULL(0), RXLEV-SUB(00), RXQUAL-SUB(0) -#02 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 00 40 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -#02 lchan_bs_pwr_ctrl() -> BS power reduction: 16 -> 16 (expected 16) -#03 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(30), RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0) -#03 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 1e 1e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -#03 lchan_bs_pwr_ctrl() -> BS power reduction: 16 -> 16 (expected 16) -#04 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(30), RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0) -#04 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 1e 1e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -#04 lchan_bs_pwr_ctrl() -> BS power reduction: 16 -> 16 (expected 16) -#05 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(30), RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0) -#05 lchan_bs_pwr_ctrl() <- UL SACCH: 06 15 1e 1e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 -#05 lchan_bs_pwr_ctrl() -> BS power reduction: 16 -> 16 (expected 16) -Test case verdict: SUCCESS - Starting test case 'TC_ctrl_interval' #00 exec_power_step() <- State (re)set (current 0 dB, max 20 dB) #01 exec_power_step() <- (Re)set power control interval: 0 -> 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I125aab5224e25585cbfbe1550d2d52d62ba198bb Gerrit-Change-Number: 26050 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 30 00:12:42 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 30 Oct 2021 00:12:42 +0000 Subject: Change in osmo-bts[master]: measurement: pass *mr to lchan_bs_pwr_ctrl() In-Reply-To: References: Message-ID: fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/26049 ) Change subject: measurement: pass *mr to lchan_bs_pwr_ctrl() ...................................................................... measurement: pass *mr to lchan_bs_pwr_ctrl() Change-Id: I937117cf26fb718d57920382f6972390ad498c51 --- M include/osmo-bts/power_control.h M src/common/measurement.c M src/common/power_control.c M tests/power/bs_power_loop_test.c M tests/power/bs_power_loop_test.ok 5 files changed, 24 insertions(+), 59 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/49/26049/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I937117cf26fb718d57920382f6972390ad498c51 Gerrit-Change-Number: 26049 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sat Oct 30 00:12:42 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 30 Oct 2021 00:12:42 +0000 Subject: Change in osmo-bts[master]: measurement: call lchan_bs_pwr_ctrl() iff *mr is valid In-Reply-To: References: Message-ID: fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/26050 ) Change subject: measurement: call lchan_bs_pwr_ctrl() iff *mr is valid ...................................................................... measurement: call lchan_bs_pwr_ctrl() iff *mr is valid Change-Id: I125aab5224e25585cbfbe1550d2d52d62ba198bb --- M src/common/measurement.c M src/common/power_control.c M tests/power/bs_power_loop_test.c M tests/power/bs_power_loop_test.err M tests/power/bs_power_loop_test.ok 5 files changed, 4 insertions(+), 62 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/50/26050/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I125aab5224e25585cbfbe1550d2d52d62ba198bb Gerrit-Change-Number: 26050 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Sat Oct 30 00:38:25 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 00:38:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <617c941a100c7_11002ae3d3bb2600246713@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 147s] intention of the Shared Library Policy is to allow parallel installation of [ 147s] multiple versions of the same shared library, hard dependencies likely make [ 147s] that impossible. Please remove this dependency and instead move it to the [ 147s] runtime uses of your library. [ 147s] [ 147s] osmo-iuh.x86_64: W: suse-missing-rclink osmo-hnbgw [ 147s] The package contains an init script or systemd service file but lacks the [ 147s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 147s] [ 147s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 147s] libosmo-rua0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 147s] This package contains a library and provides no %post scriptlet containing a [ 147s] call to ldconfig. [ 147s] [ 147s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 147s] libosmo-rua0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 147s] This package contains a library and provides no %postun scriptlet containing a [ 147s] call to ldconfig. [ 147s] [ 147s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 147s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 147s] [ 147s] ### VM INTERACTION START ### [ 150s] [ 143.176613] sysrq: SysRq : Power Off [ 150s] [ 143.180618] reboot: Power down [ 150s] ### VM INTERACTION END ### [ 150s] [ 150s] sheep85 failed "build osmo-iuh.spec" at Sat Oct 30 00:38:12 UTC 2021. [ 150s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 00:38:25 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 00:38:25 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617c941a440fb_11002ae3d3bb2600246854@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 418s] # in ... [ 418s] TEXINPUTS=".." \ [ 418s] a2x -vv -L --asciidoc-opts="-f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/tests' -a commondir='../common'" --dblatex-opts="-s ../build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" test-usermanual.adoc [ 418s] Traceback (most recent call last): [ 418s] File "/usr/bin/a2x", line 33, in [ 418s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 418s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 418s] for entry_point in distribution(dist_name).entry_points [ 418s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 418s] return Distribution.from_name(distribution_name) [ 418s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 418s] raise PackageNotFoundError(name) [ 418s] importlib.metadata.PackageNotFoundError: asciidoc [ 418s] make[3]: *** [../build/Makefile.asciidoc.inc:70: test-usermanual.pdf] Error 1 [ 418s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 418s] make[2]: *** [Makefile:439: all-recursive] Error 1 [ 418s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 418s] make[1]: *** [Makefile:363: all] Error 2 [ 418s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 418s] dh_auto_build: error: make -j1 returned exit code 2 [ 418s] make: *** [debian/rules:5: binary] Error 25 [ 418s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 418s] ### VM INTERACTION START ### [ 419s] Powering off. [ 419s] [ 401.803276] reboot: Power down [ 420s] ### VM INTERACTION END ### [ 420s] [ 420s] lamb07 failed "build osmo-gsm-manuals-dev_1.1.0.17.b92c.202110300026.dsc" at Sat Oct 30 00:38:13 UTC 2021. [ 420s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 00:40:07 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 00:40:07 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <617c9471758ce_11002ae3d3bb26002471f8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 331s] intention of the Shared Library Policy is to allow parallel installation of [ 331s] multiple versions of the same shared library, hard dependencies likely make [ 331s] that impossible. Please remove this dependency and instead move it to the [ 331s] runtime uses of your library. [ 331s] [ 331s] osmo-iuh.x86_64: W: suse-missing-rclink osmo-hnbgw [ 331s] The package contains an init script or systemd service file but lacks the [ 331s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 331s] [ 331s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 331s] libosmo-rua0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 331s] This package contains a library and provides no %post scriptlet containing a [ 331s] call to ldconfig. [ 331s] [ 331s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 331s] libosmo-rua0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 331s] This package contains a library and provides no %postun scriptlet containing a [ 331s] call to ldconfig. [ 331s] [ 331s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 331s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 331s] [ 331s] ### VM INTERACTION START ### [ 334s] [ 322.472975] sysrq: Power Off [ 334s] [ 322.482153] reboot: Power down [ 335s] ### VM INTERACTION END ### [ 335s] [ 335s] lamb23 failed "build osmo-iuh.spec" at Sat Oct 30 00:39:51 UTC 2021. [ 335s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 01:21:33 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 01:21:33 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <617c9e2e52ee0_11002ae3d3bb26002512bf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 412s] intention of the Shared Library Policy is to allow parallel installation of [ 412s] multiple versions of the same shared library, hard dependencies likely make [ 412s] that impossible. Please remove this dependency and instead move it to the [ 412s] runtime uses of your library. [ 412s] [ 412s] osmo-iuh.aarch64: W: suse-missing-rclink osmo-hnbgw [ 412s] The package contains an init script or systemd service file but lacks the [ 412s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 412s] [ 412s] libosmo-hnbap0.aarch64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 412s] libosmo-rua0.aarch64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 412s] This package contains a library and provides no %post scriptlet containing a [ 412s] call to ldconfig. [ 412s] [ 412s] libosmo-hnbap0.aarch64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 412s] libosmo-rua0.aarch64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 412s] This package contains a library and provides no %postun scriptlet containing a [ 412s] call to ldconfig. [ 412s] [ 412s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 412s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 412s] [ 412s] ### VM INTERACTION START ### [ 415s] [ 399.426311] sysrq: SysRq : Power Off [ 415s] [ 399.456705] reboot: Power down [ 416s] ### VM INTERACTION END ### [ 416s] [ 416s] obs-arm-9 failed "build osmo-iuh.spec" at Sat Oct 30 01:21:26 UTC 2021. [ 416s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 01:35:43 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 01:35:43 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1_ARM/armv7l In-Reply-To: References: Message-ID: <617ca176d9f1f_11002ae3d3bb2600260399@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1_ARM/armv7l Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 1246s] intention of the Shared Library Policy is to allow parallel installation of [ 1246s] multiple versions of the same shared library, hard dependencies likely make [ 1246s] that impossible. Please remove this dependency and instead move it to the [ 1246s] runtime uses of your library. [ 1246s] [ 1246s] osmo-iuh.armv7hl: W: suse-missing-rclink osmo-hnbgw [ 1246s] The package contains an init script or systemd service file but lacks the [ 1246s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 1246s] [ 1246s] libosmo-hnbap0.armv7hl: E: library-without-ldconfig-postin (Badness: 300) /usr/lib/libosmo-hnbap.so.0.0.0 [ 1246s] libosmo-rua0.armv7hl: E: library-without-ldconfig-postin (Badness: 300) /usr/lib/libosmo-rua.so.0.0.0 [ 1246s] This package contains a library and provides no %post scriptlet containing a [ 1246s] call to ldconfig. [ 1246s] [ 1246s] libosmo-hnbap0.armv7hl: E: library-without-ldconfig-postun (Badness: 300) /usr/lib/libosmo-hnbap.so.0.0.0 [ 1246s] libosmo-rua0.armv7hl: E: library-without-ldconfig-postun (Badness: 300) /usr/lib/libosmo-rua.so.0.0.0 [ 1246s] This package contains a library and provides no %postun scriptlet containing a [ 1246s] call to ldconfig. [ 1246s] [ 1246s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 1246s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 1246s] [ 1246s] ### VM INTERACTION START ### [ 1249s] [ 1217.860698] sysrq: SysRq : Power Off [ 1249s] [ 1217.886554] reboot: Power down [ 1250s] ### VM INTERACTION END ### [ 1250s] [ 1250s] obs-arm-6 failed "build osmo-iuh.spec" at Sat Oct 30 01:35:26 UTC 2021. [ 1250s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sat Oct 30 02:24:31 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sat, 30 Oct 2021 02:24:31 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: Fix crash when configuring an existing ns bind In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/26033 ) Change subject: gprs_bssgp_pcu: Fix crash when configuring an existing ns bind ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/26033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I103e82e6c64324c087a4ff325a83eeab0e5a4ee9 Gerrit-Change-Number: 26033 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sat, 30 Oct 2021 02:24:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Sat Oct 30 06:35:28 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 06:35:28 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ce7c299d83_11002ae3d3bb26003452cc@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 370s] # in ... [ 370s] TEXINPUTS=".." \ [ 370s] a2x -vv -L --asciidoc-opts="-f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/tests' -a commondir='../common'" --dblatex-opts="-s ../build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" test-usermanual.adoc [ 370s] Traceback (most recent call last): [ 370s] File "/usr/bin/a2x", line 33, in [ 370s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 370s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 370s] for entry_point in distribution(dist_name).entry_points [ 370s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 370s] return Distribution.from_name(distribution_name) [ 370s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 370s] raise PackageNotFoundError(name) [ 370s] importlib.metadata.PackageNotFoundError: asciidoc [ 370s] make[3]: *** [../build/Makefile.asciidoc.inc:70: test-usermanual.pdf] Error 1 [ 370s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 370s] make[2]: *** [Makefile:439: all-recursive] Error 1 [ 370s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 370s] make[1]: *** [Makefile:363: all] Error 2 [ 370s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 370s] dh_auto_build: error: make -j1 returned exit code 2 [ 370s] make: *** [debian/rules:5: binary] Error 25 [ 370s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 370s] ### VM INTERACTION START ### [ 371s] Powering off. [ 371s] [ 349.760393] reboot: Power down [ 371s] ### VM INTERACTION END ### [ 371s] [ 371s] old-cirrus3 failed "build osmo-gsm-manuals-dev_1.1.0.17.b92c.202110300026.dsc" at Sat Oct 30 06:35:11 UTC 2021. [ 371s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 06:43:46 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 06:43:46 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ce9c1942d2_11002ae3d3bb26003479c8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 931s] # in ... [ 931s] TEXINPUTS=".." \ [ 931s] a2x -vv -L --asciidoc-opts="-f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/tests' -a commondir='../common'" --dblatex-opts="-s ../build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" test-usermanual.adoc [ 931s] Traceback (most recent call last): [ 931s] File "/usr/bin/a2x", line 33, in [ 931s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 931s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 931s] for entry_point in distribution(dist_name).entry_points [ 931s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 931s] return Distribution.from_name(distribution_name) [ 931s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 931s] raise PackageNotFoundError(name) [ 931s] importlib.metadata.PackageNotFoundError: asciidoc [ 931s] make[3]: *** [../build/Makefile.asciidoc.inc:70: test-usermanual.pdf] Error 1 [ 931s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 931s] make[2]: *** [Makefile:439: all-recursive] Error 1 [ 931s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 931s] make[1]: *** [Makefile:363: all] Error 2 [ 931s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 931s] dh_auto_build: error: make -j1 returned exit code 2 [ 931s] make: *** [debian/rules:5: binary] Error 25 [ 931s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 932s] ### VM INTERACTION START ### [ 933s] Powering off. [ 933s] [ 897.352941] reboot: Power down [ 933s] ### VM INTERACTION END ### [ 933s] [ 933s] lamb04 failed "build osmo-gsm-manuals-dev_1.1.0.dsc" at Sat Oct 30 06:43:38 UTC 2021. [ 933s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 06:48:03 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 06:48:03 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ceab254baa_11002ae3d3bb2600349728@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 235s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmobts-usermanual.adoc [ 235s] Traceback (most recent call last): [ 235s] File "/usr/bin/a2x", line 33, in [ 235s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 235s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 235s] for entry_point in distribution(dist_name).entry_points [ 235s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 235s] return Distribution.from_name(distribution_name) [ 235s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 235s] raise PackageNotFoundError(name) [ 235s] importlib.metadata.PackageNotFoundError: asciidoc [ 235s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmobts-usermanual.pdf] Error 1 [ 235s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 235s] make[3]: *** [Makefile:380: all-recursive] Error 1 [ 235s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 235s] make[2]: *** [Makefile:439: all-recursive] Error 1 [ 235s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 235s] make[1]: *** [Makefile:371: all] Error 2 [ 235s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 235s] dh_auto_build: error: make -j1 returned exit code 2 [ 235s] make: *** [debian/rules:12: build] Error 25 [ 235s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 235s] ### VM INTERACTION START ### [ 236s] Powering off. [ 236s] [ 225.104963] reboot: Power down [ 236s] ### VM INTERACTION END ### [ 236s] [ 236s] goat17 failed "build osmo-bts_1.3.3.dsc" at Sat Oct 30 06:47:57 UTC 2021. [ 236s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 06:48:20 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 06:48:20 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcu in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617cead271435_11002ae3d3bb26003502a5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcu/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-pcu failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-pcu Last lines of build log: [ 249s] # in /usr/share/osmo-gsm-manuals. [ 249s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 249s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmopcu-usermanual.adoc [ 249s] Traceback (most recent call last): [ 249s] File "/usr/bin/a2x", line 33, in [ 249s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 249s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 249s] for entry_point in distribution(dist_name).entry_points [ 249s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 249s] return Distribution.from_name(distribution_name) [ 249s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 249s] raise PackageNotFoundError(name) [ 249s] importlib.metadata.PackageNotFoundError: asciidoc [ 249s] make[3]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmopcu-usermanual.pdf] Error 1 [ 249s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 249s] make[2]: *** [Makefile:384: all-recursive] Error 1 [ 249s] make[2]: Leaving directory '/usr/src/packages/BUILD/doc' [ 249s] make[1]: *** [Makefile:420: all-recursive] Error 1 [ 249s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 249s] dh_auto_build: error: make -j1 returned exit code 2 [ 249s] make: *** [debian/rules:12: build] Error 25 [ 249s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 249s] ### VM INTERACTION START ### [ 250s] Powering off. [ 250s] [ 238.877439] reboot: Power down [ 250s] ### VM INTERACTION END ### [ 250s] [ 250s] goat19 failed "build osmo-pcu_0.9.1.dsc" at Sat Oct 30 06:48:09 UTC 2021. [ 250s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 06:48:54 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 06:48:54 +0000 Subject: Build failure of network:osmocom:latest/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ceaed19808_11002ae3d3bb26003503d5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-hlr Last lines of build log: [ 283s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmohlr-usermanual.adoc [ 283s] Traceback (most recent call last): [ 283s] File "/usr/bin/a2x", line 33, in [ 283s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 283s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 283s] for entry_point in distribution(dist_name).entry_points [ 283s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 283s] return Distribution.from_name(distribution_name) [ 283s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 283s] raise PackageNotFoundError(name) [ 283s] importlib.metadata.PackageNotFoundError: asciidoc [ 283s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmohlr-usermanual.pdf] Error 1 [ 283s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 283s] make[3]: *** [Makefile:382: all-recursive] Error 1 [ 283s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 283s] make[2]: *** [Makefile:488: all-recursive] Error 1 [ 283s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 283s] make[1]: *** [Makefile:410: all] Error 2 [ 283s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 283s] dh_auto_build: error: make -j1 returned exit code 2 [ 283s] make: *** [debian/rules:7: build] Error 25 [ 283s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 283s] ### VM INTERACTION START ### [ 284s] Powering off. [ 284s] [ 272.293570] reboot: Power down [ 284s] ### VM INTERACTION END ### [ 284s] [ 284s] goat11 failed "build osmo-hlr_1.3.1.dsc" at Sat Oct 30 06:48:45 UTC 2021. [ 284s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 06:48:54 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 06:48:54 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ceaed43611_11002ae3d3bb26003504b6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 283s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmo-remsim-usermanual.adoc [ 283s] Traceback (most recent call last): [ 283s] File "/usr/bin/a2x", line 33, in [ 283s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 283s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 283s] for entry_point in distribution(dist_name).entry_points [ 283s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 283s] return Distribution.from_name(distribution_name) [ 283s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 283s] raise PackageNotFoundError(name) [ 283s] importlib.metadata.PackageNotFoundError: asciidoc [ 283s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmo-remsim-usermanual.pdf] Error 1 [ 283s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 283s] make[3]: *** [Makefile:377: all-recursive] Error 1 [ 283s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 283s] make[2]: *** [Makefile:463: all-recursive] Error 1 [ 283s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 283s] make[1]: *** [Makefile:387: all] Error 2 [ 283s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 283s] dh_auto_build: error: make -j1 returned exit code 2 [ 283s] make: *** [debian/rules:12: build] Error 25 [ 283s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 283s] ### VM INTERACTION START ### [ 284s] Powering off. [ 284s] [ 273.134674] reboot: Power down [ 284s] ### VM INTERACTION END ### [ 284s] [ 284s] goat13 failed "build osmo-remsim_0.2.4.dsc" at Sat Oct 30 06:48:45 UTC 2021. [ 284s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 06:49:11 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 06:49:11 +0000 Subject: Build failure of network:osmocom:latest/osmo-ggsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ceaef89e07_11002ae3d3bb260035115e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-ggsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-ggsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-ggsn Last lines of build log: [ 306s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmoggsn-usermanual.adoc [ 306s] Traceback (most recent call last): [ 306s] File "/usr/bin/a2x", line 33, in [ 306s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 306s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 306s] for entry_point in distribution(dist_name).entry_points [ 306s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 306s] return Distribution.from_name(distribution_name) [ 306s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 306s] raise PackageNotFoundError(name) [ 306s] importlib.metadata.PackageNotFoundError: asciidoc [ 306s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmoggsn-usermanual.pdf] Error 1 [ 306s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 306s] make[3]: *** [Makefile:447: all-recursive] Error 1 [ 306s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 306s] make[2]: *** [Makefile:487: all-recursive] Error 1 [ 306s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 306s] make[1]: *** [Makefile:392: all] Error 2 [ 306s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 306s] dh_auto_build: error: make -j1 returned exit code 2 [ 306s] make: *** [debian/rules:15: build] Error 25 [ 306s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 306s] ### VM INTERACTION START ### [ 307s] Powering off. [ 307s] [ 295.754910] reboot: Power down [ 307s] ### VM INTERACTION END ### [ 307s] [ 307s] goat07 failed "build osmo-ggsn_1.7.1.dsc" at Sat Oct 30 06:49:08 UTC 2021. [ 307s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 06:50:54 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 06:50:54 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ceb6877170_11002ae3d3bb260035153e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 401s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmocbc-usermanual.adoc [ 401s] Traceback (most recent call last): [ 401s] File "/usr/bin/a2x", line 33, in [ 401s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 401s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 401s] for entry_point in distribution(dist_name).entry_points [ 401s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 401s] return Distribution.from_name(distribution_name) [ 401s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 401s] raise PackageNotFoundError(name) [ 401s] importlib.metadata.PackageNotFoundError: asciidoc [ 401s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmocbc-usermanual.pdf] Error 1 [ 401s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 401s] make[3]: *** [Makefile:381: all-recursive] Error 1 [ 401s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 401s] make[2]: *** [Makefile:421: all-recursive] Error 1 [ 401s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 401s] make[1]: *** [Makefile:368: all] Error 2 [ 401s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 401s] dh_auto_build: error: make -j1 returned exit code 2 [ 401s] make: *** [debian/rules:45: build] Error 25 [ 401s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 401s] ### VM INTERACTION START ### [ 402s] Powering off. [ 402s] [ 389.259918] reboot: Power down [ 402s] ### VM INTERACTION END ### [ 403s] [ 403s] goat03 failed "build osmo-cbc_0.2.2.dsc" at Sat Oct 30 06:50:46 UTC 2021. [ 403s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 06:52:03 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 06:52:03 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ceba3dca10_11002ae3d3bb2600352156@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 416s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmostp-usermanual.adoc [ 416s] Traceback (most recent call last): [ 416s] File "/usr/bin/a2x", line 33, in [ 416s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 416s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 416s] for entry_point in distribution(dist_name).entry_points [ 416s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 416s] return Distribution.from_name(distribution_name) [ 416s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 416s] raise PackageNotFoundError(name) [ 416s] importlib.metadata.PackageNotFoundError: asciidoc [ 416s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmostp-usermanual.pdf] Error 1 [ 416s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 416s] make[3]: *** [Makefile:377: all-recursive] Error 1 [ 416s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 416s] make[2]: *** [Makefile:508: all-recursive] Error 1 [ 416s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 416s] make[1]: *** [Makefile:403: all] Error 2 [ 416s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 416s] dh_auto_build: error: make -j1 returned exit code 2 [ 416s] make: *** [debian/rules:12: build] Error 25 [ 416s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 416s] ### VM INTERACTION START ### [ 417s] Powering off. [ 417s] [ 398.416483] reboot: Power down [ 417s] ### VM INTERACTION END ### [ 417s] [ 417s] lamb72 failed "build libosmo-sccp_1.4.0.dsc" at Sat Oct 30 06:51:52 UTC 2021. [ 417s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 06:52:37 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 06:52:37 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617cebbe342d0_11002ae3d3bb2600352342@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 506s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmomgw-usermanual.adoc [ 506s] Traceback (most recent call last): [ 506s] File "/usr/bin/a2x", line 33, in [ 506s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 506s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 506s] for entry_point in distribution(dist_name).entry_points [ 506s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 506s] return Distribution.from_name(distribution_name) [ 506s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 506s] raise PackageNotFoundError(name) [ 506s] importlib.metadata.PackageNotFoundError: asciidoc [ 506s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmomgw-usermanual.pdf] Error 1 [ 506s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 506s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 506s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 506s] make[2]: *** [Makefile:514: all-recursive] Error 1 [ 506s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 506s] make[1]: *** [Makefile:423: all] Error 2 [ 506s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 506s] dh_auto_build: error: make -j1 returned exit code 2 [ 506s] make: *** [debian/rules:17: build] Error 25 [ 506s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 506s] ### VM INTERACTION START ### [ 508s] Powering off. [ 508s] [ 458.767949] reboot: Power down [ 508s] ### VM INTERACTION END ### [ 508s] [ 508s] lamb09 failed "build osmo-mgw_1.8.1.dsc" at Sat Oct 30 06:52:35 UTC 2021. [ 508s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 06:53:11 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 06:53:11 +0000 Subject: Build failure of network:osmocom:latest/osmo-sip-connector in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617cebde5a9b8_11002ae3d3bb26003526ed@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sip-connector/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sip-connector failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sip-connector Last lines of build log: [ 529s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmosipconnector-usermanual.adoc [ 529s] Traceback (most recent call last): [ 529s] File "/usr/bin/a2x", line 33, in [ 529s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 529s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 529s] for entry_point in distribution(dist_name).entry_points [ 529s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 529s] return Distribution.from_name(distribution_name) [ 529s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 529s] raise PackageNotFoundError(name) [ 529s] importlib.metadata.PackageNotFoundError: asciidoc [ 529s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmosipconnector-usermanual.pdf] Error 1 [ 529s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 529s] make[3]: *** [Makefile:335: all-recursive] Error 1 [ 529s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 529s] make[2]: *** [Makefile:371: all-recursive] Error 1 [ 529s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 529s] make[1]: *** [Makefile:327: all] Error 2 [ 529s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 529s] dh_auto_build: error: make -j1 returned exit code 2 [ 529s] make: *** [debian/rules:12: build] Error 25 [ 529s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 529s] ### VM INTERACTION START ### [ 530s] Powering off. [ 530s] [ 509.592757] reboot: Power down [ 530s] ### VM INTERACTION END ### [ 530s] [ 530s] lamb22 failed "build osmo-sip-connector_1.5.1.dsc" at Sat Oct 30 06:53:05 UTC 2021. [ 530s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 06:56:37 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 06:56:37 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617cecb351a78_11002ae3d3bb260035368b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 716s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmotrx-usermanual.adoc [ 716s] Traceback (most recent call last): [ 716s] File "/usr/bin/a2x", line 33, in [ 716s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 716s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 716s] for entry_point in distribution(dist_name).entry_points [ 716s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 716s] return Distribution.from_name(distribution_name) [ 716s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 716s] raise PackageNotFoundError(name) [ 716s] importlib.metadata.PackageNotFoundError: asciidoc [ 716s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmotrx-usermanual.pdf] Error 1 [ 716s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 716s] make[3]: *** [Makefile:398: all-recursive] Error 1 [ 716s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 716s] make[2]: *** [Makefile:521: all-recursive] Error 1 [ 716s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 716s] make[1]: *** [Makefile:452: all] Error 2 [ 716s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 716s] dh_auto_build: error: make -j1 returned exit code 2 [ 716s] make: *** [debian/rules:6: build] Error 25 [ 716s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 716s] ### VM INTERACTION START ### [ 717s] Powering off. [ 717s] [ 639.107853] reboot: Power down [ 717s] ### VM INTERACTION END ### [ 717s] [ 717s] lamb23 failed "build osmo-trx_1.3.1.dsc" at Sat Oct 30 06:56:23 UTC 2021. [ 717s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 07:01:46 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 07:01:46 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617cedde9edd0_11002ae3d3bb2600355542@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 524s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmohnbgw-usermanual.adoc [ 524s] Traceback (most recent call last): [ 524s] File "/usr/bin/a2x", line 33, in [ 524s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 524s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 524s] for entry_point in distribution(dist_name).entry_points [ 524s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 524s] return Distribution.from_name(distribution_name) [ 524s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 524s] raise PackageNotFoundError(name) [ 524s] importlib.metadata.PackageNotFoundError: asciidoc [ 524s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmohnbgw-usermanual.pdf] Error 1 [ 524s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 524s] make[3]: *** [Makefile:383: all-recursive] Error 1 [ 524s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 524s] make[2]: *** [Makefile:469: all-recursive] Error 1 [ 524s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 524s] make[1]: *** [Makefile:391: all] Error 2 [ 524s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 524s] dh_auto_build: error: make -j1 returned exit code 2 [ 524s] make: *** [debian/rules:9: build] Error 25 [ 524s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 524s] ### VM INTERACTION START ### [ 525s] Powering off. [ 525s] [ 483.076422] reboot: Power down [ 525s] ### VM INTERACTION END ### [ 525s] [ 525s] goat03 failed "build osmo-iuh_1.0.0.dsc" at Sat Oct 30 07:01:31 UTC 2021. [ 525s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 07:04:20 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 07:04:20 +0000 Subject: Build failure of network:osmocom:latest/osmo-gbproxy in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617cee8e8e98c_11002ae3d3bb26003566a6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gbproxy/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-gbproxy failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gbproxy Last lines of build log: [ 1185s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmogbproxy-usermanual.adoc [ 1185s] Traceback (most recent call last): [ 1185s] File "/usr/bin/a2x", line 33, in [ 1185s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 1185s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 1185s] for entry_point in distribution(dist_name).entry_points [ 1185s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 1185s] return Distribution.from_name(distribution_name) [ 1185s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 1185s] raise PackageNotFoundError(name) [ 1185s] importlib.metadata.PackageNotFoundError: asciidoc [ 1186s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmogbproxy-usermanual.pdf] Error 1 [ 1186s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 1186s] make[3]: *** [Makefile:376: all-recursive] Error 1 [ 1186s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 1186s] make[2]: *** [Makefile:445: all-recursive] Error 1 [ 1186s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 1186s] make[1]: *** [Makefile:377: all] Error 2 [ 1186s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1186s] dh_auto_build: error: make -j1 returned exit code 2 [ 1186s] make: *** [debian/rules:45: build] Error 25 [ 1186s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1186s] ### VM INTERACTION START ### [ 1187s] Powering off. [ 1187s] [ 1123.473374] reboot: Power down [ 1187s] ### VM INTERACTION END ### [ 1187s] [ 1187s] lamb55 failed "build osmo-gbproxy_0.1.2.dsc" at Sat Oct 30 07:04:04 UTC 2021. [ 1187s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 07:06:20 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 07:06:20 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617cef06f3b70_11002ae3d3bb26003585ce@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 264s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmomsc-usermanual.adoc [ 264s] Traceback (most recent call last): [ 264s] File "/usr/bin/a2x", line 33, in [ 264s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 264s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 264s] for entry_point in distribution(dist_name).entry_points [ 264s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 264s] return Distribution.from_name(distribution_name) [ 264s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 264s] raise PackageNotFoundError(name) [ 264s] importlib.metadata.PackageNotFoundError: asciidoc [ 264s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmomsc-usermanual.pdf] Error 1 [ 264s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 264s] make[3]: *** [Makefile:402: all-recursive] Error 1 [ 264s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 264s] make[2]: *** [Makefile:470: all-recursive] Error 1 [ 264s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 264s] make[1]: *** [Makefile:402: all] Error 2 [ 264s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 264s] dh_auto_build: error: make -j1 returned exit code 2 [ 264s] make: *** [debian/rules:45: build] Error 25 [ 264s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 264s] ### VM INTERACTION START ### [ 265s] Powering off. [ 265s] [ 251.692866] reboot: Power down [ 265s] ### VM INTERACTION END ### [ 265s] [ 265s] goat05 failed "build osmo-msc_1.7.1.dsc" at Sat Oct 30 07:06:17 UTC 2021. [ 265s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 07:06:37 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 07:06:37 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617cef0840d35_11002ae3d3bb26003587dd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 279s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmosgsn-usermanual.adoc [ 279s] Traceback (most recent call last): [ 279s] File "/usr/bin/a2x", line 33, in [ 279s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 279s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 279s] for entry_point in distribution(dist_name).entry_points [ 279s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 279s] return Distribution.from_name(distribution_name) [ 279s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 279s] raise PackageNotFoundError(name) [ 279s] importlib.metadata.PackageNotFoundError: asciidoc [ 279s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmosgsn-usermanual.pdf] Error 1 [ 279s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 279s] make[3]: *** [Makefile:393: all-recursive] Error 1 [ 279s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 279s] make[2]: *** [Makefile:462: all-recursive] Error 1 [ 279s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 279s] make[1]: *** [Makefile:394: all] Error 2 [ 279s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 279s] dh_auto_build: error: make -j1 returned exit code 2 [ 279s] make: *** [debian/rules:45: build] Error 25 [ 279s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 279s] ### VM INTERACTION START ### [ 280s] Powering off. [ 280s] [ 257.644056] reboot: Power down [ 280s] ### VM INTERACTION END ### [ 280s] [ 280s] goat13 failed "build osmo-sgsn_1.7.1.dsc" at Sat Oct 30 07:06:32 UTC 2021. [ 280s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 07:08:37 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 07:08:37 +0000 Subject: Build failure of network:osmocom:latest/osmo-smlc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617cef803faf0_11002ae3d3bb26003593f5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-smlc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-smlc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-smlc Last lines of build log: [ 805s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmosmlc-usermanual.adoc [ 805s] Traceback (most recent call last): [ 805s] File "/usr/bin/a2x", line 33, in [ 805s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 805s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 805s] for entry_point in distribution(dist_name).entry_points [ 805s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 805s] return Distribution.from_name(distribution_name) [ 805s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 805s] raise PackageNotFoundError(name) [ 805s] importlib.metadata.PackageNotFoundError: asciidoc [ 805s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmosmlc-usermanual.pdf] Error 1 [ 805s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 805s] make[3]: *** [Makefile:376: all-recursive] Error 1 [ 805s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 805s] make[2]: *** [Makefile:445: all-recursive] Error 1 [ 805s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 805s] make[1]: *** [Makefile:377: all] Error 2 [ 805s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 805s] dh_auto_build: error: make -j1 returned exit code 2 [ 805s] make: *** [debian/rules:45: build] Error 25 [ 805s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 805s] ### VM INTERACTION START ### [ 806s] Powering off. [ 807s] [ 755.658885] reboot: Power down [ 807s] ### VM INTERACTION END ### [ 807s] [ 807s] lamb59 failed "build osmo-smlc_0.2.0.dsc" at Sat Oct 30 07:08:22 UTC 2021. [ 807s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 07:10:03 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 07:10:03 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617cefdc153b7_11002ae3d3bb26003602b5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 891s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmobsc-usermanual.adoc [ 891s] Traceback (most recent call last): [ 891s] File "/usr/bin/a2x", line 33, in [ 891s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 891s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 891s] for entry_point in distribution(dist_name).entry_points [ 891s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 891s] return Distribution.from_name(distribution_name) [ 891s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 891s] raise PackageNotFoundError(name) [ 891s] importlib.metadata.PackageNotFoundError: asciidoc [ 891s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmobsc-usermanual.pdf] Error 1 [ 891s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 891s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 891s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 891s] make[2]: *** [Makefile:456: all-recursive] Error 1 [ 891s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 891s] make[1]: *** [Makefile:388: all] Error 2 [ 891s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 891s] dh_auto_build: error: make -j1 returned exit code 2 [ 891s] make: *** [debian/rules:45: build] Error 25 [ 891s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 891s] ### VM INTERACTION START ### [ 892s] Powering off. [ 892s] [ 847.384223] reboot: Power down [ 892s] ### VM INTERACTION END ### [ 892s] [ 892s] lamb59 failed "build osmo-bsc_1.7.2.dsc" at Sat Oct 30 07:09:58 UTC 2021. [ 892s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:33:07 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:33:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dba221ab69_11002ae3d3bb260056841a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 464s] # in ... [ 464s] TEXINPUTS=".." \ [ 464s] a2x -vv -L --asciidoc-opts="-f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/tests' -a commondir='../common'" --dblatex-opts="-s ../build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" test-usermanual.adoc [ 464s] Traceback (most recent call last): [ 464s] File "/usr/bin/a2x", line 33, in [ 464s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 464s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 464s] for entry_point in distribution(dist_name).entry_points [ 464s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 464s] return Distribution.from_name(distribution_name) [ 464s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 464s] raise PackageNotFoundError(name) [ 464s] importlib.metadata.PackageNotFoundError: asciidoc [ 464s] make[3]: *** [../build/Makefile.asciidoc.inc:70: test-usermanual.pdf] Error 1 [ 464s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 464s] make[2]: *** [Makefile:439: all-recursive] Error 1 [ 464s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 464s] make[1]: *** [Makefile:363: all] Error 2 [ 464s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 464s] dh_auto_build: error: make -j1 returned exit code 2 [ 464s] make: *** [debian/rules:5: binary] Error 25 [ 464s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 464s] ### VM INTERACTION START ### [ 465s] Powering off. [ 465s] [ 421.320196] reboot: Power down [ 465s] ### VM INTERACTION END ### [ 465s] [ 465s] cloud118 failed "build osmo-gsm-manuals-dev_1.1.0.dsc" at Sat Oct 30 21:32:53 UTC 2021. [ 465s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:37:05 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:37:05 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dbb0e313d0_11002ae3d3bb26005693f1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 721s] # in ... [ 721s] TEXINPUTS=".." \ [ 721s] a2x -vv -L --asciidoc-opts="-f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/tests' -a commondir='../common'" --dblatex-opts="-s ../build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" test-usermanual.adoc [ 721s] Traceback (most recent call last): [ 721s] File "/usr/bin/a2x", line 33, in [ 721s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 721s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 721s] for entry_point in distribution(dist_name).entry_points [ 721s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 721s] return Distribution.from_name(distribution_name) [ 721s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 721s] raise PackageNotFoundError(name) [ 721s] importlib.metadata.PackageNotFoundError: asciidoc [ 721s] make[3]: *** [../build/Makefile.asciidoc.inc:70: test-usermanual.pdf] Error 1 [ 721s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 721s] make[2]: *** [Makefile:439: all-recursive] Error 1 [ 721s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 721s] make[1]: *** [Makefile:363: all] Error 2 [ 721s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 721s] dh_auto_build: error: make -j1 returned exit code 2 [ 721s] make: *** [debian/rules:5: binary] Error 25 [ 721s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 721s] ### VM INTERACTION START ### [ 723s] Powering off. [ 723s] [ 666.646455] reboot: Power down [ 723s] ### VM INTERACTION END ### [ 723s] [ 723s] cloud114 failed "build osmo-gsm-manuals-dev_1.1.0.17.b92c.202110300026.dsc" at Sat Oct 30 21:37:03 UTC 2021. [ 723s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:40:48 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:40:48 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dbbe2dfd73_11002ae3d3bb260057139e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 429s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmo-remsim-usermanual.adoc [ 429s] Traceback (most recent call last): [ 429s] File "/usr/bin/a2x", line 33, in [ 429s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 429s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 429s] for entry_point in distribution(dist_name).entry_points [ 429s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 429s] return Distribution.from_name(distribution_name) [ 429s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 429s] raise PackageNotFoundError(name) [ 429s] importlib.metadata.PackageNotFoundError: asciidoc [ 429s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmo-remsim-usermanual.pdf] Error 1 [ 429s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 429s] make[3]: *** [Makefile:377: all-recursive] Error 1 [ 429s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 429s] make[2]: *** [Makefile:463: all-recursive] Error 1 [ 429s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 429s] make[1]: *** [Makefile:387: all] Error 2 [ 429s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 429s] dh_auto_build: error: make -j1 returned exit code 2 [ 429s] make: *** [debian/rules:12: build] Error 25 [ 429s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 429s] ### VM INTERACTION START ### [ 431s] Powering off. [ 431s] [ 409.420217] reboot: Power down [ 431s] ### VM INTERACTION END ### [ 431s] [ 431s] old-cirrus2 failed "build osmo-remsim_0.2.4.dsc" at Sat Oct 30 21:40:42 UTC 2021. [ 431s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:41:05 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:41:05 +0000 Subject: Build failure of network:osmocom:latest/osmo-sip-connector in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dbbfce316c_11002ae3d3bb260057153a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sip-connector/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sip-connector failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sip-connector Last lines of build log: [ 448s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmosipconnector-usermanual.adoc [ 448s] Traceback (most recent call last): [ 448s] File "/usr/bin/a2x", line 33, in [ 448s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 448s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 448s] for entry_point in distribution(dist_name).entry_points [ 448s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 448s] return Distribution.from_name(distribution_name) [ 448s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 448s] raise PackageNotFoundError(name) [ 448s] importlib.metadata.PackageNotFoundError: asciidoc [ 448s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmosipconnector-usermanual.pdf] Error 1 [ 448s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 448s] make[3]: *** [Makefile:335: all-recursive] Error 1 [ 448s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 448s] make[2]: *** [Makefile:371: all-recursive] Error 1 [ 448s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 448s] make[1]: *** [Makefile:327: all] Error 2 [ 448s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 448s] dh_auto_build: error: make -j1 returned exit code 2 [ 448s] make: *** [debian/rules:12: build] Error 25 [ 448s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 448s] ### VM INTERACTION START ### [ 449s] Powering off. [ 449s] [ 428.290680] reboot: Power down [ 449s] ### VM INTERACTION END ### [ 449s] [ 449s] lamb14 failed "build osmo-sip-connector_1.5.1.dsc" at Sat Oct 30 21:40:57 UTC 2021. [ 449s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:41:39 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:41:39 +0000 Subject: Build failure of network:osmocom:latest/osmo-ggsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dbc2170ad3_11002ae3d3bb260057162d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-ggsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-ggsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-ggsn Last lines of build log: [ 479s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmoggsn-usermanual.adoc [ 479s] Traceback (most recent call last): [ 479s] File "/usr/bin/a2x", line 33, in [ 479s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 479s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 479s] for entry_point in distribution(dist_name).entry_points [ 479s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 479s] return Distribution.from_name(distribution_name) [ 479s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 479s] raise PackageNotFoundError(name) [ 479s] importlib.metadata.PackageNotFoundError: asciidoc [ 479s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmoggsn-usermanual.pdf] Error 1 [ 479s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 479s] make[3]: *** [Makefile:447: all-recursive] Error 1 [ 479s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 479s] make[2]: *** [Makefile:487: all-recursive] Error 1 [ 479s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 479s] make[1]: *** [Makefile:392: all] Error 2 [ 479s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 479s] dh_auto_build: error: make -j1 returned exit code 2 [ 479s] make: *** [debian/rules:15: build] Error 25 [ 479s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 479s] ### VM INTERACTION START ### [ 480s] Powering off. [ 480s] [ 444.351337] reboot: Power down [ 480s] ### VM INTERACTION END ### [ 480s] [ 480s] cloud106 failed "build osmo-ggsn_1.7.1.dsc" at Sat Oct 30 21:41:30 UTC 2021. [ 480s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:42:13 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:42:13 +0000 Subject: Build failure of network:osmocom:latest/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dbc3cb92d2_11002ae3d3bb260057210@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-hlr Last lines of build log: [ 494s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmohlr-usermanual.adoc [ 494s] Traceback (most recent call last): [ 494s] File "/usr/bin/a2x", line 33, in [ 494s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 494s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 494s] for entry_point in distribution(dist_name).entry_points [ 494s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 494s] return Distribution.from_name(distribution_name) [ 494s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 494s] raise PackageNotFoundError(name) [ 494s] importlib.metadata.PackageNotFoundError: asciidoc [ 494s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmohlr-usermanual.pdf] Error 1 [ 494s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 494s] make[3]: *** [Makefile:382: all-recursive] Error 1 [ 494s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 494s] make[2]: *** [Makefile:488: all-recursive] Error 1 [ 494s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 494s] make[1]: *** [Makefile:410: all] Error 2 [ 494s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 494s] dh_auto_build: error: make -j1 returned exit code 2 [ 494s] make: *** [debian/rules:7: build] Error 25 [ 494s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 494s] ### VM INTERACTION START ### [ 495s] Powering off. [ 495s] [ 440.872898] reboot: Power down [ 495s] ### VM INTERACTION END ### [ 495s] [ 495s] cloud107 failed "build osmo-hlr_1.3.1.dsc" at Sat Oct 30 21:42:08 UTC 2021. [ 495s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:42:47 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:42:47 +0000 Subject: Build failure of network:osmocom:latest/osmo-gbproxy in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dbc75beadc_11002ae3d3bb260057245d@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gbproxy/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-gbproxy failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gbproxy Last lines of build log: [ 546s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmogbproxy-usermanual.adoc [ 546s] Traceback (most recent call last): [ 546s] File "/usr/bin/a2x", line 33, in [ 546s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 546s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 546s] for entry_point in distribution(dist_name).entry_points [ 546s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 546s] return Distribution.from_name(distribution_name) [ 546s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 546s] raise PackageNotFoundError(name) [ 546s] importlib.metadata.PackageNotFoundError: asciidoc [ 546s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmogbproxy-usermanual.pdf] Error 1 [ 546s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 546s] make[3]: *** [Makefile:376: all-recursive] Error 1 [ 546s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 546s] make[2]: *** [Makefile:445: all-recursive] Error 1 [ 546s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 546s] make[1]: *** [Makefile:377: all] Error 2 [ 546s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 546s] dh_auto_build: error: make -j1 returned exit code 2 [ 546s] make: *** [debian/rules:45: build] Error 25 [ 546s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 546s] ### VM INTERACTION START ### [ 547s] Powering off. [ 547s] [ 526.813613] reboot: Power down [ 547s] ### VM INTERACTION END ### [ 547s] [ 547s] lamb17 failed "build osmo-gbproxy_0.1.2.dsc" at Sat Oct 30 21:42:39 UTC 2021. [ 547s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:43:04 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:43:04 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dbc767be0c_11002ae3d3bb26005725cd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 563s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmobts-usermanual.adoc [ 563s] Traceback (most recent call last): [ 563s] File "/usr/bin/a2x", line 33, in [ 563s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 563s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 563s] for entry_point in distribution(dist_name).entry_points [ 563s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 563s] return Distribution.from_name(distribution_name) [ 563s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 563s] raise PackageNotFoundError(name) [ 563s] importlib.metadata.PackageNotFoundError: asciidoc [ 563s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmobts-usermanual.pdf] Error 1 [ 563s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 563s] make[3]: *** [Makefile:380: all-recursive] Error 1 [ 563s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 563s] make[2]: *** [Makefile:439: all-recursive] Error 1 [ 563s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 563s] make[1]: *** [Makefile:371: all] Error 2 [ 563s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 563s] dh_auto_build: error: make -j1 returned exit code 2 [ 563s] make: *** [debian/rules:12: build] Error 25 [ 563s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 563s] ### VM INTERACTION START ### [ 564s] Powering off. [ 564s] [ 540.725783] reboot: Power down [ 564s] ### VM INTERACTION END ### [ 564s] [ 564s] old-atreju4 failed "build osmo-bts_1.3.3.dsc" at Sat Oct 30 21:42:48 UTC 2021. [ 564s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:43:04 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:43:04 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dbc76ad69e_11002ae3d3bb260057265f@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 536s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmostp-usermanual.adoc [ 536s] Traceback (most recent call last): [ 536s] File "/usr/bin/a2x", line 33, in [ 536s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 536s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 536s] for entry_point in distribution(dist_name).entry_points [ 536s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 536s] return Distribution.from_name(distribution_name) [ 536s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 536s] raise PackageNotFoundError(name) [ 536s] importlib.metadata.PackageNotFoundError: asciidoc [ 536s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmostp-usermanual.pdf] Error 1 [ 536s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 536s] make[3]: *** [Makefile:377: all-recursive] Error 1 [ 536s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 536s] make[2]: *** [Makefile:508: all-recursive] Error 1 [ 536s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 536s] make[1]: *** [Makefile:403: all] Error 2 [ 536s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 536s] dh_auto_build: error: make -j1 returned exit code 2 [ 536s] make: *** [debian/rules:12: build] Error 25 [ 536s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 536s] ### VM INTERACTION START ### [ 537s] Powering off. [ 537s] [ 481.607508] reboot: Power down [ 537s] ### VM INTERACTION END ### [ 537s] [ 537s] cloud107 failed "build libosmo-sccp_1.4.0.dsc" at Sat Oct 30 21:42:49 UTC 2021. [ 537s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:46:45 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:46:45 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dbd64815cb_11002ae3d3bb26005736c3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 788s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmomgw-usermanual.adoc [ 788s] Traceback (most recent call last): [ 788s] File "/usr/bin/a2x", line 33, in [ 788s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 788s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 788s] for entry_point in distribution(dist_name).entry_points [ 788s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 788s] return Distribution.from_name(distribution_name) [ 788s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 788s] raise PackageNotFoundError(name) [ 788s] importlib.metadata.PackageNotFoundError: asciidoc [ 788s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmomgw-usermanual.pdf] Error 1 [ 788s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 788s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 788s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 788s] make[2]: *** [Makefile:514: all-recursive] Error 1 [ 788s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 788s] make[1]: *** [Makefile:423: all] Error 2 [ 788s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 788s] dh_auto_build: error: make -j1 returned exit code 2 [ 788s] make: *** [debian/rules:17: build] Error 25 [ 788s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 788s] ### VM INTERACTION START ### [ 789s] Powering off. [ 789s] [ 736.070902] reboot: Power down [ 789s] ### VM INTERACTION END ### [ 789s] [ 789s] cloud127 failed "build osmo-mgw_1.8.1.dsc" at Sat Oct 30 21:46:42 UTC 2021. [ 789s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:47:19 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:47:19 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dbd842e880_11002ae3d3bb26005738d0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 813s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmotrx-usermanual.adoc [ 813s] Traceback (most recent call last): [ 813s] File "/usr/bin/a2x", line 33, in [ 813s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 813s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 813s] for entry_point in distribution(dist_name).entry_points [ 813s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 813s] return Distribution.from_name(distribution_name) [ 813s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 813s] raise PackageNotFoundError(name) [ 813s] importlib.metadata.PackageNotFoundError: asciidoc [ 813s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmotrx-usermanual.pdf] Error 1 [ 813s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 813s] make[3]: *** [Makefile:398: all-recursive] Error 1 [ 813s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 813s] make[2]: *** [Makefile:521: all-recursive] Error 1 [ 813s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 813s] make[1]: *** [Makefile:452: all] Error 2 [ 813s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 813s] dh_auto_build: error: make -j1 returned exit code 2 [ 813s] make: *** [debian/rules:6: build] Error 25 [ 813s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 813s] ### VM INTERACTION START ### [ 814s] Powering off. [ 814s] [ 787.974899] reboot: Power down [ 814s] ### VM INTERACTION END ### [ 814s] [ 814s] old-atreju4 failed "build osmo-trx_1.3.1.dsc" at Sat Oct 30 21:47:02 UTC 2021. [ 814s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:47:36 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:47:36 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dbd85474c7_11002ae3d3bb260057395b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 833s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmocbc-usermanual.adoc [ 833s] Traceback (most recent call last): [ 833s] File "/usr/bin/a2x", line 33, in [ 833s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 833s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 833s] for entry_point in distribution(dist_name).entry_points [ 833s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 833s] return Distribution.from_name(distribution_name) [ 833s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 833s] raise PackageNotFoundError(name) [ 833s] importlib.metadata.PackageNotFoundError: asciidoc [ 833s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmocbc-usermanual.pdf] Error 1 [ 833s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 833s] make[3]: *** [Makefile:381: all-recursive] Error 1 [ 833s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 833s] make[2]: *** [Makefile:421: all-recursive] Error 1 [ 833s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 833s] make[1]: *** [Makefile:368: all] Error 2 [ 833s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 833s] dh_auto_build: error: make -j1 returned exit code 2 [ 834s] make: *** [debian/rules:45: build] Error 25 [ 834s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 834s] ### VM INTERACTION START ### [ 835s] Powering off. [ 835s] [ 785.343555] reboot: Power down [ 835s] ### VM INTERACTION END ### [ 835s] [ 835s] lamb26 failed "build osmo-cbc_0.2.2.dsc" at Sat Oct 30 21:47:27 UTC 2021. [ 835s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:50:43 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:50:43 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcu in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dbe37516b8_11002ae3d3bb2600574428@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcu/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-pcu failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-pcu Last lines of build log: [ 1033s] # in /usr/share/osmo-gsm-manuals. [ 1033s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 1033s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmopcu-usermanual.adoc [ 1033s] Traceback (most recent call last): [ 1033s] File "/usr/bin/a2x", line 33, in [ 1033s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 1033s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 1033s] for entry_point in distribution(dist_name).entry_points [ 1033s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 1033s] return Distribution.from_name(distribution_name) [ 1033s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 1033s] raise PackageNotFoundError(name) [ 1033s] importlib.metadata.PackageNotFoundError: asciidoc [ 1033s] make[3]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmopcu-usermanual.pdf] Error 1 [ 1033s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 1033s] make[2]: *** [Makefile:384: all-recursive] Error 1 [ 1033s] make[2]: Leaving directory '/usr/src/packages/BUILD/doc' [ 1033s] make[1]: *** [Makefile:420: all-recursive] Error 1 [ 1033s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 1033s] dh_auto_build: error: make -j1 returned exit code 2 [ 1033s] make: *** [debian/rules:12: build] Error 25 [ 1033s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 1033s] ### VM INTERACTION START ### [ 1035s] Powering off. [ 1035s] [ 993.770842] reboot: Power down [ 1035s] ### VM INTERACTION END ### [ 1035s] [ 1035s] old-atreju5 failed "build osmo-pcu_0.9.1.dsc" at Sat Oct 30 21:50:42 UTC 2021. [ 1035s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:51:51 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:51:51 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dbe911f5fe_11002ae3d3bb26005747f1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 249s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmobsc-usermanual.adoc [ 249s] Traceback (most recent call last): [ 249s] File "/usr/bin/a2x", line 33, in [ 249s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 249s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 249s] for entry_point in distribution(dist_name).entry_points [ 249s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 249s] return Distribution.from_name(distribution_name) [ 249s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 249s] raise PackageNotFoundError(name) [ 249s] importlib.metadata.PackageNotFoundError: asciidoc [ 249s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmobsc-usermanual.pdf] Error 1 [ 249s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 249s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 249s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 249s] make[2]: *** [Makefile:456: all-recursive] Error 1 [ 249s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 249s] make[1]: *** [Makefile:388: all] Error 2 [ 249s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 249s] dh_auto_build: error: make -j1 returned exit code 2 [ 249s] make: *** [debian/rules:45: build] Error 25 [ 249s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 249s] ### VM INTERACTION START ### [ 250s] Powering off. [ 250s] [ 239.328327] reboot: Power down [ 250s] ### VM INTERACTION END ### [ 250s] [ 250s] goat15 failed "build osmo-bsc_1.7.2.dsc" at Sat Oct 30 21:51:35 UTC 2021. [ 250s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:55:33 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:55:33 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dbf6487ab7_11002ae3d3bb2600575698@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 736s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmohnbgw-usermanual.adoc [ 736s] Traceback (most recent call last): [ 736s] File "/usr/bin/a2x", line 33, in [ 736s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 736s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 736s] for entry_point in distribution(dist_name).entry_points [ 736s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 736s] return Distribution.from_name(distribution_name) [ 736s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 736s] raise PackageNotFoundError(name) [ 736s] importlib.metadata.PackageNotFoundError: asciidoc [ 736s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmohnbgw-usermanual.pdf] Error 1 [ 736s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 736s] make[3]: *** [Makefile:383: all-recursive] Error 1 [ 736s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 736s] make[2]: *** [Makefile:469: all-recursive] Error 1 [ 736s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 736s] make[1]: *** [Makefile:391: all] Error 2 [ 736s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 736s] dh_auto_build: error: make -j1 returned exit code 2 [ 736s] make: *** [debian/rules:9: build] Error 25 [ 736s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 736s] ### VM INTERACTION START ### [ 737s] Powering off. [ 737s] [ 716.763157] reboot: Power down [ 737s] ### VM INTERACTION END ### [ 737s] [ 737s] lamb09 failed "build osmo-iuh_1.0.0.dsc" at Sat Oct 30 21:55:28 UTC 2021. [ 737s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 21:59:14 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 21:59:14 +0000 Subject: Build failure of network:osmocom:latest/osmo-smlc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dc035bc03d_11002ae3d3bb26005762bd@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-smlc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-smlc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-smlc Last lines of build log: [ 933s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmosmlc-usermanual.adoc [ 933s] Traceback (most recent call last): [ 933s] File "/usr/bin/a2x", line 33, in [ 933s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 933s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 933s] for entry_point in distribution(dist_name).entry_points [ 933s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 933s] return Distribution.from_name(distribution_name) [ 933s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 933s] raise PackageNotFoundError(name) [ 933s] importlib.metadata.PackageNotFoundError: asciidoc [ 933s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmosmlc-usermanual.pdf] Error 1 [ 933s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 933s] make[3]: *** [Makefile:376: all-recursive] Error 1 [ 933s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 933s] make[2]: *** [Makefile:445: all-recursive] Error 1 [ 933s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 933s] make[1]: *** [Makefile:377: all] Error 2 [ 933s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 933s] dh_auto_build: error: make -j1 returned exit code 2 [ 933s] make: *** [debian/rules:45: build] Error 25 [ 933s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 933s] ### VM INTERACTION START ### [ 934s] Powering off. [ 934s] [ 890.470553] reboot: Power down [ 935s] ### VM INTERACTION END ### [ 935s] [ 935s] lamb01 failed "build osmo-smlc_0.2.0.dsc" at Sat Oct 30 21:58:57 UTC 2021. [ 935s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 22:00:05 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 22:00:05 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dc06fbd961_11002ae3d3bb26005767a3@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 252s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmomsc-usermanual.adoc [ 252s] Traceback (most recent call last): [ 252s] File "/usr/bin/a2x", line 33, in [ 252s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 252s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 252s] for entry_point in distribution(dist_name).entry_points [ 252s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 252s] return Distribution.from_name(distribution_name) [ 252s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 252s] raise PackageNotFoundError(name) [ 252s] importlib.metadata.PackageNotFoundError: asciidoc [ 252s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmomsc-usermanual.pdf] Error 1 [ 252s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 252s] make[3]: *** [Makefile:402: all-recursive] Error 1 [ 252s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 252s] make[2]: *** [Makefile:470: all-recursive] Error 1 [ 252s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 252s] make[1]: *** [Makefile:402: all] Error 2 [ 252s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 252s] dh_auto_build: error: make -j1 returned exit code 2 [ 252s] make: *** [debian/rules:45: build] Error 25 [ 252s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 252s] ### VM INTERACTION START ### [ 253s] Powering off. [ 253s] [ 241.708350] reboot: Power down [ 253s] ### VM INTERACTION END ### [ 253s] [ 253s] goat07 failed "build osmo-msc_1.7.1.dsc" at Sat Oct 30 21:59:57 UTC 2021. [ 253s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sat Oct 30 22:07:10 2021 From: noreply at opensuse.org (OBS Notification) Date: Sat, 30 Oct 2021 22:07:10 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617dc21473395_11002ae3d3bb2600578681@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 657s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmosgsn-usermanual.adoc [ 657s] Traceback (most recent call last): [ 657s] File "/usr/bin/a2x", line 33, in [ 657s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 657s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 657s] for entry_point in distribution(dist_name).entry_points [ 657s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 657s] return Distribution.from_name(distribution_name) [ 657s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 657s] raise PackageNotFoundError(name) [ 657s] importlib.metadata.PackageNotFoundError: asciidoc [ 657s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmosgsn-usermanual.pdf] Error 1 [ 657s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 657s] make[3]: *** [Makefile:393: all-recursive] Error 1 [ 657s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 657s] make[2]: *** [Makefile:462: all-recursive] Error 1 [ 657s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 657s] make[1]: *** [Makefile:394: all] Error 2 [ 657s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 657s] dh_auto_build: error: make -j1 returned exit code 2 [ 657s] make: *** [debian/rules:45: build] Error 25 [ 657s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 657s] ### VM INTERACTION START ### [ 658s] Powering off. [ 658s] [ 636.618794] reboot: Power down [ 658s] ### VM INTERACTION END ### [ 658s] [ 658s] lamb04 failed "build osmo-sgsn_1.7.1.dsc" at Sat Oct 30 22:06:55 UTC 2021. [ 658s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 00:41:41 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 00:41:41 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617de64b12600_11002ae3d3bb26006205cf@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 412s] # in ... [ 412s] TEXINPUTS=".." \ [ 412s] a2x -vv -L --asciidoc-opts="-f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/tests' -a commondir='../common'" --dblatex-opts="-s ../build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" test-usermanual.adoc [ 412s] Traceback (most recent call last): [ 412s] File "/usr/bin/a2x", line 33, in [ 412s] sys.exit(load_entry_point('asciidoc==10.0.1', 'console_scripts', 'a2x')()) [ 412s] File "/usr/bin/a2x", line 22, in importlib_load_entry_point [ 412s] for entry_point in distribution(dist_name).entry_points [ 412s] File "/usr/lib/python3.9/importlib/metadata.py", line 524, in distribution [ 412s] return Distribution.from_name(distribution_name) [ 412s] File "/usr/lib/python3.9/importlib/metadata.py", line 187, in from_name [ 412s] raise PackageNotFoundError(name) [ 412s] importlib.metadata.PackageNotFoundError: asciidoc [ 412s] make[3]: *** [../build/Makefile.asciidoc.inc:70: test-usermanual.pdf] Error 1 [ 412s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 412s] make[2]: *** [Makefile:439: all-recursive] Error 1 [ 412s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 412s] make[1]: *** [Makefile:363: all] Error 2 [ 412s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 412s] dh_auto_build: error: make -j1 returned exit code 2 [ 412s] make: *** [debian/rules:5: binary] Error 25 [ 412s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 412s] ### VM INTERACTION START ### [ 413s] Powering off. [ 413s] [ 386.166663] reboot: Power down [ 413s] ### VM INTERACTION END ### [ 413s] [ 413s] cloud123 failed "build osmo-gsm-manuals-dev_1.1.0.17.b92c.202110310026.dsc" at Sun Oct 31 00:41:33 UTC 2021. [ 413s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 00:43:57 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 00:43:57 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.2/x86_64 In-Reply-To: References: Message-ID: <617de6e666502_11002ae3d3bb2600620722@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.2/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.2/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 175s] intention of the Shared Library Policy is to allow parallel installation of [ 175s] multiple versions of the same shared library, hard dependencies likely make [ 175s] that impossible. Please remove this dependency and instead move it to the [ 175s] runtime uses of your library. [ 175s] [ 175s] osmo-iuh.x86_64: W: suse-missing-rclink osmo-hnbgw [ 175s] The package contains an init script or systemd service file but lacks the [ 175s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 175s] [ 175s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 175s] libosmo-rua0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 175s] This package contains a library and provides no %post scriptlet containing a [ 175s] call to ldconfig. [ 175s] [ 175s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 175s] libosmo-rua0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 175s] This package contains a library and provides no %postun scriptlet containing a [ 175s] call to ldconfig. [ 175s] [ 175s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 175s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 175s] [ 175s] ### VM INTERACTION START ### [ 178s] [ 170.334044] sysrq: Power Off [ 178s] [ 170.337370] reboot: Power down [ 178s] ### VM INTERACTION END ### [ 178s] [ 178s] goat03 failed "build osmo-iuh.spec" at Sun Oct 31 00:43:54 UTC 2021. [ 178s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 00:48:29 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 00:48:29 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1/x86_64 In-Reply-To: References: Message-ID: <617de7eebb017_11002ae3d3bb2600621259@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1/x86_64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 162s] intention of the Shared Library Policy is to allow parallel installation of [ 162s] multiple versions of the same shared library, hard dependencies likely make [ 162s] that impossible. Please remove this dependency and instead move it to the [ 162s] runtime uses of your library. [ 162s] [ 162s] osmo-iuh.x86_64: W: suse-missing-rclink osmo-hnbgw [ 162s] The package contains an init script or systemd service file but lacks the [ 162s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 162s] [ 162s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 162s] libosmo-rua0.x86_64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 162s] This package contains a library and provides no %post scriptlet containing a [ 162s] call to ldconfig. [ 162s] [ 162s] libosmo-hnbap0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 162s] libosmo-rua0.x86_64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 162s] This package contains a library and provides no %postun scriptlet containing a [ 162s] call to ldconfig. [ 162s] [ 162s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 162s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 162s] [ 162s] ### VM INTERACTION START ### [ 165s] [ 160.339254] sysrq: SysRq : Power Off [ 165s] [ 160.348491] reboot: Power down [ 166s] ### VM INTERACTION END ### [ 166s] [ 166s] goat15 failed "build osmo-iuh.spec" at Sun Oct 31 00:48:15 UTC 2021. [ 166s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 00:55:00 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 00:55:00 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1_ARM/aarch64 In-Reply-To: References: Message-ID: <617de9783b3b7_11002ae3d3bb260062151e@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1_ARM/aarch64 Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 344s] intention of the Shared Library Policy is to allow parallel installation of [ 344s] multiple versions of the same shared library, hard dependencies likely make [ 344s] that impossible. Please remove this dependency and instead move it to the [ 344s] runtime uses of your library. [ 344s] [ 344s] osmo-iuh.aarch64: W: suse-missing-rclink osmo-hnbgw [ 344s] The package contains an init script or systemd service file but lacks the [ 344s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 344s] [ 344s] libosmo-hnbap0.aarch64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 344s] libosmo-rua0.aarch64: E: library-without-ldconfig-postin (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 344s] This package contains a library and provides no %post scriptlet containing a [ 344s] call to ldconfig. [ 344s] [ 344s] libosmo-hnbap0.aarch64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-hnbap.so.0.0.0 [ 344s] libosmo-rua0.aarch64: E: library-without-ldconfig-postun (Badness: 300) /usr/lib64/libosmo-rua.so.0.0.0 [ 344s] This package contains a library and provides no %postun scriptlet containing a [ 344s] call to ldconfig. [ 344s] [ 344s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 344s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 344s] [ 344s] ### VM INTERACTION START ### [ 348s] [ 333.448658] sysrq: SysRq : Power Off [ 348s] [ 333.509811] reboot: Power down [ 348s] ### VM INTERACTION END ### [ 348s] [ 348s] obs-arm-9 failed "build osmo-iuh.spec" at Sun Oct 31 00:54:54 UTC 2021. [ 348s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 01:07:11 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 01:07:11 +0000 Subject: Build failure of network:osmocom:nightly/osmo-iuh in openSUSE_Leap_15.1_ARM/armv7l In-Reply-To: References: Message-ID: <617dec46cd0f5_11002ae3d3bb26006234f8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-iuh/openSUSE_Leap_15.1_ARM/armv7l Package network:osmocom:nightly/osmo-iuh failed to build in openSUSE_Leap_15.1_ARM/armv7l Check out the package for editing: osc checkout network:osmocom:nightly osmo-iuh Last lines of build log: [ 1182s] intention of the Shared Library Policy is to allow parallel installation of [ 1182s] multiple versions of the same shared library, hard dependencies likely make [ 1182s] that impossible. Please remove this dependency and instead move it to the [ 1182s] runtime uses of your library. [ 1182s] [ 1182s] osmo-iuh.armv7hl: W: suse-missing-rclink osmo-hnbgw [ 1182s] The package contains an init script or systemd service file but lacks the [ 1182s] symlink /usr/sbin/rcFOO -> /usr/sbin/service [ 1182s] [ 1182s] libosmo-hnbap0.armv7hl: E: library-without-ldconfig-postin (Badness: 300) /usr/lib/libosmo-hnbap.so.0.0.0 [ 1182s] libosmo-rua0.armv7hl: E: library-without-ldconfig-postin (Badness: 300) /usr/lib/libosmo-rua.so.0.0.0 [ 1182s] This package contains a library and provides no %post scriptlet containing a [ 1182s] call to ldconfig. [ 1182s] [ 1182s] libosmo-hnbap0.armv7hl: E: library-without-ldconfig-postun (Badness: 300) /usr/lib/libosmo-hnbap.so.0.0.0 [ 1182s] libosmo-rua0.armv7hl: E: library-without-ldconfig-postun (Badness: 300) /usr/lib/libosmo-rua.so.0.0.0 [ 1182s] This package contains a library and provides no %postun scriptlet containing a [ 1182s] call to ldconfig. [ 1182s] [ 1182s] (none): E: badness 1200 exceeds threshold 1000, aborting. [ 1182s] 10 packages and 0 specfiles checked; 4 errors, 21 warnings. [ 1182s] [ 1182s] ### VM INTERACTION START ### [ 1185s] [ 1132.401261] sysrq: SysRq : Power Off [ 1185s] [ 1132.451405] reboot: Power down [ 1186s] ### VM INTERACTION END ### [ 1186s] [ 1186s] obs-arm-5 failed "build osmo-iuh.spec" at Sun Oct 31 01:07:05 UTC 2021. [ 1186s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:22:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:22:59 +0000 Subject: Change in pysim[master]: cards: use python style commends to describe methods In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/26038 ) Change subject: cards: use python style commends to describe methods ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iae862d8f0a191c7015a94f9516ef5804265f7a82 Gerrit-Change-Number: 26038 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:22:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:23:11 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:23:11 +0000 Subject: Change in pysim[master]: commands: use python style commends to describe methods In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/26039 ) Change subject: commands: use python style commends to describe methods ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iccc9f01769ee9274d01036d3fbbc161d8bca7628 Gerrit-Change-Number: 26039 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:23:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:23:25 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:23:25 +0000 Subject: Change in pysim[master]: cards: add method to modify APDU parameters (cla, sel_ctrl) In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/26040 ) Change subject: cards: add method to modify APDU parameters (cla, sel_ctrl) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ifd8aa2660e44a18d28945d070419612eff443e78 Gerrit-Change-Number: 26040 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:23:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:24:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:24:03 +0000 Subject: Change in pysim[master]: filesystem: fix reset mechanism In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/26041 ) Change subject: filesystem: fix reset mechanism ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0e9d2a62a42a7387e7ca69d2ae830782a61aed89 Gerrit-Change-Number: 26041 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:24:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:24:06 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:24:06 +0000 Subject: Change in pysim[master]: ts_51_011: implement CardProfileSIM as a class In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/26042 ) Change subject: ts_51_011: implement CardProfileSIM as a class ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I37d49b11a07ce5a80d1a703fab4620b7d1ecb25b Gerrit-Change-Number: 26042 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:24:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:27:14 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:27:14 +0000 Subject: Change in pysim[master]: pySim-shell: add method to probe for UICC In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/26043 ) Change subject: pySim-shell: add method to probe for UICC ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/pysim/+/26043/1/pySim-shell.py File pySim-shell.py: https://gerrit.osmocom.org/c/pysim/+/26043/1/pySim-shell.py at 87 PS1, Line 87: card_is_uicc = probe_card(card, ['UICC']) why does the 'UICC' get passed in a list? Also, why not simply have probe_card() return a list of card models/profiles? This way we would have something like: probe_result = probe_card(card) if 'SIM' in probe_result: ... if 'USIM' in probe_result: ... Furthermore, I think the entire 'card' model needs a more fundamental reform. It made sense for pySim-prog supporting only a few very specific models of programmable cards. But it makes no sense at all for pysim-shell. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I535bef35847140e611d4fa95ed2859ee81cce605 Gerrit-Change-Number: 26043 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:27:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:27:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:27:18 +0000 Subject: Change in pysim[master]: cards: use python style commends to describe methods In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/26038 ) Change subject: cards: use python style commends to describe methods ...................................................................... cards: use python style commends to describe methods Change-Id: Iae862d8f0a191c7015a94f9516ef5804265f7a82 --- M pySim/cards.py 1 file changed, 7 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/cards.py b/pySim/cards.py index 95352ff..1a86b14 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -74,9 +74,7 @@ return True def verify_adm(self, key): - ''' - Authenticate with ADM key - ''' + """Authenticate with ADM key""" (res, sw) = self._scc.verify_chv(self._adm_chv_num, key) return sw @@ -135,10 +133,7 @@ return (None, sw) def update_oplmn_act(self, mcc, mnc, access_tech='FFFF'): - """ - See note in update_hplmn_act() - """ - # get size and write EF.OPLMNwAcT + """get size and write EF.OPLMNwAcT, See note in update_hplmn_act()""" data = self._scc.read_binary(EF['OPLMNwAcT'], length=None, offset=0) size = len(data[0]) // 2 hplmn = enc_plmn(mcc, mnc) @@ -154,10 +149,7 @@ return (None, sw) def update_plmn_act(self, mcc, mnc, access_tech='FFFF'): - """ - See note in update_hplmn_act() - """ - # get size and write EF.PLMNwAcT + """get size and write EF.PLMNwAcT, See note in update_hplmn_act()""" data = self._scc.read_binary(EF['PLMNwAcT'], length=None, offset=0) size = len(data[0]) // 2 hplmn = enc_plmn(mcc, mnc) @@ -265,8 +257,8 @@ else: return (None, sw) - # Fetch all the AIDs present on UICC def read_aids(self): + """Fetch all the AIDs present on UICC""" self._aids = [] try: # Find out how many records the EF.DIR has @@ -282,8 +274,8 @@ self._aids = [] return self._aids - # Select ADF.U/ISIM in the Card using its full AID def select_adf_by_aid(self, adf="usim"): + """Select ADF.U/ISIM in the Card using its full AID""" # Find full AID by partial AID: if is_hex(adf): for aid in self._aids: @@ -300,13 +292,13 @@ return self._scc.select_adf(aid) return (None, None) - # Erase the contents of a file def erase_binary(self, ef): + """Erase the contents of a file""" len = self._scc.binary_size(ef) self._scc.update_binary(ef, "ff" * len, offset=0, verify=True) - # Erase the contents of a single record def erase_record(self, ef, rec_no): + """Erase the contents of a single record""" len = self._scc.record_size(ef) self._scc.update_record(ef, rec_no, "ff" * len, force_len=False, verify=True) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26038 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iae862d8f0a191c7015a94f9516ef5804265f7a82 Gerrit-Change-Number: 26038 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:27:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:27:18 +0000 Subject: Change in pysim[master]: commands: use python style commends to describe methods In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/26039 ) Change subject: commands: use python style commends to describe methods ...................................................................... commands: use python style commends to describe methods Change-Id: Iccc9f01769ee9274d01036d3fbbc161d8bca7628 --- M pySim/commands.py 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/commands.py b/pySim/commands.py index 7d09fa9..805fe61 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -283,9 +283,8 @@ pdu = '80cb000000' return self._tp.send_apdu_checksw(pdu) - # TS 102 221 Section 11.3.1 def retrieve_data(self, ef, tag:int): - """Execute RETRIEVE DATA. + """Execute RETRIEVE DATA, see also TS 102 221 Section 11.3.1. Args ef : string or list of strings indicating name or path of transparent EF -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26039 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iccc9f01769ee9274d01036d3fbbc161d8bca7628 Gerrit-Change-Number: 26039 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:27:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:27:18 +0000 Subject: Change in pysim[master]: cards: add method to modify APDU parameters (cla, sel_ctrl) In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/26040 ) Change subject: cards: add method to modify APDU parameters (cla, sel_ctrl) ...................................................................... cards: add method to modify APDU parameters (cla, sel_ctrl) There are situations where it is necessary to modify the class byte and the selection control bytes of a card at runtime. This should not be done by accessing the properties of the _scc object directly. The modification of those properties should be done via a set method instead. Change-Id: Ifd8aa2660e44a18d28945d070419612eff443e78 --- M pySim/cards.py 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/cards.py b/pySim/cards.py index 1a86b14..4511271 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -302,6 +302,15 @@ len = self._scc.record_size(ef) self._scc.update_record(ef, rec_no, "ff" * len, force_len=False, verify=True) + def set_apdu_parameter(self, cla, sel_ctrl): + """Set apdu parameters (class byte and selection control bytes)""" + self._scc.cla_byte = cla + self._scc.sel_ctrl = sel_ctrl + + def get_apdu_parameter(self): + """Get apdu parameters (class byte and selection control bytes)""" + return (self._scc.cla_byte, self._scc.sel_ctrl) + class UsimCard(SimCard): name = 'USIM' -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26040 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ifd8aa2660e44a18d28945d070419612eff443e78 Gerrit-Change-Number: 26040 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:27:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:27:18 +0000 Subject: Change in pysim[master]: filesystem: fix reset mechanism In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/26041 ) Change subject: filesystem: fix reset mechanism ...................................................................... filesystem: fix reset mechanism Currently we call the reset_card and get_atr methods directly at the transport layer via the private _scc and _tp object of the card. This is a violation. Fix and use the reset methods that are already in the SimCard object. Change-Id: I0e9d2a62a42a7387e7ca69d2ae830782a61aed89 --- M pySim/cards.py M pySim/filesystem.py 2 files changed, 6 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/cards.py b/pySim/cards.py index 4511271..8f5004e 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -60,7 +60,11 @@ self._aids = [] def reset(self): - self._scc.reset_card() + rc = self._scc.reset_card() + if rc is 1: + return self._scc.get_atr() + else: + return None def erase(self): print("warning: erasing is not supported for specified card type!") diff --git a/pySim/filesystem.py b/pySim/filesystem.py index cc9176f..dcc2608 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -1068,8 +1068,7 @@ Args: cmd_app : Command Application State (for unregistering old file commands) """ - self.card._scc._tp.reset_card() - atr = i2h(self.card._scc._tp.get_atr()) + atr = i2h(self.card.reset()) # select MF to reset internal state and to verify card really works self.select('MF', cmd_app) return atr -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26041 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I0e9d2a62a42a7387e7ca69d2ae830782a61aed89 Gerrit-Change-Number: 26041 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:27:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:27:19 +0000 Subject: Change in pysim[master]: ts_51_011: implement CardProfileSIM as a class In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/26042 ) Change subject: ts_51_011: implement CardProfileSIM as a class ...................................................................... ts_51_011: implement CardProfileSIM as a class CardProfileSIM is currenty instantiated directly. However, it should be implemented as class and then instaniated later like CardProfileUICC Change-Id: I37d49b11a07ce5a80d1a703fab4620b7d1ecb25b --- M pySim/ts_51_011.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/ts_51_011.py b/pySim/ts_51_011.py index 3492a8d..743c14b 100644 --- a/pySim/ts_51_011.py +++ b/pySim/ts_51_011.py @@ -980,4 +980,6 @@ return ret -CardProfileSIM = CardProfile('SIM', desc='GSM SIM Card', files_in_mf=[DF_TELECOM(), DF_GSM()]) +class CardProfileSIM(CardProfile): + def __init__(self): + super().__init__('SIM', desc='GSM SIM Card', files_in_mf=[DF_TELECOM(), DF_GSM()]) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/26042 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I37d49b11a07ce5a80d1a703fab4620b7d1ecb25b Gerrit-Change-Number: 26042 Gerrit-PatchSet: 1 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:27:39 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:27:39 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: Fix crash when configuring an existing ns bind In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/26033 ) Change subject: gprs_bssgp_pcu: Fix crash when configuring an existing ns bind ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/26033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I103e82e6c64324c087a4ff325a83eeab0e5a4ee9 Gerrit-Change-Number: 26033 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 31 Oct 2021 07:27:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:27:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:27:41 +0000 Subject: Change in osmo-pcu[master]: gprs_bssgp_pcu: Fix crash when configuring an existing ns bind In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/26033 ) Change subject: gprs_bssgp_pcu: Fix crash when configuring an existing ns bind ...................................................................... gprs_bssgp_pcu: Fix crash when configuring an existing ns bind ns_configure_nse() only sets bind when it doesn't exist yet. If it already exists bind[i] stays NULL and causes a segfault in gprs_ns2_is_ip_bind() later on. This patch ensures bind[i] is either created of set to the existing bind. Change-Id: I103e82e6c64324c087a4ff325a83eeab0e5a4ee9 Related: SYS#4971 --- M src/gprs_bssgp_pcu.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gprs_bssgp_pcu.c b/src/gprs_bssgp_pcu.c index 1fcacdb..0dd6cdc 100644 --- a/src/gprs_bssgp_pcu.c +++ b/src/gprs_bssgp_pcu.c @@ -1118,7 +1118,8 @@ if (!(valid & (1 << i))) continue; - if (!gprs_ns2_ip_bind_by_sockaddr(the_pcu->nsi, &local[i])) { + bind[i] = gprs_ns2_ip_bind_by_sockaddr(the_pcu->nsi, &local[i]); + if (!bind[i]) { snprintf(name, sizeof(name), "pcu%u", i); rc = gprs_ns2_ip_bind(the_pcu->nsi, name, &local[i], 0, &bind[i]); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/26033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I103e82e6c64324c087a4ff325a83eeab0e5a4ee9 Gerrit-Change-Number: 26033 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:28:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:28:36 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: add TC_meas_res_speech_{tchf, tchh}_sapi3() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25968 ) Change subject: BTS_Tests: add TC_meas_res_speech_{tchf,tchh}_sapi3() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7d17d6e5f413f2de78db944f23ad731b81ad24cf Gerrit-Change-Number: 25968 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 31 Oct 2021 07:28:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:28:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:28:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: add TC_meas_res_speech_{tchf, tchh}_sapi3() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25968 ) Change subject: BTS_Tests: add TC_meas_res_speech_{tchf,tchh}_sapi3() ...................................................................... BTS_Tests: add TC_meas_res_speech_{tchf,tchh}_sapi3() The idea behind these test cases is to make sure that osmo-bts does send RSL MEASurement RESult messages regardless of what was received on SACCH: RR Measurement Report or SAPI=3 data. Change-Id: I7d17d6e5f413f2de78db944f23ad731b81ad24cf --- M bts/BTS_Tests.ttcn 1 file changed, 82 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 03519d9..d7419a9 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -3310,6 +3310,86 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +/* Make sure that we always get RSL MEASurement RESult messages regardless + * of what is sent on SACCH: (RR) Measurement Report or SAPI=3 data (SMS). */ +private function f_TC_meas_res_sapi3(charstring id) runs on ConnHdlr { + timer Texec := 8.0; + timer Timpf := 2.0; + timer Tmr; + + f_l1_tune(L1CTL); + RSL.clear; + + f_est_dchan(); + L1CTL.clear; + + /* Establish the main SAPI=0 link on DCCH first */ + f_tx_lapdm(ts_LAPDm_SABM(0, cr_MO_CMD, true, ''O), ts_RslLinkID_DCCH(0)); + + /* Give more time for the first RSL MEASurement RESult */ + Tmr.start(0.480 * 2.0); + Texec.start; /* EXECution timer */ + Timpf.start; /* IMPFung timer */ + + alt { + /* We expect RSL MEASurement RESult messages every ~480ms (plus some guard) */ + [] RSL.receive(tr_RSL_MEAS_RES(g_pars.chan_nr)) { + /* Reschedule the MEAS RES timer */ + Tmr.start(0.480 + 0.120); + repeat; + } + [] RSL.receive { repeat; } + [] Tmr.timeout { + setverdict(fail, "Timeout waiting for RSL MEAS RES"); + } + /* Inject some SAPI=3 traffic on SACCH every 2 seconds */ + [] Timpf.timeout { + f_tx_lapdm(ts_LAPDm_SABM(3, cr_MO_CMD, true, ''O), ts_RslLinkID_SACCH(3)); + log("Injected SAPI=3 traffic on SACCH"); + Timpf.start; + repeat; + } + /* We're good if survived so far */ + [] Texec.timeout { + setverdict(pass); + } + } + + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(0, g_chan_nr); +} +testcase TC_meas_res_speech_tchf_sapi3() runs on test_CT { + var template RSL_IE_ChannelMode ch_mode; + var template ConnHdlrPars pars; + var ConnHdlr vc_conn; + + f_init(); + + ch_mode := ts_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM1); + pars := t_Pars(t_RslChanNr_Bm(1), ch_mode); + + vc_conn := f_start_handler(refers(f_TC_meas_res_sapi3), valueof(pars)); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} +testcase TC_meas_res_speech_tchh_sapi3() runs on test_CT { + var template RSL_IE_ChannelMode ch_mode; + var template ConnHdlrPars pars; + var ConnHdlr vc_conn; + + f_init(); + + ch_mode := ts_RSL_ChanMode(RSL_CHRT_TCH_H, RSL_CMOD_SP_GSM1); + pars := t_Pars(t_RslChanNr_Lm(5, 0), ch_mode); + + vc_conn := f_start_handler(refers(f_TC_meas_res_sapi3), valueof(pars)); + vc_conn.done; + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} + /* establish DChan, and send MS POWER CONTROL messages via RSL, verify that * the BTS is forwarding those values to the MS via the SACCH L1 header. */ private function f_tc_rsl_ms_pwr_ctrl(charstring id) runs on ConnHdlr { @@ -7890,6 +7970,8 @@ execute( TC_meas_res_sign_sdcch4() ); execute( TC_meas_res_sign_sdcch8() ); execute( TC_meas_res_sign_tchh_toa256() ); + execute( TC_meas_res_speech_tchf_sapi3() ); + execute( TC_meas_res_speech_tchh_sapi3() ); execute( TC_tx_power_start_ramp_up_bcch() ); execute( TC_tx_power_start_ramp_down_bcch() ); execute( TC_tx_power_ramp_adm_state_change() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I7d17d6e5f413f2de78db944f23ad731b81ad24cf Gerrit-Change-Number: 25968 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:29:00 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:29:00 +0000 Subject: Change in osmo-msc[master]: smpp_smsc: use osmo_talloc_replace_string() in smpp_smsc_conf() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25930 ) Change subject: smpp_smsc: use osmo_talloc_replace_string() in smpp_smsc_conf() ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie3dc0d9673a0410a5908cba77fc352d581bac6f6 Gerrit-Change-Number: 25930 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 31 Oct 2021 07:29:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:29:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:29:17 +0000 Subject: Change in osmo-msc[master]: smpp_smsc: use osmo_talloc_replace_string() in smpp_smsc_conf() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/25930 ) Change subject: smpp_smsc: use osmo_talloc_replace_string() in smpp_smsc_conf() ...................................................................... smpp_smsc: use osmo_talloc_replace_string() in smpp_smsc_conf() Change-Id: Ie3dc0d9673a0410a5908cba77fc352d581bac6f6 Fixes: CID#240711 --- M src/libmsc/smpp_smsc.c 1 file changed, 1 insertion(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/libmsc/smpp_smsc.c b/src/libmsc/smpp_smsc.c index a5c6165..4581865 100644 --- a/src/libmsc/smpp_smsc.c +++ b/src/libmsc/smpp_smsc.c @@ -987,14 +987,8 @@ /* Avoid use-after-free if bind_addr == smsc->bind_addr */ if (smsc->bind_addr == bind_addr) return 0; + osmo_talloc_replace_string(smsc, &smsc->bind_addr, bind_addr); - talloc_free((void*)smsc->bind_addr); - smsc->bind_addr = NULL; - if (bind_addr) { - smsc->bind_addr = bind_addr ? talloc_strdup(smsc, bind_addr) : NULL; - if (!smsc->bind_addr) - return -ENOMEM; - } return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/25930 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie3dc0d9673a0410a5908cba77fc352d581bac6f6 Gerrit-Change-Number: 25930 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:30:37 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:30:37 +0000 Subject: Change in osmo-hnodeb[master]: Import hnb-test from osmo-iuh.git In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25995 ) Change subject: Import hnb-test from osmo-iuh.git ...................................................................... Patch Set 3: > Patch Set 3: > > linter doesn't apply here, I'm simply importing code from somewhere else. Most patches here are moving code around, so I'll skip linter in general to avoid messing the patches. ACK, but we also have actual build failures to resolve. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I36fd4aa5d39222371bd36e9f540b91e36a26de43 Gerrit-Change-Number: 25995 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:30:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:33:34 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:33:34 +0000 Subject: Change in simtrace2[master]: firmware: add bootloader update "app" In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26026 ) Change subject: firmware: add bootloader update "app" ...................................................................... Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/simtrace2/+/26026/3/firmware/Makefile File firmware/Makefile: https://gerrit.osmocom.org/c/simtrace2/+/26026/3/firmware/Makefile at 248 PS3, Line 248: EXTRA_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(EXTRA_OBJECTS)) tbh, I'm not following exactly what you are doing here in detail without further analysis, but it looks to me like some makefile refactoring patch should come before this patch adding the blupdate? -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26026 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I53dea57bba790a2ab3245d9483e0ff1c8d19d5e3 Gerrit-Change-Number: 26026 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Sun, 31 Oct 2021 07:33:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:34:28 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:34:28 +0000 Subject: Change in simtrace2[master]: firmware: remove usb pullup that dates back to simtrace1 In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26027 ) Change subject: firmware: remove usb pullup that dates back to simtrace1 ...................................................................... Patch Set 3: Code-Review+1 there originally was some plan to support SIMtrace1 (SAM7S) also from this new hardware, but given that the SIMtrace1 hardware hasn't been sold for ages, it is probably worth getting rid of some cruft. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26027 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I04a703a2eba6ff1dc64692c089213389d0c1066d Gerrit-Change-Number: 26027 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:34:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:35:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:35:01 +0000 Subject: Change in simtrace2[master]: firmware: increase reset delay before usb reattach In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26028 ) Change subject: firmware: increase reset delay before usb reattach ...................................................................... Patch Set 3: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/simtrace2/+/26028/3/firmware/libcommon/source/usb.c File firmware/libcommon/source/usb.c: https://gerrit.osmocom.org/c/simtrace2/+/26028/3/firmware/libcommon/source/usb.c at 693 PS3, Line 693: mdelay(500); are we sure this doesn't make us run into the watchdog? -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26028 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I9b8c8bf794ad5b94fc7ea2a01d1ebf4e36862c36 Gerrit-Change-Number: 26028 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:35:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:35:30 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:35:30 +0000 Subject: Change in simtrace2[master]: firmware: drop cref printing In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26029 ) Change subject: firmware: drop cref printing ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26029 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: Ie2281e207164f82d8ee29bd596a5593c22aaf198 Gerrit-Change-Number: 26029 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:35:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:35:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:35:52 +0000 Subject: Change in simtrace2[master]: add our default clang-format file In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/26030 ) Change subject: add our default clang-format file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/26030 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I77aab70400bdbb46cbdd83e428e2a28ebf29b8dd Gerrit-Change-Number: 26030 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:35:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:37:24 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:37:24 +0000 Subject: Change in osmo-hnodeb[master]: Import hnb-test from osmo-iuh.git In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/25995 ) Change subject: Import hnb-test from osmo-iuh.git ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/25995 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I36fd4aa5d39222371bd36e9f540b91e36a26de43 Gerrit-Change-Number: 25995 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:37:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:38:23 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:38:23 +0000 Subject: Change in osmo-hnodeb[master]: Move protocol related code in main.c to related proto files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26002 ) Change subject: Move protocol related code in main.c to related proto files ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I771b3d3f61207137477eed2b316a5f670fb79ef2 Gerrit-Change-Number: 26002 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:38:23 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:38:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:38:47 +0000 Subject: Change in osmo-hnodeb[master]: More work on main.c to add osmocom functionalitites In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013 ) Change subject: More work on main.c to add osmocom functionalitites ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I61a5ee2e100f79cef7e42dbd981e308597c30900 Gerrit-Change-Number: 26013 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-CC: fixeria Gerrit-Comment-Date: Sun, 31 Oct 2021 07:38:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:39:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:39:47 +0000 Subject: Change in osmo-hnodeb[master]: Set up Iuh conn params through VTY In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26014 ) Change subject: Set up Iuh conn params through VTY ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Id5a17742643e8f02c22228e3055bcc213423a416 Gerrit-Change-Number: 26014 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:39:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:40:03 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:40:03 +0000 Subject: Change in osmo-hnodeb[master]: Drop unused fields in struct hnb In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 ) Change subject: Drop unused fields in struct hnb ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ia981d99bf521eb8b79bdf8d7f81ca50f6cdeba8c Gerrit-Change-Number: 26015 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:40:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:40:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:40:49 +0000 Subject: Change in osmo-hnodeb[master]: Use osmocom logging in non-main files In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017 ) Change subject: Use osmocom logging in non-main files ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I649b17803aeffd20354aa76dde61094959f08e43 Gerrit-Change-Number: 26017 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:40:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:41:57 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:41:57 +0000 Subject: Change in osmo-hnodeb[master]: Configure CI, LAC, RAC, SAC over VTY and use it in HnbRegisterRequest In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021 ) Change subject: Configure CI,LAC,RAC,SAC over VTY and use it in HnbRegisterRequest ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I06f21758e361b7d4d7141086d758893bee434e5c Gerrit-Change-Number: 26021 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:41:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:42:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:42:18 +0000 Subject: Change in osmo-hnodeb[master]: Generate proper rnc_id and plmn in LuRequest In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26023 ) Change subject: Generate proper rnc_id and plmn in LuRequest ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ib40b5eb96b7cc13c424076a4ca725019514d52af Gerrit-Change-Number: 26023 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:42:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:42:29 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:42:29 +0000 Subject: Change in osmo-hnodeb[master]: hnb.c: Fix memleak in hnb_iuh_read_cb In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26032 ) Change subject: hnb.c: Fix memleak in hnb_iuh_read_cb ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26032 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: If5d5d41693e26f485aa5372129dccf0dcfb7fa6c Gerrit-Change-Number: 26032 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:42:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:42:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:42:45 +0000 Subject: Change in osmo-hnodeb[master]: ranap: Fix compiler warnings passing func callback In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26034 ) Change subject: ranap: Fix compiler warnings passing func callback ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: If80b57a8d36c28dee7db28cb36a88ed41e0a7328 Gerrit-Change-Number: 26034 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:42:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:42:53 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:42:53 +0000 Subject: Change in osmo-hnodeb[master]: configure: link against libsctp In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26035 ) Change subject: configure: link against libsctp ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I793d6fe8601cf9a8dd72bf6884b469204b513c11 Gerrit-Change-Number: 26035 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:42:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:43:36 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:43:36 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25991 ) Change subject: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1bcbe047d233684647d6ffe9febb14a12c579696 Gerrit-Change-Number: 25991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 31 Oct 2021 07:43:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:43:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:43:41 +0000 Subject: Change in osmo-iuh[master]: rua: Use asn1c flag -fcompound-names to avoid name collisions with ot... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25992 ) Change subject: rua: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Id4e337cdc82c26922b7ca7f0fe8af523e9a0945c Gerrit-Change-Number: 25992 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 31 Oct 2021 07:43:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:43:45 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:43:45 +0000 Subject: Change in osmo-iuh[master]: sabp: Use asn1c flag -fcompound-names to avoid name collisions with o... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25993 ) Change subject: sabp: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I10ce4a9414768cdcf850feeca4088296e339919f Gerrit-Change-Number: 25993 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 31 Oct 2021 07:43:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:43:48 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:43:48 +0000 Subject: Change in osmo-iuh[master]: ranap: Use asn1c flag -fcompound-names to avoid name collisions with ... In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25994 ) Change subject: ranap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iba106dcc18e3d429b4b9808610a44ac29b798172 Gerrit-Change-Number: 25994 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 31 Oct 2021 07:43:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:43:51 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:43:51 +0000 Subject: Change in osmo-iuh[master]: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with ... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25991 ) Change subject: hnbap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... hnbap: Use asn1c flag -fcompound-names to avoid name collisions with other libs Change-Id: I1bcbe047d233684647d6ffe9febb14a12c579696 --- M include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h M include/osmocom/hnbap/HNBAP_AccessResult.h M include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h M include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h M include/osmocom/hnbap/HNBAP_BackoffTimer.h M include/osmocom/hnbap/HNBAP_BindingID.h M include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h M include/osmocom/hnbap/HNBAP_CGI.h M include/osmocom/hnbap/HNBAP_CI.h M include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h M include/osmocom/hnbap/HNBAP_CSG-Capability.h M include/osmocom/hnbap/HNBAP_CSG-ID.h M include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h M include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h M include/osmocom/hnbap/HNBAP_Cause.h M include/osmocom/hnbap/HNBAP_CauseMisc.h M include/osmocom/hnbap/HNBAP_CauseProtocol.h M include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h M include/osmocom/hnbap/HNBAP_CauseTransport.h M include/osmocom/hnbap/HNBAP_CellIdentity.h M include/osmocom/hnbap/HNBAP_ConfigurationInformation.h M include/osmocom/hnbap/HNBAP_Context-ID.h M include/osmocom/hnbap/HNBAP_Criticality.h M include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h M include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h M include/osmocom/hnbap/HNBAP_ESN.h M include/osmocom/hnbap/HNBAP_ErrorIndication.h M include/osmocom/hnbap/HNBAP_GTP-TEI.h M include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h M include/osmocom/hnbap/HNBAP_GeographicalLocation.h M include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h M include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h M include/osmocom/hnbap/HNBAP_HNB-GWResponse.h M include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h M include/osmocom/hnbap/HNBAP_HNB-Identity.h M include/osmocom/hnbap/HNBAP_HNB-Location-Information.h M include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h M include/osmocom/hnbap/HNBAP_HNBAP-PDU.h M include/osmocom/hnbap/HNBAP_HNBCapacity.h M include/osmocom/hnbap/HNBAP_HNBConfigInfo.h M include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h M include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h M include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h M include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h M include/osmocom/hnbap/HNBAP_HNBDe-Register.h M include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h M include/osmocom/hnbap/HNBAP_HNBRegisterReject.h M include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h M include/osmocom/hnbap/HNBAP_IE-Extensions.h M include/osmocom/hnbap/HNBAP_IE.h M include/osmocom/hnbap/HNBAP_IMEI.h M include/osmocom/hnbap/HNBAP_IMSI.h M include/osmocom/hnbap/HNBAP_IMSIDS41.h M include/osmocom/hnbap/HNBAP_IMSIESN.h M include/osmocom/hnbap/HNBAP_IP-Address.h M include/osmocom/hnbap/HNBAP_InitiatingMessage.h M include/osmocom/hnbap/HNBAP_Ipv4Address.h M include/osmocom/hnbap/HNBAP_Ipv6Address.h M include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h M include/osmocom/hnbap/HNBAP_LAC.h M include/osmocom/hnbap/HNBAP_LAI.h M include/osmocom/hnbap/HNBAP_MacroCellID.h M include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h M include/osmocom/hnbap/HNBAP_MuxPortNumber.h M include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h M include/osmocom/hnbap/HNBAP_NeighbourIdentity.h M include/osmocom/hnbap/HNBAP_NeighbourInfoList.h M include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h M include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h M include/osmocom/hnbap/HNBAP_PLMNidentity.h M include/osmocom/hnbap/HNBAP_PSC.h M include/osmocom/hnbap/HNBAP_PTMSI.h M include/osmocom/hnbap/HNBAP_PTMSIRAI.h M include/osmocom/hnbap/HNBAP_Presence.h M include/osmocom/hnbap/HNBAP_PrivateIE-ID.h M include/osmocom/hnbap/HNBAP_PrivateMessage.h M include/osmocom/hnbap/HNBAP_ProcedureCode.h M include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h M include/osmocom/hnbap/HNBAP_RAB-ID.h M include/osmocom/hnbap/HNBAP_RABList.h M include/osmocom/hnbap/HNBAP_RABListItem.h M include/osmocom/hnbap/HNBAP_RAC.h M include/osmocom/hnbap/HNBAP_RAI.h M include/osmocom/hnbap/HNBAP_RNC-ID.h M include/osmocom/hnbap/HNBAP_Registration-Cause.h M include/osmocom/hnbap/HNBAP_RelocationComplete.h M include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h M include/osmocom/hnbap/HNBAP_SAC.h M include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h M include/osmocom/hnbap/HNBAP_TMSIDS41.h M include/osmocom/hnbap/HNBAP_TMSILAI.h M include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h M include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h M include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h M include/osmocom/hnbap/HNBAP_TransportInfo.h M include/osmocom/hnbap/HNBAP_TransportLayerAddress.h M include/osmocom/hnbap/HNBAP_TriggeringMessage.h M include/osmocom/hnbap/HNBAP_Tunnel-Information.h M include/osmocom/hnbap/HNBAP_TypeOfError.h M include/osmocom/hnbap/HNBAP_U-RNTI.h M include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h M include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h M include/osmocom/hnbap/HNBAP_UDP-Port-Number.h M include/osmocom/hnbap/HNBAP_UE-Capabilities.h M include/osmocom/hnbap/HNBAP_UE-Identity.h M include/osmocom/hnbap/HNBAP_UEDe-Register.h M include/osmocom/hnbap/HNBAP_UERegisterAccept.h M include/osmocom/hnbap/HNBAP_UERegisterReject.h M include/osmocom/hnbap/HNBAP_UERegisterRequest.h M include/osmocom/hnbap/HNBAP_URAIdentity.h M include/osmocom/hnbap/HNBAP_URAIdentityList.h M include/osmocom/hnbap/HNBAP_UTRANCellID.h M include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h M include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h M include/osmocom/hnbap/HNBAP_Update-cause.h M src/hnbap/HNBAP_Access-stratum-release-indicator.c M src/hnbap/HNBAP_AccessResult.c M src/hnbap/HNBAP_AdditionalNeighbourInfoList.c M src/hnbap/HNBAP_AltitudeAndDirection.c M src/hnbap/HNBAP_BackoffTimer.c M src/hnbap/HNBAP_BindingID.c M src/hnbap/HNBAP_CELL-FACHMobilitySupport.c M src/hnbap/HNBAP_CGI.c M src/hnbap/HNBAP_CI.c M src/hnbap/HNBAP_CN-DomainIndicator.c M src/hnbap/HNBAP_CSG-Capability.c M src/hnbap/HNBAP_CSG-ID.c M src/hnbap/HNBAP_CSGMembershipStatus.c M src/hnbap/HNBAP_CSGMembershipUpdate.c M src/hnbap/HNBAP_Cause.c M src/hnbap/HNBAP_CauseMisc.c M src/hnbap/HNBAP_CauseProtocol.c M src/hnbap/HNBAP_CauseRadioNetwork.c M src/hnbap/HNBAP_CauseTransport.c M src/hnbap/HNBAP_CellIdentity.c M src/hnbap/HNBAP_ConfigurationInformation.c M src/hnbap/HNBAP_Context-ID.c M src/hnbap/HNBAP_Criticality.c M src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c M src/hnbap/HNBAP_CriticalityDiagnostics.c M src/hnbap/HNBAP_ESN.c M src/hnbap/HNBAP_ErrorIndication.c M src/hnbap/HNBAP_GTP-TEI.c M src/hnbap/HNBAP_GeographicalCoordinates.c M src/hnbap/HNBAP_GeographicalLocation.c M src/hnbap/HNBAP_HNB-Cell-Access-Mode.c M src/hnbap/HNBAP_HNB-Cell-Identifier.c M src/hnbap/HNBAP_HNB-GWResponse.c M src/hnbap/HNBAP_HNB-Identity-Info.c M src/hnbap/HNBAP_HNB-Identity.c M src/hnbap/HNBAP_HNB-Location-Information.c M src/hnbap/HNBAP_HNB-RNL-Identity.c M src/hnbap/HNBAP_HNBAP-PDU.c M src/hnbap/HNBAP_HNBCapacity.c M src/hnbap/HNBAP_HNBConfigInfo.c M src/hnbap/HNBAP_HNBConfigTransferRequest.c M src/hnbap/HNBAP_HNBConfigTransferResponse.c M src/hnbap/HNBAP_HNBConfigurationInformationMissing.c M src/hnbap/HNBAP_HNBConfigurationInformationProvided.c M src/hnbap/HNBAP_HNBDe-Register.c M src/hnbap/HNBAP_HNBRegisterAccept.c M src/hnbap/HNBAP_HNBRegisterReject.c M src/hnbap/HNBAP_HNBRegisterRequest.c M src/hnbap/HNBAP_IE-Extensions.c M src/hnbap/HNBAP_IE.c M src/hnbap/HNBAP_IMEI.c M src/hnbap/HNBAP_IMSI.c M src/hnbap/HNBAP_IMSIDS41.c M src/hnbap/HNBAP_IMSIESN.c M src/hnbap/HNBAP_IP-Address.c M src/hnbap/HNBAP_InitiatingMessage.c M src/hnbap/HNBAP_Ipv4Address.c M src/hnbap/HNBAP_Ipv6Address.c M src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c M src/hnbap/HNBAP_LAC.c M src/hnbap/HNBAP_LAI.c M src/hnbap/HNBAP_MacroCellID.c M src/hnbap/HNBAP_MacroCoverageInformation.c M src/hnbap/HNBAP_MuxPortNumber.c M src/hnbap/HNBAP_NeighbourCellIdentityList.c M src/hnbap/HNBAP_NeighbourIdentity.c M src/hnbap/HNBAP_NeighbourInfoList.c M src/hnbap/HNBAP_NeighbourInfoRequestItem.c M src/hnbap/HNBAP_NeighbourInfoRequestList.c M src/hnbap/HNBAP_PLMNidentity.c M src/hnbap/HNBAP_PSC.c M src/hnbap/HNBAP_PTMSI.c M src/hnbap/HNBAP_PTMSIRAI.c M src/hnbap/HNBAP_Presence.c M src/hnbap/HNBAP_PrivateIE-ID.c M src/hnbap/HNBAP_PrivateMessage.c M src/hnbap/HNBAP_ProcedureCode.c M src/hnbap/HNBAP_ProtocolIE-ID.c M src/hnbap/HNBAP_RAB-ID.c M src/hnbap/HNBAP_RABList.c M src/hnbap/HNBAP_RABListItem.c M src/hnbap/HNBAP_RAC.c M src/hnbap/HNBAP_RAI.c M src/hnbap/HNBAP_RNC-ID.c M src/hnbap/HNBAP_Registration-Cause.c M src/hnbap/HNBAP_RelocationComplete.c M src/hnbap/HNBAP_S-RNTIPrefix.c M src/hnbap/HNBAP_SAC.c M src/hnbap/HNBAP_SuccessfulOutcome.c M src/hnbap/HNBAP_TMSIDS41.c M src/hnbap/HNBAP_TMSILAI.c M src/hnbap/HNBAP_TNLUpdateFailure.c M src/hnbap/HNBAP_TNLUpdateRequest.c M src/hnbap/HNBAP_TNLUpdateResponse.c M src/hnbap/HNBAP_TransportInfo.c M src/hnbap/HNBAP_TransportLayerAddress.c M src/hnbap/HNBAP_TriggeringMessage.c M src/hnbap/HNBAP_Tunnel-Information.c M src/hnbap/HNBAP_TypeOfError.c M src/hnbap/HNBAP_U-RNTI.c M src/hnbap/HNBAP_U-RNTIQueryRequest.c M src/hnbap/HNBAP_U-RNTIQueryResponse.c M src/hnbap/HNBAP_UDP-Port-Number.c M src/hnbap/HNBAP_UE-Capabilities.c M src/hnbap/HNBAP_UE-Identity.c M src/hnbap/HNBAP_UEDe-Register.c M src/hnbap/HNBAP_UERegisterAccept.c M src/hnbap/HNBAP_UERegisterReject.c M src/hnbap/HNBAP_UERegisterRequest.c M src/hnbap/HNBAP_URAIdentity.c M src/hnbap/HNBAP_URAIdentityList.c M src/hnbap/HNBAP_UTRANCellID.c M src/hnbap/HNBAP_UnknownU-RNTIIndication.c M src/hnbap/HNBAP_UnsuccessfulOutcome.c M src/hnbap/HNBAP_Update-cause.c M src/hnbap/Makefile.am 231 files changed, 329 insertions(+), 329 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h b/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h index 1aba84e..c52065c 100644 --- a/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h +++ b/include/osmocom/hnbap/HNBAP_Access-stratum-release-indicator.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Access_stratum_release_indicator_H_ diff --git a/include/osmocom/hnbap/HNBAP_AccessResult.h b/include/osmocom/hnbap/HNBAP_AccessResult.h index 3d71d2d..06c37fd 100644 --- a/include/osmocom/hnbap/HNBAP_AccessResult.h +++ b/include/osmocom/hnbap/HNBAP_AccessResult.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_AccessResult_H_ diff --git a/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h b/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h index be2dd1f..5b46e95 100644 --- a/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h +++ b/include/osmocom/hnbap/HNBAP_AdditionalNeighbourInfoList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_AdditionalNeighbourInfoList_H_ diff --git a/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h b/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h index 5b406d8..3bf4401 100644 --- a/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h +++ b/include/osmocom/hnbap/HNBAP_AltitudeAndDirection.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_AltitudeAndDirection_H_ @@ -21,10 +21,10 @@ #endif /* Dependencies */ -typedef enum directionOfAltitude { - directionOfAltitude_height = 0, - directionOfAltitude_depth = 1 -} e_directionOfAltitude; +typedef enum HNBAP_AltitudeAndDirection__directionOfAltitude { + HNBAP_AltitudeAndDirection__directionOfAltitude_height = 0, + HNBAP_AltitudeAndDirection__directionOfAltitude_depth = 1 +} e_HNBAP_AltitudeAndDirection__directionOfAltitude; /* HNBAP_AltitudeAndDirection */ typedef struct HNBAP_AltitudeAndDirection { diff --git a/include/osmocom/hnbap/HNBAP_BackoffTimer.h b/include/osmocom/hnbap/HNBAP_BackoffTimer.h index 03f64c9..5ee18a0 100644 --- a/include/osmocom/hnbap/HNBAP_BackoffTimer.h +++ b/include/osmocom/hnbap/HNBAP_BackoffTimer.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_BackoffTimer_H_ diff --git a/include/osmocom/hnbap/HNBAP_BindingID.h b/include/osmocom/hnbap/HNBAP_BindingID.h index b5cdebc..c26159d 100644 --- a/include/osmocom/hnbap/HNBAP_BindingID.h +++ b/include/osmocom/hnbap/HNBAP_BindingID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_BindingID_H_ diff --git a/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h b/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h index 864f6ce..dc91cb6 100644 --- a/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h +++ b/include/osmocom/hnbap/HNBAP_CELL-FACHMobilitySupport.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CELL_FACHMobilitySupport_H_ diff --git a/include/osmocom/hnbap/HNBAP_CGI.h b/include/osmocom/hnbap/HNBAP_CGI.h index 657aff8..927257d 100644 --- a/include/osmocom/hnbap/HNBAP_CGI.h +++ b/include/osmocom/hnbap/HNBAP_CGI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CGI_H_ diff --git a/include/osmocom/hnbap/HNBAP_CI.h b/include/osmocom/hnbap/HNBAP_CI.h index 637c9bd..89916cc 100644 --- a/include/osmocom/hnbap/HNBAP_CI.h +++ b/include/osmocom/hnbap/HNBAP_CI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CI_H_ diff --git a/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h b/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h index 5128d5b..765ba2b 100644 --- a/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h +++ b/include/osmocom/hnbap/HNBAP_CN-DomainIndicator.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CN_DomainIndicator_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSG-Capability.h b/include/osmocom/hnbap/HNBAP_CSG-Capability.h index 57d6ee2..ff10c3d 100644 --- a/include/osmocom/hnbap/HNBAP_CSG-Capability.h +++ b/include/osmocom/hnbap/HNBAP_CSG-Capability.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CSG_Capability_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSG-ID.h b/include/osmocom/hnbap/HNBAP_CSG-ID.h index d76f078..87e476a 100644 --- a/include/osmocom/hnbap/HNBAP_CSG-ID.h +++ b/include/osmocom/hnbap/HNBAP_CSG-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CSG_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h b/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h index d83bd14..25ecacf 100644 --- a/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h +++ b/include/osmocom/hnbap/HNBAP_CSGMembershipStatus.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CSGMembershipStatus_H_ diff --git a/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h b/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h index 035b331..b6324cf 100644 --- a/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h +++ b/include/osmocom/hnbap/HNBAP_CSGMembershipUpdate.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CSGMembershipUpdate_H_ @@ -23,7 +23,7 @@ /* HNBAP_CSGMembershipUpdate */ typedef struct HNBAP_CSGMembershipUpdate { - struct csgMembershipUpdate_ies { + struct HNBAP_CSGMembershipUpdate__csgMembershipUpdate_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_Cause.h b/include/osmocom/hnbap/HNBAP_Cause.h index e385b5f..eba2cc1 100644 --- a/include/osmocom/hnbap/HNBAP_Cause.h +++ b/include/osmocom/hnbap/HNBAP_Cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Cause_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseMisc.h b/include/osmocom/hnbap/HNBAP_CauseMisc.h index c53cafe..2534318 100644 --- a/include/osmocom/hnbap/HNBAP_CauseMisc.h +++ b/include/osmocom/hnbap/HNBAP_CauseMisc.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * >From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CauseMisc_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseProtocol.h b/include/osmocom/hnbap/HNBAP_CauseProtocol.h index 3416b47..0ca1254 100644 --- a/include/osmocom/hnbap/HNBAP_CauseProtocol.h +++ b/include/osmocom/hnbap/HNBAP_CauseProtocol.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CauseProtocol_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h b/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h index 895ac69..5c998ca 100644 --- a/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h +++ b/include/osmocom/hnbap/HNBAP_CauseRadioNetwork.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CauseRadioNetwork_H_ diff --git a/include/osmocom/hnbap/HNBAP_CauseTransport.h b/include/osmocom/hnbap/HNBAP_CauseTransport.h index d2e486e..8dff6b8 100644 --- a/include/osmocom/hnbap/HNBAP_CauseTransport.h +++ b/include/osmocom/hnbap/HNBAP_CauseTransport.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CauseTransport_H_ diff --git a/include/osmocom/hnbap/HNBAP_CellIdentity.h b/include/osmocom/hnbap/HNBAP_CellIdentity.h index 1b76f6b..1a47122 100644 --- a/include/osmocom/hnbap/HNBAP_CellIdentity.h +++ b/include/osmocom/hnbap/HNBAP_CellIdentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CellIdentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h b/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h index 7720b23..d5e2128 100644 --- a/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h +++ b/include/osmocom/hnbap/HNBAP_ConfigurationInformation.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_ConfigurationInformation_H_ diff --git a/include/osmocom/hnbap/HNBAP_Context-ID.h b/include/osmocom/hnbap/HNBAP_Context-ID.h index 570e8cb..fce0508 100644 --- a/include/osmocom/hnbap/HNBAP_Context-ID.h +++ b/include/osmocom/hnbap/HNBAP_Context-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Context_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_Criticality.h b/include/osmocom/hnbap/HNBAP_Criticality.h index cbc4c01..45c20a3 100644 --- a/include/osmocom/hnbap/HNBAP_Criticality.h +++ b/include/osmocom/hnbap/HNBAP_Criticality.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Criticality_H_ diff --git a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h index db82056..7759078 100644 --- a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h +++ b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics-IE-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CriticalityDiagnostics_IE_List_H_ @@ -26,7 +26,7 @@ /* HNBAP_CriticalityDiagnostics-IE-List */ typedef struct HNBAP_CriticalityDiagnostics_IE_List { - A_SEQUENCE_OF(struct Member { + A_SEQUENCE_OF(struct HNBAP_CriticalityDiagnostics_IE_List__Member { HNBAP_Criticality_t iECriticality; HNBAP_ProtocolIE_ID_t iE_ID; HNBAP_TypeOfError_t typeOfError; diff --git a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h index 34d798d..f4b7b2a 100644 --- a/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h +++ b/include/osmocom/hnbap/HNBAP_CriticalityDiagnostics.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_CriticalityDiagnostics_H_ diff --git a/include/osmocom/hnbap/HNBAP_ESN.h b/include/osmocom/hnbap/HNBAP_ESN.h index b1353ea..e3e5e5f 100644 --- a/include/osmocom/hnbap/HNBAP_ESN.h +++ b/include/osmocom/hnbap/HNBAP_ESN.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_ESN_H_ diff --git a/include/osmocom/hnbap/HNBAP_ErrorIndication.h b/include/osmocom/hnbap/HNBAP_ErrorIndication.h index 889cf08..b640aa8 100644 --- a/include/osmocom/hnbap/HNBAP_ErrorIndication.h +++ b/include/osmocom/hnbap/HNBAP_ErrorIndication.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_ErrorIndication_H_ @@ -23,7 +23,7 @@ /* HNBAP_ErrorIndication */ typedef struct HNBAP_ErrorIndication { - struct errorIndication_ies { + struct HNBAP_ErrorIndication__errorIndication_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_GTP-TEI.h b/include/osmocom/hnbap/HNBAP_GTP-TEI.h index 214964d..c3b8917 100644 --- a/include/osmocom/hnbap/HNBAP_GTP-TEI.h +++ b/include/osmocom/hnbap/HNBAP_GTP-TEI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_GTP_TEI_H_ diff --git a/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h b/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h index 6cdfdec..3033b7a 100644 --- a/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h +++ b/include/osmocom/hnbap/HNBAP_GeographicalCoordinates.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_GeographicalCoordinates_H_ @@ -22,10 +22,10 @@ #endif /* Dependencies */ -typedef enum latitudeSign { - latitudeSign_north = 0, - latitudeSign_south = 1 -} e_latitudeSign; +typedef enum HNBAP_GeographicalCoordinates__latitudeSign { + HNBAP_GeographicalCoordinates__latitudeSign_north = 0, + HNBAP_GeographicalCoordinates__latitudeSign_south = 1 +} e_HNBAP_GeographicalCoordinates__latitudeSign; /* HNBAP_GeographicalCoordinates */ typedef struct HNBAP_GeographicalCoordinates { diff --git a/include/osmocom/hnbap/HNBAP_GeographicalLocation.h b/include/osmocom/hnbap/HNBAP_GeographicalLocation.h index 6311d85..9a2a071 100644 --- a/include/osmocom/hnbap/HNBAP_GeographicalLocation.h +++ b/include/osmocom/hnbap/HNBAP_GeographicalLocation.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_GeographicalLocation_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h b/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h index 2a6e05a..9a2529a 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Cell-Access-Mode.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNB_Cell_Access_Mode_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h b/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h index 14d2850..27c0fd9 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Cell-Identifier.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNB_Cell_Identifier_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h b/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h index cadd7e3..8afd5e3 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h +++ b/include/osmocom/hnbap/HNBAP_HNB-GWResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNB_GWResponse_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h b/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h index 25606bd..bb85a86 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Identity-Info.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNB_Identity_Info_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Identity.h b/include/osmocom/hnbap/HNBAP_HNB-Identity.h index ca28950..d6038cc 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Identity.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Identity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNB_Identity_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h b/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h index f8a3769..c944e42 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h +++ b/include/osmocom/hnbap/HNBAP_HNB-Location-Information.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNB_Location_Information_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h b/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h index 642e8e6..591b12d 100644 --- a/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h +++ b/include/osmocom/hnbap/HNBAP_HNB-RNL-Identity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNB_RNL_Identity_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h b/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h index 48dac94..cbfd50f 100644 --- a/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h +++ b/include/osmocom/hnbap/HNBAP_HNBAP-PDU.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBAP_PDU_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBCapacity.h b/include/osmocom/hnbap/HNBAP_HNBCapacity.h index 39e4f29..b2e70b1 100644 --- a/include/osmocom/hnbap/HNBAP_HNBCapacity.h +++ b/include/osmocom/hnbap/HNBAP_HNBCapacity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBCapacity_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h b/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h index f0b6dc2..606d113 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigInfo.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBConfigInfo_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h b/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h index 8ce6ca7..23d5413 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigTransferRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBConfigTransferRequest_H_ @@ -23,7 +23,7 @@ /* HNBAP_HNBConfigTransferRequest */ typedef struct HNBAP_HNBConfigTransferRequest { - struct hnbConfigTransferRequest_ies { + struct HNBAP_HNBConfigTransferRequest__hnbConfigTransferRequest_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h b/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h index 81ec650..80dcd1b 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigTransferResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBConfigTransferResponse_H_ @@ -23,7 +23,7 @@ /* HNBAP_HNBConfigTransferResponse */ typedef struct HNBAP_HNBConfigTransferResponse { - struct hnbConfigTransferResponse_ies { + struct HNBAP_HNBConfigTransferResponse__hnbConfigTransferResponse_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h index 42bafdb..f1b28ef 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationMissing.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBConfigurationInformationMissing_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h index 2750038..8c20b74 100644 --- a/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h +++ b/include/osmocom/hnbap/HNBAP_HNBConfigurationInformationProvided.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBConfigurationInformationProvided_H_ diff --git a/include/osmocom/hnbap/HNBAP_HNBDe-Register.h b/include/osmocom/hnbap/HNBAP_HNBDe-Register.h index 79d7bbe..eb69bc5 100644 --- a/include/osmocom/hnbap/HNBAP_HNBDe-Register.h +++ b/include/osmocom/hnbap/HNBAP_HNBDe-Register.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBDe_Register_H_ @@ -23,7 +23,7 @@ /* HNBAP_HNBDe-Register */ typedef struct HNBAP_HNBDe_Register { - struct hnbDe_Register_ies { + struct HNBAP_HNBDe_Register__hnbDe_Register_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h b/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h index 83a48f8..ddacd50 100644 --- a/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h +++ b/include/osmocom/hnbap/HNBAP_HNBRegisterAccept.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBRegisterAccept_H_ @@ -23,7 +23,7 @@ /* HNBAP_HNBRegisterAccept */ typedef struct HNBAP_HNBRegisterAccept { - struct hnbRegisterAccept_ies { + struct HNBAP_HNBRegisterAccept__hnbRegisterAccept_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h b/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h index 2b203db..38bea56 100644 --- a/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h +++ b/include/osmocom/hnbap/HNBAP_HNBRegisterReject.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBRegisterReject_H_ @@ -23,7 +23,7 @@ /* HNBAP_HNBRegisterReject */ typedef struct HNBAP_HNBRegisterReject { - struct hnbRegisterReject_ies { + struct HNBAP_HNBRegisterReject__hnbRegisterReject_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h b/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h index 1431432..724afb1 100644 --- a/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h +++ b/include/osmocom/hnbap/HNBAP_HNBRegisterRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_HNBRegisterRequest_H_ @@ -23,7 +23,7 @@ /* HNBAP_HNBRegisterRequest */ typedef struct HNBAP_HNBRegisterRequest { - struct hnbRegisterRequest_ies { + struct HNBAP_HNBRegisterRequest__hnbRegisterRequest_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_IE-Extensions.h b/include/osmocom/hnbap/HNBAP_IE-Extensions.h index 81ffb00..0578aca 100644 --- a/include/osmocom/hnbap/HNBAP_IE-Extensions.h +++ b/include/osmocom/hnbap/HNBAP_IE-Extensions.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_IE_Extensions_H_ diff --git a/include/osmocom/hnbap/HNBAP_IE.h b/include/osmocom/hnbap/HNBAP_IE.h index 1abae50..7abd85b 100644 --- a/include/osmocom/hnbap/HNBAP_IE.h +++ b/include/osmocom/hnbap/HNBAP_IE.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_IE_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMEI.h b/include/osmocom/hnbap/HNBAP_IMEI.h index ff082a8..b507526 100644 --- a/include/osmocom/hnbap/HNBAP_IMEI.h +++ b/include/osmocom/hnbap/HNBAP_IMEI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_IMEI_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMSI.h b/include/osmocom/hnbap/HNBAP_IMSI.h index 98970ed..ae439fb 100644 --- a/include/osmocom/hnbap/HNBAP_IMSI.h +++ b/include/osmocom/hnbap/HNBAP_IMSI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_IMSI_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMSIDS41.h b/include/osmocom/hnbap/HNBAP_IMSIDS41.h index 94f35b9..08fcf7a 100644 --- a/include/osmocom/hnbap/HNBAP_IMSIDS41.h +++ b/include/osmocom/hnbap/HNBAP_IMSIDS41.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_IMSIDS41_H_ diff --git a/include/osmocom/hnbap/HNBAP_IMSIESN.h b/include/osmocom/hnbap/HNBAP_IMSIESN.h index 2178336..48edbee 100644 --- a/include/osmocom/hnbap/HNBAP_IMSIESN.h +++ b/include/osmocom/hnbap/HNBAP_IMSIESN.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_IMSIESN_H_ diff --git a/include/osmocom/hnbap/HNBAP_IP-Address.h b/include/osmocom/hnbap/HNBAP_IP-Address.h index 8e6d119..6639f4c 100644 --- a/include/osmocom/hnbap/HNBAP_IP-Address.h +++ b/include/osmocom/hnbap/HNBAP_IP-Address.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_IP_Address_H_ @@ -23,18 +23,18 @@ #endif /* Dependencies */ -typedef enum ipaddress_PR { - ipaddress_PR_NOTHING, /* No components present */ - ipaddress_PR_ipv4info, - ipaddress_PR_ipv6info, +typedef enum HNBAP_IP_Address__ipaddress_PR { + HNBAP_IP_Address__ipaddress_PR_NOTHING, /* No components present */ + HNBAP_IP_Address__ipaddress_PR_ipv4info, + HNBAP_IP_Address__ipaddress_PR_ipv6info, /* Extensions may appear below */ -} ipaddress_PR; +} HNBAP_IP_Address__ipaddress_PR; /* HNBAP_IP-Address */ typedef struct HNBAP_IP_Address { - struct ipaddress { - ipaddress_PR present; + struct HNBAP_IP_Address__ipaddress { + HNBAP_IP_Address__ipaddress_PR present; union HNBAP_IP_Address__ipaddress_u { HNBAP_Ipv4Address_t ipv4info; HNBAP_Ipv6Address_t ipv6info; diff --git a/include/osmocom/hnbap/HNBAP_InitiatingMessage.h b/include/osmocom/hnbap/HNBAP_InitiatingMessage.h index 1a7e6e3..4264666 100644 --- a/include/osmocom/hnbap/HNBAP_InitiatingMessage.h +++ b/include/osmocom/hnbap/HNBAP_InitiatingMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_InitiatingMessage_H_ diff --git a/include/osmocom/hnbap/HNBAP_Ipv4Address.h b/include/osmocom/hnbap/HNBAP_Ipv4Address.h index eecb57a..9fa5f44 100644 --- a/include/osmocom/hnbap/HNBAP_Ipv4Address.h +++ b/include/osmocom/hnbap/HNBAP_Ipv4Address.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Ipv4Address_H_ diff --git a/include/osmocom/hnbap/HNBAP_Ipv6Address.h b/include/osmocom/hnbap/HNBAP_Ipv6Address.h index 319ee82..e7e32c4 100644 --- a/include/osmocom/hnbap/HNBAP_Ipv6Address.h +++ b/include/osmocom/hnbap/HNBAP_Ipv6Address.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Ipv6Address_H_ diff --git a/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h b/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h index f3e5f24..4f96bfa 100644 --- a/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h +++ b/include/osmocom/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Iurh_Signalling_TNL_AddressList_H_ diff --git a/include/osmocom/hnbap/HNBAP_LAC.h b/include/osmocom/hnbap/HNBAP_LAC.h index 66369cf..13eecd7 100644 --- a/include/osmocom/hnbap/HNBAP_LAC.h +++ b/include/osmocom/hnbap/HNBAP_LAC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_LAC_H_ diff --git a/include/osmocom/hnbap/HNBAP_LAI.h b/include/osmocom/hnbap/HNBAP_LAI.h index bc44334..e22d54e 100644 --- a/include/osmocom/hnbap/HNBAP_LAI.h +++ b/include/osmocom/hnbap/HNBAP_LAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_LAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_MacroCellID.h b/include/osmocom/hnbap/HNBAP_MacroCellID.h index 808e4cc..b291c9e 100644 --- a/include/osmocom/hnbap/HNBAP_MacroCellID.h +++ b/include/osmocom/hnbap/HNBAP_MacroCellID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_MacroCellID_H_ diff --git a/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h b/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h index 8c58db7..5f223ab 100644 --- a/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h +++ b/include/osmocom/hnbap/HNBAP_MacroCoverageInformation.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_MacroCoverageInformation_H_ diff --git a/include/osmocom/hnbap/HNBAP_MuxPortNumber.h b/include/osmocom/hnbap/HNBAP_MuxPortNumber.h index 126423b..d703a87 100644 --- a/include/osmocom/hnbap/HNBAP_MuxPortNumber.h +++ b/include/osmocom/hnbap/HNBAP_MuxPortNumber.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_MuxPortNumber_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h b/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h index 7b045bd..1c60b03 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourCellIdentityList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_NeighbourCellIdentityList_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h b/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h index a05d5c6..7047e9f 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourIdentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_NeighbourIdentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h b/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h index c3ac952..9f86d1d 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourInfoList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_NeighbourInfoList_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h index babc581..263b781 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestItem.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_NeighbourInfoRequestItem_H_ diff --git a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h index 8ce71b4..274a1cf 100644 --- a/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h +++ b/include/osmocom/hnbap/HNBAP_NeighbourInfoRequestList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_NeighbourInfoRequestList_H_ diff --git a/include/osmocom/hnbap/HNBAP_PLMNidentity.h b/include/osmocom/hnbap/HNBAP_PLMNidentity.h index eaae7fd..de48ddd 100644 --- a/include/osmocom/hnbap/HNBAP_PLMNidentity.h +++ b/include/osmocom/hnbap/HNBAP_PLMNidentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_PLMNidentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_PSC.h b/include/osmocom/hnbap/HNBAP_PSC.h index a399947..d2bcff7 100644 --- a/include/osmocom/hnbap/HNBAP_PSC.h +++ b/include/osmocom/hnbap/HNBAP_PSC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_PSC_H_ diff --git a/include/osmocom/hnbap/HNBAP_PTMSI.h b/include/osmocom/hnbap/HNBAP_PTMSI.h index 70a9d21..04e4c4f 100644 --- a/include/osmocom/hnbap/HNBAP_PTMSI.h +++ b/include/osmocom/hnbap/HNBAP_PTMSI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_PTMSI_H_ diff --git a/include/osmocom/hnbap/HNBAP_PTMSIRAI.h b/include/osmocom/hnbap/HNBAP_PTMSIRAI.h index 45396e0..5487dde 100644 --- a/include/osmocom/hnbap/HNBAP_PTMSIRAI.h +++ b/include/osmocom/hnbap/HNBAP_PTMSIRAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_PTMSIRAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_Presence.h b/include/osmocom/hnbap/HNBAP_Presence.h index 60ec1f9..512674f 100644 --- a/include/osmocom/hnbap/HNBAP_Presence.h +++ b/include/osmocom/hnbap/HNBAP_Presence.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Presence_H_ diff --git a/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h b/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h index 78857d0..24a241f 100644 --- a/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h +++ b/include/osmocom/hnbap/HNBAP_PrivateIE-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_PrivateIE_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_PrivateMessage.h b/include/osmocom/hnbap/HNBAP_PrivateMessage.h index ee7faa4..4cb81cb 100644 --- a/include/osmocom/hnbap/HNBAP_PrivateMessage.h +++ b/include/osmocom/hnbap/HNBAP_PrivateMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_PrivateMessage_H_ @@ -23,7 +23,7 @@ /* HNBAP_PrivateMessage */ typedef struct HNBAP_PrivateMessage { - struct privateMessage_ies { + struct HNBAP_PrivateMessage__privateMessage_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_ProcedureCode.h b/include/osmocom/hnbap/HNBAP_ProcedureCode.h index 84e1d41..d55bd08 100644 --- a/include/osmocom/hnbap/HNBAP_ProcedureCode.h +++ b/include/osmocom/hnbap/HNBAP_ProcedureCode.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_ProcedureCode_H_ diff --git a/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h b/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h index 4ca0627..4f1e9c4 100644 --- a/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h +++ b/include/osmocom/hnbap/HNBAP_ProtocolIE-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_ProtocolIE_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_RAB-ID.h b/include/osmocom/hnbap/HNBAP_RAB-ID.h index 45422f4..8fe284a 100644 --- a/include/osmocom/hnbap/HNBAP_RAB-ID.h +++ b/include/osmocom/hnbap/HNBAP_RAB-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_RAB_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_RABList.h b/include/osmocom/hnbap/HNBAP_RABList.h index 50741e0..ae6c86b 100644 --- a/include/osmocom/hnbap/HNBAP_RABList.h +++ b/include/osmocom/hnbap/HNBAP_RABList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_RABList_H_ diff --git a/include/osmocom/hnbap/HNBAP_RABListItem.h b/include/osmocom/hnbap/HNBAP_RABListItem.h index a041d25..97bdcce 100644 --- a/include/osmocom/hnbap/HNBAP_RABListItem.h +++ b/include/osmocom/hnbap/HNBAP_RABListItem.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_RABListItem_H_ diff --git a/include/osmocom/hnbap/HNBAP_RAC.h b/include/osmocom/hnbap/HNBAP_RAC.h index 20534f8..700fe12 100644 --- a/include/osmocom/hnbap/HNBAP_RAC.h +++ b/include/osmocom/hnbap/HNBAP_RAC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_RAC_H_ diff --git a/include/osmocom/hnbap/HNBAP_RAI.h b/include/osmocom/hnbap/HNBAP_RAI.h index 0cc6985..9f0bb07 100644 --- a/include/osmocom/hnbap/HNBAP_RAI.h +++ b/include/osmocom/hnbap/HNBAP_RAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_RAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_RNC-ID.h b/include/osmocom/hnbap/HNBAP_RNC-ID.h index 36c6644..35b58aa 100644 --- a/include/osmocom/hnbap/HNBAP_RNC-ID.h +++ b/include/osmocom/hnbap/HNBAP_RNC-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_RNC_ID_H_ diff --git a/include/osmocom/hnbap/HNBAP_Registration-Cause.h b/include/osmocom/hnbap/HNBAP_Registration-Cause.h index 8fc58bd..3de4fde 100644 --- a/include/osmocom/hnbap/HNBAP_Registration-Cause.h +++ b/include/osmocom/hnbap/HNBAP_Registration-Cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Registration_Cause_H_ diff --git a/include/osmocom/hnbap/HNBAP_RelocationComplete.h b/include/osmocom/hnbap/HNBAP_RelocationComplete.h index 8ab1e5a..6c89364 100644 --- a/include/osmocom/hnbap/HNBAP_RelocationComplete.h +++ b/include/osmocom/hnbap/HNBAP_RelocationComplete.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_RelocationComplete_H_ @@ -23,7 +23,7 @@ /* HNBAP_RelocationComplete */ typedef struct HNBAP_RelocationComplete { - struct relocationComplete_ies { + struct HNBAP_RelocationComplete__relocationComplete_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h b/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h index a315b9a..47bd663 100644 --- a/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h +++ b/include/osmocom/hnbap/HNBAP_S-RNTIPrefix.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_S_RNTIPrefix_H_ diff --git a/include/osmocom/hnbap/HNBAP_SAC.h b/include/osmocom/hnbap/HNBAP_SAC.h index 6b4bf11..15549a3 100644 --- a/include/osmocom/hnbap/HNBAP_SAC.h +++ b/include/osmocom/hnbap/HNBAP_SAC.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_SAC_H_ diff --git a/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h b/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h index 97ddd2e..aa7a937 100644 --- a/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h +++ b/include/osmocom/hnbap/HNBAP_SuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_SuccessfulOutcome_H_ diff --git a/include/osmocom/hnbap/HNBAP_TMSIDS41.h b/include/osmocom/hnbap/HNBAP_TMSIDS41.h index ec40e84..0f45fce 100644 --- a/include/osmocom/hnbap/HNBAP_TMSIDS41.h +++ b/include/osmocom/hnbap/HNBAP_TMSIDS41.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TMSIDS41_H_ diff --git a/include/osmocom/hnbap/HNBAP_TMSILAI.h b/include/osmocom/hnbap/HNBAP_TMSILAI.h index de4101a..0df3774 100644 --- a/include/osmocom/hnbap/HNBAP_TMSILAI.h +++ b/include/osmocom/hnbap/HNBAP_TMSILAI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TMSILAI_H_ diff --git a/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h b/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h index 73313fb..b662d0c 100644 --- a/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h +++ b/include/osmocom/hnbap/HNBAP_TNLUpdateFailure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TNLUpdateFailure_H_ @@ -23,7 +23,7 @@ /* HNBAP_TNLUpdateFailure */ typedef struct HNBAP_TNLUpdateFailure { - struct tnlUpdateFailure_ies { + struct HNBAP_TNLUpdateFailure__tnlUpdateFailure_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h b/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h index 11b1a36..8f43046 100644 --- a/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h +++ b/include/osmocom/hnbap/HNBAP_TNLUpdateRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TNLUpdateRequest_H_ @@ -23,7 +23,7 @@ /* HNBAP_TNLUpdateRequest */ typedef struct HNBAP_TNLUpdateRequest { - struct tnlUpdateRequest_ies { + struct HNBAP_TNLUpdateRequest__tnlUpdateRequest_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h b/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h index 8aac76b..921ecc4 100644 --- a/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h +++ b/include/osmocom/hnbap/HNBAP_TNLUpdateResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TNLUpdateResponse_H_ @@ -23,7 +23,7 @@ /* HNBAP_TNLUpdateResponse */ typedef struct HNBAP_TNLUpdateResponse { - struct tnlUpdateResponse_ies { + struct HNBAP_TNLUpdateResponse__tnlUpdateResponse_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_TransportInfo.h b/include/osmocom/hnbap/HNBAP_TransportInfo.h index 8f0a5eb..2b7bf2b 100644 --- a/include/osmocom/hnbap/HNBAP_TransportInfo.h +++ b/include/osmocom/hnbap/HNBAP_TransportInfo.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TransportInfo_H_ @@ -24,19 +24,19 @@ #endif /* Dependencies */ -typedef enum transportAssociation_PR { - transportAssociation_PR_NOTHING, /* No components present */ - transportAssociation_PR_gtp_TEI, - transportAssociation_PR_bindingID, +typedef enum HNBAP_TransportInfo__transportAssociation_PR { + HNBAP_TransportInfo__transportAssociation_PR_NOTHING, /* No components present */ + HNBAP_TransportInfo__transportAssociation_PR_gtp_TEI, + HNBAP_TransportInfo__transportAssociation_PR_bindingID, /* Extensions may appear below */ -} transportAssociation_PR; +} HNBAP_TransportInfo__transportAssociation_PR; /* HNBAP_TransportInfo */ typedef struct HNBAP_TransportInfo { HNBAP_TransportLayerAddress_t transportLayerAddress; - struct transportAssociation { - transportAssociation_PR present; + struct HNBAP_TransportInfo__transportAssociation { + HNBAP_TransportInfo__transportAssociation_PR present; union HNBAP_TransportInfo__transportAssociation_u { HNBAP_GTP_TEI_t gtp_TEI; HNBAP_BindingID_t bindingID; diff --git a/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h b/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h index 4edd7b8..9b2a81a 100644 --- a/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h +++ b/include/osmocom/hnbap/HNBAP_TransportLayerAddress.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TransportLayerAddress_H_ diff --git a/include/osmocom/hnbap/HNBAP_TriggeringMessage.h b/include/osmocom/hnbap/HNBAP_TriggeringMessage.h index 859dc12..24dcaec 100644 --- a/include/osmocom/hnbap/HNBAP_TriggeringMessage.h +++ b/include/osmocom/hnbap/HNBAP_TriggeringMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TriggeringMessage_H_ diff --git a/include/osmocom/hnbap/HNBAP_Tunnel-Information.h b/include/osmocom/hnbap/HNBAP_Tunnel-Information.h index 470420d..63eaa37 100644 --- a/include/osmocom/hnbap/HNBAP_Tunnel-Information.h +++ b/include/osmocom/hnbap/HNBAP_Tunnel-Information.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Tunnel_Information_H_ diff --git a/include/osmocom/hnbap/HNBAP_TypeOfError.h b/include/osmocom/hnbap/HNBAP_TypeOfError.h index 04771a3..eba4911 100644 --- a/include/osmocom/hnbap/HNBAP_TypeOfError.h +++ b/include/osmocom/hnbap/HNBAP_TypeOfError.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_TypeOfError_H_ diff --git a/include/osmocom/hnbap/HNBAP_U-RNTI.h b/include/osmocom/hnbap/HNBAP_U-RNTI.h index cf506b0..f942e35 100644 --- a/include/osmocom/hnbap/HNBAP_U-RNTI.h +++ b/include/osmocom/hnbap/HNBAP_U-RNTI.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_U_RNTI_H_ diff --git a/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h b/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h index 8714c55..c0cbbe8 100644 --- a/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h +++ b/include/osmocom/hnbap/HNBAP_U-RNTIQueryRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_U_RNTIQueryRequest_H_ @@ -23,7 +23,7 @@ /* HNBAP_U-RNTIQueryRequest */ typedef struct HNBAP_U_RNTIQueryRequest { - struct u_RNTIQueryRequest_ies { + struct HNBAP_U_RNTIQueryRequest__u_RNTIQueryRequest_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h b/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h index 2696f9b..8c4a2d0 100644 --- a/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h +++ b/include/osmocom/hnbap/HNBAP_U-RNTIQueryResponse.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_U_RNTIQueryResponse_H_ @@ -23,7 +23,7 @@ /* HNBAP_U-RNTIQueryResponse */ typedef struct HNBAP_U_RNTIQueryResponse { - struct u_RNTIQueryResponse_ies { + struct HNBAP_U_RNTIQueryResponse__u_RNTIQueryResponse_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h b/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h index 9a8b675..988cedb 100644 --- a/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h +++ b/include/osmocom/hnbap/HNBAP_UDP-Port-Number.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UDP_Port_Number_H_ diff --git a/include/osmocom/hnbap/HNBAP_UE-Capabilities.h b/include/osmocom/hnbap/HNBAP_UE-Capabilities.h index 38551d6..5f275a3 100644 --- a/include/osmocom/hnbap/HNBAP_UE-Capabilities.h +++ b/include/osmocom/hnbap/HNBAP_UE-Capabilities.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UE_Capabilities_H_ diff --git a/include/osmocom/hnbap/HNBAP_UE-Identity.h b/include/osmocom/hnbap/HNBAP_UE-Identity.h index 8e63603..3c11a84 100644 --- a/include/osmocom/hnbap/HNBAP_UE-Identity.h +++ b/include/osmocom/hnbap/HNBAP_UE-Identity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UE_Identity_H_ diff --git a/include/osmocom/hnbap/HNBAP_UEDe-Register.h b/include/osmocom/hnbap/HNBAP_UEDe-Register.h index 5a0e298..58009c5 100644 --- a/include/osmocom/hnbap/HNBAP_UEDe-Register.h +++ b/include/osmocom/hnbap/HNBAP_UEDe-Register.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UEDe_Register_H_ @@ -23,7 +23,7 @@ /* HNBAP_UEDe-Register */ typedef struct HNBAP_UEDe_Register { - struct ueDe_Register_ies { + struct HNBAP_UEDe_Register__ueDe_Register_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_UERegisterAccept.h b/include/osmocom/hnbap/HNBAP_UERegisterAccept.h index 8d2bec1..9e5c206 100644 --- a/include/osmocom/hnbap/HNBAP_UERegisterAccept.h +++ b/include/osmocom/hnbap/HNBAP_UERegisterAccept.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UERegisterAccept_H_ @@ -23,7 +23,7 @@ /* HNBAP_UERegisterAccept */ typedef struct HNBAP_UERegisterAccept { - struct ueRegisterAccept_ies { + struct HNBAP_UERegisterAccept__ueRegisterAccept_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_UERegisterReject.h b/include/osmocom/hnbap/HNBAP_UERegisterReject.h index c30ffbe..44ed158 100644 --- a/include/osmocom/hnbap/HNBAP_UERegisterReject.h +++ b/include/osmocom/hnbap/HNBAP_UERegisterReject.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UERegisterReject_H_ @@ -23,7 +23,7 @@ /* HNBAP_UERegisterReject */ typedef struct HNBAP_UERegisterReject { - struct ueRegisterReject_ies { + struct HNBAP_UERegisterReject__ueRegisterReject_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_UERegisterRequest.h b/include/osmocom/hnbap/HNBAP_UERegisterRequest.h index 46778c8..ae82132 100644 --- a/include/osmocom/hnbap/HNBAP_UERegisterRequest.h +++ b/include/osmocom/hnbap/HNBAP_UERegisterRequest.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UERegisterRequest_H_ @@ -23,7 +23,7 @@ /* HNBAP_UERegisterRequest */ typedef struct HNBAP_UERegisterRequest { - struct ueRegisterRequest_ies { + struct HNBAP_UERegisterRequest__ueRegisterRequest_ies { A_SEQUENCE_OF(HNBAP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/hnbap/HNBAP_URAIdentity.h b/include/osmocom/hnbap/HNBAP_URAIdentity.h index 6d4d582..97a1e12 100644 --- a/include/osmocom/hnbap/HNBAP_URAIdentity.h +++ b/include/osmocom/hnbap/HNBAP_URAIdentity.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_URAIdentity_H_ diff --git a/include/osmocom/hnbap/HNBAP_URAIdentityList.h b/include/osmocom/hnbap/HNBAP_URAIdentityList.h index b676efa..0b22d29 100644 --- a/include/osmocom/hnbap/HNBAP_URAIdentityList.h +++ b/include/osmocom/hnbap/HNBAP_URAIdentityList.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_URAIdentityList_H_ diff --git a/include/osmocom/hnbap/HNBAP_UTRANCellID.h b/include/osmocom/hnbap/HNBAP_UTRANCellID.h index d5105b3..0659034 100644 --- a/include/osmocom/hnbap/HNBAP_UTRANCellID.h +++ b/include/osmocom/hnbap/HNBAP_UTRANCellID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UTRANCellID_H_ diff --git a/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h b/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h index 9f285f9..3951209 100644 --- a/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h +++ b/include/osmocom/hnbap/HNBAP_UnknownU-RNTIIndication.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UnknownU_RNTIIndication_H_ diff --git a/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h b/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h index b3d2a7e..032936f 100644 --- a/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h +++ b/include/osmocom/hnbap/HNBAP_UnsuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_UnsuccessfulOutcome_H_ diff --git a/include/osmocom/hnbap/HNBAP_Update-cause.h b/include/osmocom/hnbap/HNBAP_Update-cause.h index 601a34e..ebede3d 100644 --- a/include/osmocom/hnbap/HNBAP_Update-cause.h +++ b/include/osmocom/hnbap/HNBAP_Update-cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _HNBAP_Update_cause_H_ diff --git a/src/hnbap/HNBAP_Access-stratum-release-indicator.c b/src/hnbap/HNBAP_Access-stratum-release-indicator.c index fec27b8..747b8d5 100644 --- a/src/hnbap/HNBAP_Access-stratum-release-indicator.c +++ b/src/hnbap/HNBAP_Access-stratum-release-indicator.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_AccessResult.c b/src/hnbap/HNBAP_AccessResult.c index ef2d6db..d473c46 100644 --- a/src/hnbap/HNBAP_AccessResult.c +++ b/src/hnbap/HNBAP_AccessResult.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c b/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c index d19a303..337fbdb 100644 --- a/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c +++ b/src/hnbap/HNBAP_AdditionalNeighbourInfoList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_AltitudeAndDirection.c b/src/hnbap/HNBAP_AltitudeAndDirection.c index 9995f74..893838b 100644 --- a/src/hnbap/HNBAP_AltitudeAndDirection.c +++ b/src/hnbap/HNBAP_AltitudeAndDirection.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_BackoffTimer.c b/src/hnbap/HNBAP_BackoffTimer.c index 097ce18..2e72a5e 100644 --- a/src/hnbap/HNBAP_BackoffTimer.c +++ b/src/hnbap/HNBAP_BackoffTimer.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_BindingID.c b/src/hnbap/HNBAP_BindingID.c index 105a6f8..39137d1 100644 --- a/src/hnbap/HNBAP_BindingID.c +++ b/src/hnbap/HNBAP_BindingID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c b/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c index a25797b..7707cd1 100644 --- a/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c +++ b/src/hnbap/HNBAP_CELL-FACHMobilitySupport.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CGI.c b/src/hnbap/HNBAP_CGI.c index fbf96b6..17507cf 100644 --- a/src/hnbap/HNBAP_CGI.c +++ b/src/hnbap/HNBAP_CGI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CI.c b/src/hnbap/HNBAP_CI.c index c4d20ea..a3d4531 100644 --- a/src/hnbap/HNBAP_CI.c +++ b/src/hnbap/HNBAP_CI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CN-DomainIndicator.c b/src/hnbap/HNBAP_CN-DomainIndicator.c index 158957d..1374aca 100644 --- a/src/hnbap/HNBAP_CN-DomainIndicator.c +++ b/src/hnbap/HNBAP_CN-DomainIndicator.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CSG-Capability.c b/src/hnbap/HNBAP_CSG-Capability.c index 5bf3426..b98a8e8 100644 --- a/src/hnbap/HNBAP_CSG-Capability.c +++ b/src/hnbap/HNBAP_CSG-Capability.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CSG-ID.c b/src/hnbap/HNBAP_CSG-ID.c index 2000f51..402f9e3 100644 --- a/src/hnbap/HNBAP_CSG-ID.c +++ b/src/hnbap/HNBAP_CSG-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CSGMembershipStatus.c b/src/hnbap/HNBAP_CSGMembershipStatus.c index b49e7a8..7496570 100644 --- a/src/hnbap/HNBAP_CSGMembershipStatus.c +++ b/src/hnbap/HNBAP_CSGMembershipStatus.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CSGMembershipUpdate.c b/src/hnbap/HNBAP_CSGMembershipUpdate.c index 1febe4f..82a961d 100644 --- a/src/hnbap/HNBAP_CSGMembershipUpdate.c +++ b/src/hnbap/HNBAP_CSGMembershipUpdate.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_csgMembershipUpdate_ies_specs_2 = { - sizeof(struct csgMembershipUpdate_ies), - offsetof(struct csgMembershipUpdate_ies, _asn_ctx), + sizeof(struct HNBAP_CSGMembershipUpdate__csgMembershipUpdate_ies), + offsetof(struct HNBAP_CSGMembershipUpdate__csgMembershipUpdate_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_Cause.c b/src/hnbap/HNBAP_Cause.c index e0db859..7dfb5d6 100644 --- a/src/hnbap/HNBAP_Cause.c +++ b/src/hnbap/HNBAP_Cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CauseMisc.c b/src/hnbap/HNBAP_CauseMisc.c index a3c5752..2c0aeed 100644 --- a/src/hnbap/HNBAP_CauseMisc.c +++ b/src/hnbap/HNBAP_CauseMisc.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CauseProtocol.c b/src/hnbap/HNBAP_CauseProtocol.c index 8893481..d3a8943 100644 --- a/src/hnbap/HNBAP_CauseProtocol.c +++ b/src/hnbap/HNBAP_CauseProtocol.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CauseRadioNetwork.c b/src/hnbap/HNBAP_CauseRadioNetwork.c index 2418a72..f1beead 100644 --- a/src/hnbap/HNBAP_CauseRadioNetwork.c +++ b/src/hnbap/HNBAP_CauseRadioNetwork.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CauseTransport.c b/src/hnbap/HNBAP_CauseTransport.c index 6c37c66..e3b6755 100644 --- a/src/hnbap/HNBAP_CauseTransport.c +++ b/src/hnbap/HNBAP_CauseTransport.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CellIdentity.c b/src/hnbap/HNBAP_CellIdentity.c index 3465697..daf8e5e 100644 --- a/src/hnbap/HNBAP_CellIdentity.c +++ b/src/hnbap/HNBAP_CellIdentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_ConfigurationInformation.c b/src/hnbap/HNBAP_ConfigurationInformation.c index 6cf24b1..13bfe4a 100644 --- a/src/hnbap/HNBAP_ConfigurationInformation.c +++ b/src/hnbap/HNBAP_ConfigurationInformation.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Context-ID.c b/src/hnbap/HNBAP_Context-ID.c index 4d2a2b9..c8606d8 100644 --- a/src/hnbap/HNBAP_Context-ID.c +++ b/src/hnbap/HNBAP_Context-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Criticality.c b/src/hnbap/HNBAP_Criticality.c index de6fe43..2ff443f 100644 --- a/src/hnbap/HNBAP_Criticality.c +++ b/src/hnbap/HNBAP_Criticality.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c b/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c index f5aff57..df98d95 100644 --- a/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c +++ b/src/hnbap/HNBAP_CriticalityDiagnostics-IE-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -13,7 +13,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_Member_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct Member, iECriticality), + { ATF_NOFLAGS, 0, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, iECriticality), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_Criticality, @@ -22,7 +22,7 @@ 0, "iECriticality" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, iE_ID), + { ATF_NOFLAGS, 0, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, iE_ID), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_ProtocolIE_ID, @@ -31,7 +31,7 @@ 0, "iE-ID" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, typeOfError), + { ATF_NOFLAGS, 0, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, typeOfError), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_TypeOfError, @@ -40,7 +40,7 @@ 0, "typeOfError" }, - { ATF_POINTER, 1, offsetof(struct Member, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_IE_Extensions, @@ -61,8 +61,8 @@ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { - sizeof(struct Member), - offsetof(struct Member, _asn_ctx), + sizeof(struct HNBAP_CriticalityDiagnostics_IE_List__Member), + offsetof(struct HNBAP_CriticalityDiagnostics_IE_List__Member, _asn_ctx), asn_MAP_Member_tag2el_2, 4, /* Count of tags in the map */ asn_MAP_Member_oms_2, /* Optional members */ diff --git a/src/hnbap/HNBAP_CriticalityDiagnostics.c b/src/hnbap/HNBAP_CriticalityDiagnostics.c index 5760e92..e80b352 100644 --- a/src/hnbap/HNBAP_CriticalityDiagnostics.c +++ b/src/hnbap/HNBAP_CriticalityDiagnostics.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_ESN.c b/src/hnbap/HNBAP_ESN.c index d17f2ca..14107f7 100644 --- a/src/hnbap/HNBAP_ESN.c +++ b/src/hnbap/HNBAP_ESN.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_ErrorIndication.c b/src/hnbap/HNBAP_ErrorIndication.c index 4babda2..7077ab5 100644 --- a/src/hnbap/HNBAP_ErrorIndication.c +++ b/src/hnbap/HNBAP_ErrorIndication.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_errorIndication_ies_specs_2 = { - sizeof(struct errorIndication_ies), - offsetof(struct errorIndication_ies, _asn_ctx), + sizeof(struct HNBAP_ErrorIndication__errorIndication_ies), + offsetof(struct HNBAP_ErrorIndication__errorIndication_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_GTP-TEI.c b/src/hnbap/HNBAP_GTP-TEI.c index 7d4b292..448d611 100644 --- a/src/hnbap/HNBAP_GTP-TEI.c +++ b/src/hnbap/HNBAP_GTP-TEI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_GeographicalCoordinates.c b/src/hnbap/HNBAP_GeographicalCoordinates.c index 9607ebf..286a1f3 100644 --- a/src/hnbap/HNBAP_GeographicalCoordinates.c +++ b/src/hnbap/HNBAP_GeographicalCoordinates.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_GeographicalLocation.c b/src/hnbap/HNBAP_GeographicalLocation.c index 6daa15a..1d7c895 100644 --- a/src/hnbap/HNBAP_GeographicalLocation.c +++ b/src/hnbap/HNBAP_GeographicalLocation.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c b/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c index 5154bdf..4eac481 100644 --- a/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c +++ b/src/hnbap/HNBAP_HNB-Cell-Access-Mode.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNB-Cell-Identifier.c b/src/hnbap/HNBAP_HNB-Cell-Identifier.c index cf2b620..43d7165 100644 --- a/src/hnbap/HNBAP_HNB-Cell-Identifier.c +++ b/src/hnbap/HNBAP_HNB-Cell-Identifier.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNB-GWResponse.c b/src/hnbap/HNBAP_HNB-GWResponse.c index e48cada..9df03b5 100644 --- a/src/hnbap/HNBAP_HNB-GWResponse.c +++ b/src/hnbap/HNBAP_HNB-GWResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNB-Identity-Info.c b/src/hnbap/HNBAP_HNB-Identity-Info.c index 1ac5789..a28b2af 100644 --- a/src/hnbap/HNBAP_HNB-Identity-Info.c +++ b/src/hnbap/HNBAP_HNB-Identity-Info.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNB-Identity.c b/src/hnbap/HNBAP_HNB-Identity.c index 217b714..f4eb992 100644 --- a/src/hnbap/HNBAP_HNB-Identity.c +++ b/src/hnbap/HNBAP_HNB-Identity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNB-Location-Information.c b/src/hnbap/HNBAP_HNB-Location-Information.c index 178ac0f..d8ffefb 100644 --- a/src/hnbap/HNBAP_HNB-Location-Information.c +++ b/src/hnbap/HNBAP_HNB-Location-Information.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNB-RNL-Identity.c b/src/hnbap/HNBAP_HNB-RNL-Identity.c index 09d3c52..2e9e705 100644 --- a/src/hnbap/HNBAP_HNB-RNL-Identity.c +++ b/src/hnbap/HNBAP_HNB-RNL-Identity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNBAP-PDU.c b/src/hnbap/HNBAP_HNBAP-PDU.c index 2adb422..d982b93 100644 --- a/src/hnbap/HNBAP_HNBAP-PDU.c +++ b/src/hnbap/HNBAP_HNBAP-PDU.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNBCapacity.c b/src/hnbap/HNBAP_HNBCapacity.c index 3f9da47..e34caf7 100644 --- a/src/hnbap/HNBAP_HNBCapacity.c +++ b/src/hnbap/HNBAP_HNBCapacity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigInfo.c b/src/hnbap/HNBAP_HNBConfigInfo.c index 402363d..ba41f60 100644 --- a/src/hnbap/HNBAP_HNBConfigInfo.c +++ b/src/hnbap/HNBAP_HNBConfigInfo.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigTransferRequest.c b/src/hnbap/HNBAP_HNBConfigTransferRequest.c index ff2b20f..e5db652 100644 --- a/src/hnbap/HNBAP_HNBConfigTransferRequest.c +++ b/src/hnbap/HNBAP_HNBConfigTransferRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_hnbConfigTransferRequest_ies_specs_2 = { - sizeof(struct hnbConfigTransferRequest_ies), - offsetof(struct hnbConfigTransferRequest_ies, _asn_ctx), + sizeof(struct HNBAP_HNBConfigTransferRequest__hnbConfigTransferRequest_ies), + offsetof(struct HNBAP_HNBConfigTransferRequest__hnbConfigTransferRequest_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_HNBConfigTransferResponse.c b/src/hnbap/HNBAP_HNBConfigTransferResponse.c index 00e2d1f..5b73f16 100644 --- a/src/hnbap/HNBAP_HNBConfigTransferResponse.c +++ b/src/hnbap/HNBAP_HNBConfigTransferResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_hnbConfigTransferResponse_ies_specs_2 = { - sizeof(struct hnbConfigTransferResponse_ies), - offsetof(struct hnbConfigTransferResponse_ies, _asn_ctx), + sizeof(struct HNBAP_HNBConfigTransferResponse__hnbConfigTransferResponse_ies), + offsetof(struct HNBAP_HNBConfigTransferResponse__hnbConfigTransferResponse_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c b/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c index 27e12fa..4a8e3e9 100644 --- a/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c +++ b/src/hnbap/HNBAP_HNBConfigurationInformationMissing.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c b/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c index db68725..f0988fe 100644 --- a/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c +++ b/src/hnbap/HNBAP_HNBConfigurationInformationProvided.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_HNBDe-Register.c b/src/hnbap/HNBAP_HNBDe-Register.c index d2ef818..313dcd1 100644 --- a/src/hnbap/HNBAP_HNBDe-Register.c +++ b/src/hnbap/HNBAP_HNBDe-Register.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_hnbDe_Register_ies_specs_2 = { - sizeof(struct hnbDe_Register_ies), - offsetof(struct hnbDe_Register_ies, _asn_ctx), + sizeof(struct HNBAP_HNBDe_Register__hnbDe_Register_ies), + offsetof(struct HNBAP_HNBDe_Register__hnbDe_Register_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_HNBRegisterAccept.c b/src/hnbap/HNBAP_HNBRegisterAccept.c index 4b1afa0..dafb29a 100644 --- a/src/hnbap/HNBAP_HNBRegisterAccept.c +++ b/src/hnbap/HNBAP_HNBRegisterAccept.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_hnbRegisterAccept_ies_specs_2 = { - sizeof(struct hnbRegisterAccept_ies), - offsetof(struct hnbRegisterAccept_ies, _asn_ctx), + sizeof(struct HNBAP_HNBRegisterAccept__hnbRegisterAccept_ies), + offsetof(struct HNBAP_HNBRegisterAccept__hnbRegisterAccept_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_HNBRegisterReject.c b/src/hnbap/HNBAP_HNBRegisterReject.c index ecab1d1..e13289f 100644 --- a/src/hnbap/HNBAP_HNBRegisterReject.c +++ b/src/hnbap/HNBAP_HNBRegisterReject.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_hnbRegisterReject_ies_specs_2 = { - sizeof(struct hnbRegisterReject_ies), - offsetof(struct hnbRegisterReject_ies, _asn_ctx), + sizeof(struct HNBAP_HNBRegisterReject__hnbRegisterReject_ies), + offsetof(struct HNBAP_HNBRegisterReject__hnbRegisterReject_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_HNBRegisterRequest.c b/src/hnbap/HNBAP_HNBRegisterRequest.c index 3bf2278..443024f 100644 --- a/src/hnbap/HNBAP_HNBRegisterRequest.c +++ b/src/hnbap/HNBAP_HNBRegisterRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_hnbRegisterRequest_ies_specs_2 = { - sizeof(struct hnbRegisterRequest_ies), - offsetof(struct hnbRegisterRequest_ies, _asn_ctx), + sizeof(struct HNBAP_HNBRegisterRequest__hnbRegisterRequest_ies), + offsetof(struct HNBAP_HNBRegisterRequest__hnbRegisterRequest_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_IE-Extensions.c b/src/hnbap/HNBAP_IE-Extensions.c index 603b933..2cc141b 100644 --- a/src/hnbap/HNBAP_IE-Extensions.c +++ b/src/hnbap/HNBAP_IE-Extensions.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_IE.c b/src/hnbap/HNBAP_IE.c index c57f924..2c9c779 100644 --- a/src/hnbap/HNBAP_IE.c +++ b/src/hnbap/HNBAP_IE.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_IMEI.c b/src/hnbap/HNBAP_IMEI.c index b3c4406..cf13c7b 100644 --- a/src/hnbap/HNBAP_IMEI.c +++ b/src/hnbap/HNBAP_IMEI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_IMSI.c b/src/hnbap/HNBAP_IMSI.c index 9a3c757..bb0c58e 100644 --- a/src/hnbap/HNBAP_IMSI.c +++ b/src/hnbap/HNBAP_IMSI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_IMSIDS41.c b/src/hnbap/HNBAP_IMSIDS41.c index 10a7807..0d82417 100644 --- a/src/hnbap/HNBAP_IMSIDS41.c +++ b/src/hnbap/HNBAP_IMSIDS41.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_IMSIESN.c b/src/hnbap/HNBAP_IMSIESN.c index 1b9d9a6..d0c3e9a 100644 --- a/src/hnbap/HNBAP_IMSIESN.c +++ b/src/hnbap/HNBAP_IMSIESN.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_IP-Address.c b/src/hnbap/HNBAP_IP-Address.c index 6bc9d7f..06bc182 100644 --- a/src/hnbap/HNBAP_IP-Address.c +++ b/src/hnbap/HNBAP_IP-Address.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -13,7 +13,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_ipaddress_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct ipaddress, choice.ipv4info), + { ATF_NOFLAGS, 0, offsetof(struct HNBAP_IP_Address__ipaddress, choice.ipv4info), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_Ipv4Address, @@ -22,7 +22,7 @@ 0, "ipv4info" }, - { ATF_NOFLAGS, 0, offsetof(struct ipaddress, choice.ipv6info), + { ATF_NOFLAGS, 0, offsetof(struct HNBAP_IP_Address__ipaddress, choice.ipv6info), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_Ipv6Address, @@ -37,10 +37,10 @@ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* ipv6info */ }; static asn_CHOICE_specifics_t asn_SPC_ipaddress_specs_2 = { - sizeof(struct ipaddress), - offsetof(struct ipaddress, _asn_ctx), - offsetof(struct ipaddress, present), - sizeof(((struct ipaddress *)0)->present), + sizeof(struct HNBAP_IP_Address__ipaddress), + offsetof(struct HNBAP_IP_Address__ipaddress, _asn_ctx), + offsetof(struct HNBAP_IP_Address__ipaddress, present), + sizeof(((struct HNBAP_IP_Address__ipaddress *)0)->present), asn_MAP_ipaddress_tag2el_2, 2, /* Count of tags in the map */ 0, diff --git a/src/hnbap/HNBAP_InitiatingMessage.c b/src/hnbap/HNBAP_InitiatingMessage.c index 1b87f7d..155eff9 100644 --- a/src/hnbap/HNBAP_InitiatingMessage.c +++ b/src/hnbap/HNBAP_InitiatingMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Ipv4Address.c b/src/hnbap/HNBAP_Ipv4Address.c index f325ead..4481e57 100644 --- a/src/hnbap/HNBAP_Ipv4Address.c +++ b/src/hnbap/HNBAP_Ipv4Address.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Ipv6Address.c b/src/hnbap/HNBAP_Ipv6Address.c index b0c9176..2fad0a5 100644 --- a/src/hnbap/HNBAP_Ipv6Address.c +++ b/src/hnbap/HNBAP_Ipv6Address.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c b/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c index 79b4dad..3b70b99 100644 --- a/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c +++ b/src/hnbap/HNBAP_Iurh-Signalling-TNL-AddressList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_LAC.c b/src/hnbap/HNBAP_LAC.c index 8f3d9f5..81bc84a 100644 --- a/src/hnbap/HNBAP_LAC.c +++ b/src/hnbap/HNBAP_LAC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_LAI.c b/src/hnbap/HNBAP_LAI.c index bcfddde..4b0a560 100644 --- a/src/hnbap/HNBAP_LAI.c +++ b/src/hnbap/HNBAP_LAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_MacroCellID.c b/src/hnbap/HNBAP_MacroCellID.c index 568e56a..04cc2ea 100644 --- a/src/hnbap/HNBAP_MacroCellID.c +++ b/src/hnbap/HNBAP_MacroCellID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_MacroCoverageInformation.c b/src/hnbap/HNBAP_MacroCoverageInformation.c index 83ae67b..6284030 100644 --- a/src/hnbap/HNBAP_MacroCoverageInformation.c +++ b/src/hnbap/HNBAP_MacroCoverageInformation.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_MuxPortNumber.c b/src/hnbap/HNBAP_MuxPortNumber.c index 4c7ca42..4619dff 100644 --- a/src/hnbap/HNBAP_MuxPortNumber.c +++ b/src/hnbap/HNBAP_MuxPortNumber.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_NeighbourCellIdentityList.c b/src/hnbap/HNBAP_NeighbourCellIdentityList.c index e0f912c..47165dc 100644 --- a/src/hnbap/HNBAP_NeighbourCellIdentityList.c +++ b/src/hnbap/HNBAP_NeighbourCellIdentityList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_NeighbourIdentity.c b/src/hnbap/HNBAP_NeighbourIdentity.c index 2e69f01..8386ee1 100644 --- a/src/hnbap/HNBAP_NeighbourIdentity.c +++ b/src/hnbap/HNBAP_NeighbourIdentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_NeighbourInfoList.c b/src/hnbap/HNBAP_NeighbourInfoList.c index 458a142..61a4efb 100644 --- a/src/hnbap/HNBAP_NeighbourInfoList.c +++ b/src/hnbap/HNBAP_NeighbourInfoList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_NeighbourInfoRequestItem.c b/src/hnbap/HNBAP_NeighbourInfoRequestItem.c index 42cd579..e556fca 100644 --- a/src/hnbap/HNBAP_NeighbourInfoRequestItem.c +++ b/src/hnbap/HNBAP_NeighbourInfoRequestItem.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_NeighbourInfoRequestList.c b/src/hnbap/HNBAP_NeighbourInfoRequestList.c index 738d5c2..cc700cc 100644 --- a/src/hnbap/HNBAP_NeighbourInfoRequestList.c +++ b/src/hnbap/HNBAP_NeighbourInfoRequestList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_PLMNidentity.c b/src/hnbap/HNBAP_PLMNidentity.c index cb6879b..9ea2254 100644 --- a/src/hnbap/HNBAP_PLMNidentity.c +++ b/src/hnbap/HNBAP_PLMNidentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_PSC.c b/src/hnbap/HNBAP_PSC.c index b696fc0..d8049db 100644 --- a/src/hnbap/HNBAP_PSC.c +++ b/src/hnbap/HNBAP_PSC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_PTMSI.c b/src/hnbap/HNBAP_PTMSI.c index 23976ef..52c380b 100644 --- a/src/hnbap/HNBAP_PTMSI.c +++ b/src/hnbap/HNBAP_PTMSI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_PTMSIRAI.c b/src/hnbap/HNBAP_PTMSIRAI.c index dc17dd3..b18bd34 100644 --- a/src/hnbap/HNBAP_PTMSIRAI.c +++ b/src/hnbap/HNBAP_PTMSIRAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Presence.c b/src/hnbap/HNBAP_Presence.c index a6e7286..3988022 100644 --- a/src/hnbap/HNBAP_Presence.c +++ b/src/hnbap/HNBAP_Presence.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_PrivateIE-ID.c b/src/hnbap/HNBAP_PrivateIE-ID.c index 3bf3000..a514507 100644 --- a/src/hnbap/HNBAP_PrivateIE-ID.c +++ b/src/hnbap/HNBAP_PrivateIE-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_PrivateMessage.c b/src/hnbap/HNBAP_PrivateMessage.c index ebac795..2e703e3 100644 --- a/src/hnbap/HNBAP_PrivateMessage.c +++ b/src/hnbap/HNBAP_PrivateMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_privateMessage_ies_specs_2 = { - sizeof(struct privateMessage_ies), - offsetof(struct privateMessage_ies, _asn_ctx), + sizeof(struct HNBAP_PrivateMessage__privateMessage_ies), + offsetof(struct HNBAP_PrivateMessage__privateMessage_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_ProcedureCode.c b/src/hnbap/HNBAP_ProcedureCode.c index c32e9fb..e2b909d 100644 --- a/src/hnbap/HNBAP_ProcedureCode.c +++ b/src/hnbap/HNBAP_ProcedureCode.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_ProtocolIE-ID.c b/src/hnbap/HNBAP_ProtocolIE-ID.c index f4fc953..e685cb1 100644 --- a/src/hnbap/HNBAP_ProtocolIE-ID.c +++ b/src/hnbap/HNBAP_ProtocolIE-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_RAB-ID.c b/src/hnbap/HNBAP_RAB-ID.c index 4dea280..b66cd9c 100644 --- a/src/hnbap/HNBAP_RAB-ID.c +++ b/src/hnbap/HNBAP_RAB-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_RABList.c b/src/hnbap/HNBAP_RABList.c index fe478e2..e56bdc2 100644 --- a/src/hnbap/HNBAP_RABList.c +++ b/src/hnbap/HNBAP_RABList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_RABListItem.c b/src/hnbap/HNBAP_RABListItem.c index 4fcf4aa..c147214 100644 --- a/src/hnbap/HNBAP_RABListItem.c +++ b/src/hnbap/HNBAP_RABListItem.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_RAC.c b/src/hnbap/HNBAP_RAC.c index 6a6235c..9b210ad 100644 --- a/src/hnbap/HNBAP_RAC.c +++ b/src/hnbap/HNBAP_RAC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_RAI.c b/src/hnbap/HNBAP_RAI.c index c6bca5b..c958051 100644 --- a/src/hnbap/HNBAP_RAI.c +++ b/src/hnbap/HNBAP_RAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_RNC-ID.c b/src/hnbap/HNBAP_RNC-ID.c index 57da025..73a3921 100644 --- a/src/hnbap/HNBAP_RNC-ID.c +++ b/src/hnbap/HNBAP_RNC-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Registration-Cause.c b/src/hnbap/HNBAP_Registration-Cause.c index 8047241..703d5af 100644 --- a/src/hnbap/HNBAP_Registration-Cause.c +++ b/src/hnbap/HNBAP_Registration-Cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_RelocationComplete.c b/src/hnbap/HNBAP_RelocationComplete.c index b939e69..d0655f0 100644 --- a/src/hnbap/HNBAP_RelocationComplete.c +++ b/src/hnbap/HNBAP_RelocationComplete.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_relocationComplete_ies_specs_2 = { - sizeof(struct relocationComplete_ies), - offsetof(struct relocationComplete_ies, _asn_ctx), + sizeof(struct HNBAP_RelocationComplete__relocationComplete_ies), + offsetof(struct HNBAP_RelocationComplete__relocationComplete_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_S-RNTIPrefix.c b/src/hnbap/HNBAP_S-RNTIPrefix.c index 3d5394c..c236fc7 100644 --- a/src/hnbap/HNBAP_S-RNTIPrefix.c +++ b/src/hnbap/HNBAP_S-RNTIPrefix.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_SAC.c b/src/hnbap/HNBAP_SAC.c index 6c2a1e2..0c6fc35 100644 --- a/src/hnbap/HNBAP_SAC.c +++ b/src/hnbap/HNBAP_SAC.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_SuccessfulOutcome.c b/src/hnbap/HNBAP_SuccessfulOutcome.c index 5adb2ab..bd3152a 100644 --- a/src/hnbap/HNBAP_SuccessfulOutcome.c +++ b/src/hnbap/HNBAP_SuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_TMSIDS41.c b/src/hnbap/HNBAP_TMSIDS41.c index 0f2e295..7f62cb6 100644 --- a/src/hnbap/HNBAP_TMSIDS41.c +++ b/src/hnbap/HNBAP_TMSIDS41.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_TMSILAI.c b/src/hnbap/HNBAP_TMSILAI.c index 2fe80eb..05ea97b 100644 --- a/src/hnbap/HNBAP_TMSILAI.c +++ b/src/hnbap/HNBAP_TMSILAI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_TNLUpdateFailure.c b/src/hnbap/HNBAP_TNLUpdateFailure.c index 0f01084..86b371f 100644 --- a/src/hnbap/HNBAP_TNLUpdateFailure.c +++ b/src/hnbap/HNBAP_TNLUpdateFailure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_tnlUpdateFailure_ies_specs_2 = { - sizeof(struct tnlUpdateFailure_ies), - offsetof(struct tnlUpdateFailure_ies, _asn_ctx), + sizeof(struct HNBAP_TNLUpdateFailure__tnlUpdateFailure_ies), + offsetof(struct HNBAP_TNLUpdateFailure__tnlUpdateFailure_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_TNLUpdateRequest.c b/src/hnbap/HNBAP_TNLUpdateRequest.c index bdf5c00..b0650dd 100644 --- a/src/hnbap/HNBAP_TNLUpdateRequest.c +++ b/src/hnbap/HNBAP_TNLUpdateRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_tnlUpdateRequest_ies_specs_2 = { - sizeof(struct tnlUpdateRequest_ies), - offsetof(struct tnlUpdateRequest_ies, _asn_ctx), + sizeof(struct HNBAP_TNLUpdateRequest__tnlUpdateRequest_ies), + offsetof(struct HNBAP_TNLUpdateRequest__tnlUpdateRequest_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_TNLUpdateResponse.c b/src/hnbap/HNBAP_TNLUpdateResponse.c index 8876313..db9affb 100644 --- a/src/hnbap/HNBAP_TNLUpdateResponse.c +++ b/src/hnbap/HNBAP_TNLUpdateResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_tnlUpdateResponse_ies_specs_2 = { - sizeof(struct tnlUpdateResponse_ies), - offsetof(struct tnlUpdateResponse_ies, _asn_ctx), + sizeof(struct HNBAP_TNLUpdateResponse__tnlUpdateResponse_ies), + offsetof(struct HNBAP_TNLUpdateResponse__tnlUpdateResponse_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_TransportInfo.c b/src/hnbap/HNBAP_TransportInfo.c index 9e0f7a3..2162f9b 100644 --- a/src/hnbap/HNBAP_TransportInfo.c +++ b/src/hnbap/HNBAP_TransportInfo.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -13,7 +13,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_transportAssociation_3[] = { - { ATF_NOFLAGS, 0, offsetof(struct transportAssociation, choice.gtp_TEI), + { ATF_NOFLAGS, 0, offsetof(struct HNBAP_TransportInfo__transportAssociation, choice.gtp_TEI), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_GTP_TEI, @@ -22,7 +22,7 @@ 0, "gtp-TEI" }, - { ATF_NOFLAGS, 0, offsetof(struct transportAssociation, choice.bindingID), + { ATF_NOFLAGS, 0, offsetof(struct HNBAP_TransportInfo__transportAssociation, choice.bindingID), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_HNBAP_BindingID, @@ -37,10 +37,10 @@ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* bindingID */ }; static asn_CHOICE_specifics_t asn_SPC_transportAssociation_specs_3 = { - sizeof(struct transportAssociation), - offsetof(struct transportAssociation, _asn_ctx), - offsetof(struct transportAssociation, present), - sizeof(((struct transportAssociation *)0)->present), + sizeof(struct HNBAP_TransportInfo__transportAssociation), + offsetof(struct HNBAP_TransportInfo__transportAssociation, _asn_ctx), + offsetof(struct HNBAP_TransportInfo__transportAssociation, present), + sizeof(((struct HNBAP_TransportInfo__transportAssociation *)0)->present), asn_MAP_transportAssociation_tag2el_3, 2, /* Count of tags in the map */ 0, diff --git a/src/hnbap/HNBAP_TransportLayerAddress.c b/src/hnbap/HNBAP_TransportLayerAddress.c index 9cc085f..f324e55 100644 --- a/src/hnbap/HNBAP_TransportLayerAddress.c +++ b/src/hnbap/HNBAP_TransportLayerAddress.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_TriggeringMessage.c b/src/hnbap/HNBAP_TriggeringMessage.c index 4485222..d851a6c 100644 --- a/src/hnbap/HNBAP_TriggeringMessage.c +++ b/src/hnbap/HNBAP_TriggeringMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-CommonDataTypes" * found in "../../asn1/hnbap/HNBAP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Tunnel-Information.c b/src/hnbap/HNBAP_Tunnel-Information.c index db3387e..5429d9e 100644 --- a/src/hnbap/HNBAP_Tunnel-Information.c +++ b/src/hnbap/HNBAP_Tunnel-Information.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * >From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_TypeOfError.c b/src/hnbap/HNBAP_TypeOfError.c index 2d894f6..53dccc3 100644 --- a/src/hnbap/HNBAP_TypeOfError.c +++ b/src/hnbap/HNBAP_TypeOfError.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_U-RNTI.c b/src/hnbap/HNBAP_U-RNTI.c index 438c32a..bb10ac7 100644 --- a/src/hnbap/HNBAP_U-RNTI.c +++ b/src/hnbap/HNBAP_U-RNTI.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_U-RNTIQueryRequest.c b/src/hnbap/HNBAP_U-RNTIQueryRequest.c index f10d278..cea48cb 100644 --- a/src/hnbap/HNBAP_U-RNTIQueryRequest.c +++ b/src/hnbap/HNBAP_U-RNTIQueryRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_u_RNTIQueryRequest_ies_specs_2 = { - sizeof(struct u_RNTIQueryRequest_ies), - offsetof(struct u_RNTIQueryRequest_ies, _asn_ctx), + sizeof(struct HNBAP_U_RNTIQueryRequest__u_RNTIQueryRequest_ies), + offsetof(struct HNBAP_U_RNTIQueryRequest__u_RNTIQueryRequest_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_U-RNTIQueryResponse.c b/src/hnbap/HNBAP_U-RNTIQueryResponse.c index eda66b0..98b9bef 100644 --- a/src/hnbap/HNBAP_U-RNTIQueryResponse.c +++ b/src/hnbap/HNBAP_U-RNTIQueryResponse.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_u_RNTIQueryResponse_ies_specs_2 = { - sizeof(struct u_RNTIQueryResponse_ies), - offsetof(struct u_RNTIQueryResponse_ies, _asn_ctx), + sizeof(struct HNBAP_U_RNTIQueryResponse__u_RNTIQueryResponse_ies), + offsetof(struct HNBAP_U_RNTIQueryResponse__u_RNTIQueryResponse_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_UDP-Port-Number.c b/src/hnbap/HNBAP_UDP-Port-Number.c index 6a5ddb7..ccfea53 100644 --- a/src/hnbap/HNBAP_UDP-Port-Number.c +++ b/src/hnbap/HNBAP_UDP-Port-Number.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_UE-Capabilities.c b/src/hnbap/HNBAP_UE-Capabilities.c index 903df3e..1343a9c 100644 --- a/src/hnbap/HNBAP_UE-Capabilities.c +++ b/src/hnbap/HNBAP_UE-Capabilities.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_UE-Identity.c b/src/hnbap/HNBAP_UE-Identity.c index 8a820cc..8160d4e 100644 --- a/src/hnbap/HNBAP_UE-Identity.c +++ b/src/hnbap/HNBAP_UE-Identity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_UEDe-Register.c b/src/hnbap/HNBAP_UEDe-Register.c index 2e5d3ed..5d466f4 100644 --- a/src/hnbap/HNBAP_UEDe-Register.c +++ b/src/hnbap/HNBAP_UEDe-Register.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_ueDe_Register_ies_specs_2 = { - sizeof(struct ueDe_Register_ies), - offsetof(struct ueDe_Register_ies, _asn_ctx), + sizeof(struct HNBAP_UEDe_Register__ueDe_Register_ies), + offsetof(struct HNBAP_UEDe_Register__ueDe_Register_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_UERegisterAccept.c b/src/hnbap/HNBAP_UERegisterAccept.c index 02f5d5b..d7f2fd8 100644 --- a/src/hnbap/HNBAP_UERegisterAccept.c +++ b/src/hnbap/HNBAP_UERegisterAccept.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_ueRegisterAccept_ies_specs_2 = { - sizeof(struct ueRegisterAccept_ies), - offsetof(struct ueRegisterAccept_ies, _asn_ctx), + sizeof(struct HNBAP_UERegisterAccept__ueRegisterAccept_ies), + offsetof(struct HNBAP_UERegisterAccept__ueRegisterAccept_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_UERegisterReject.c b/src/hnbap/HNBAP_UERegisterReject.c index aab3e7f..4969dc9 100644 --- a/src/hnbap/HNBAP_UERegisterReject.c +++ b/src/hnbap/HNBAP_UERegisterReject.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_ueRegisterReject_ies_specs_2 = { - sizeof(struct ueRegisterReject_ies), - offsetof(struct ueRegisterReject_ies, _asn_ctx), + sizeof(struct HNBAP_UERegisterReject__ueRegisterReject_ies), + offsetof(struct HNBAP_UERegisterReject__ueRegisterReject_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_UERegisterRequest.c b/src/hnbap/HNBAP_UERegisterRequest.c index af2c267..95a97f7 100644 --- a/src/hnbap/HNBAP_UERegisterRequest.c +++ b/src/hnbap/HNBAP_UERegisterRequest.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_ueRegisterRequest_ies_specs_2 = { - sizeof(struct ueRegisterRequest_ies), - offsetof(struct ueRegisterRequest_ies, _asn_ctx), + sizeof(struct HNBAP_UERegisterRequest__ueRegisterRequest_ies), + offsetof(struct HNBAP_UERegisterRequest__ueRegisterRequest_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/hnbap/HNBAP_URAIdentity.c b/src/hnbap/HNBAP_URAIdentity.c index 4f9bff7..3bd347e 100644 --- a/src/hnbap/HNBAP_URAIdentity.c +++ b/src/hnbap/HNBAP_URAIdentity.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_URAIdentityList.c b/src/hnbap/HNBAP_URAIdentityList.c index 4530743..eaff2e9 100644 --- a/src/hnbap/HNBAP_URAIdentityList.c +++ b/src/hnbap/HNBAP_URAIdentityList.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_UTRANCellID.c b/src/hnbap/HNBAP_UTRANCellID.c index 28d69fe..f0a7f6a 100644 --- a/src/hnbap/HNBAP_UTRANCellID.c +++ b/src/hnbap/HNBAP_UTRANCellID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_UnknownU-RNTIIndication.c b/src/hnbap/HNBAP_UnknownU-RNTIIndication.c index 188dcbf..f6c3011 100644 --- a/src/hnbap/HNBAP_UnknownU-RNTIIndication.c +++ b/src/hnbap/HNBAP_UnknownU-RNTIIndication.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_UnsuccessfulOutcome.c b/src/hnbap/HNBAP_UnsuccessfulOutcome.c index 4b83dda..30734ca 100644 --- a/src/hnbap/HNBAP_UnsuccessfulOutcome.c +++ b/src/hnbap/HNBAP_UnsuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-PDU" * found in "../../asn1/hnbap/HNBAP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/HNBAP_Update-cause.c b/src/hnbap/HNBAP_Update-cause.c index 105e3b6..d7acd6c 100644 --- a/src/hnbap/HNBAP_Update-cause.c +++ b/src/hnbap/HNBAP_Update-cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "HNBAP-IEs" * found in "../../asn1/hnbap/HNBAP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am index 53dd609..15bee55 100644 --- a/src/hnbap/Makefile.am +++ b/src/hnbap/Makefile.am @@ -243,7 +243,7 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - ASN1C_PREFIX="HNBAP_" asn1c -R -gen-PER $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn + ASN1C_PREFIX="HNBAP_" asn1c -R -fcompound-names -gen-PER $(HNBAP_ASN1)/HNBAP-CommonDataTypes.asn $(HNBAP_ASN1)/HNBAP-Constants.asn $(HNBAP_ASN1)/HNBAP-IEs.asn $(HNBAP_ASN1)/HNBAP-PDU.asn # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/hnbap $(ASN_MODULE_INC) # Finally copy *.c from buildir to srcdir: -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25991 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1bcbe047d233684647d6ffe9febb14a12c579696 Gerrit-Change-Number: 25991 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:43:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:43:52 +0000 Subject: Change in osmo-iuh[master]: rua: Use asn1c flag -fcompound-names to avoid name collisions with ot... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25992 ) Change subject: rua: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... rua: Use asn1c flag -fcompound-names to avoid name collisions with other libs Change-Id: Id4e337cdc82c26922b7ca7f0fe8af523e9a0945c --- M include/osmocom/rua/RUA_Ansi-41-IDNNS.h M include/osmocom/rua/RUA_CN-DomainIndicator.h M include/osmocom/rua/RUA_CSGMembershipStatus.h M include/osmocom/rua/RUA_Cause.h M include/osmocom/rua/RUA_CauseMisc.h M include/osmocom/rua/RUA_CauseProtocol.h M include/osmocom/rua/RUA_CauseRadioNetwork.h M include/osmocom/rua/RUA_CauseTransport.h M include/osmocom/rua/RUA_Connect.h M include/osmocom/rua/RUA_ConnectionlessTransfer.h M include/osmocom/rua/RUA_Context-ID.h M include/osmocom/rua/RUA_Criticality.h M include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h M include/osmocom/rua/RUA_CriticalityDiagnostics.h M include/osmocom/rua/RUA_DirectTransfer.h M include/osmocom/rua/RUA_Disconnect.h M include/osmocom/rua/RUA_ErrorIndication.h M include/osmocom/rua/RUA_Establishment-Cause.h M include/osmocom/rua/RUA_Gsm-map-IDNNS.h M include/osmocom/rua/RUA_IE-Extensions.h M include/osmocom/rua/RUA_IE.h M include/osmocom/rua/RUA_InitiatingMessage.h M include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h M include/osmocom/rua/RUA_Presence.h M include/osmocom/rua/RUA_PrivateIE-ID.h M include/osmocom/rua/RUA_PrivateMessage.h M include/osmocom/rua/RUA_ProcedureCode.h M include/osmocom/rua/RUA_ProtocolIE-ID.h M include/osmocom/rua/RUA_RANAP-Message.h M include/osmocom/rua/RUA_RUA-PDU.h M include/osmocom/rua/RUA_RoutingParameter.h M include/osmocom/rua/RUA_SuccessfulOutcome.h M include/osmocom/rua/RUA_TriggeringMessage.h M include/osmocom/rua/RUA_TypeOfError.h M include/osmocom/rua/RUA_UnsuccessfulOutcome.h M src/rua/Makefile.am M src/rua/RUA_Ansi-41-IDNNS.c M src/rua/RUA_CN-DomainIndicator.c M src/rua/RUA_CSGMembershipStatus.c M src/rua/RUA_Cause.c M src/rua/RUA_CauseMisc.c M src/rua/RUA_CauseProtocol.c M src/rua/RUA_CauseRadioNetwork.c M src/rua/RUA_CauseTransport.c M src/rua/RUA_Connect.c M src/rua/RUA_ConnectionlessTransfer.c M src/rua/RUA_Context-ID.c M src/rua/RUA_Criticality.c M src/rua/RUA_CriticalityDiagnostics-IE-List.c M src/rua/RUA_CriticalityDiagnostics.c M src/rua/RUA_DirectTransfer.c M src/rua/RUA_Disconnect.c M src/rua/RUA_ErrorIndication.c M src/rua/RUA_Establishment-Cause.c M src/rua/RUA_Gsm-map-IDNNS.c M src/rua/RUA_IE-Extensions.c M src/rua/RUA_IE.c M src/rua/RUA_InitiatingMessage.c M src/rua/RUA_IntraDomainNasNodeSelector.c M src/rua/RUA_Presence.c M src/rua/RUA_PrivateIE-ID.c M src/rua/RUA_PrivateMessage.c M src/rua/RUA_ProcedureCode.c M src/rua/RUA_ProtocolIE-ID.c M src/rua/RUA_RANAP-Message.c M src/rua/RUA_RUA-PDU.c M src/rua/RUA_RoutingParameter.c M src/rua/RUA_SuccessfulOutcome.c M src/rua/RUA_TriggeringMessage.c M src/rua/RUA_TypeOfError.c M src/rua/RUA_UnsuccessfulOutcome.c 71 files changed, 187 insertions(+), 187 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/rua/RUA_Ansi-41-IDNNS.h b/include/osmocom/rua/RUA_Ansi-41-IDNNS.h index 26e5d62..9c78efd 100644 --- a/include/osmocom/rua/RUA_Ansi-41-IDNNS.h +++ b/include/osmocom/rua/RUA_Ansi-41-IDNNS.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Ansi_41_IDNNS_H_ diff --git a/include/osmocom/rua/RUA_CN-DomainIndicator.h b/include/osmocom/rua/RUA_CN-DomainIndicator.h index 507558b..60eadb9 100644 --- a/include/osmocom/rua/RUA_CN-DomainIndicator.h +++ b/include/osmocom/rua/RUA_CN-DomainIndicator.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CN_DomainIndicator_H_ diff --git a/include/osmocom/rua/RUA_CSGMembershipStatus.h b/include/osmocom/rua/RUA_CSGMembershipStatus.h index a4889ca..cc5cbb6 100644 --- a/include/osmocom/rua/RUA_CSGMembershipStatus.h +++ b/include/osmocom/rua/RUA_CSGMembershipStatus.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CSGMembershipStatus_H_ diff --git a/include/osmocom/rua/RUA_Cause.h b/include/osmocom/rua/RUA_Cause.h index 8269f9f..860b7e1 100644 --- a/include/osmocom/rua/RUA_Cause.h +++ b/include/osmocom/rua/RUA_Cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Cause_H_ diff --git a/include/osmocom/rua/RUA_CauseMisc.h b/include/osmocom/rua/RUA_CauseMisc.h index 45ca8db..ffb4fe7 100644 --- a/include/osmocom/rua/RUA_CauseMisc.h +++ b/include/osmocom/rua/RUA_CauseMisc.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CauseMisc_H_ diff --git a/include/osmocom/rua/RUA_CauseProtocol.h b/include/osmocom/rua/RUA_CauseProtocol.h index b857ce5..661105c 100644 --- a/include/osmocom/rua/RUA_CauseProtocol.h +++ b/include/osmocom/rua/RUA_CauseProtocol.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CauseProtocol_H_ diff --git a/include/osmocom/rua/RUA_CauseRadioNetwork.h b/include/osmocom/rua/RUA_CauseRadioNetwork.h index 6a28791..47a6ebd 100644 --- a/include/osmocom/rua/RUA_CauseRadioNetwork.h +++ b/include/osmocom/rua/RUA_CauseRadioNetwork.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CauseRadioNetwork_H_ diff --git a/include/osmocom/rua/RUA_CauseTransport.h b/include/osmocom/rua/RUA_CauseTransport.h index d46e434..a18cca5 100644 --- a/include/osmocom/rua/RUA_CauseTransport.h +++ b/include/osmocom/rua/RUA_CauseTransport.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CauseTransport_H_ diff --git a/include/osmocom/rua/RUA_Connect.h b/include/osmocom/rua/RUA_Connect.h index 7ea12e3..b006269 100644 --- a/include/osmocom/rua/RUA_Connect.h +++ b/include/osmocom/rua/RUA_Connect.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Connect_H_ @@ -23,7 +23,7 @@ /* RUA_Connect */ typedef struct RUA_Connect { - struct connect_ies { + struct RUA_Connect__connect_ies { A_SEQUENCE_OF(RUA_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_ConnectionlessTransfer.h b/include/osmocom/rua/RUA_ConnectionlessTransfer.h index 65e2078..c14ee5a 100644 --- a/include/osmocom/rua/RUA_ConnectionlessTransfer.h +++ b/include/osmocom/rua/RUA_ConnectionlessTransfer.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_ConnectionlessTransfer_H_ @@ -23,7 +23,7 @@ /* RUA_ConnectionlessTransfer */ typedef struct RUA_ConnectionlessTransfer { - struct connectionlessTransfer_ies { + struct RUA_ConnectionlessTransfer__connectionlessTransfer_ies { A_SEQUENCE_OF(RUA_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_Context-ID.h b/include/osmocom/rua/RUA_Context-ID.h index 45c9489..b96a7bb 100644 --- a/include/osmocom/rua/RUA_Context-ID.h +++ b/include/osmocom/rua/RUA_Context-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Context_ID_H_ diff --git a/include/osmocom/rua/RUA_Criticality.h b/include/osmocom/rua/RUA_Criticality.h index 781dd0c..26a330c 100644 --- a/include/osmocom/rua/RUA_Criticality.h +++ b/include/osmocom/rua/RUA_Criticality.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Criticality_H_ diff --git a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h index ae84738..0f948d3 100644 --- a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h +++ b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CriticalityDiagnostics_IE_List_H_ @@ -26,7 +26,7 @@ /* RUA_CriticalityDiagnostics-IE-List */ typedef struct RUA_CriticalityDiagnostics_IE_List { - A_SEQUENCE_OF(struct Member { + A_SEQUENCE_OF(struct RUA_CriticalityDiagnostics_IE_List__Member { RUA_Criticality_t iECriticality; RUA_ProtocolIE_ID_t iE_ID; RUA_TypeOfError_t typeOfError; diff --git a/include/osmocom/rua/RUA_CriticalityDiagnostics.h b/include/osmocom/rua/RUA_CriticalityDiagnostics.h index 98d2aa4..b4d6d96 100644 --- a/include/osmocom/rua/RUA_CriticalityDiagnostics.h +++ b/include/osmocom/rua/RUA_CriticalityDiagnostics.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_CriticalityDiagnostics_H_ diff --git a/include/osmocom/rua/RUA_DirectTransfer.h b/include/osmocom/rua/RUA_DirectTransfer.h index dd72260..8de1593 100644 --- a/include/osmocom/rua/RUA_DirectTransfer.h +++ b/include/osmocom/rua/RUA_DirectTransfer.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_DirectTransfer_H_ @@ -23,7 +23,7 @@ /* RUA_DirectTransfer */ typedef struct RUA_DirectTransfer { - struct directTransfer_ies { + struct RUA_DirectTransfer__directTransfer_ies { A_SEQUENCE_OF(RUA_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_Disconnect.h b/include/osmocom/rua/RUA_Disconnect.h index 2e23cd9..ff24255 100644 --- a/include/osmocom/rua/RUA_Disconnect.h +++ b/include/osmocom/rua/RUA_Disconnect.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Disconnect_H_ @@ -23,7 +23,7 @@ /* RUA_Disconnect */ typedef struct RUA_Disconnect { - struct disconnect_ies { + struct RUA_Disconnect__disconnect_ies { A_SEQUENCE_OF(RUA_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_ErrorIndication.h b/include/osmocom/rua/RUA_ErrorIndication.h index a8e2124..28785f1 100644 --- a/include/osmocom/rua/RUA_ErrorIndication.h +++ b/include/osmocom/rua/RUA_ErrorIndication.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_ErrorIndication_H_ @@ -23,7 +23,7 @@ /* RUA_ErrorIndication */ typedef struct RUA_ErrorIndication { - struct errorIndication_ies { + struct RUA_ErrorIndication__errorIndication_ies { A_SEQUENCE_OF(RUA_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_Establishment-Cause.h b/include/osmocom/rua/RUA_Establishment-Cause.h index 0c855b4..ccc7521 100644 --- a/include/osmocom/rua/RUA_Establishment-Cause.h +++ b/include/osmocom/rua/RUA_Establishment-Cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Establishment_Cause_H_ diff --git a/include/osmocom/rua/RUA_Gsm-map-IDNNS.h b/include/osmocom/rua/RUA_Gsm-map-IDNNS.h index f2939fe..634103c 100644 --- a/include/osmocom/rua/RUA_Gsm-map-IDNNS.h +++ b/include/osmocom/rua/RUA_Gsm-map-IDNNS.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Gsm_map_IDNNS_H_ @@ -22,66 +22,66 @@ #endif /* Dependencies */ -typedef enum routingbasis_PR { - routingbasis_PR_NOTHING, /* No components present */ - routingbasis_PR_localPTMSI, - routingbasis_PR_tMSIofsamePLMN, - routingbasis_PR_tMSIofdifferentPLMN, - routingbasis_PR_iMSIresponsetopaging, - routingbasis_PR_iMSIcauseUEinitiatedEvent, - routingbasis_PR_iMEI, - routingbasis_PR_spare2, - routingbasis_PR_spare1 -} routingbasis_PR; +typedef enum RUA_Gsm_map_IDNNS__routingbasis_PR { + RUA_Gsm_map_IDNNS__routingbasis_PR_NOTHING, /* No components present */ + RUA_Gsm_map_IDNNS__routingbasis_PR_localPTMSI, + RUA_Gsm_map_IDNNS__routingbasis_PR_tMSIofsamePLMN, + RUA_Gsm_map_IDNNS__routingbasis_PR_tMSIofdifferentPLMN, + RUA_Gsm_map_IDNNS__routingbasis_PR_iMSIresponsetopaging, + RUA_Gsm_map_IDNNS__routingbasis_PR_iMSIcauseUEinitiatedEvent, + RUA_Gsm_map_IDNNS__routingbasis_PR_iMEI, + RUA_Gsm_map_IDNNS__routingbasis_PR_spare2, + RUA_Gsm_map_IDNNS__routingbasis_PR_spare1 +} RUA_Gsm_map_IDNNS__routingbasis_PR; /* RUA_Gsm-map-IDNNS */ typedef struct RUA_Gsm_map_IDNNS { - struct routingbasis { - routingbasis_PR present; + struct RUA_Gsm_map_IDNNS__routingbasis { + RUA_Gsm_map_IDNNS__routingbasis_PR present; union RUA_Gsm_map_IDNNS__routingbasis_u { - struct localPTMSI { + struct RUA_Gsm_map_IDNNS__routingbasis__localPTMSI { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } localPTMSI; - struct tMSIofsamePLMN { + struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofsamePLMN { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } tMSIofsamePLMN; - struct tMSIofdifferentPLMN { + struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofdifferentPLMN { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } tMSIofdifferentPLMN; - struct iMSIresponsetopaging { + struct RUA_Gsm_map_IDNNS__routingbasis__iMSIresponsetopaging { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } iMSIresponsetopaging; - struct iMSIcauseUEinitiatedEvent { + struct RUA_Gsm_map_IDNNS__routingbasis__iMSIcauseUEinitiatedEvent { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } iMSIcauseUEinitiatedEvent; - struct iMEI { + struct RUA_Gsm_map_IDNNS__routingbasis__iMEI { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } iMEI; - struct spare2 { + struct RUA_Gsm_map_IDNNS__routingbasis__spare2 { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } spare2; - struct spare1 { + struct RUA_Gsm_map_IDNNS__routingbasis__spare1 { RUA_RoutingParameter_t routingparameter; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_IE-Extensions.h b/include/osmocom/rua/RUA_IE-Extensions.h index c92210f..364cbd5 100644 --- a/include/osmocom/rua/RUA_IE-Extensions.h +++ b/include/osmocom/rua/RUA_IE-Extensions.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_IE_Extensions_H_ diff --git a/include/osmocom/rua/RUA_IE.h b/include/osmocom/rua/RUA_IE.h index 509b140..2881366 100644 --- a/include/osmocom/rua/RUA_IE.h +++ b/include/osmocom/rua/RUA_IE.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_IE_H_ diff --git a/include/osmocom/rua/RUA_InitiatingMessage.h b/include/osmocom/rua/RUA_InitiatingMessage.h index d372834..61dd089 100644 --- a/include/osmocom/rua/RUA_InitiatingMessage.h +++ b/include/osmocom/rua/RUA_InitiatingMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_InitiatingMessage_H_ diff --git a/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h b/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h index 186bd8c..78c88e7 100644 --- a/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h +++ b/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_IntraDomainNasNodeSelector_H_ @@ -23,25 +23,25 @@ #endif /* Dependencies */ -typedef enum version_PR { - version_PR_NOTHING, /* No components present */ - version_PR_release99, - version_PR_later -} version_PR; -typedef enum cn_Type_PR { - cn_Type_PR_NOTHING, /* No components present */ - cn_Type_PR_gsm_Map_IDNNS, - cn_Type_PR_ansi_41_IDNNS -} cn_Type_PR; +typedef enum RUA_IntraDomainNasNodeSelector__version_PR { + RUA_IntraDomainNasNodeSelector__version_PR_NOTHING, /* No components present */ + RUA_IntraDomainNasNodeSelector__version_PR_release99, + RUA_IntraDomainNasNodeSelector__version_PR_later +} RUA_IntraDomainNasNodeSelector__version_PR; +typedef enum RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR { + RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR_NOTHING, /* No components present */ + RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR_gsm_Map_IDNNS, + RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR_ansi_41_IDNNS +} RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR; /* RUA_IntraDomainNasNodeSelector */ typedef struct RUA_IntraDomainNasNodeSelector { - struct version { - version_PR present; + struct RUA_IntraDomainNasNodeSelector__version { + RUA_IntraDomainNasNodeSelector__version_PR present; union RUA_IntraDomainNasNodeSelector__version_u { - struct release99 { - struct cn_Type { - cn_Type_PR present; + struct RUA_IntraDomainNasNodeSelector__version__release99 { + struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type { + RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_PR present; union RUA_IntraDomainNasNodeSelector__version__release99__cn_Type_u { RUA_Gsm_map_IDNNS_t gsm_Map_IDNNS; RUA_Ansi_41_IDNNS_t ansi_41_IDNNS; @@ -54,7 +54,7 @@ /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } release99; - struct later { + struct RUA_IntraDomainNasNodeSelector__version__later { BIT_STRING_t futurecoding; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_Presence.h b/include/osmocom/rua/RUA_Presence.h index d583d7d..b241dae 100644 --- a/include/osmocom/rua/RUA_Presence.h +++ b/include/osmocom/rua/RUA_Presence.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_Presence_H_ diff --git a/include/osmocom/rua/RUA_PrivateIE-ID.h b/include/osmocom/rua/RUA_PrivateIE-ID.h index 1aa7d07..602439d 100644 --- a/include/osmocom/rua/RUA_PrivateIE-ID.h +++ b/include/osmocom/rua/RUA_PrivateIE-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_PrivateIE_ID_H_ diff --git a/include/osmocom/rua/RUA_PrivateMessage.h b/include/osmocom/rua/RUA_PrivateMessage.h index fcea8fa..d385bf0 100644 --- a/include/osmocom/rua/RUA_PrivateMessage.h +++ b/include/osmocom/rua/RUA_PrivateMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_PrivateMessage_H_ @@ -23,7 +23,7 @@ /* RUA_PrivateMessage */ typedef struct RUA_PrivateMessage { - struct privateMessage_ies { + struct RUA_PrivateMessage__privateMessage_ies { A_SEQUENCE_OF(RUA_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/rua/RUA_ProcedureCode.h b/include/osmocom/rua/RUA_ProcedureCode.h index 63c5974..616a6df 100644 --- a/include/osmocom/rua/RUA_ProcedureCode.h +++ b/include/osmocom/rua/RUA_ProcedureCode.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_ProcedureCode_H_ diff --git a/include/osmocom/rua/RUA_ProtocolIE-ID.h b/include/osmocom/rua/RUA_ProtocolIE-ID.h index 8fc5915..db53b3c 100644 --- a/include/osmocom/rua/RUA_ProtocolIE-ID.h +++ b/include/osmocom/rua/RUA_ProtocolIE-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_ProtocolIE_ID_H_ diff --git a/include/osmocom/rua/RUA_RANAP-Message.h b/include/osmocom/rua/RUA_RANAP-Message.h index b32c301..b5d2ffc 100644 --- a/include/osmocom/rua/RUA_RANAP-Message.h +++ b/include/osmocom/rua/RUA_RANAP-Message.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_RANAP_Message_H_ diff --git a/include/osmocom/rua/RUA_RUA-PDU.h b/include/osmocom/rua/RUA_RUA-PDU.h index 334da5b..77fb655 100644 --- a/include/osmocom/rua/RUA_RUA-PDU.h +++ b/include/osmocom/rua/RUA_RUA-PDU.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_RUA_PDU_H_ diff --git a/include/osmocom/rua/RUA_RoutingParameter.h b/include/osmocom/rua/RUA_RoutingParameter.h index b917f46..9766176 100644 --- a/include/osmocom/rua/RUA_RoutingParameter.h +++ b/include/osmocom/rua/RUA_RoutingParameter.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_RoutingParameter_H_ diff --git a/include/osmocom/rua/RUA_SuccessfulOutcome.h b/include/osmocom/rua/RUA_SuccessfulOutcome.h index fb8924e..b7208f5 100644 --- a/include/osmocom/rua/RUA_SuccessfulOutcome.h +++ b/include/osmocom/rua/RUA_SuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_SuccessfulOutcome_H_ diff --git a/include/osmocom/rua/RUA_TriggeringMessage.h b/include/osmocom/rua/RUA_TriggeringMessage.h index b6dfb8b..c1e017b 100644 --- a/include/osmocom/rua/RUA_TriggeringMessage.h +++ b/include/osmocom/rua/RUA_TriggeringMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_TriggeringMessage_H_ diff --git a/include/osmocom/rua/RUA_TypeOfError.h b/include/osmocom/rua/RUA_TypeOfError.h index 51bdab7..7d6cf41 100644 --- a/include/osmocom/rua/RUA_TypeOfError.h +++ b/include/osmocom/rua/RUA_TypeOfError.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_TypeOfError_H_ diff --git a/include/osmocom/rua/RUA_UnsuccessfulOutcome.h b/include/osmocom/rua/RUA_UnsuccessfulOutcome.h index b7058f9..09e1a13 100644 --- a/include/osmocom/rua/RUA_UnsuccessfulOutcome.h +++ b/include/osmocom/rua/RUA_UnsuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _RUA_UnsuccessfulOutcome_H_ diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am index 493a466..8cb2e7d 100644 --- a/src/rua/Makefile.am +++ b/src/rua/Makefile.am @@ -81,7 +81,7 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - ASN1C_PREFIX="RUA_" asn1c -R -gen-PER $(top_srcdir)/asn1/rua/RUA-CommonDataTypes.asn $(top_srcdir)/asn1/rua/RUA-Constants.asn $(top_srcdir)/asn1/rua/RUA-IEs.asn $(top_srcdir)/asn1/rua/RUA-PDU.asn + ASN1C_PREFIX="RUA_" asn1c -R -fcompound-names -gen-PER $(top_srcdir)/asn1/rua/RUA-CommonDataTypes.asn $(top_srcdir)/asn1/rua/RUA-Constants.asn $(top_srcdir)/asn1/rua/RUA-IEs.asn $(top_srcdir)/asn1/rua/RUA-PDU.asn # change include style to `#include ' $(top_srcdir)/move-asn1-header-files.sh osmocom/rua $(ASN_MODULE_INC) # Finally copy *.c from buildir to srcdir: diff --git a/src/rua/RUA_Ansi-41-IDNNS.c b/src/rua/RUA_Ansi-41-IDNNS.c index 3f1c77a..a43f85d 100644 --- a/src/rua/RUA_Ansi-41-IDNNS.c +++ b/src/rua/RUA_Ansi-41-IDNNS.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_CN-DomainIndicator.c b/src/rua/RUA_CN-DomainIndicator.c index 503258d..f690d14 100644 --- a/src/rua/RUA_CN-DomainIndicator.c +++ b/src/rua/RUA_CN-DomainIndicator.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_CSGMembershipStatus.c b/src/rua/RUA_CSGMembershipStatus.c index 7cc8c3e..8a32372 100644 --- a/src/rua/RUA_CSGMembershipStatus.c +++ b/src/rua/RUA_CSGMembershipStatus.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_Cause.c b/src/rua/RUA_Cause.c index 4fd0027..ac5548f 100644 --- a/src/rua/RUA_Cause.c +++ b/src/rua/RUA_Cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_CauseMisc.c b/src/rua/RUA_CauseMisc.c index fb9400b..8d66fae 100644 --- a/src/rua/RUA_CauseMisc.c +++ b/src/rua/RUA_CauseMisc.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_CauseProtocol.c b/src/rua/RUA_CauseProtocol.c index 48bcabf..e824c4e 100644 --- a/src/rua/RUA_CauseProtocol.c +++ b/src/rua/RUA_CauseProtocol.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_CauseRadioNetwork.c b/src/rua/RUA_CauseRadioNetwork.c index 9e3a6f6..aa1bd56 100644 --- a/src/rua/RUA_CauseRadioNetwork.c +++ b/src/rua/RUA_CauseRadioNetwork.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_CauseTransport.c b/src/rua/RUA_CauseTransport.c index 5cc4234..b47a014 100644 --- a/src/rua/RUA_CauseTransport.c +++ b/src/rua/RUA_CauseTransport.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_Connect.c b/src/rua/RUA_Connect.c index 291a0f5..94b0a09 100644 --- a/src/rua/RUA_Connect.c +++ b/src/rua/RUA_Connect.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_connect_ies_specs_2 = { - sizeof(struct connect_ies), - offsetof(struct connect_ies, _asn_ctx), + sizeof(struct RUA_Connect__connect_ies), + offsetof(struct RUA_Connect__connect_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/rua/RUA_ConnectionlessTransfer.c b/src/rua/RUA_ConnectionlessTransfer.c index c90e8ba..32b8ff1 100644 --- a/src/rua/RUA_ConnectionlessTransfer.c +++ b/src/rua/RUA_ConnectionlessTransfer.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_connectionlessTransfer_ies_specs_2 = { - sizeof(struct connectionlessTransfer_ies), - offsetof(struct connectionlessTransfer_ies, _asn_ctx), + sizeof(struct RUA_ConnectionlessTransfer__connectionlessTransfer_ies), + offsetof(struct RUA_ConnectionlessTransfer__connectionlessTransfer_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/rua/RUA_Context-ID.c b/src/rua/RUA_Context-ID.c index a0c5c3b..b542bdb 100644 --- a/src/rua/RUA_Context-ID.c +++ b/src/rua/RUA_Context-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_Criticality.c b/src/rua/RUA_Criticality.c index 05d27ad..8b292f5 100644 --- a/src/rua/RUA_Criticality.c +++ b/src/rua/RUA_Criticality.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_CriticalityDiagnostics-IE-List.c b/src/rua/RUA_CriticalityDiagnostics-IE-List.c index bc87f91..43a5179 100644 --- a/src/rua/RUA_CriticalityDiagnostics-IE-List.c +++ b/src/rua/RUA_CriticalityDiagnostics-IE-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -13,7 +13,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_Member_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct Member, iECriticality), + { ATF_NOFLAGS, 0, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, iECriticality), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_Criticality, @@ -22,7 +22,7 @@ 0, "iECriticality" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, iE_ID), + { ATF_NOFLAGS, 0, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, iE_ID), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_ProtocolIE_ID, @@ -31,7 +31,7 @@ 0, "iE-ID" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, typeOfError), + { ATF_NOFLAGS, 0, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, typeOfError), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_TypeOfError, @@ -40,7 +40,7 @@ 0, "typeOfError" }, - { ATF_POINTER, 1, offsetof(struct Member, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_IE_Extensions, @@ -61,8 +61,8 @@ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { - sizeof(struct Member), - offsetof(struct Member, _asn_ctx), + sizeof(struct RUA_CriticalityDiagnostics_IE_List__Member), + offsetof(struct RUA_CriticalityDiagnostics_IE_List__Member, _asn_ctx), asn_MAP_Member_tag2el_2, 4, /* Count of tags in the map */ asn_MAP_Member_oms_2, /* Optional members */ diff --git a/src/rua/RUA_CriticalityDiagnostics.c b/src/rua/RUA_CriticalityDiagnostics.c index 58791f5..dae8096 100644 --- a/src/rua/RUA_CriticalityDiagnostics.c +++ b/src/rua/RUA_CriticalityDiagnostics.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_DirectTransfer.c b/src/rua/RUA_DirectTransfer.c index d11cb88..a9c8de1 100644 --- a/src/rua/RUA_DirectTransfer.c +++ b/src/rua/RUA_DirectTransfer.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_directTransfer_ies_specs_2 = { - sizeof(struct directTransfer_ies), - offsetof(struct directTransfer_ies, _asn_ctx), + sizeof(struct RUA_DirectTransfer__directTransfer_ies), + offsetof(struct RUA_DirectTransfer__directTransfer_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/rua/RUA_Disconnect.c b/src/rua/RUA_Disconnect.c index e63be21..6dd5be1 100644 --- a/src/rua/RUA_Disconnect.c +++ b/src/rua/RUA_Disconnect.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_disconnect_ies_specs_2 = { - sizeof(struct disconnect_ies), - offsetof(struct disconnect_ies, _asn_ctx), + sizeof(struct RUA_Disconnect__disconnect_ies), + offsetof(struct RUA_Disconnect__disconnect_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/rua/RUA_ErrorIndication.c b/src/rua/RUA_ErrorIndication.c index 21293b1..564a1fd 100644 --- a/src/rua/RUA_ErrorIndication.c +++ b/src/rua/RUA_ErrorIndication.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_errorIndication_ies_specs_2 = { - sizeof(struct errorIndication_ies), - offsetof(struct errorIndication_ies, _asn_ctx), + sizeof(struct RUA_ErrorIndication__errorIndication_ies), + offsetof(struct RUA_ErrorIndication__errorIndication_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/rua/RUA_Establishment-Cause.c b/src/rua/RUA_Establishment-Cause.c index 0316b03..1f27b56 100644 --- a/src/rua/RUA_Establishment-Cause.c +++ b/src/rua/RUA_Establishment-Cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_Gsm-map-IDNNS.c b/src/rua/RUA_Gsm-map-IDNNS.c index 0c50092..7cdbebb 100644 --- a/src/rua/RUA_Gsm-map-IDNNS.c +++ b/src/rua/RUA_Gsm-map-IDNNS.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -13,7 +13,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_localPTMSI_3[] = { - { ATF_NOFLAGS, 0, offsetof(struct localPTMSI, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__localPTMSI, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -31,8 +31,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_localPTMSI_specs_3 = { - sizeof(struct localPTMSI), - offsetof(struct localPTMSI, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__localPTMSI), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__localPTMSI, _asn_ctx), asn_MAP_localPTMSI_tag2el_3, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -68,7 +68,7 @@ }; static asn_TYPE_member_t asn_MBR_tMSIofsamePLMN_5[] = { - { ATF_NOFLAGS, 0, offsetof(struct tMSIofsamePLMN, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofsamePLMN, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -86,8 +86,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_tMSIofsamePLMN_specs_5 = { - sizeof(struct tMSIofsamePLMN), - offsetof(struct tMSIofsamePLMN, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofsamePLMN), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofsamePLMN, _asn_ctx), asn_MAP_tMSIofsamePLMN_tag2el_5, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -123,7 +123,7 @@ }; static asn_TYPE_member_t asn_MBR_tMSIofdifferentPLMN_7[] = { - { ATF_NOFLAGS, 0, offsetof(struct tMSIofdifferentPLMN, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofdifferentPLMN, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -141,8 +141,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_tMSIofdifferentPLMN_specs_7 = { - sizeof(struct tMSIofdifferentPLMN), - offsetof(struct tMSIofdifferentPLMN, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofdifferentPLMN), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__tMSIofdifferentPLMN, _asn_ctx), asn_MAP_tMSIofdifferentPLMN_tag2el_7, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -178,7 +178,7 @@ }; static asn_TYPE_member_t asn_MBR_iMSIresponsetopaging_9[] = { - { ATF_NOFLAGS, 0, offsetof(struct iMSIresponsetopaging, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIresponsetopaging, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -196,8 +196,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_iMSIresponsetopaging_specs_9 = { - sizeof(struct iMSIresponsetopaging), - offsetof(struct iMSIresponsetopaging, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIresponsetopaging), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIresponsetopaging, _asn_ctx), asn_MAP_iMSIresponsetopaging_tag2el_9, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -233,7 +233,7 @@ }; static asn_TYPE_member_t asn_MBR_iMSIcauseUEinitiatedEvent_11[] = { - { ATF_NOFLAGS, 0, offsetof(struct iMSIcauseUEinitiatedEvent, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIcauseUEinitiatedEvent, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -251,8 +251,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_iMSIcauseUEinitiatedEvent_specs_11 = { - sizeof(struct iMSIcauseUEinitiatedEvent), - offsetof(struct iMSIcauseUEinitiatedEvent, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIcauseUEinitiatedEvent), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMSIcauseUEinitiatedEvent, _asn_ctx), asn_MAP_iMSIcauseUEinitiatedEvent_tag2el_11, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -288,7 +288,7 @@ }; static asn_TYPE_member_t asn_MBR_iMEI_13[] = { - { ATF_NOFLAGS, 0, offsetof(struct iMEI, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMEI, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -306,8 +306,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_iMEI_specs_13 = { - sizeof(struct iMEI), - offsetof(struct iMEI, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__iMEI), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__iMEI, _asn_ctx), asn_MAP_iMEI_tag2el_13, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -343,7 +343,7 @@ }; static asn_TYPE_member_t asn_MBR_spare2_15[] = { - { ATF_NOFLAGS, 0, offsetof(struct spare2, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__spare2, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -361,8 +361,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_spare2_specs_15 = { - sizeof(struct spare2), - offsetof(struct spare2, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__spare2), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__spare2, _asn_ctx), asn_MAP_spare2_tag2el_15, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -398,7 +398,7 @@ }; static asn_TYPE_member_t asn_MBR_spare1_17[] = { - { ATF_NOFLAGS, 0, offsetof(struct spare1, routingparameter), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__spare1, routingparameter), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_RoutingParameter, @@ -416,8 +416,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* routingparameter */ }; static asn_SEQUENCE_specifics_t asn_SPC_spare1_specs_17 = { - sizeof(struct spare1), - offsetof(struct spare1, _asn_ctx), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis__spare1), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis__spare1, _asn_ctx), asn_MAP_spare1_tag2el_17, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -453,7 +453,7 @@ }; static asn_TYPE_member_t asn_MBR_routingbasis_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.localPTMSI), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.localPTMSI), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, &asn_DEF_localPTMSI_3, @@ -462,7 +462,7 @@ 0, "localPTMSI" }, - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.tMSIofsamePLMN), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.tMSIofsamePLMN), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, &asn_DEF_tMSIofsamePLMN_5, @@ -471,7 +471,7 @@ 0, "tMSIofsamePLMN" }, - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.tMSIofdifferentPLMN), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.tMSIofdifferentPLMN), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 0, &asn_DEF_tMSIofdifferentPLMN_7, @@ -480,7 +480,7 @@ 0, "tMSIofdifferentPLMN" }, - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.iMSIresponsetopaging), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.iMSIresponsetopaging), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 0, &asn_DEF_iMSIresponsetopaging_9, @@ -489,7 +489,7 @@ 0, "iMSIresponsetopaging" }, - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.iMSIcauseUEinitiatedEvent), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.iMSIcauseUEinitiatedEvent), (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 0, &asn_DEF_iMSIcauseUEinitiatedEvent_11, @@ -498,7 +498,7 @@ 0, "iMSIcauseUEinitiatedEvent" }, - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.iMEI), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.iMEI), (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 0, &asn_DEF_iMEI_13, @@ -507,7 +507,7 @@ 0, "iMEI" }, - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.spare2), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.spare2), (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 0, &asn_DEF_spare2_15, @@ -516,7 +516,7 @@ 0, "spare2" }, - { ATF_NOFLAGS, 0, offsetof(struct routingbasis, choice.spare1), + { ATF_NOFLAGS, 0, offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, choice.spare1), (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 0, &asn_DEF_spare1_17, @@ -537,10 +537,10 @@ { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 7, 0, 0 } /* spare1 */ }; static asn_CHOICE_specifics_t asn_SPC_routingbasis_specs_2 = { - sizeof(struct routingbasis), - offsetof(struct routingbasis, _asn_ctx), - offsetof(struct routingbasis, present), - sizeof(((struct routingbasis *)0)->present), + sizeof(struct RUA_Gsm_map_IDNNS__routingbasis), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, _asn_ctx), + offsetof(struct RUA_Gsm_map_IDNNS__routingbasis, present), + sizeof(((struct RUA_Gsm_map_IDNNS__routingbasis *)0)->present), asn_MAP_routingbasis_tag2el_2, 8, /* Count of tags in the map */ 0, diff --git a/src/rua/RUA_IE-Extensions.c b/src/rua/RUA_IE-Extensions.c index 2bcdc72..a90056f 100644 --- a/src/rua/RUA_IE-Extensions.c +++ b/src/rua/RUA_IE-Extensions.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_IE.c b/src/rua/RUA_IE.c index 73dc0b1..086787f 100644 --- a/src/rua/RUA_IE.c +++ b/src/rua/RUA_IE.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_InitiatingMessage.c b/src/rua/RUA_InitiatingMessage.c index b1278ec..1c6f2e4 100644 --- a/src/rua/RUA_InitiatingMessage.c +++ b/src/rua/RUA_InitiatingMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_IntraDomainNasNodeSelector.c b/src/rua/RUA_IntraDomainNasNodeSelector.c index 0653abb..fef8f2a 100644 --- a/src/rua/RUA_IntraDomainNasNodeSelector.c +++ b/src/rua/RUA_IntraDomainNasNodeSelector.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -54,7 +54,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_cn_Type_4[] = { - { ATF_NOFLAGS, 0, offsetof(struct cn_Type, choice.gsm_Map_IDNNS), + { ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type, choice.gsm_Map_IDNNS), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_Gsm_map_IDNNS, @@ -63,7 +63,7 @@ 0, "gsm-Map-IDNNS" }, - { ATF_NOFLAGS, 0, offsetof(struct cn_Type, choice.ansi_41_IDNNS), + { ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type, choice.ansi_41_IDNNS), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_RUA_Ansi_41_IDNNS, @@ -78,10 +78,10 @@ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* ansi-41-IDNNS */ }; static asn_CHOICE_specifics_t asn_SPC_cn_Type_specs_4 = { - sizeof(struct cn_Type), - offsetof(struct cn_Type, _asn_ctx), - offsetof(struct cn_Type, present), - sizeof(((struct cn_Type *)0)->present), + sizeof(struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type), + offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type, _asn_ctx), + offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type, present), + sizeof(((struct RUA_IntraDomainNasNodeSelector__version__release99__cn_Type *)0)->present), asn_MAP_cn_Type_tag2el_4, 2, /* Count of tags in the map */ 0, @@ -114,7 +114,7 @@ }; static asn_TYPE_member_t asn_MBR_release99_3[] = { - { ATF_NOFLAGS, 0, offsetof(struct release99, cn_Type), + { ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99, cn_Type), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), +1, /* EXPLICIT tag at current level */ &asn_DEF_cn_Type_4, @@ -132,8 +132,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* cn-Type */ }; static asn_SEQUENCE_specifics_t asn_SPC_release99_specs_3 = { - sizeof(struct release99), - offsetof(struct release99, _asn_ctx), + sizeof(struct RUA_IntraDomainNasNodeSelector__version__release99), + offsetof(struct RUA_IntraDomainNasNodeSelector__version__release99, _asn_ctx), asn_MAP_release99_tag2el_3, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -169,7 +169,7 @@ }; static asn_TYPE_member_t asn_MBR_later_7[] = { - { ATF_NOFLAGS, 0, offsetof(struct later, futurecoding), + { ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version__later, futurecoding), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_BIT_STRING, @@ -187,8 +187,8 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* futurecoding */ }; static asn_SEQUENCE_specifics_t asn_SPC_later_specs_7 = { - sizeof(struct later), - offsetof(struct later, _asn_ctx), + sizeof(struct RUA_IntraDomainNasNodeSelector__version__later), + offsetof(struct RUA_IntraDomainNasNodeSelector__version__later, _asn_ctx), asn_MAP_later_tag2el_7, 1, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ @@ -224,7 +224,7 @@ }; static asn_TYPE_member_t asn_MBR_version_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct version, choice.release99), + { ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version, choice.release99), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, &asn_DEF_release99_3, @@ -233,7 +233,7 @@ 0, "release99" }, - { ATF_NOFLAGS, 0, offsetof(struct version, choice.later), + { ATF_NOFLAGS, 0, offsetof(struct RUA_IntraDomainNasNodeSelector__version, choice.later), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, &asn_DEF_later_7, @@ -248,10 +248,10 @@ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* later */ }; static asn_CHOICE_specifics_t asn_SPC_version_specs_2 = { - sizeof(struct version), - offsetof(struct version, _asn_ctx), - offsetof(struct version, present), - sizeof(((struct version *)0)->present), + sizeof(struct RUA_IntraDomainNasNodeSelector__version), + offsetof(struct RUA_IntraDomainNasNodeSelector__version, _asn_ctx), + offsetof(struct RUA_IntraDomainNasNodeSelector__version, present), + sizeof(((struct RUA_IntraDomainNasNodeSelector__version *)0)->present), asn_MAP_version_tag2el_2, 2, /* Count of tags in the map */ 0, diff --git a/src/rua/RUA_Presence.c b/src/rua/RUA_Presence.c index 581a3ed..6dd6c87 100644 --- a/src/rua/RUA_Presence.c +++ b/src/rua/RUA_Presence.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_PrivateIE-ID.c b/src/rua/RUA_PrivateIE-ID.c index 5947369..acc4b2a 100644 --- a/src/rua/RUA_PrivateIE-ID.c +++ b/src/rua/RUA_PrivateIE-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_PrivateMessage.c b/src/rua/RUA_PrivateMessage.c index efad1bb..dbe38b3 100644 --- a/src/rua/RUA_PrivateMessage.c +++ b/src/rua/RUA_PrivateMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_privateMessage_ies_specs_2 = { - sizeof(struct privateMessage_ies), - offsetof(struct privateMessage_ies, _asn_ctx), + sizeof(struct RUA_PrivateMessage__privateMessage_ies), + offsetof(struct RUA_PrivateMessage__privateMessage_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/rua/RUA_ProcedureCode.c b/src/rua/RUA_ProcedureCode.c index cf7da40..b597e51 100644 --- a/src/rua/RUA_ProcedureCode.c +++ b/src/rua/RUA_ProcedureCode.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_ProtocolIE-ID.c b/src/rua/RUA_ProtocolIE-ID.c index b264e16..3947767 100644 --- a/src/rua/RUA_ProtocolIE-ID.c +++ b/src/rua/RUA_ProtocolIE-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_RANAP-Message.c b/src/rua/RUA_RANAP-Message.c index 9998e84..978d829 100644 --- a/src/rua/RUA_RANAP-Message.c +++ b/src/rua/RUA_RANAP-Message.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_RUA-PDU.c b/src/rua/RUA_RUA-PDU.c index fb6cd28..a026497 100644 --- a/src/rua/RUA_RUA-PDU.c +++ b/src/rua/RUA_RUA-PDU.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_RoutingParameter.c b/src/rua/RUA_RoutingParameter.c index 8e83456..f96a5f0 100644 --- a/src/rua/RUA_RoutingParameter.c +++ b/src/rua/RUA_RoutingParameter.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_SuccessfulOutcome.c b/src/rua/RUA_SuccessfulOutcome.c index 183ed34..3bf39c5 100644 --- a/src/rua/RUA_SuccessfulOutcome.c +++ b/src/rua/RUA_SuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_TriggeringMessage.c b/src/rua/RUA_TriggeringMessage.c index b2e9128..4cfae4c 100644 --- a/src/rua/RUA_TriggeringMessage.c +++ b/src/rua/RUA_TriggeringMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-CommonDataTypes" * found in "../../asn1/rua/RUA-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_TypeOfError.c b/src/rua/RUA_TypeOfError.c index a8b081c..84018b3 100644 --- a/src/rua/RUA_TypeOfError.c +++ b/src/rua/RUA_TypeOfError.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-IEs" * found in "../../asn1/rua/RUA-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/rua/RUA_UnsuccessfulOutcome.c b/src/rua/RUA_UnsuccessfulOutcome.c index 5fa5a2e..2e2cca7 100644 --- a/src/rua/RUA_UnsuccessfulOutcome.c +++ b/src/rua/RUA_UnsuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "RUA-PDU" * found in "../../asn1/rua/RUA-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Id4e337cdc82c26922b7ca7f0fe8af523e9a0945c Gerrit-Change-Number: 25992 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:43:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:43:52 +0000 Subject: Change in osmo-iuh[master]: sabp: Use asn1c flag -fcompound-names to avoid name collisions with o... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25993 ) Change subject: sabp: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... sabp: Use asn1c flag -fcompound-names to avoid name collisions with other libs Change-Id: I10ce4a9414768cdcf850feeca4088296e339919f --- M include/osmocom/sabp/SABP_Available-Bandwidth.h M include/osmocom/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.h M include/osmocom/sabp/SABP_Broadcast-Message-Content.h M include/osmocom/sabp/SABP_Category.h M include/osmocom/sabp/SABP_Cause.h M include/osmocom/sabp/SABP_Criticality-Diagnostics.h M include/osmocom/sabp/SABP_Criticality.h M include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h M include/osmocom/sabp/SABP_Data-Coding-Scheme.h M include/osmocom/sabp/SABP_Error-Indication.h M include/osmocom/sabp/SABP_Failure-List-Item.h M include/osmocom/sabp/SABP_Failure-List.h M include/osmocom/sabp/SABP_Failure.h M include/osmocom/sabp/SABP_IE-Extensions.h M include/osmocom/sabp/SABP_IE.h M include/osmocom/sabp/SABP_InitiatingMessage.h M include/osmocom/sabp/SABP_Kill-Complete.h M include/osmocom/sabp/SABP_Kill-Failure.h M include/osmocom/sabp/SABP_Kill.h M include/osmocom/sabp/SABP_Load-Query-Complete.h M include/osmocom/sabp/SABP_Load-Query-Failure.h M include/osmocom/sabp/SABP_Load-Query.h M include/osmocom/sabp/SABP_Message-Identifier.h M include/osmocom/sabp/SABP_Message-Status-Query-Complete.h M include/osmocom/sabp/SABP_Message-Status-Query-Failure.h M include/osmocom/sabp/SABP_Message-Status-Query.h M include/osmocom/sabp/SABP_MessageStructure.h M include/osmocom/sabp/SABP_New-Serial-Number.h M include/osmocom/sabp/SABP_Number-Of-Broadcasts-Completed-Info.h M include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.h M include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List.h M include/osmocom/sabp/SABP_Number-of-Broadcasts-Requested.h M include/osmocom/sabp/SABP_Old-Serial-Number.h M include/osmocom/sabp/SABP_Paging-ETWS-Indicator.h M include/osmocom/sabp/SABP_Presence.h M include/osmocom/sabp/SABP_ProcedureCode.h M include/osmocom/sabp/SABP_ProtocolExtensionID.h M include/osmocom/sabp/SABP_ProtocolIE-ID.h M include/osmocom/sabp/SABP_Radio-Resource-Loading-List-Item.h M include/osmocom/sabp/SABP_Radio-Resource-Loading-List.h M include/osmocom/sabp/SABP_Recovery-Indication.h M include/osmocom/sabp/SABP_Repetition-Period.h M include/osmocom/sabp/SABP_RepetitionNumber0.h M include/osmocom/sabp/SABP_RepetitionNumber1.h M include/osmocom/sabp/SABP_Reset-Complete.h M include/osmocom/sabp/SABP_Reset-Failure.h M include/osmocom/sabp/SABP_Reset.h M include/osmocom/sabp/SABP_Restart.h M include/osmocom/sabp/SABP_SABP-PDU.h M include/osmocom/sabp/SABP_Serial-Number.h M include/osmocom/sabp/SABP_Service-Area-Identifier.h M include/osmocom/sabp/SABP_Service-Areas-List.h M include/osmocom/sabp/SABP_SuccessfulOutcome.h M include/osmocom/sabp/SABP_TriggeringMessage.h M include/osmocom/sabp/SABP_TypeOfError.h M include/osmocom/sabp/SABP_UnsuccessfulOutcome.h M include/osmocom/sabp/SABP_Warning-Type.h M include/osmocom/sabp/SABP_WarningSecurityInfo.h M include/osmocom/sabp/SABP_Write-Replace-Complete.h M include/osmocom/sabp/SABP_Write-Replace-Failure.h M include/osmocom/sabp/SABP_Write-Replace.h M src/sabp/Makefile.am M src/sabp/SABP_Available-Bandwidth.c M src/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.c M src/sabp/SABP_Broadcast-Message-Content.c M src/sabp/SABP_Category.c M src/sabp/SABP_Cause.c M src/sabp/SABP_Criticality-Diagnostics.c M src/sabp/SABP_Criticality.c M src/sabp/SABP_CriticalityDiagnostics-IE-List.c M src/sabp/SABP_Data-Coding-Scheme.c M src/sabp/SABP_Error-Indication.c M src/sabp/SABP_Failure-List-Item.c M src/sabp/SABP_Failure-List.c M src/sabp/SABP_Failure.c M src/sabp/SABP_IE-Extensions.c M src/sabp/SABP_IE.c M src/sabp/SABP_InitiatingMessage.c M src/sabp/SABP_Kill-Complete.c M src/sabp/SABP_Kill-Failure.c M src/sabp/SABP_Kill.c M src/sabp/SABP_Load-Query-Complete.c M src/sabp/SABP_Load-Query-Failure.c M src/sabp/SABP_Load-Query.c M src/sabp/SABP_Message-Identifier.c M src/sabp/SABP_Message-Status-Query-Complete.c M src/sabp/SABP_Message-Status-Query-Failure.c M src/sabp/SABP_Message-Status-Query.c M src/sabp/SABP_MessageStructure.c M src/sabp/SABP_New-Serial-Number.c M src/sabp/SABP_Number-Of-Broadcasts-Completed-Info.c M src/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.c M src/sabp/SABP_Number-of-Broadcasts-Completed-List.c M src/sabp/SABP_Number-of-Broadcasts-Requested.c M src/sabp/SABP_Old-Serial-Number.c M src/sabp/SABP_Paging-ETWS-Indicator.c M src/sabp/SABP_Presence.c M src/sabp/SABP_ProcedureCode.c M src/sabp/SABP_ProtocolExtensionID.c M src/sabp/SABP_ProtocolIE-ID.c M src/sabp/SABP_Radio-Resource-Loading-List-Item.c M src/sabp/SABP_Radio-Resource-Loading-List.c M src/sabp/SABP_Recovery-Indication.c M src/sabp/SABP_Repetition-Period.c M src/sabp/SABP_RepetitionNumber0.c M src/sabp/SABP_RepetitionNumber1.c M src/sabp/SABP_Reset-Complete.c M src/sabp/SABP_Reset-Failure.c M src/sabp/SABP_Reset.c M src/sabp/SABP_Restart.c M src/sabp/SABP_SABP-PDU.c M src/sabp/SABP_Serial-Number.c M src/sabp/SABP_Service-Area-Identifier.c M src/sabp/SABP_Service-Areas-List.c M src/sabp/SABP_SuccessfulOutcome.c M src/sabp/SABP_TriggeringMessage.c M src/sabp/SABP_TypeOfError.c M src/sabp/SABP_UnsuccessfulOutcome.c M src/sabp/SABP_Warning-Type.c M src/sabp/SABP_WarningSecurityInfo.c M src/sabp/SABP_Write-Replace-Complete.c M src/sabp/SABP_Write-Replace-Failure.c M src/sabp/SABP_Write-Replace.c 123 files changed, 207 insertions(+), 210 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/sabp/SABP_Available-Bandwidth.h b/include/osmocom/sabp/SABP_Available-Bandwidth.h index f1c9200..b8d2950 100644 --- a/include/osmocom/sabp/SABP_Available-Bandwidth.h +++ b/include/osmocom/sabp/SABP_Available-Bandwidth.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Available_Bandwidth_H_ diff --git a/include/osmocom/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.h b/include/osmocom/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.h index bc653cb..6406f95 100644 --- a/include/osmocom/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.h +++ b/include/osmocom/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Broadcast_Message_Content_Validity_Indicator_H_ diff --git a/include/osmocom/sabp/SABP_Broadcast-Message-Content.h b/include/osmocom/sabp/SABP_Broadcast-Message-Content.h index 1e09bda..b5400a2 100644 --- a/include/osmocom/sabp/SABP_Broadcast-Message-Content.h +++ b/include/osmocom/sabp/SABP_Broadcast-Message-Content.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Broadcast_Message_Content_H_ diff --git a/include/osmocom/sabp/SABP_Category.h b/include/osmocom/sabp/SABP_Category.h index b7746d3..278e2cd 100644 --- a/include/osmocom/sabp/SABP_Category.h +++ b/include/osmocom/sabp/SABP_Category.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Category_H_ diff --git a/include/osmocom/sabp/SABP_Cause.h b/include/osmocom/sabp/SABP_Cause.h index c1e8db2..5c15c82 100644 --- a/include/osmocom/sabp/SABP_Cause.h +++ b/include/osmocom/sabp/SABP_Cause.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Cause_H_ diff --git a/include/osmocom/sabp/SABP_Criticality-Diagnostics.h b/include/osmocom/sabp/SABP_Criticality-Diagnostics.h index 4cf2ee3..0bc4074 100644 --- a/include/osmocom/sabp/SABP_Criticality-Diagnostics.h +++ b/include/osmocom/sabp/SABP_Criticality-Diagnostics.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Criticality_Diagnostics_H_ diff --git a/include/osmocom/sabp/SABP_Criticality.h b/include/osmocom/sabp/SABP_Criticality.h index 1d53c78..eaf8db6 100644 --- a/include/osmocom/sabp/SABP_Criticality.h +++ b/include/osmocom/sabp/SABP_Criticality.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Criticality_H_ diff --git a/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h b/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h index 066c0de..c454fd0 100644 --- a/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h +++ b/include/osmocom/sabp/SABP_CriticalityDiagnostics-IE-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_CriticalityDiagnostics_IE_List_H_ @@ -26,7 +26,7 @@ /* SABP_CriticalityDiagnostics-IE-List */ typedef struct SABP_CriticalityDiagnostics_IE_List { - A_SEQUENCE_OF(struct Member { + A_SEQUENCE_OF(struct SABP_CriticalityDiagnostics_IE_List__Member { SABP_Criticality_t iECriticality; SABP_ProtocolIE_ID_t iE_ID; SABP_RepetitionNumber0_t *repetitionNumber /* OPTIONAL */; diff --git a/include/osmocom/sabp/SABP_Data-Coding-Scheme.h b/include/osmocom/sabp/SABP_Data-Coding-Scheme.h index 377e969..909155f 100644 --- a/include/osmocom/sabp/SABP_Data-Coding-Scheme.h +++ b/include/osmocom/sabp/SABP_Data-Coding-Scheme.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Data_Coding_Scheme_H_ diff --git a/include/osmocom/sabp/SABP_Error-Indication.h b/include/osmocom/sabp/SABP_Error-Indication.h index 9b4018d..21ecc59 100644 --- a/include/osmocom/sabp/SABP_Error-Indication.h +++ b/include/osmocom/sabp/SABP_Error-Indication.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Error_Indication_H_ @@ -23,7 +23,7 @@ /* SABP_Error-Indication */ typedef struct SABP_Error_Indication { - struct error_Indication_ies { + struct SABP_Error_Indication__error_Indication_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Failure-List-Item.h b/include/osmocom/sabp/SABP_Failure-List-Item.h index e3f1ea1..dec3bf6 100644 --- a/include/osmocom/sabp/SABP_Failure-List-Item.h +++ b/include/osmocom/sabp/SABP_Failure-List-Item.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Failure_List_Item_H_ diff --git a/include/osmocom/sabp/SABP_Failure-List.h b/include/osmocom/sabp/SABP_Failure-List.h index 70a710f..26f8326 100644 --- a/include/osmocom/sabp/SABP_Failure-List.h +++ b/include/osmocom/sabp/SABP_Failure-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Failure_List_H_ diff --git a/include/osmocom/sabp/SABP_Failure.h b/include/osmocom/sabp/SABP_Failure.h index 5574143..e9b4f92 100644 --- a/include/osmocom/sabp/SABP_Failure.h +++ b/include/osmocom/sabp/SABP_Failure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Failure_H_ @@ -23,7 +23,7 @@ /* SABP_Failure */ typedef struct SABP_Failure { - struct failure_ies { + struct SABP_Failure__failure_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_IE-Extensions.h b/include/osmocom/sabp/SABP_IE-Extensions.h index 46f4b5e..b87c308 100644 --- a/include/osmocom/sabp/SABP_IE-Extensions.h +++ b/include/osmocom/sabp/SABP_IE-Extensions.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_IE_Extensions_H_ diff --git a/include/osmocom/sabp/SABP_IE.h b/include/osmocom/sabp/SABP_IE.h index e32ab2f..13c2537 100644 --- a/include/osmocom/sabp/SABP_IE.h +++ b/include/osmocom/sabp/SABP_IE.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_IE_H_ diff --git a/include/osmocom/sabp/SABP_InitiatingMessage.h b/include/osmocom/sabp/SABP_InitiatingMessage.h index 94c76f9..0da1b3a 100644 --- a/include/osmocom/sabp/SABP_InitiatingMessage.h +++ b/include/osmocom/sabp/SABP_InitiatingMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_InitiatingMessage_H_ diff --git a/include/osmocom/sabp/SABP_Kill-Complete.h b/include/osmocom/sabp/SABP_Kill-Complete.h index 8a44d10..6a1dce7 100644 --- a/include/osmocom/sabp/SABP_Kill-Complete.h +++ b/include/osmocom/sabp/SABP_Kill-Complete.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Kill_Complete_H_ @@ -23,7 +23,7 @@ /* SABP_Kill-Complete */ typedef struct SABP_Kill_Complete { - struct kill_Complete_ies { + struct SABP_Kill_Complete__kill_Complete_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Kill-Failure.h b/include/osmocom/sabp/SABP_Kill-Failure.h index 8e11918..59a71ae 100644 --- a/include/osmocom/sabp/SABP_Kill-Failure.h +++ b/include/osmocom/sabp/SABP_Kill-Failure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Kill_Failure_H_ @@ -23,7 +23,7 @@ /* SABP_Kill-Failure */ typedef struct SABP_Kill_Failure { - struct kill_Failure_ies { + struct SABP_Kill_Failure__kill_Failure_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Kill.h b/include/osmocom/sabp/SABP_Kill.h index cbd69bc..bc52825 100644 --- a/include/osmocom/sabp/SABP_Kill.h +++ b/include/osmocom/sabp/SABP_Kill.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Kill_H_ @@ -23,7 +23,7 @@ /* SABP_Kill */ typedef struct SABP_Kill { - struct kill_ies { + struct SABP_Kill__kill_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Load-Query-Complete.h b/include/osmocom/sabp/SABP_Load-Query-Complete.h index 6fc6c0e..4c034e7 100644 --- a/include/osmocom/sabp/SABP_Load-Query-Complete.h +++ b/include/osmocom/sabp/SABP_Load-Query-Complete.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Load_Query_Complete_H_ @@ -23,7 +23,7 @@ /* SABP_Load-Query-Complete */ typedef struct SABP_Load_Query_Complete { - struct load_Query_Complete_ies { + struct SABP_Load_Query_Complete__load_Query_Complete_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Load-Query-Failure.h b/include/osmocom/sabp/SABP_Load-Query-Failure.h index 892b89c..7697843 100644 --- a/include/osmocom/sabp/SABP_Load-Query-Failure.h +++ b/include/osmocom/sabp/SABP_Load-Query-Failure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Load_Query_Failure_H_ @@ -23,7 +23,7 @@ /* SABP_Load-Query-Failure */ typedef struct SABP_Load_Query_Failure { - struct load_Query_Failure_ies { + struct SABP_Load_Query_Failure__load_Query_Failure_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Load-Query.h b/include/osmocom/sabp/SABP_Load-Query.h index e510b43..3d49c65 100644 --- a/include/osmocom/sabp/SABP_Load-Query.h +++ b/include/osmocom/sabp/SABP_Load-Query.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Load_Query_H_ @@ -23,7 +23,7 @@ /* SABP_Load-Query */ typedef struct SABP_Load_Query { - struct load_Query_ies { + struct SABP_Load_Query__load_Query_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Message-Identifier.h b/include/osmocom/sabp/SABP_Message-Identifier.h index c3c8256..e6d64d0 100644 --- a/include/osmocom/sabp/SABP_Message-Identifier.h +++ b/include/osmocom/sabp/SABP_Message-Identifier.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * >From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Message_Identifier_H_ diff --git a/include/osmocom/sabp/SABP_Message-Status-Query-Complete.h b/include/osmocom/sabp/SABP_Message-Status-Query-Complete.h index b64c30f..1b6b564 100644 --- a/include/osmocom/sabp/SABP_Message-Status-Query-Complete.h +++ b/include/osmocom/sabp/SABP_Message-Status-Query-Complete.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Message_Status_Query_Complete_H_ @@ -23,7 +23,7 @@ /* SABP_Message-Status-Query-Complete */ typedef struct SABP_Message_Status_Query_Complete { - struct message_Status_Query_Complete_ies { + struct SABP_Message_Status_Query_Complete__message_Status_Query_Complete_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Message-Status-Query-Failure.h b/include/osmocom/sabp/SABP_Message-Status-Query-Failure.h index 655f7a1..bf2ade5 100644 --- a/include/osmocom/sabp/SABP_Message-Status-Query-Failure.h +++ b/include/osmocom/sabp/SABP_Message-Status-Query-Failure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Message_Status_Query_Failure_H_ @@ -23,7 +23,7 @@ /* SABP_Message-Status-Query-Failure */ typedef struct SABP_Message_Status_Query_Failure { - struct message_Status_Query_Failure_ies { + struct SABP_Message_Status_Query_Failure__message_Status_Query_Failure_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Message-Status-Query.h b/include/osmocom/sabp/SABP_Message-Status-Query.h index 4f53dda..be9f68e 100644 --- a/include/osmocom/sabp/SABP_Message-Status-Query.h +++ b/include/osmocom/sabp/SABP_Message-Status-Query.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Message_Status_Query_H_ @@ -23,7 +23,7 @@ /* SABP_Message-Status-Query */ typedef struct SABP_Message_Status_Query { - struct message_Status_Query_ies { + struct SABP_Message_Status_Query__message_Status_Query_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_MessageStructure.h b/include/osmocom/sabp/SABP_MessageStructure.h index 08b3d0d..ce3819f 100644 --- a/include/osmocom/sabp/SABP_MessageStructure.h +++ b/include/osmocom/sabp/SABP_MessageStructure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_MessageStructure_H_ @@ -25,7 +25,7 @@ /* SABP_MessageStructure */ typedef struct SABP_MessageStructure { - A_SEQUENCE_OF(struct MemberA { + A_SEQUENCE_OF(struct SABP_MessageStructure__Member { SABP_ProtocolIE_ID_t iE_ID; SABP_RepetitionNumber1_t *repetitionNumber /* OPTIONAL */; SABP_IE_Extensions_t *iE_Extensions /* OPTIONAL */; diff --git a/include/osmocom/sabp/SABP_New-Serial-Number.h b/include/osmocom/sabp/SABP_New-Serial-Number.h index 70b150d..2f17a3d 100644 --- a/include/osmocom/sabp/SABP_New-Serial-Number.h +++ b/include/osmocom/sabp/SABP_New-Serial-Number.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_New_Serial_Number_H_ diff --git a/include/osmocom/sabp/SABP_Number-Of-Broadcasts-Completed-Info.h b/include/osmocom/sabp/SABP_Number-Of-Broadcasts-Completed-Info.h index 4e4c464..15eaf19 100644 --- a/include/osmocom/sabp/SABP_Number-Of-Broadcasts-Completed-Info.h +++ b/include/osmocom/sabp/SABP_Number-Of-Broadcasts-Completed-Info.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Number_Of_Broadcasts_Completed_Info_H_ diff --git a/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.h b/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.h index 7d70ce5..76c66b6 100644 --- a/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.h +++ b/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Number_of_Broadcasts_Completed_List_Item_H_ diff --git a/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List.h b/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List.h index aae0caa..479821d 100644 --- a/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List.h +++ b/include/osmocom/sabp/SABP_Number-of-Broadcasts-Completed-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Number_of_Broadcasts_Completed_List_H_ diff --git a/include/osmocom/sabp/SABP_Number-of-Broadcasts-Requested.h b/include/osmocom/sabp/SABP_Number-of-Broadcasts-Requested.h index 51b7880..aea577a 100644 --- a/include/osmocom/sabp/SABP_Number-of-Broadcasts-Requested.h +++ b/include/osmocom/sabp/SABP_Number-of-Broadcasts-Requested.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Number_of_Broadcasts_Requested_H_ diff --git a/include/osmocom/sabp/SABP_Old-Serial-Number.h b/include/osmocom/sabp/SABP_Old-Serial-Number.h index 751816c..860fc17 100644 --- a/include/osmocom/sabp/SABP_Old-Serial-Number.h +++ b/include/osmocom/sabp/SABP_Old-Serial-Number.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Old_Serial_Number_H_ diff --git a/include/osmocom/sabp/SABP_Paging-ETWS-Indicator.h b/include/osmocom/sabp/SABP_Paging-ETWS-Indicator.h index e0c3421..d8e7c74 100644 --- a/include/osmocom/sabp/SABP_Paging-ETWS-Indicator.h +++ b/include/osmocom/sabp/SABP_Paging-ETWS-Indicator.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Paging_ETWS_Indicator_H_ diff --git a/include/osmocom/sabp/SABP_Presence.h b/include/osmocom/sabp/SABP_Presence.h index ee73dae..f3270eb 100644 --- a/include/osmocom/sabp/SABP_Presence.h +++ b/include/osmocom/sabp/SABP_Presence.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Presence_H_ diff --git a/include/osmocom/sabp/SABP_ProcedureCode.h b/include/osmocom/sabp/SABP_ProcedureCode.h index b820876..bf114fe 100644 --- a/include/osmocom/sabp/SABP_ProcedureCode.h +++ b/include/osmocom/sabp/SABP_ProcedureCode.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_ProcedureCode_H_ diff --git a/include/osmocom/sabp/SABP_ProtocolExtensionID.h b/include/osmocom/sabp/SABP_ProtocolExtensionID.h index bc27bec..cce30ab 100644 --- a/include/osmocom/sabp/SABP_ProtocolExtensionID.h +++ b/include/osmocom/sabp/SABP_ProtocolExtensionID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_ProtocolExtensionID_H_ diff --git a/include/osmocom/sabp/SABP_ProtocolIE-ID.h b/include/osmocom/sabp/SABP_ProtocolIE-ID.h index e2eaf57..511eccb 100644 --- a/include/osmocom/sabp/SABP_ProtocolIE-ID.h +++ b/include/osmocom/sabp/SABP_ProtocolIE-ID.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_ProtocolIE_ID_H_ diff --git a/include/osmocom/sabp/SABP_Radio-Resource-Loading-List-Item.h b/include/osmocom/sabp/SABP_Radio-Resource-Loading-List-Item.h index 9a62bed..3185c31 100644 --- a/include/osmocom/sabp/SABP_Radio-Resource-Loading-List-Item.h +++ b/include/osmocom/sabp/SABP_Radio-Resource-Loading-List-Item.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Radio_Resource_Loading_List_Item_H_ diff --git a/include/osmocom/sabp/SABP_Radio-Resource-Loading-List.h b/include/osmocom/sabp/SABP_Radio-Resource-Loading-List.h index d80fd78..5ff26a0 100644 --- a/include/osmocom/sabp/SABP_Radio-Resource-Loading-List.h +++ b/include/osmocom/sabp/SABP_Radio-Resource-Loading-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Radio_Resource_Loading_List_H_ diff --git a/include/osmocom/sabp/SABP_Recovery-Indication.h b/include/osmocom/sabp/SABP_Recovery-Indication.h index 0deb5a0..69608da 100644 --- a/include/osmocom/sabp/SABP_Recovery-Indication.h +++ b/include/osmocom/sabp/SABP_Recovery-Indication.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Recovery_Indication_H_ diff --git a/include/osmocom/sabp/SABP_Repetition-Period.h b/include/osmocom/sabp/SABP_Repetition-Period.h index 8eece01..9b9576f 100644 --- a/include/osmocom/sabp/SABP_Repetition-Period.h +++ b/include/osmocom/sabp/SABP_Repetition-Period.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Repetition_Period_H_ diff --git a/include/osmocom/sabp/SABP_RepetitionNumber0.h b/include/osmocom/sabp/SABP_RepetitionNumber0.h index 373356a..dcc8adf 100644 --- a/include/osmocom/sabp/SABP_RepetitionNumber0.h +++ b/include/osmocom/sabp/SABP_RepetitionNumber0.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_RepetitionNumber0_H_ diff --git a/include/osmocom/sabp/SABP_RepetitionNumber1.h b/include/osmocom/sabp/SABP_RepetitionNumber1.h index 01ba46a..e2e6f92 100644 --- a/include/osmocom/sabp/SABP_RepetitionNumber1.h +++ b/include/osmocom/sabp/SABP_RepetitionNumber1.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_RepetitionNumber1_H_ diff --git a/include/osmocom/sabp/SABP_Reset-Complete.h b/include/osmocom/sabp/SABP_Reset-Complete.h index edab63e..8870e38 100644 --- a/include/osmocom/sabp/SABP_Reset-Complete.h +++ b/include/osmocom/sabp/SABP_Reset-Complete.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Reset_Complete_H_ @@ -23,7 +23,7 @@ /* SABP_Reset-Complete */ typedef struct SABP_Reset_Complete { - struct reset_Complete_ies { + struct SABP_Reset_Complete__reset_Complete_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Reset-Failure.h b/include/osmocom/sabp/SABP_Reset-Failure.h index a6b6b29..899a118 100644 --- a/include/osmocom/sabp/SABP_Reset-Failure.h +++ b/include/osmocom/sabp/SABP_Reset-Failure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Reset_Failure_H_ @@ -23,7 +23,7 @@ /* SABP_Reset-Failure */ typedef struct SABP_Reset_Failure { - struct reset_Failure_ies { + struct SABP_Reset_Failure__reset_Failure_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Reset.h b/include/osmocom/sabp/SABP_Reset.h index 37cb0ff..4916a2b 100644 --- a/include/osmocom/sabp/SABP_Reset.h +++ b/include/osmocom/sabp/SABP_Reset.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Reset_H_ @@ -23,7 +23,7 @@ /* SABP_Reset */ typedef struct SABP_Reset { - struct reset_ies { + struct SABP_Reset__reset_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Restart.h b/include/osmocom/sabp/SABP_Restart.h index 2756a14..de5e9bb 100644 --- a/include/osmocom/sabp/SABP_Restart.h +++ b/include/osmocom/sabp/SABP_Restart.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Restart_H_ @@ -23,7 +23,7 @@ /* SABP_Restart */ typedef struct SABP_Restart { - struct restart_ies { + struct SABP_Restart__restart_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_SABP-PDU.h b/include/osmocom/sabp/SABP_SABP-PDU.h index 4cebd44..b7c93f9 100644 --- a/include/osmocom/sabp/SABP_SABP-PDU.h +++ b/include/osmocom/sabp/SABP_SABP-PDU.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_SABP_PDU_H_ diff --git a/include/osmocom/sabp/SABP_Serial-Number.h b/include/osmocom/sabp/SABP_Serial-Number.h index 4b9867c..ed34f55 100644 --- a/include/osmocom/sabp/SABP_Serial-Number.h +++ b/include/osmocom/sabp/SABP_Serial-Number.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Serial_Number_H_ diff --git a/include/osmocom/sabp/SABP_Service-Area-Identifier.h b/include/osmocom/sabp/SABP_Service-Area-Identifier.h index 31139bd..ea0934f 100644 --- a/include/osmocom/sabp/SABP_Service-Area-Identifier.h +++ b/include/osmocom/sabp/SABP_Service-Area-Identifier.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Service_Area_Identifier_H_ diff --git a/include/osmocom/sabp/SABP_Service-Areas-List.h b/include/osmocom/sabp/SABP_Service-Areas-List.h index ed5837a..34a07d6 100644 --- a/include/osmocom/sabp/SABP_Service-Areas-List.h +++ b/include/osmocom/sabp/SABP_Service-Areas-List.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Service_Areas_List_H_ diff --git a/include/osmocom/sabp/SABP_SuccessfulOutcome.h b/include/osmocom/sabp/SABP_SuccessfulOutcome.h index 8463a75..1e72de4 100644 --- a/include/osmocom/sabp/SABP_SuccessfulOutcome.h +++ b/include/osmocom/sabp/SABP_SuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_SuccessfulOutcome_H_ diff --git a/include/osmocom/sabp/SABP_TriggeringMessage.h b/include/osmocom/sabp/SABP_TriggeringMessage.h index c54d4bf..134ba69 100644 --- a/include/osmocom/sabp/SABP_TriggeringMessage.h +++ b/include/osmocom/sabp/SABP_TriggeringMessage.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_TriggeringMessage_H_ diff --git a/include/osmocom/sabp/SABP_TypeOfError.h b/include/osmocom/sabp/SABP_TypeOfError.h index 28e556d..2c50d97 100644 --- a/include/osmocom/sabp/SABP_TypeOfError.h +++ b/include/osmocom/sabp/SABP_TypeOfError.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_TypeOfError_H_ diff --git a/include/osmocom/sabp/SABP_UnsuccessfulOutcome.h b/include/osmocom/sabp/SABP_UnsuccessfulOutcome.h index f7ef604..b4fe2c0 100644 --- a/include/osmocom/sabp/SABP_UnsuccessfulOutcome.h +++ b/include/osmocom/sabp/SABP_UnsuccessfulOutcome.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_UnsuccessfulOutcome_H_ diff --git a/include/osmocom/sabp/SABP_Warning-Type.h b/include/osmocom/sabp/SABP_Warning-Type.h index bbd520b..96b7ef3 100644 --- a/include/osmocom/sabp/SABP_Warning-Type.h +++ b/include/osmocom/sabp/SABP_Warning-Type.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Warning_Type_H_ diff --git a/include/osmocom/sabp/SABP_WarningSecurityInfo.h b/include/osmocom/sabp/SABP_WarningSecurityInfo.h index 395c67b..4409492 100644 --- a/include/osmocom/sabp/SABP_WarningSecurityInfo.h +++ b/include/osmocom/sabp/SABP_WarningSecurityInfo.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_WarningSecurityInfo_H_ diff --git a/include/osmocom/sabp/SABP_Write-Replace-Complete.h b/include/osmocom/sabp/SABP_Write-Replace-Complete.h index e9c6b49..a9a8451 100644 --- a/include/osmocom/sabp/SABP_Write-Replace-Complete.h +++ b/include/osmocom/sabp/SABP_Write-Replace-Complete.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Write_Replace_Complete_H_ @@ -23,7 +23,7 @@ /* SABP_Write-Replace-Complete */ typedef struct SABP_Write_Replace_Complete { - struct write_Replace_Complete_ies { + struct SABP_Write_Replace_Complete__write_Replace_Complete_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Write-Replace-Failure.h b/include/osmocom/sabp/SABP_Write-Replace-Failure.h index 5a7a394..9bd3d6e 100644 --- a/include/osmocom/sabp/SABP_Write-Replace-Failure.h +++ b/include/osmocom/sabp/SABP_Write-Replace-Failure.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Write_Replace_Failure_H_ @@ -23,7 +23,7 @@ /* SABP_Write-Replace-Failure */ typedef struct SABP_Write_Replace_Failure { - struct write_Replace_Failure_ies { + struct SABP_Write_Replace_Failure__write_Replace_Failure_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/include/osmocom/sabp/SABP_Write-Replace.h b/include/osmocom/sabp/SABP_Write-Replace.h index 33d9b04..f1b41eb 100644 --- a/include/osmocom/sabp/SABP_Write-Replace.h +++ b/include/osmocom/sabp/SABP_Write-Replace.h @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #ifndef _SABP_Write_Replace_H_ @@ -23,7 +23,7 @@ /* SABP_Write-Replace */ typedef struct SABP_Write_Replace { - struct write_Replace_ies { + struct SABP_Write_Replace__write_Replace_ies { A_SEQUENCE_OF(SABP_IE_t) list; /* Context for parsing across buffer boundaries */ diff --git a/src/sabp/Makefile.am b/src/sabp/Makefile.am index faace13..0665db4 100644 --- a/src/sabp/Makefile.am +++ b/src/sabp/Makefile.am @@ -135,10 +135,7 @@ regen: regenerate-from-asn1-source regenerate-from-asn1-source: - ASN1C_PREFIX="SABP_" asn1c -R -gen-PER $(top_srcdir)/asn1/sabp/SABP-CommonDataTypes.asn $(top_srcdir)/asn1/sabp/SABP-Constants.asn $(top_srcdir)/asn1/sabp/SABP-IEs.asn $(top_srcdir)/asn1/sabp/SABP-PDU.asn -# change include style to `#include ' - sed -i 's/Member/MemberA/' SABP_MessageStructure.[ch] - sed -i 's/Member/MemberB/' SABP_Criticality-Diagnostics.[ch] + ASN1C_PREFIX="SABP_" asn1c -R -fcompound-names -gen-PER $(top_srcdir)/asn1/sabp/SABP-CommonDataTypes.asn $(top_srcdir)/asn1/sabp/SABP-Constants.asn $(top_srcdir)/asn1/sabp/SABP-IEs.asn $(top_srcdir)/asn1/sabp/SABP-PDU.asn # add missing includes sed -i '/#include "SABP_Serial-Number.h"/a #include ' SABP_Old-Serial-Number.h SABP_New-Serial-Number.h # change include style to `#include ' diff --git a/src/sabp/SABP_Available-Bandwidth.c b/src/sabp/SABP_Available-Bandwidth.c index e382a4f..8fb6bc4 100644 --- a/src/sabp/SABP_Available-Bandwidth.c +++ b/src/sabp/SABP_Available-Bandwidth.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.c b/src/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.c index c747aa5..1573bbc 100644 --- a/src/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.c +++ b/src/sabp/SABP_Broadcast-Message-Content-Validity-Indicator.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Broadcast-Message-Content.c b/src/sabp/SABP_Broadcast-Message-Content.c index 83c6539..56f18aa 100644 --- a/src/sabp/SABP_Broadcast-Message-Content.c +++ b/src/sabp/SABP_Broadcast-Message-Content.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Category.c b/src/sabp/SABP_Category.c index d1ba3c8..b683cea 100644 --- a/src/sabp/SABP_Category.c +++ b/src/sabp/SABP_Category.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Cause.c b/src/sabp/SABP_Cause.c index 1e131c6..97e5391 100644 --- a/src/sabp/SABP_Cause.c +++ b/src/sabp/SABP_Cause.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Criticality-Diagnostics.c b/src/sabp/SABP_Criticality-Diagnostics.c index 9991966..bb29c4d 100644 --- a/src/sabp/SABP_Criticality-Diagnostics.c +++ b/src/sabp/SABP_Criticality-Diagnostics.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Criticality.c b/src/sabp/SABP_Criticality.c index e921697..d4d61e8 100644 --- a/src/sabp/SABP_Criticality.c +++ b/src/sabp/SABP_Criticality.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_CriticalityDiagnostics-IE-List.c b/src/sabp/SABP_CriticalityDiagnostics-IE-List.c index bfaddee..8c4c2f3 100644 --- a/src/sabp/SABP_CriticalityDiagnostics-IE-List.c +++ b/src/sabp/SABP_CriticalityDiagnostics-IE-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -13,7 +13,7 @@ 0, 0 /* No PER value map */ }; static asn_TYPE_member_t asn_MBR_Member_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct Member, iECriticality), + { ATF_NOFLAGS, 0, offsetof(struct SABP_CriticalityDiagnostics_IE_List__Member, iECriticality), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_Criticality, @@ -22,7 +22,7 @@ 0, "iECriticality" }, - { ATF_NOFLAGS, 0, offsetof(struct Member, iE_ID), + { ATF_NOFLAGS, 0, offsetof(struct SABP_CriticalityDiagnostics_IE_List__Member, iE_ID), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_ProtocolIE_ID, @@ -31,7 +31,7 @@ 0, "iE-ID" }, - { ATF_POINTER, 2, offsetof(struct Member, repetitionNumber), + { ATF_POINTER, 2, offsetof(struct SABP_CriticalityDiagnostics_IE_List__Member, repetitionNumber), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_RepetitionNumber0, @@ -40,7 +40,7 @@ 0, "repetitionNumber" }, - { ATF_POINTER, 1, offsetof(struct Member, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct SABP_CriticalityDiagnostics_IE_List__Member, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_IE_Extensions, @@ -61,8 +61,8 @@ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* iE-Extensions */ }; static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { - sizeof(struct Member), - offsetof(struct Member, _asn_ctx), + sizeof(struct SABP_CriticalityDiagnostics_IE_List__Member), + offsetof(struct SABP_CriticalityDiagnostics_IE_List__Member, _asn_ctx), asn_MAP_Member_tag2el_2, 4, /* Count of tags in the map */ asn_MAP_Member_oms_2, /* Optional members */ diff --git a/src/sabp/SABP_Data-Coding-Scheme.c b/src/sabp/SABP_Data-Coding-Scheme.c index 58f2ff8..d03ae62 100644 --- a/src/sabp/SABP_Data-Coding-Scheme.c +++ b/src/sabp/SABP_Data-Coding-Scheme.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Error-Indication.c b/src/sabp/SABP_Error-Indication.c index 93e171b..8ffb00b 100644 --- a/src/sabp/SABP_Error-Indication.c +++ b/src/sabp/SABP_Error-Indication.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_error_Indication_ies_specs_2 = { - sizeof(struct error_Indication_ies), - offsetof(struct error_Indication_ies, _asn_ctx), + sizeof(struct SABP_Error_Indication__error_Indication_ies), + offsetof(struct SABP_Error_Indication__error_Indication_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Failure-List-Item.c b/src/sabp/SABP_Failure-List-Item.c index 20e2c6c..eb22f59 100644 --- a/src/sabp/SABP_Failure-List-Item.c +++ b/src/sabp/SABP_Failure-List-Item.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Failure-List.c b/src/sabp/SABP_Failure-List.c index 33be93a..d9a1707 100644 --- a/src/sabp/SABP_Failure-List.c +++ b/src/sabp/SABP_Failure-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Failure.c b/src/sabp/SABP_Failure.c index b636e59..a35d8c1 100644 --- a/src/sabp/SABP_Failure.c +++ b/src/sabp/SABP_Failure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_failure_ies_specs_2 = { - sizeof(struct failure_ies), - offsetof(struct failure_ies, _asn_ctx), + sizeof(struct SABP_Failure__failure_ies), + offsetof(struct SABP_Failure__failure_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_IE-Extensions.c b/src/sabp/SABP_IE-Extensions.c index 5f4c7af..8ba550a 100644 --- a/src/sabp/SABP_IE-Extensions.c +++ b/src/sabp/SABP_IE-Extensions.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_IE.c b/src/sabp/SABP_IE.c index 44f6bd8..dfe7a5e 100644 --- a/src/sabp/SABP_IE.c +++ b/src/sabp/SABP_IE.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_InitiatingMessage.c b/src/sabp/SABP_InitiatingMessage.c index 210fa39..33f89ce 100644 --- a/src/sabp/SABP_InitiatingMessage.c +++ b/src/sabp/SABP_InitiatingMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Kill-Complete.c b/src/sabp/SABP_Kill-Complete.c index 3c8a4b4..991f40a 100644 --- a/src/sabp/SABP_Kill-Complete.c +++ b/src/sabp/SABP_Kill-Complete.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_kill_Complete_ies_specs_2 = { - sizeof(struct kill_Complete_ies), - offsetof(struct kill_Complete_ies, _asn_ctx), + sizeof(struct SABP_Kill_Complete__kill_Complete_ies), + offsetof(struct SABP_Kill_Complete__kill_Complete_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Kill-Failure.c b/src/sabp/SABP_Kill-Failure.c index b09fa79..ada7122 100644 --- a/src/sabp/SABP_Kill-Failure.c +++ b/src/sabp/SABP_Kill-Failure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_kill_Failure_ies_specs_2 = { - sizeof(struct kill_Failure_ies), - offsetof(struct kill_Failure_ies, _asn_ctx), + sizeof(struct SABP_Kill_Failure__kill_Failure_ies), + offsetof(struct SABP_Kill_Failure__kill_Failure_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Kill.c b/src/sabp/SABP_Kill.c index 4a3bb90..e9d5874 100644 --- a/src/sabp/SABP_Kill.c +++ b/src/sabp/SABP_Kill.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_kill_ies_specs_2 = { - sizeof(struct kill_ies), - offsetof(struct kill_ies, _asn_ctx), + sizeof(struct SABP_Kill__kill_ies), + offsetof(struct SABP_Kill__kill_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Load-Query-Complete.c b/src/sabp/SABP_Load-Query-Complete.c index c840a7e..4b03553 100644 --- a/src/sabp/SABP_Load-Query-Complete.c +++ b/src/sabp/SABP_Load-Query-Complete.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_load_Query_Complete_ies_specs_2 = { - sizeof(struct load_Query_Complete_ies), - offsetof(struct load_Query_Complete_ies, _asn_ctx), + sizeof(struct SABP_Load_Query_Complete__load_Query_Complete_ies), + offsetof(struct SABP_Load_Query_Complete__load_Query_Complete_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Load-Query-Failure.c b/src/sabp/SABP_Load-Query-Failure.c index 6ff5d49..ad04a30 100644 --- a/src/sabp/SABP_Load-Query-Failure.c +++ b/src/sabp/SABP_Load-Query-Failure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_load_Query_Failure_ies_specs_2 = { - sizeof(struct load_Query_Failure_ies), - offsetof(struct load_Query_Failure_ies, _asn_ctx), + sizeof(struct SABP_Load_Query_Failure__load_Query_Failure_ies), + offsetof(struct SABP_Load_Query_Failure__load_Query_Failure_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Load-Query.c b/src/sabp/SABP_Load-Query.c index 7ec4624..483d988 100644 --- a/src/sabp/SABP_Load-Query.c +++ b/src/sabp/SABP_Load-Query.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_load_Query_ies_specs_2 = { - sizeof(struct load_Query_ies), - offsetof(struct load_Query_ies, _asn_ctx), + sizeof(struct SABP_Load_Query__load_Query_ies), + offsetof(struct SABP_Load_Query__load_Query_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Message-Identifier.c b/src/sabp/SABP_Message-Identifier.c index 80d4d68..0d2432d 100644 --- a/src/sabp/SABP_Message-Identifier.c +++ b/src/sabp/SABP_Message-Identifier.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Message-Status-Query-Complete.c b/src/sabp/SABP_Message-Status-Query-Complete.c index f75adc2..6483ed1 100644 --- a/src/sabp/SABP_Message-Status-Query-Complete.c +++ b/src/sabp/SABP_Message-Status-Query-Complete.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_message_Status_Query_Complete_ies_specs_2 = { - sizeof(struct message_Status_Query_Complete_ies), - offsetof(struct message_Status_Query_Complete_ies, _asn_ctx), + sizeof(struct SABP_Message_Status_Query_Complete__message_Status_Query_Complete_ies), + offsetof(struct SABP_Message_Status_Query_Complete__message_Status_Query_Complete_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Message-Status-Query-Failure.c b/src/sabp/SABP_Message-Status-Query-Failure.c index 21601c8..3308a27 100644 --- a/src/sabp/SABP_Message-Status-Query-Failure.c +++ b/src/sabp/SABP_Message-Status-Query-Failure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_message_Status_Query_Failure_ies_specs_2 = { - sizeof(struct message_Status_Query_Failure_ies), - offsetof(struct message_Status_Query_Failure_ies, _asn_ctx), + sizeof(struct SABP_Message_Status_Query_Failure__message_Status_Query_Failure_ies), + offsetof(struct SABP_Message_Status_Query_Failure__message_Status_Query_Failure_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Message-Status-Query.c b/src/sabp/SABP_Message-Status-Query.c index 045aee9..5a0b5ac 100644 --- a/src/sabp/SABP_Message-Status-Query.c +++ b/src/sabp/SABP_Message-Status-Query.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_message_Status_Query_ies_specs_2 = { - sizeof(struct message_Status_Query_ies), - offsetof(struct message_Status_Query_ies, _asn_ctx), + sizeof(struct SABP_Message_Status_Query__message_Status_Query_ies), + offsetof(struct SABP_Message_Status_Query__message_Status_Query_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_MessageStructure.c b/src/sabp/SABP_MessageStructure.c index 53bd1f7..3c6755a 100644 --- a/src/sabp/SABP_MessageStructure.c +++ b/src/sabp/SABP_MessageStructure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -12,8 +12,8 @@ { APC_CONSTRAINED, 8, 8, 1l, 256l } /* (SIZE(1..256)) */, 0, 0 /* No PER value map */ }; -static asn_TYPE_member_t asn_MBR_MemberA_2[] = { - { ATF_NOFLAGS, 0, offsetof(struct MemberA, iE_ID), +static asn_TYPE_member_t asn_MBR_Member_2[] = { + { ATF_NOFLAGS, 0, offsetof(struct SABP_MessageStructure__Member, iE_ID), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_ProtocolIE_ID, @@ -22,7 +22,7 @@ 0, "iE-ID" }, - { ATF_POINTER, 2, offsetof(struct MemberA, repetitionNumber), + { ATF_POINTER, 2, offsetof(struct SABP_MessageStructure__Member, repetitionNumber), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_RepetitionNumber1, @@ -31,7 +31,7 @@ 0, "repetitionNumber" }, - { ATF_POINTER, 1, offsetof(struct MemberA, iE_Extensions), + { ATF_POINTER, 1, offsetof(struct SABP_MessageStructure__Member, iE_Extensions), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SABP_IE_Extensions, @@ -41,27 +41,27 @@ "iE-Extensions" }, }; -static const int asn_MAP_MemberA_oms_2[] = { 1, 2 }; -static const ber_tlv_tag_t asn_DEF_MemberA_tags_2[] = { +static const int asn_MAP_Member_oms_2[] = { 1, 2 }; +static const ber_tlv_tag_t asn_DEF_Member_tags_2[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; -static const asn_TYPE_tag2member_t asn_MAP_MemberA_tag2el_2[] = { +static const asn_TYPE_tag2member_t asn_MAP_Member_tag2el_2[] = { { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* iE-ID */ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* repetitionNumber */ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* iE-Extensions */ }; -static asn_SEQUENCE_specifics_t asn_SPC_MemberA_specs_2 = { - sizeof(struct MemberA), - offsetof(struct MemberA, _asn_ctx), - asn_MAP_MemberA_tag2el_2, +static asn_SEQUENCE_specifics_t asn_SPC_Member_specs_2 = { + sizeof(struct SABP_MessageStructure__Member), + offsetof(struct SABP_MessageStructure__Member, _asn_ctx), + asn_MAP_Member_tag2el_2, 3, /* Count of tags in the map */ - asn_MAP_MemberA_oms_2, /* Optional members */ + asn_MAP_Member_oms_2, /* Optional members */ 2, 0, /* Root/Additions */ 2, /* Start extensions */ 4 /* Stop extensions */ }; static /* Use -fall-defs-global to expose */ -asn_TYPE_descriptor_t asn_DEF_MemberA_2 = { +asn_TYPE_descriptor_t asn_DEF_Member_2 = { "SEQUENCE", "SEQUENCE", SEQUENCE_free, @@ -76,23 +76,23 @@ SEQUENCE_decode_aper, SEQUENCE_encode_aper, 0, /* Use generic outmost tag fetcher */ - asn_DEF_MemberA_tags_2, - sizeof(asn_DEF_MemberA_tags_2) - /sizeof(asn_DEF_MemberA_tags_2[0]), /* 1 */ - asn_DEF_MemberA_tags_2, /* Same as above */ - sizeof(asn_DEF_MemberA_tags_2) - /sizeof(asn_DEF_MemberA_tags_2[0]), /* 1 */ + asn_DEF_Member_tags_2, + sizeof(asn_DEF_Member_tags_2) + /sizeof(asn_DEF_Member_tags_2[0]), /* 1 */ + asn_DEF_Member_tags_2, /* Same as above */ + sizeof(asn_DEF_Member_tags_2) + /sizeof(asn_DEF_Member_tags_2[0]), /* 1 */ 0, /* No PER visible constraints */ - asn_MBR_MemberA_2, + asn_MBR_Member_2, 3, /* Elements count */ - &asn_SPC_MemberA_specs_2 /* Additional specs */ + &asn_SPC_Member_specs_2 /* Additional specs */ }; static asn_TYPE_member_t asn_MBR_SABP_MessageStructure_1[] = { { ATF_POINTER, 0, 0, (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, - &asn_DEF_MemberA_2, + &asn_DEF_Member_2, 0, /* Defer constraints checking to the member type */ 0, /* No PER visible constraints */ 0, diff --git a/src/sabp/SABP_New-Serial-Number.c b/src/sabp/SABP_New-Serial-Number.c index 01e5f22..f4ffd1d 100644 --- a/src/sabp/SABP_New-Serial-Number.c +++ b/src/sabp/SABP_New-Serial-Number.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Number-Of-Broadcasts-Completed-Info.c b/src/sabp/SABP_Number-Of-Broadcasts-Completed-Info.c index b4c8f07..239bfc9 100644 --- a/src/sabp/SABP_Number-Of-Broadcasts-Completed-Info.c +++ b/src/sabp/SABP_Number-Of-Broadcasts-Completed-Info.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.c b/src/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.c index 78fc565..11693c0 100644 --- a/src/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.c +++ b/src/sabp/SABP_Number-of-Broadcasts-Completed-List-Item.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Number-of-Broadcasts-Completed-List.c b/src/sabp/SABP_Number-of-Broadcasts-Completed-List.c index c76fc7f..26a42f0 100644 --- a/src/sabp/SABP_Number-of-Broadcasts-Completed-List.c +++ b/src/sabp/SABP_Number-of-Broadcasts-Completed-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Number-of-Broadcasts-Requested.c b/src/sabp/SABP_Number-of-Broadcasts-Requested.c index 4aea5fb..ce72ab7 100644 --- a/src/sabp/SABP_Number-of-Broadcasts-Requested.c +++ b/src/sabp/SABP_Number-of-Broadcasts-Requested.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Old-Serial-Number.c b/src/sabp/SABP_Old-Serial-Number.c index 48af4dd..d40c297 100644 --- a/src/sabp/SABP_Old-Serial-Number.c +++ b/src/sabp/SABP_Old-Serial-Number.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Paging-ETWS-Indicator.c b/src/sabp/SABP_Paging-ETWS-Indicator.c index 8c1a14a..1d8c847 100644 --- a/src/sabp/SABP_Paging-ETWS-Indicator.c +++ b/src/sabp/SABP_Paging-ETWS-Indicator.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Presence.c b/src/sabp/SABP_Presence.c index f1136ca..3706a4b 100644 --- a/src/sabp/SABP_Presence.c +++ b/src/sabp/SABP_Presence.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_ProcedureCode.c b/src/sabp/SABP_ProcedureCode.c index 7625d85..98df07b 100644 --- a/src/sabp/SABP_ProcedureCode.c +++ b/src/sabp/SABP_ProcedureCode.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_ProtocolExtensionID.c b/src/sabp/SABP_ProtocolExtensionID.c index 7ff84fb..9ac99a9 100644 --- a/src/sabp/SABP_ProtocolExtensionID.c +++ b/src/sabp/SABP_ProtocolExtensionID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_ProtocolIE-ID.c b/src/sabp/SABP_ProtocolIE-ID.c index 5d46525..2f2f704 100644 --- a/src/sabp/SABP_ProtocolIE-ID.c +++ b/src/sabp/SABP_ProtocolIE-ID.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Radio-Resource-Loading-List-Item.c b/src/sabp/SABP_Radio-Resource-Loading-List-Item.c index 5970bd5..3abf2d7 100644 --- a/src/sabp/SABP_Radio-Resource-Loading-List-Item.c +++ b/src/sabp/SABP_Radio-Resource-Loading-List-Item.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Radio-Resource-Loading-List.c b/src/sabp/SABP_Radio-Resource-Loading-List.c index 5453300..9e1a208 100644 --- a/src/sabp/SABP_Radio-Resource-Loading-List.c +++ b/src/sabp/SABP_Radio-Resource-Loading-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Recovery-Indication.c b/src/sabp/SABP_Recovery-Indication.c index 2fa6e7c..4d84bcb 100644 --- a/src/sabp/SABP_Recovery-Indication.c +++ b/src/sabp/SABP_Recovery-Indication.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Repetition-Period.c b/src/sabp/SABP_Repetition-Period.c index 77c90e7..9cceab6 100644 --- a/src/sabp/SABP_Repetition-Period.c +++ b/src/sabp/SABP_Repetition-Period.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_RepetitionNumber0.c b/src/sabp/SABP_RepetitionNumber0.c index ae315cc..9a1b172 100644 --- a/src/sabp/SABP_RepetitionNumber0.c +++ b/src/sabp/SABP_RepetitionNumber0.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_RepetitionNumber1.c b/src/sabp/SABP_RepetitionNumber1.c index 48077be..f4befd1 100644 --- a/src/sabp/SABP_RepetitionNumber1.c +++ b/src/sabp/SABP_RepetitionNumber1.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Reset-Complete.c b/src/sabp/SABP_Reset-Complete.c index e1d6111..3ccf9d5 100644 --- a/src/sabp/SABP_Reset-Complete.c +++ b/src/sabp/SABP_Reset-Complete.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_reset_Complete_ies_specs_2 = { - sizeof(struct reset_Complete_ies), - offsetof(struct reset_Complete_ies, _asn_ctx), + sizeof(struct SABP_Reset_Complete__reset_Complete_ies), + offsetof(struct SABP_Reset_Complete__reset_Complete_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Reset-Failure.c b/src/sabp/SABP_Reset-Failure.c index deef866..08b07c8 100644 --- a/src/sabp/SABP_Reset-Failure.c +++ b/src/sabp/SABP_Reset-Failure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_reset_Failure_ies_specs_2 = { - sizeof(struct reset_Failure_ies), - offsetof(struct reset_Failure_ies, _asn_ctx), + sizeof(struct SABP_Reset_Failure__reset_Failure_ies), + offsetof(struct SABP_Reset_Failure__reset_Failure_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Reset.c b/src/sabp/SABP_Reset.c index 9d3801d..89e661f 100644 --- a/src/sabp/SABP_Reset.c +++ b/src/sabp/SABP_Reset.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_reset_ies_specs_2 = { - sizeof(struct reset_ies), - offsetof(struct reset_ies, _asn_ctx), + sizeof(struct SABP_Reset__reset_ies), + offsetof(struct SABP_Reset__reset_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Restart.c b/src/sabp/SABP_Restart.c index b00781a..dad513b 100644 --- a/src/sabp/SABP_Restart.c +++ b/src/sabp/SABP_Restart.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_restart_ies_specs_2 = { - sizeof(struct restart_ies), - offsetof(struct restart_ies, _asn_ctx), + sizeof(struct SABP_Restart__restart_ies), + offsetof(struct SABP_Restart__restart_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_SABP-PDU.c b/src/sabp/SABP_SABP-PDU.c index c8c91ab..c1e7f57 100644 --- a/src/sabp/SABP_SABP-PDU.c +++ b/src/sabp/SABP_SABP-PDU.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Serial-Number.c b/src/sabp/SABP_Serial-Number.c index 0358638..36dc3ed 100644 --- a/src/sabp/SABP_Serial-Number.c +++ b/src/sabp/SABP_Serial-Number.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Service-Area-Identifier.c b/src/sabp/SABP_Service-Area-Identifier.c index bc0dbba..495c3d5 100644 --- a/src/sabp/SABP_Service-Area-Identifier.c +++ b/src/sabp/SABP_Service-Area-Identifier.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Service-Areas-List.c b/src/sabp/SABP_Service-Areas-List.c index 79a4ae5..3a6b9ee 100644 --- a/src/sabp/SABP_Service-Areas-List.c +++ b/src/sabp/SABP_Service-Areas-List.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_SuccessfulOutcome.c b/src/sabp/SABP_SuccessfulOutcome.c index 5269eeb..7fd444c 100644 --- a/src/sabp/SABP_SuccessfulOutcome.c +++ b/src/sabp/SABP_SuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_TriggeringMessage.c b/src/sabp/SABP_TriggeringMessage.c index 2d01975..5ec0087 100644 --- a/src/sabp/SABP_TriggeringMessage.c +++ b/src/sabp/SABP_TriggeringMessage.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-CommonDataTypes" * found in "../../asn1/sabp/SABP-CommonDataTypes.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_TypeOfError.c b/src/sabp/SABP_TypeOfError.c index 09793e1..1273b67 100644 --- a/src/sabp/SABP_TypeOfError.c +++ b/src/sabp/SABP_TypeOfError.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_UnsuccessfulOutcome.c b/src/sabp/SABP_UnsuccessfulOutcome.c index 33c4b4a..bd869f9 100644 --- a/src/sabp/SABP_UnsuccessfulOutcome.c +++ b/src/sabp/SABP_UnsuccessfulOutcome.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Warning-Type.c b/src/sabp/SABP_Warning-Type.c index 725a982..9e958a2 100644 --- a/src/sabp/SABP_Warning-Type.c +++ b/src/sabp/SABP_Warning-Type.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_WarningSecurityInfo.c b/src/sabp/SABP_WarningSecurityInfo.c index 0294ad3..70859e3 100644 --- a/src/sabp/SABP_WarningSecurityInfo.c +++ b/src/sabp/SABP_WarningSecurityInfo.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-IEs" * found in "../../asn1/sabp/SABP-IEs.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include diff --git a/src/sabp/SABP_Write-Replace-Complete.c b/src/sabp/SABP_Write-Replace-Complete.c index 1cebe1f..56f44d4 100644 --- a/src/sabp/SABP_Write-Replace-Complete.c +++ b/src/sabp/SABP_Write-Replace-Complete.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_write_Replace_Complete_ies_specs_2 = { - sizeof(struct write_Replace_Complete_ies), - offsetof(struct write_Replace_Complete_ies, _asn_ctx), + sizeof(struct SABP_Write_Replace_Complete__write_Replace_Complete_ies), + offsetof(struct SABP_Write_Replace_Complete__write_Replace_Complete_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Write-Replace-Failure.c b/src/sabp/SABP_Write-Replace-Failure.c index 40f49bd..9d1fad3 100644 --- a/src/sabp/SABP_Write-Replace-Failure.c +++ b/src/sabp/SABP_Write-Replace-Failure.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_write_Replace_Failure_ies_specs_2 = { - sizeof(struct write_Replace_Failure_ies), - offsetof(struct write_Replace_Failure_ies, _asn_ctx), + sizeof(struct SABP_Write_Replace_Failure__write_Replace_Failure_ies), + offsetof(struct SABP_Write_Replace_Failure__write_Replace_Failure_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ diff --git a/src/sabp/SABP_Write-Replace.c b/src/sabp/SABP_Write-Replace.c index 23b406c..994e145 100644 --- a/src/sabp/SABP_Write-Replace.c +++ b/src/sabp/SABP_Write-Replace.c @@ -2,7 +2,7 @@ * Generated by asn1c-0.9.28 (http://lionet.info/asn1c) * From ASN.1 module "SABP-PDU" * found in "../../asn1/sabp/SABP-PDU.asn" - * `asn1c -R` + * `asn1c -R -fcompound-names` */ #include @@ -59,8 +59,8 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static asn_SET_OF_specifics_t asn_SPC_write_Replace_ies_specs_2 = { - sizeof(struct write_Replace_ies), - offsetof(struct write_Replace_ies, _asn_ctx), + sizeof(struct SABP_Write_Replace__write_Replace_ies), + offsetof(struct SABP_Write_Replace__write_Replace_ies, _asn_ctx), 0, /* XER encoding is XMLDelimitedItemList */ }; static /* Use -fall-defs-global to expose */ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I10ce4a9414768cdcf850feeca4088296e339919f Gerrit-Change-Number: 25993 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:43:52 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:43:52 +0000 Subject: Change in osmo-iuh[master]: ranap: Use asn1c flag -fcompound-names to avoid name collisions with ... In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/25994 ) Change subject: ranap: Use asn1c flag -fcompound-names to avoid name collisions with other libs ...................................................................... ranap: Use asn1c flag -fcompound-names to avoid name collisions with other libs Change-Id: Iba106dcc18e3d429b4b9808610a44ac29b798172 --- M include/osmocom/ranap/RANAP_APN.h M include/osmocom/ranap/RANAP_AccuracyFulfilmentIndicator.h M include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h M include/osmocom/ranap/RANAP_Alt-RAB-Parameters.h M include/osmocom/ranap/RANAP_AlternativeRABConfigurationRequest.h M include/osmocom/ranap/RANAP_AreaIdentity.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_Ass-RAB-Parameters.h M include/osmocom/ranap/RANAP_AuthorisedPLMNs.h M include/osmocom/ranap/RANAP_AuthorisedSNAs.h M include/osmocom/ranap/RANAP_BindingID.h M include/osmocom/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.h M include/osmocom/ranap/RANAP_CGI.h M include/osmocom/ranap/RANAP_CI.h M include/osmocom/ranap/RANAP_CN-DeactivateTrace.h M include/osmocom/ranap/RANAP_CN-DomainIndicator.h M include/osmocom/ranap/RANAP_CN-ID.h M include/osmocom/ranap/RANAP_CN-InvokeTrace.h M include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h M include/osmocom/ranap/RANAP_CSFB-Information.h M include/osmocom/ranap/RANAP_CSG-Id-List.h M include/osmocom/ranap/RANAP_CSG-Id.h M include/osmocom/ranap/RANAP_CSG-Membership-Status.h M include/osmocom/ranap/RANAP_Cause.h M include/osmocom/ranap/RANAP_CauseMisc.h M include/osmocom/ranap/RANAP_CauseNAS.h M include/osmocom/ranap/RANAP_CauseNon-Standard.h M include/osmocom/ranap/RANAP_CauseProtocol.h M include/osmocom/ranap/RANAP_CauseRadioNetwork.h M include/osmocom/ranap/RANAP_CauseRadioNetworkExtension.h M include/osmocom/ranap/RANAP_CauseTransmissionNetwork.h M include/osmocom/ranap/RANAP_Cell-Access-Mode.h M include/osmocom/ranap/RANAP_Cell-Capacity-Class-Value.h M include/osmocom/ranap/RANAP_Cell-Id.h M include/osmocom/ranap/RANAP_CellBased.h M include/osmocom/ranap/RANAP_CellIdList.h M include/osmocom/ranap/RANAP_CellLoadInformation.h M include/osmocom/ranap/RANAP_CellLoadInformationGroup.h M include/osmocom/ranap/RANAP_CellType.h M include/osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h M include/osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h M include/osmocom/ranap/RANAP_ClassmarkInformation2.h M include/osmocom/ranap/RANAP_ClassmarkInformation3.h M include/osmocom/ranap/RANAP_ClientType.h M include/osmocom/ranap/RANAP_CommonID.h M include/osmocom/ranap/RANAP_Correlation-ID.h M include/osmocom/ranap/RANAP_Criticality.h M include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h M include/osmocom/ranap/RANAP_CriticalityDiagnostics.h M include/osmocom/ranap/RANAP_D-RNTI.h M include/osmocom/ranap/RANAP_DCH-ID.h M include/osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_DL-N-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_DRX-CycleLengthCoefficient.h M include/osmocom/ranap/RANAP_DSCH-ID.h M include/osmocom/ranap/RANAP_DataPDUType.h M include/osmocom/ranap/RANAP_DataVolumeList.h M include/osmocom/ranap/RANAP_DataVolumeReference.h M include/osmocom/ranap/RANAP_DataVolumeReport.h M include/osmocom/ranap/RANAP_DataVolumeReportList.h M include/osmocom/ranap/RANAP_DataVolumeReportRequest.h M include/osmocom/ranap/RANAP_DataVolumeReportingIndication.h M include/osmocom/ranap/RANAP_DeliveryOfErroneousSDU.h M include/osmocom/ranap/RANAP_DeliveryOrder.h M include/osmocom/ranap/RANAP_DeltaRAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_DirectInformationTransfer.h M include/osmocom/ranap/RANAP_DirectReportingIndicator.h M include/osmocom/ranap/RANAP_DirectTransfer-IE-ContainerList.h M include/osmocom/ranap/RANAP_DirectTransfer.h M include/osmocom/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h M include/osmocom/ranap/RANAP_E-DCH-MAC-d-Flow-ID.h M include/osmocom/ranap/RANAP_E-UTRAN-Service-Handover.h M include/osmocom/ranap/RANAP_EARFCN-Extended.h M include/osmocom/ranap/RANAP_ENB-ID.h M include/osmocom/ranap/RANAP_EUTRANFrequencies.h M include/osmocom/ranap/RANAP_EncryptionAlgorithm.h M include/osmocom/ranap/RANAP_EncryptionInformation.h M include/osmocom/ranap/RANAP_EncryptionKey.h M include/osmocom/ranap/RANAP_End-Of-CSFB.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteConfirm.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteFailure.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteRequest.h M include/osmocom/ranap/RANAP_EnhancedRelocationCompleteResponse.h M include/osmocom/ranap/RANAP_EquipmentsToBeTraced.h M include/osmocom/ranap/RANAP_ErrorIndication.h M include/osmocom/ranap/RANAP_Event.h M include/osmocom/ranap/RANAP_Event1F-Parameters.h M include/osmocom/ranap/RANAP_Event1I-Parameters.h M include/osmocom/ranap/RANAP_ExtendedGuaranteedBitrate.h M include/osmocom/ranap/RANAP_ExtendedMaxBitrate.h M include/osmocom/ranap/RANAP_ExtendedRNC-ID.h M include/osmocom/ranap/RANAP_ForwardSRNS-Context.h M include/osmocom/ranap/RANAP_ForwardingIndication.h M include/osmocom/ranap/RANAP_FrameSequenceNumber.h M include/osmocom/ranap/RANAP_FrequenceLayerConvergenceFlag.h M include/osmocom/ranap/RANAP_GA-AltitudeAndDirection.h M include/osmocom/ranap/RANAP_GA-EllipsoidArc.h M include/osmocom/ranap/RANAP_GA-Point.h M include/osmocom/ranap/RANAP_GA-PointWithAltitude.h M include/osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h M include/osmocom/ranap/RANAP_GA-PointWithUnCertainty.h M include/osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h M include/osmocom/ranap/RANAP_GA-Polygon.h M include/osmocom/ranap/RANAP_GA-UncertaintyEllipse.h M include/osmocom/ranap/RANAP_GANSS-PositioningDataSet.h M include/osmocom/ranap/RANAP_GANSS-PositioningMethodAndUsage.h M include/osmocom/ranap/RANAP_GERAN-BSC-Container.h M include/osmocom/ranap/RANAP_GERAN-Cell-ID.h M include/osmocom/ranap/RANAP_GERAN-Classmark.h M include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h M include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h M include/osmocom/ranap/RANAP_GTP-TEI.h M include/osmocom/ranap/RANAP_GeographicalArea.h M include/osmocom/ranap/RANAP_GeographicalCoordinates.h M include/osmocom/ranap/RANAP_GlobalCN-ID.h M include/osmocom/ranap/RANAP_GlobalRNC-ID.h M include/osmocom/ranap/RANAP_GuaranteedBitrate.h M include/osmocom/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.h M include/osmocom/ranap/RANAP_HigherBitratesThan16MbpsFlag.h M include/osmocom/ranap/RANAP_HorizontalSpeedAndBearing.h M include/osmocom/ranap/RANAP_HorizontalVelocity.h M include/osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h M include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h M include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h M include/osmocom/ranap/RANAP_IE-Extensions.h M include/osmocom/ranap/RANAP_IE.h M include/osmocom/ranap/RANAP_IMEI.h M include/osmocom/ranap/RANAP_IMEIGroup.h M include/osmocom/ranap/RANAP_IMEIList.h M include/osmocom/ranap/RANAP_IMEISV.h M include/osmocom/ranap/RANAP_IMEISVGroup.h M include/osmocom/ranap/RANAP_IMEISVList.h M include/osmocom/ranap/RANAP_IMSI.h M include/osmocom/ranap/RANAP_IPMulticastAddress.h M include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h M include/osmocom/ranap/RANAP_IRATmeasurementParameters.h M include/osmocom/ranap/RANAP_ImmediateMDT.h M include/osmocom/ranap/RANAP_IncludeVelocity.h M include/osmocom/ranap/RANAP_InformationExchangeID.h M include/osmocom/ranap/RANAP_InformationExchangeType.h M include/osmocom/ranap/RANAP_InformationRequestType.h M include/osmocom/ranap/RANAP_InformationRequested.h M include/osmocom/ranap/RANAP_InformationTransferConfirmation.h M include/osmocom/ranap/RANAP_InformationTransferFailure.h M include/osmocom/ranap/RANAP_InformationTransferID.h M include/osmocom/ranap/RANAP_InformationTransferIndication.h M include/osmocom/ranap/RANAP_InformationTransferType.h M include/osmocom/ranap/RANAP_InitialUE-Message.h M include/osmocom/ranap/RANAP_InitiatingMessage.h M include/osmocom/ranap/RANAP_IntegrityProtectionAlgorithm.h M include/osmocom/ranap/RANAP_IntegrityProtectionInformation.h M include/osmocom/ranap/RANAP_IntegrityProtectionKey.h M include/osmocom/ranap/RANAP_InterSystemInformation-TransparentContainer.h M include/osmocom/ranap/RANAP_InterSystemInformationTransferType.h M include/osmocom/ranap/RANAP_InterfacesToTraceItem.h M include/osmocom/ranap/RANAP_Iu-ReleaseCommand.h M include/osmocom/ranap/RANAP_Iu-ReleaseComplete.h M include/osmocom/ranap/RANAP_Iu-ReleaseRequest.h M include/osmocom/ranap/RANAP_IuSigConId-IE-ContainerList.h M include/osmocom/ranap/RANAP_IuSignallingConnectionIdentifier.h M include/osmocom/ranap/RANAP_IuTransportAssociation.h M include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h M include/osmocom/ranap/RANAP_KeyStatus.h M include/osmocom/ranap/RANAP_L3-Information.h M include/osmocom/ranap/RANAP_LA-LIST.h M include/osmocom/ranap/RANAP_LABased.h M include/osmocom/ranap/RANAP_LAC.h M include/osmocom/ranap/RANAP_LAI-List.h M include/osmocom/ranap/RANAP_LAI.h M include/osmocom/ranap/RANAP_LAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_LHN-ID.h M include/osmocom/ranap/RANAP_LastKnownServiceArea.h M include/osmocom/ranap/RANAP_LastVisitedUTRANCell-Item.h M include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h M include/osmocom/ranap/RANAP_Links-to-log.h M include/osmocom/ranap/RANAP_ListOF-SNAs.h M include/osmocom/ranap/RANAP_ListOfInterfacesToTrace.h M include/osmocom/ranap/RANAP_LoadValue.h M include/osmocom/ranap/RANAP_LocationRelatedDataFailure.h M include/osmocom/ranap/RANAP_LocationRelatedDataRequest.h M include/osmocom/ranap/RANAP_LocationRelatedDataRequestType.h M include/osmocom/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.h M include/osmocom/ranap/RANAP_LocationRelatedDataResponse.h M include/osmocom/ranap/RANAP_LocationReport.h M include/osmocom/ranap/RANAP_LocationReportingControl.h M include/osmocom/ranap/RANAP_LocationReportingTransferInformation.h M include/osmocom/ranap/RANAP_LoggedMDT.h M include/osmocom/ranap/RANAP_LoggingDuration.h M include/osmocom/ranap/RANAP_LoggingInterval.h M include/osmocom/ranap/RANAP_M1Report.h M include/osmocom/ranap/RANAP_M2Report.h M include/osmocom/ranap/RANAP_M4-Collection-Parameters.h M include/osmocom/ranap/RANAP_M4-Period.h M include/osmocom/ranap/RANAP_M4-Threshold.h M include/osmocom/ranap/RANAP_M4Report.h M include/osmocom/ranap/RANAP_M5-Period.h M include/osmocom/ranap/RANAP_M5Report.h M include/osmocom/ranap/RANAP_M6-Period.h M include/osmocom/ranap/RANAP_M6Report.h M include/osmocom/ranap/RANAP_M7-Period.h M include/osmocom/ranap/RANAP_M7Report.h M include/osmocom/ranap/RANAP_MBMS-PTP-RAB-ID.h M include/osmocom/ranap/RANAP_MBMSBearerServiceType.h M include/osmocom/ranap/RANAP_MBMSCNDe-Registration.h M include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationRequest.h M include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationResponse.h M include/osmocom/ranap/RANAP_MBMSCountingInformation.h M include/osmocom/ranap/RANAP_MBMSHCIndicator.h M include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h M include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h M include/osmocom/ranap/RANAP_MBMSLinkingInformation.h M include/osmocom/ranap/RANAP_MBMSRABEstablishmentIndication.h M include/osmocom/ranap/RANAP_MBMSRABRelease.h M include/osmocom/ranap/RANAP_MBMSRABReleaseFailure.h M include/osmocom/ranap/RANAP_MBMSRABReleaseRequest.h M include/osmocom/ranap/RANAP_MBMSRegistrationFailure.h M include/osmocom/ranap/RANAP_MBMSRegistrationRequest.h M include/osmocom/ranap/RANAP_MBMSRegistrationRequestType.h M include/osmocom/ranap/RANAP_MBMSRegistrationResponse.h M include/osmocom/ranap/RANAP_MBMSServiceArea.h M include/osmocom/ranap/RANAP_MBMSSessionDuration.h M include/osmocom/ranap/RANAP_MBMSSessionIdentity.h M include/osmocom/ranap/RANAP_MBMSSessionRepetitionNumber.h M include/osmocom/ranap/RANAP_MBMSSessionStart.h M include/osmocom/ranap/RANAP_MBMSSessionStartFailure.h M include/osmocom/ranap/RANAP_MBMSSessionStartResponse.h M include/osmocom/ranap/RANAP_MBMSSessionStop.h M include/osmocom/ranap/RANAP_MBMSSessionStopResponse.h M include/osmocom/ranap/RANAP_MBMSSessionUpdate.h M include/osmocom/ranap/RANAP_MBMSSessionUpdateFailure.h M include/osmocom/ranap/RANAP_MBMSSessionUpdateResponse.h M include/osmocom/ranap/RANAP_MBMSSynchronisationInformation.h M include/osmocom/ranap/RANAP_MBMSUELinkingRequest.h M include/osmocom/ranap/RANAP_MBMSUELinkingResponse.h M include/osmocom/ranap/RANAP_MDT-Activation.h M include/osmocom/ranap/RANAP_MDT-Configuration.h M include/osmocom/ranap/RANAP_MDT-PLMN-List.h M include/osmocom/ranap/RANAP_MDT-Report-Parameters.h M include/osmocom/ranap/RANAP_MDTAreaScope.h M include/osmocom/ranap/RANAP_MDTMode.h M include/osmocom/ranap/RANAP_MSISDN.h M include/osmocom/ranap/RANAP_Management-Based-MDT-Allowed.h M include/osmocom/ranap/RANAP_MaxBitrate.h M include/osmocom/ranap/RANAP_MaxSDU-Size.h M include/osmocom/ranap/RANAP_MeasBand.h M include/osmocom/ranap/RANAP_MeasurementQuantity.h M include/osmocom/ranap/RANAP_MeasurementsToActivate.h M include/osmocom/ranap/RANAP_MessageStructure.h M include/osmocom/ranap/RANAP_NAS-PDU.h M include/osmocom/ranap/RANAP_NAS-SequenceNumber.h M include/osmocom/ranap/RANAP_NAS-SynchronisationIndicator.h M include/osmocom/ranap/RANAP_NRTLoadInformationValue.h M include/osmocom/ranap/RANAP_NewBSS-To-OldBSS-Information.h M include/osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_NonSearchingIndication.h M include/osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_NumberOfIuInstances.h M include/osmocom/ranap/RANAP_NumberOfSteps.h M include/osmocom/ranap/RANAP_OMC-ID.h M include/osmocom/ranap/RANAP_Offload-RAB-Parameters-APN.h M include/osmocom/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.h M include/osmocom/ranap/RANAP_Offload-RAB-Parameters.h M include/osmocom/ranap/RANAP_OldBSS-ToNewBSS-Information.h M include/osmocom/ranap/RANAP_Out-Of-UTRAN.h M include/osmocom/ranap/RANAP_Outcome.h M include/osmocom/ranap/RANAP_Overload.h M include/osmocom/ranap/RANAP_P-TMSI.h M include/osmocom/ranap/RANAP_PDP-Type-extension.h M include/osmocom/ranap/RANAP_PDP-Type.h M include/osmocom/ranap/RANAP_PDP-TypeInformation-extension.h M include/osmocom/ranap/RANAP_PDP-TypeInformation.h M include/osmocom/ranap/RANAP_PDUType14FrameSequenceNumber.h M include/osmocom/ranap/RANAP_PLMNidentity.h M include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h M include/osmocom/ranap/RANAP_Paging.h M include/osmocom/ranap/RANAP_PagingAreaID.h M include/osmocom/ranap/RANAP_PagingCause.h M include/osmocom/ranap/RANAP_PeriodicLocationInfo.h M include/osmocom/ranap/RANAP_PeriodicReportingIndicator.h M include/osmocom/ranap/RANAP_PermanentNAS-UE-ID.h M include/osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h M include/osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h M include/osmocom/ranap/RANAP_Port-Number.h M include/osmocom/ranap/RANAP_PositionData.h M include/osmocom/ranap/RANAP_PositionDataSpecificToGERANIuMode.h M include/osmocom/ranap/RANAP_PositioningDataDiscriminator.h M include/osmocom/ranap/RANAP_PositioningDataSet.h M include/osmocom/ranap/RANAP_PositioningMethodAndUsage.h M include/osmocom/ranap/RANAP_PositioningPriority.h M include/osmocom/ranap/RANAP_Pre-emptionCapability.h M include/osmocom/ranap/RANAP_Pre-emptionVulnerability.h M include/osmocom/ranap/RANAP_Presence.h M include/osmocom/ranap/RANAP_Priority-Class-Indicator.h M include/osmocom/ranap/RANAP_PriorityLevel.h M include/osmocom/ranap/RANAP_PrivateIE-ID.h M include/osmocom/ranap/RANAP_PrivateMessage.h M include/osmocom/ranap/RANAP_ProcedureCode.h M include/osmocom/ranap/RANAP_ProtocolError-IE-ContainerList.h M include/osmocom/ranap/RANAP_ProtocolExtensionContainer.h M include/osmocom/ranap/RANAP_ProtocolExtensionField.h M include/osmocom/ranap/RANAP_ProtocolExtensionID.h M include/osmocom/ranap/RANAP_ProtocolIE-Container.h M include/osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h M include/osmocom/ranap/RANAP_ProtocolIE-FieldPair.h M include/osmocom/ranap/RANAP_ProtocolIE-ID.h M include/osmocom/ranap/RANAP_ProvidedData.h M include/osmocom/ranap/RANAP_QueuingAllowed.h M include/osmocom/ranap/RANAP_RAB-AssignmentRequest.h M include/osmocom/ranap/RANAP_RAB-AssignmentResponse.h M include/osmocom/ranap/RANAP_RAB-AsymmetryIndicator.h M include/osmocom/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h M include/osmocom/ranap/RANAP_RAB-ContextItem.h M include/osmocom/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h M include/osmocom/ranap/RANAP_RAB-ContextList.h M include/osmocom/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h M include/osmocom/ranap/RANAP_RAB-DataForwardingItem.h M include/osmocom/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h M include/osmocom/ranap/RANAP_RAB-DataForwardingList.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportList.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestItem.h M include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestList.h M include/osmocom/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-FailedItem.h M include/osmocom/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-FailedList.h M include/osmocom/ranap/RANAP_RAB-ID.h M include/osmocom/ranap/RANAP_RAB-IE-ContainerList.h M include/osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h M include/osmocom/ranap/RANAP_RAB-ModifyItem.h M include/osmocom/ranap/RANAP_RAB-ModifyList.h M include/osmocom/ranap/RANAP_RAB-ModifyRequest.h M include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_RAB-Parameters.h M include/osmocom/ranap/RANAP_RAB-QueuedItem.h M include/osmocom/ranap/RANAP_RAB-QueuedList.h M include/osmocom/ranap/RANAP_RAB-ReleaseFailedList.h M include/osmocom/ranap/RANAP_RAB-ReleaseItem.h M include/osmocom/ranap/RANAP_RAB-ReleaseList.h M include/osmocom/ranap/RANAP_RAB-ReleaseRequest.h M include/osmocom/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h M include/osmocom/ranap/RANAP_RAB-ReleasedItem.h M include/osmocom/ranap/RANAP_RAB-ReleasedList-IuRelComp.h M include/osmocom/ranap/RANAP_RAB-ReleasedList.h M include/osmocom/ranap/RANAP_RAB-RelocationReleaseItem.h M include/osmocom/ranap/RANAP_RAB-RelocationReleaseList.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h M include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReq.h M include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReqAck.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h M include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-SetupList-RelocReq.h M include/osmocom/ranap/RANAP_RAB-SetupList-RelocReqAck.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifiedList.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemFirst.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemSecond.h M include/osmocom/ranap/RANAP_RAB-SetupOrModifyList.h M include/osmocom/ranap/RANAP_RAB-SubflowCombinationBitRate.h M include/osmocom/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h M include/osmocom/ranap/RANAP_RAB-TrCH-Mapping.h M include/osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h M include/osmocom/ranap/RANAP_RABDataVolumeReport.h M include/osmocom/ranap/RANAP_RABParametersList.h M include/osmocom/ranap/RANAP_RABased.h M include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferItem.h M include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferList.h M include/osmocom/ranap/RANAP_RABs-failed-to-reportItem.h M include/osmocom/ranap/RANAP_RABs-failed-to-reportList.h M include/osmocom/ranap/RANAP_RAC.h M include/osmocom/ranap/RANAP_RAI-List.h M include/osmocom/ranap/RANAP_RAI.h M include/osmocom/ranap/RANAP_RAListofIdleModeUEs.h M include/osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h M include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h M include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h M include/osmocom/ranap/RANAP_RANAP-PDU.h M include/osmocom/ranap/RANAP_RANAP-RelocationInformation.h M include/osmocom/ranap/RANAP_RAT-Type.h M include/osmocom/ranap/RANAP_RAofIdleModeUEs.h M include/osmocom/ranap/RANAP_RIM-Transfer.h M include/osmocom/ranap/RANAP_RIMInformation.h M include/osmocom/ranap/RANAP_RIMRoutingAddress.h M include/osmocom/ranap/RANAP_RNC-ID.h M include/osmocom/ranap/RANAP_RNCTraceInformation.h M include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h M include/osmocom/ranap/RANAP_RRC-Container.h M include/osmocom/ranap/RANAP_RSRQ-Extension.h M include/osmocom/ranap/RANAP_RSRQ-Type.h M include/osmocom/ranap/RANAP_RSRVCC-HO-Indication.h M include/osmocom/ranap/RANAP_RSRVCC-Information.h M include/osmocom/ranap/RANAP_RSRVCC-Operation-Possible.h M include/osmocom/ranap/RANAP_RTLoadValue.h M include/osmocom/ranap/RANAP_RateControlAllowed.h M include/osmocom/ranap/RANAP_RedirectAttemptFlag.h M include/osmocom/ranap/RANAP_RedirectionCompleted.h M include/osmocom/ranap/RANAP_RedirectionIndication.h M include/osmocom/ranap/RANAP_RejectCauseValue.h M include/osmocom/ranap/RANAP_RelocationCancel.h M include/osmocom/ranap/RANAP_RelocationCancelAcknowledge.h M include/osmocom/ranap/RANAP_RelocationCommand.h M include/osmocom/ranap/RANAP_RelocationComplete.h M include/osmocom/ranap/RANAP_RelocationDetect.h M include/osmocom/ranap/RANAP_RelocationFailure.h M include/osmocom/ranap/RANAP_RelocationPreparationFailure.h M include/osmocom/ranap/RANAP_RelocationRequest.h M include/osmocom/ranap/RANAP_RelocationRequestAcknowledge.h M include/osmocom/ranap/RANAP_RelocationRequired.h M include/osmocom/ranap/RANAP_RelocationRequirement.h M include/osmocom/ranap/RANAP_RelocationType.h M include/osmocom/ranap/RANAP_RepetitionNumber0.h M include/osmocom/ranap/RANAP_RepetitionNumber1.h M include/osmocom/ranap/RANAP_ReportAmount.h M include/osmocom/ranap/RANAP_ReportArea.h M include/osmocom/ranap/RANAP_ReportChangeOfSAI.h M include/osmocom/ranap/RANAP_ReportInterval.h M include/osmocom/ranap/RANAP_RequestType.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h M include/osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h M include/osmocom/ranap/RANAP_RequestedGANSSAssistanceData.h M include/osmocom/ranap/RANAP_RequestedGPSAssistanceData.h M include/osmocom/ranap/RANAP_RequestedLocationRelatedDataType.h M include/osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h M include/osmocom/ranap/RANAP_RequestedMulticastServiceList.h M include/osmocom/ranap/RANAP_Reset.h M include/osmocom/ranap/RANAP_ResetAcknowledge.h M include/osmocom/ranap/RANAP_ResetResource.h M include/osmocom/ranap/RANAP_ResetResourceAckItem.h M include/osmocom/ranap/RANAP_ResetResourceAckList.h M include/osmocom/ranap/RANAP_ResetResourceAcknowledge.h M include/osmocom/ranap/RANAP_ResetResourceItem.h M include/osmocom/ranap/RANAP_ResetResourceList.h M include/osmocom/ranap/RANAP_ResidualBitErrorRatio.h M include/osmocom/ranap/RANAP_ResponseTime.h M include/osmocom/ranap/RANAP_SAC.h M include/osmocom/ranap/RANAP_SAI.h M include/osmocom/ranap/RANAP_SAPI.h M include/osmocom/ranap/RANAP_SDU-ErrorRatio.h M include/osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h M include/osmocom/ranap/RANAP_SDU-FormatInformationParameters.h M include/osmocom/ranap/RANAP_SDU-ParameterItem.h M include/osmocom/ranap/RANAP_SDU-Parameters.h M include/osmocom/ranap/RANAP_SNA-Access-Information.h M include/osmocom/ranap/RANAP_SNAC.h M include/osmocom/ranap/RANAP_SRB-ID.h M include/osmocom/ranap/RANAP_SRB-TrCH-Mapping.h M include/osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h M include/osmocom/ranap/RANAP_SRNS-ContextRequest.h M include/osmocom/ranap/RANAP_SRNS-ContextResponse.h M include/osmocom/ranap/RANAP_SRNS-DataForwardCommand.h M include/osmocom/ranap/RANAP_SRVCC-CSKeysRequest.h M include/osmocom/ranap/RANAP_SRVCC-CSKeysResponse.h M include/osmocom/ranap/RANAP_SRVCC-HO-Indication.h M include/osmocom/ranap/RANAP_SRVCC-Information.h M include/osmocom/ranap/RANAP_SRVCC-Operation-Possible.h M include/osmocom/ranap/RANAP_SecurityModeCommand.h M include/osmocom/ranap/RANAP_SecurityModeComplete.h M include/osmocom/ranap/RANAP_SecurityModeReject.h M include/osmocom/ranap/RANAP_Service-Handover.h M include/osmocom/ranap/RANAP_Session-Re-establishment-Indicator.h M include/osmocom/ranap/RANAP_SessionUpdateID.h M include/osmocom/ranap/RANAP_Shared-Network-Information.h M include/osmocom/ranap/RANAP_SignallingIndication.h M include/osmocom/ranap/RANAP_Source-ToTarget-TransparentContainer.h M include/osmocom/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.h M include/osmocom/ranap/RANAP_SourceCellID.h M include/osmocom/ranap/RANAP_SourceID.h M include/osmocom/ranap/RANAP_SourceRNC-ID.h M include/osmocom/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h M include/osmocom/ranap/RANAP_SourceStatisticsDescriptor.h M include/osmocom/ranap/RANAP_SourceUTRANCellID.h M include/osmocom/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.h M include/osmocom/ranap/RANAP_SubflowSDU-Size.h M include/osmocom/ranap/RANAP_SubscriberProfileIDforRFP.h M include/osmocom/ranap/RANAP_SuccessfulOutcome.h M include/osmocom/ranap/RANAP_SupportedBitrate.h M include/osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h M include/osmocom/ranap/RANAP_TAC.h M include/osmocom/ranap/RANAP_TAI.h M include/osmocom/ranap/RANAP_TBCD-STRING.h M include/osmocom/ranap/RANAP_TMGI.h M include/osmocom/ranap/RANAP_TMSI.h M include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h M include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h M include/osmocom/ranap/RANAP_Target-ToSource-TransparentContainer.h M include/osmocom/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.h M include/osmocom/ranap/RANAP_TargetCellId.h M include/osmocom/ranap/RANAP_TargetENB-ID.h M include/osmocom/ranap/RANAP_TargetID.h M include/osmocom/ranap/RANAP_TargetRNC-ID.h M include/osmocom/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h M include/osmocom/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.h M include/osmocom/ranap/RANAP_TemporaryUE-ID.h M include/osmocom/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.h M include/osmocom/ranap/RANAP_Time-UE-StayedInCell.h M include/osmocom/ranap/RANAP_TimeToMBMSDataTransfer.h M include/osmocom/ranap/RANAP_TimingDifferenceULDL.h M include/osmocom/ranap/RANAP_TrCH-ID-List.h M include/osmocom/ranap/RANAP_TrCH-ID.h M include/osmocom/ranap/RANAP_TraceDepth.h M include/osmocom/ranap/RANAP_TraceInformation.h M include/osmocom/ranap/RANAP_TracePropagationParameters.h M include/osmocom/ranap/RANAP_TraceRecordingSessionInformation.h M include/osmocom/ranap/RANAP_TraceRecordingSessionReference.h M include/osmocom/ranap/RANAP_TraceReference.h M include/osmocom/ranap/RANAP_TraceType.h M include/osmocom/ranap/RANAP_TrafficClass.h M include/osmocom/ranap/RANAP_TrafficHandlingPriority.h M include/osmocom/ranap/RANAP_TransferDelay.h M include/osmocom/ranap/RANAP_TransportLayerAddress.h M include/osmocom/ranap/RANAP_TransportLayerInformation.h M include/osmocom/ranap/RANAP_TriggerID.h M include/osmocom/ranap/RANAP_TriggeringMessage.h M include/osmocom/ranap/RANAP_TunnelInformation.h M include/osmocom/ranap/RANAP_TypeOfError.h M include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h M include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.h M include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRateUplink.h M include/osmocom/ranap/RANAP_UE-History-Information.h M include/osmocom/ranap/RANAP_UE-ID.h M include/osmocom/ranap/RANAP_UESBI-Iu.h M include/osmocom/ranap/RANAP_UESBI-IuA.h M include/osmocom/ranap/RANAP_UESBI-IuB.h M include/osmocom/ranap/RANAP_UESpecificInformationIndication.h M include/osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_UL-N-PDU-SequenceNumber.h M include/osmocom/ranap/RANAP_UP-ModeVersions.h M include/osmocom/ranap/RANAP_UPInformation.h M include/osmocom/ranap/RANAP_UPInitialisationFrame.h M include/osmocom/ranap/RANAP_USCH-ID.h M include/osmocom/ranap/RANAP_UTRAN-CellID.h M include/osmocom/ranap/RANAP_UeRadioCapabilityMatchRequest.h M include/osmocom/ranap/RANAP_UeRadioCapabilityMatchResponse.h M include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h M include/osmocom/ranap/RANAP_UnsuccessfulOutcome.h M include/osmocom/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h M include/osmocom/ranap/RANAP_UplinkInformationExchangeFailure.h M include/osmocom/ranap/RANAP_UplinkInformationExchangeRequest.h M include/osmocom/ranap/RANAP_UplinkInformationExchangeResponse.h M include/osmocom/ranap/RANAP_UserPlaneInformation.h M include/osmocom/ranap/RANAP_UserPlaneMode.h M include/osmocom/ranap/RANAP_VelocityEstimate.h M include/osmocom/ranap/RANAP_VerticalAccuracyCode.h M include/osmocom/ranap/RANAP_VerticalSpeedDirection.h M include/osmocom/ranap/RANAP_VerticalVelocity.h M include/osmocom/ranap/RANAP_VoiceSupportMatchIndicator.h M src/ranap/Makefile.am M src/ranap/RANAP_APN.c M src/ranap/RANAP_AccuracyFulfilmentIndicator.c M src/ranap/RANAP_AllocationOrRetentionPriority.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.c M src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.c M src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.c M src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.c M src/ranap/RANAP_Alt-RAB-Parameters.c M src/ranap/RANAP_AlternativeRABConfigurationRequest.c M src/ranap/RANAP_AreaIdentity.c M src/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_Ass-RAB-Parameters.c M src/ranap/RANAP_AuthorisedPLMNs.c M src/ranap/RANAP_AuthorisedSNAs.c M src/ranap/RANAP_BindingID.c M src/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.c M src/ranap/RANAP_CGI.c M src/ranap/RANAP_CI.c M src/ranap/RANAP_CN-DeactivateTrace.c M src/ranap/RANAP_CN-DomainIndicator.c M src/ranap/RANAP_CN-ID.c M src/ranap/RANAP_CN-InvokeTrace.c M src/ranap/RANAP_CNMBMSLinkingInformation.c M src/ranap/RANAP_CSFB-Information.c M src/ranap/RANAP_CSG-Id-List.c M src/ranap/RANAP_CSG-Id.c M src/ranap/RANAP_CSG-Membership-Status.c M src/ranap/RANAP_Cause.c M src/ranap/RANAP_CauseMisc.c M src/ranap/RANAP_CauseNAS.c M src/ranap/RANAP_CauseNon-Standard.c M src/ranap/RANAP_CauseProtocol.c M src/ranap/RANAP_CauseRadioNetwork.c M src/ranap/RANAP_CauseRadioNetworkExtension.c M src/ranap/RANAP_CauseTransmissionNetwork.c M src/ranap/RANAP_Cell-Access-Mode.c M src/ranap/RANAP_Cell-Capacity-Class-Value.c M src/ranap/RANAP_Cell-Id.c M src/ranap/RANAP_CellBased.c M src/ranap/RANAP_CellIdList.c M src/ranap/RANAP_CellLoadInformation.c M src/ranap/RANAP_CellLoadInformationGroup.c M src/ranap/RANAP_CellType.c M src/ranap/RANAP_ChosenEncryptionAlgorithm.c M src/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.c M src/ranap/RANAP_ClassmarkInformation2.c M src/ranap/RANAP_ClassmarkInformation3.c M src/ranap/RANAP_ClientType.c M src/ranap/RANAP_CommonID.c M src/ranap/RANAP_Correlation-ID.c M src/ranap/RANAP_Criticality.c M src/ranap/RANAP_CriticalityDiagnostics-IE-List.c M src/ranap/RANAP_CriticalityDiagnostics.c M src/ranap/RANAP_D-RNTI.c M src/ranap/RANAP_DCH-ID.c M src/ranap/RANAP_DL-GTP-PDU-SequenceNumber.c M src/ranap/RANAP_DL-N-PDU-SequenceNumber.c M src/ranap/RANAP_DRX-CycleLengthCoefficient.c M src/ranap/RANAP_DSCH-ID.c M src/ranap/RANAP_DataPDUType.c M src/ranap/RANAP_DataVolumeList.c M src/ranap/RANAP_DataVolumeReference.c M src/ranap/RANAP_DataVolumeReport.c M src/ranap/RANAP_DataVolumeReportList.c M src/ranap/RANAP_DataVolumeReportRequest.c M src/ranap/RANAP_DataVolumeReportingIndication.c M src/ranap/RANAP_DeliveryOfErroneousSDU.c M src/ranap/RANAP_DeliveryOrder.c M src/ranap/RANAP_DeltaRAListofIdleModeUEs.c M src/ranap/RANAP_DirectInformationTransfer.c M src/ranap/RANAP_DirectReportingIndicator.c M src/ranap/RANAP_DirectTransfer-IE-ContainerList.c M src/ranap/RANAP_DirectTransfer.c M src/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.c M src/ranap/RANAP_E-DCH-MAC-d-Flow-ID.c M src/ranap/RANAP_E-UTRAN-Service-Handover.c M src/ranap/RANAP_EARFCN-Extended.c M src/ranap/RANAP_ENB-ID.c M src/ranap/RANAP_EUTRANFrequencies.c M src/ranap/RANAP_EncryptionAlgorithm.c M src/ranap/RANAP_EncryptionInformation.c M src/ranap/RANAP_EncryptionKey.c M src/ranap/RANAP_End-Of-CSFB.c M src/ranap/RANAP_EnhancedRelocationCompleteConfirm.c M src/ranap/RANAP_EnhancedRelocationCompleteFailure.c M src/ranap/RANAP_EnhancedRelocationCompleteRequest.c M src/ranap/RANAP_EnhancedRelocationCompleteResponse.c M src/ranap/RANAP_EquipmentsToBeTraced.c M src/ranap/RANAP_ErrorIndication.c M src/ranap/RANAP_Event.c M src/ranap/RANAP_Event1F-Parameters.c M src/ranap/RANAP_Event1I-Parameters.c M src/ranap/RANAP_ExtendedGuaranteedBitrate.c M src/ranap/RANAP_ExtendedMaxBitrate.c M src/ranap/RANAP_ExtendedRNC-ID.c M src/ranap/RANAP_ForwardSRNS-Context.c M src/ranap/RANAP_ForwardingIndication.c M src/ranap/RANAP_FrameSequenceNumber.c M src/ranap/RANAP_FrequenceLayerConvergenceFlag.c M src/ranap/RANAP_GA-AltitudeAndDirection.c M src/ranap/RANAP_GA-EllipsoidArc.c M src/ranap/RANAP_GA-Point.c M src/ranap/RANAP_GA-PointWithAltitude.c M src/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.c M src/ranap/RANAP_GA-PointWithUnCertainty.c M src/ranap/RANAP_GA-PointWithUnCertaintyEllipse.c M src/ranap/RANAP_GA-Polygon.c M src/ranap/RANAP_GA-UncertaintyEllipse.c M src/ranap/RANAP_GANSS-PositioningDataSet.c M src/ranap/RANAP_GANSS-PositioningMethodAndUsage.c M src/ranap/RANAP_GERAN-BSC-Container.c M src/ranap/RANAP_GERAN-Cell-ID.c M src/ranap/RANAP_GERAN-Classmark.c M src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.c M src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.c M src/ranap/RANAP_GTP-TEI.c M src/ranap/RANAP_GeographicalArea.c M src/ranap/RANAP_GeographicalCoordinates.c M src/ranap/RANAP_GlobalCN-ID.c M src/ranap/RANAP_GlobalRNC-ID.c M src/ranap/RANAP_GuaranteedBitrate.c M src/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.c M src/ranap/RANAP_HigherBitratesThan16MbpsFlag.c M src/ranap/RANAP_HorizontalSpeedAndBearing.c M src/ranap/RANAP_HorizontalVelocity.c M src/ranap/RANAP_HorizontalVelocityWithUncertainty.c M src/ranap/RANAP_HorizontalWithVerticalVelocity.c M src/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.c M src/ranap/RANAP_IE-Extensions.c M src/ranap/RANAP_IE.c M src/ranap/RANAP_IMEI.c M src/ranap/RANAP_IMEIGroup.c M src/ranap/RANAP_IMEIList.c M src/ranap/RANAP_IMEISV.c M src/ranap/RANAP_IMEISVGroup.c M src/ranap/RANAP_IMEISVList.c M src/ranap/RANAP_IMSI.c M src/ranap/RANAP_IPMulticastAddress.c M src/ranap/RANAP_IRAT-Measurement-Configuration.c M src/ranap/RANAP_IRATmeasurementParameters.c M src/ranap/RANAP_ImmediateMDT.c M src/ranap/RANAP_IncludeVelocity.c M src/ranap/RANAP_InformationExchangeID.c M src/ranap/RANAP_InformationExchangeType.c M src/ranap/RANAP_InformationRequestType.c M src/ranap/RANAP_InformationRequested.c M src/ranap/RANAP_InformationTransferConfirmation.c M src/ranap/RANAP_InformationTransferFailure.c M src/ranap/RANAP_InformationTransferID.c M src/ranap/RANAP_InformationTransferIndication.c M src/ranap/RANAP_InformationTransferType.c M src/ranap/RANAP_InitialUE-Message.c M src/ranap/RANAP_InitiatingMessage.c M src/ranap/RANAP_IntegrityProtectionAlgorithm.c M src/ranap/RANAP_IntegrityProtectionInformation.c M src/ranap/RANAP_IntegrityProtectionKey.c M src/ranap/RANAP_InterSystemInformation-TransparentContainer.c M src/ranap/RANAP_InterSystemInformationTransferType.c M src/ranap/RANAP_InterfacesToTraceItem.c M src/ranap/RANAP_Iu-ReleaseCommand.c M src/ranap/RANAP_Iu-ReleaseComplete.c M src/ranap/RANAP_Iu-ReleaseRequest.c M src/ranap/RANAP_IuSigConId-IE-ContainerList.c M src/ranap/RANAP_IuSignallingConnectionIdentifier.c M src/ranap/RANAP_IuTransportAssociation.c M src/ranap/RANAP_JoinedMBMSBearerService-IEs.c M src/ranap/RANAP_KeyStatus.c M src/ranap/RANAP_L3-Information.c M src/ranap/RANAP_LA-LIST.c M src/ranap/RANAP_LABased.c M src/ranap/RANAP_LAC.c M src/ranap/RANAP_LAI-List.c M src/ranap/RANAP_LAI.c M src/ranap/RANAP_LAListofIdleModeUEs.c M src/ranap/RANAP_LHN-ID.c M src/ranap/RANAP_LastKnownServiceArea.c M src/ranap/RANAP_LastVisitedUTRANCell-Item.c M src/ranap/RANAP_LeftMBMSBearerService-IEs.c M src/ranap/RANAP_Links-to-log.c M src/ranap/RANAP_ListOF-SNAs.c M src/ranap/RANAP_ListOfInterfacesToTrace.c M src/ranap/RANAP_LoadValue.c M src/ranap/RANAP_LocationRelatedDataFailure.c M src/ranap/RANAP_LocationRelatedDataRequest.c M src/ranap/RANAP_LocationRelatedDataRequestType.c M src/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.c M src/ranap/RANAP_LocationRelatedDataResponse.c M src/ranap/RANAP_LocationReport.c M src/ranap/RANAP_LocationReportingControl.c M src/ranap/RANAP_LocationReportingTransferInformation.c M src/ranap/RANAP_LoggedMDT.c M src/ranap/RANAP_LoggingDuration.c M src/ranap/RANAP_LoggingInterval.c M src/ranap/RANAP_M1Report.c M src/ranap/RANAP_M2Report.c M src/ranap/RANAP_M4-Collection-Parameters.c M src/ranap/RANAP_M4-Period.c M src/ranap/RANAP_M4-Threshold.c M src/ranap/RANAP_M4Report.c M src/ranap/RANAP_M5-Period.c M src/ranap/RANAP_M5Report.c M src/ranap/RANAP_M6-Period.c M src/ranap/RANAP_M6Report.c M src/ranap/RANAP_M7-Period.c M src/ranap/RANAP_M7Report.c M src/ranap/RANAP_MBMS-PTP-RAB-ID.c M src/ranap/RANAP_MBMSBearerServiceType.c M src/ranap/RANAP_MBMSCNDe-Registration.c M src/ranap/RANAP_MBMSCNDe-RegistrationRequest.c M src/ranap/RANAP_MBMSCNDe-RegistrationResponse.c M src/ranap/RANAP_MBMSCountingInformation.c M src/ranap/RANAP_MBMSHCIndicator.c M src/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.c M src/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.c M src/ranap/RANAP_MBMSLinkingInformation.c M src/ranap/RANAP_MBMSRABEstablishmentIndication.c M src/ranap/RANAP_MBMSRABRelease.c M src/ranap/RANAP_MBMSRABReleaseFailure.c M src/ranap/RANAP_MBMSRABReleaseRequest.c M src/ranap/RANAP_MBMSRegistrationFailure.c M src/ranap/RANAP_MBMSRegistrationRequest.c M src/ranap/RANAP_MBMSRegistrationRequestType.c M src/ranap/RANAP_MBMSRegistrationResponse.c M src/ranap/RANAP_MBMSServiceArea.c M src/ranap/RANAP_MBMSSessionDuration.c M src/ranap/RANAP_MBMSSessionIdentity.c M src/ranap/RANAP_MBMSSessionRepetitionNumber.c M src/ranap/RANAP_MBMSSessionStart.c M src/ranap/RANAP_MBMSSessionStartFailure.c M src/ranap/RANAP_MBMSSessionStartResponse.c M src/ranap/RANAP_MBMSSessionStop.c M src/ranap/RANAP_MBMSSessionStopResponse.c M src/ranap/RANAP_MBMSSessionUpdate.c M src/ranap/RANAP_MBMSSessionUpdateFailure.c M src/ranap/RANAP_MBMSSessionUpdateResponse.c M src/ranap/RANAP_MBMSSynchronisationInformation.c M src/ranap/RANAP_MBMSUELinkingRequest.c M src/ranap/RANAP_MBMSUELinkingResponse.c M src/ranap/RANAP_MDT-Activation.c M src/ranap/RANAP_MDT-Configuration.c M src/ranap/RANAP_MDT-PLMN-List.c M src/ranap/RANAP_MDT-Report-Parameters.c M src/ranap/RANAP_MDTAreaScope.c M src/ranap/RANAP_MDTMode.c M src/ranap/RANAP_MSISDN.c M src/ranap/RANAP_Management-Based-MDT-Allowed.c M src/ranap/RANAP_MaxBitrate.c M src/ranap/RANAP_MaxSDU-Size.c M src/ranap/RANAP_MeasBand.c M src/ranap/RANAP_MeasurementQuantity.c M src/ranap/RANAP_MeasurementsToActivate.c M src/ranap/RANAP_MessageStructure.c M src/ranap/RANAP_NAS-PDU.c M src/ranap/RANAP_NAS-SequenceNumber.c M src/ranap/RANAP_NAS-SynchronisationIndicator.c M src/ranap/RANAP_NRTLoadInformationValue.c M src/ranap/RANAP_NewBSS-To-OldBSS-Information.c M src/ranap/RANAP_NewRAListofIdleModeUEs.c M src/ranap/RANAP_NonSearchingIndication.c M src/ranap/RANAP_NotEmptyRAListofIdleModeUEs.c M src/ranap/RANAP_NumberOfIuInstances.c M src/ranap/RANAP_NumberOfSteps.c M src/ranap/RANAP_OMC-ID.c M src/ranap/RANAP_Offload-RAB-Parameters-APN.c M src/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.c M src/ranap/RANAP_Offload-RAB-Parameters.c M src/ranap/RANAP_OldBSS-ToNewBSS-Information.c M src/ranap/RANAP_Out-Of-UTRAN.c M src/ranap/RANAP_Outcome.c M src/ranap/RANAP_Overload.c M src/ranap/RANAP_P-TMSI.c M src/ranap/RANAP_PDP-Type-extension.c M src/ranap/RANAP_PDP-Type.c M src/ranap/RANAP_PDP-TypeInformation-extension.c M src/ranap/RANAP_PDP-TypeInformation.c M src/ranap/RANAP_PDUType14FrameSequenceNumber.c M src/ranap/RANAP_PLMNidentity.c M src/ranap/RANAP_PLMNs-in-shared-network.c M src/ranap/RANAP_Paging.c M src/ranap/RANAP_PagingAreaID.c M src/ranap/RANAP_PagingCause.c M src/ranap/RANAP_PeriodicLocationInfo.c M src/ranap/RANAP_PeriodicReportingIndicator.c M src/ranap/RANAP_PermanentNAS-UE-ID.c M src/ranap/RANAP_PermittedEncryptionAlgorithms.c M src/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.c M src/ranap/RANAP_Port-Number.c M src/ranap/RANAP_PositionData.c M src/ranap/RANAP_PositionDataSpecificToGERANIuMode.c M src/ranap/RANAP_PositioningDataDiscriminator.c M src/ranap/RANAP_PositioningDataSet.c M src/ranap/RANAP_PositioningMethodAndUsage.c M src/ranap/RANAP_PositioningPriority.c M src/ranap/RANAP_Pre-emptionCapability.c M src/ranap/RANAP_Pre-emptionVulnerability.c M src/ranap/RANAP_Presence.c M src/ranap/RANAP_Priority-Class-Indicator.c M src/ranap/RANAP_PriorityLevel.c M src/ranap/RANAP_PrivateIE-ID.c M src/ranap/RANAP_PrivateMessage.c M src/ranap/RANAP_ProcedureCode.c M src/ranap/RANAP_ProtocolError-IE-ContainerList.c M src/ranap/RANAP_ProtocolExtensionContainer.c M src/ranap/RANAP_ProtocolExtensionField.c M src/ranap/RANAP_ProtocolExtensionID.c M src/ranap/RANAP_ProtocolIE-Container.c M src/ranap/RANAP_ProtocolIE-ContainerPair.c M src/ranap/RANAP_ProtocolIE-FieldPair.c M src/ranap/RANAP_ProtocolIE-ID.c M src/ranap/RANAP_ProvidedData.c M src/ranap/RANAP_QueuingAllowed.c M src/ranap/RANAP_RAB-AssignmentRequest.c M src/ranap/RANAP_RAB-AssignmentResponse.c M src/ranap/RANAP_RAB-AsymmetryIndicator.c M src/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.c M src/ranap/RANAP_RAB-ContextItem.c M src/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.c M src/ranap/RANAP_RAB-ContextList.c M src/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.c M src/ranap/RANAP_RAB-DataForwardingItem.c M src/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.c M src/ranap/RANAP_RAB-DataForwardingList.c M src/ranap/RANAP_RAB-DataVolumeReportItem.c M src/ranap/RANAP_RAB-DataVolumeReportList.c M src/ranap/RANAP_RAB-DataVolumeReportRequestItem.c M src/ranap/RANAP_RAB-DataVolumeReportRequestList.c M src/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-FailedItem.c M src/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-FailedList.c M src/ranap/RANAP_RAB-ID.c M src/ranap/RANAP_RAB-IE-ContainerList.c M src/ranap/RANAP_RAB-IE-ContainerPairList.c M src/ranap/RANAP_RAB-ModifyItem.c M src/ranap/RANAP_RAB-ModifyList.c M src/ranap/RANAP_RAB-ModifyRequest.c M src/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_RAB-Parameters.c M src/ranap/RANAP_RAB-QueuedItem.c M src/ranap/RANAP_RAB-QueuedList.c M src/ranap/RANAP_RAB-ReleaseFailedList.c M src/ranap/RANAP_RAB-ReleaseItem.c M src/ranap/RANAP_RAB-ReleaseList.c M src/ranap/RANAP_RAB-ReleaseRequest.c M src/ranap/RANAP_RAB-ReleasedItem-IuRelComp.c M src/ranap/RANAP_RAB-ReleasedItem.c M src/ranap/RANAP_RAB-ReleasedList-IuRelComp.c M src/ranap/RANAP_RAB-ReleasedList.c M src/ranap/RANAP_RAB-RelocationReleaseItem.c M src/ranap/RANAP_RAB-RelocationReleaseList.c M src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.c M src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.c M src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-SetupItem-RelocReq.c M src/ranap/RANAP_RAB-SetupItem-RelocReqAck.c M src/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.c M src/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.c M src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.c M src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-SetupList-RelocReq.c M src/ranap/RANAP_RAB-SetupList-RelocReqAck.c M src/ranap/RANAP_RAB-SetupOrModifiedItem.c M src/ranap/RANAP_RAB-SetupOrModifiedList.c M src/ranap/RANAP_RAB-SetupOrModifyItemFirst.c M src/ranap/RANAP_RAB-SetupOrModifyItemSecond.c M src/ranap/RANAP_RAB-SetupOrModifyList.c M src/ranap/RANAP_RAB-SubflowCombinationBitRate.c M src/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.c M src/ranap/RANAP_RAB-TrCH-Mapping.c M src/ranap/RANAP_RAB-TrCH-MappingItem.c M src/ranap/RANAP_RABDataVolumeReport.c M src/ranap/RANAP_RABParametersList.c M src/ranap/RANAP_RABased.c M src/ranap/RANAP_RABs-ContextFailedtoTransferItem.c M src/ranap/RANAP_RABs-ContextFailedtoTransferList.c M src/ranap/RANAP_RABs-failed-to-reportItem.c M src/ranap/RANAP_RABs-failed-to-reportList.c M src/ranap/RANAP_RAC.c M src/ranap/RANAP_RAI-List.c M src/ranap/RANAP_RAI.c M src/ranap/RANAP_RAListofIdleModeUEs.c M src/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.c M src/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.c M src/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.c M src/ranap/RANAP_RANAP-PDU.c M src/ranap/RANAP_RANAP-RelocationInformation.c M src/ranap/RANAP_RAT-Type.c M src/ranap/RANAP_RAofIdleModeUEs.c M src/ranap/RANAP_RIM-Transfer.c M src/ranap/RANAP_RIMInformation.c M src/ranap/RANAP_RIMRoutingAddress.c M src/ranap/RANAP_RNC-ID.c M src/ranap/RANAP_RNCTraceInformation.c M src/ranap/RANAP_RNSAPRelocationParameters.c M src/ranap/RANAP_RRC-Container.c M src/ranap/RANAP_RSRQ-Extension.c M src/ranap/RANAP_RSRQ-Type.c M src/ranap/RANAP_RSRVCC-HO-Indication.c M src/ranap/RANAP_RSRVCC-Information.c M src/ranap/RANAP_RSRVCC-Operation-Possible.c M src/ranap/RANAP_RTLoadValue.c M src/ranap/RANAP_RateControlAllowed.c M src/ranap/RANAP_RedirectAttemptFlag.c M src/ranap/RANAP_RedirectionCompleted.c M src/ranap/RANAP_RedirectionIndication.c M src/ranap/RANAP_RejectCauseValue.c M src/ranap/RANAP_RelocationCancel.c M src/ranap/RANAP_RelocationCancelAcknowledge.c M src/ranap/RANAP_RelocationCommand.c M src/ranap/RANAP_RelocationComplete.c M src/ranap/RANAP_RelocationDetect.c M src/ranap/RANAP_RelocationFailure.c M src/ranap/RANAP_RelocationPreparationFailure.c M src/ranap/RANAP_RelocationRequest.c M src/ranap/RANAP_RelocationRequestAcknowledge.c M src/ranap/RANAP_RelocationRequired.c M src/ranap/RANAP_RelocationRequirement.c M src/ranap/RANAP_RelocationType.c M src/ranap/RANAP_RepetitionNumber0.c M src/ranap/RANAP_RepetitionNumber1.c M src/ranap/RANAP_ReportAmount.c M src/ranap/RANAP_ReportArea.c M src/ranap/RANAP_ReportChangeOfSAI.c M src/ranap/RANAP_ReportInterval.c M src/ranap/RANAP_RequestType.c M src/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.c M src/ranap/RANAP_Requested-RAB-Parameter-Values.c M src/ranap/RANAP_RequestedGANSSAssistanceData.c M src/ranap/RANAP_RequestedGPSAssistanceData.c M src/ranap/RANAP_RequestedLocationRelatedDataType.c M src/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.c M src/ranap/RANAP_RequestedMulticastServiceList.c M src/ranap/RANAP_Reset.c M src/ranap/RANAP_ResetAcknowledge.c M src/ranap/RANAP_ResetResource.c M src/ranap/RANAP_ResetResourceAckItem.c M src/ranap/RANAP_ResetResourceAckList.c M src/ranap/RANAP_ResetResourceAcknowledge.c M src/ranap/RANAP_ResetResourceItem.c M src/ranap/RANAP_ResetResourceList.c M src/ranap/RANAP_ResidualBitErrorRatio.c M src/ranap/RANAP_ResponseTime.c M src/ranap/RANAP_SAC.c M src/ranap/RANAP_SAI.c M src/ranap/RANAP_SAPI.c M src/ranap/RANAP_SDU-ErrorRatio.c M src/ranap/RANAP_SDU-FormatInformationParameterItem.c M src/ranap/RANAP_SDU-FormatInformationParameters.c M src/ranap/RANAP_SDU-ParameterItem.c M src/ranap/RANAP_SDU-Parameters.c M src/ranap/RANAP_SNA-Access-Information.c M src/ranap/RANAP_SNAC.c M src/ranap/RANAP_SRB-ID.c M src/ranap/RANAP_SRB-TrCH-Mapping.c M src/ranap/RANAP_SRB-TrCH-MappingItem.c M src/ranap/RANAP_SRNS-ContextRequest.c M src/ranap/RANAP_SRNS-ContextResponse.c M src/ranap/RANAP_SRNS-DataForwardCommand.c M src/ranap/RANAP_SRVCC-CSKeysRequest.c M src/ranap/RANAP_SRVCC-CSKeysResponse.c M src/ranap/RANAP_SRVCC-HO-Indication.c M src/ranap/RANAP_SRVCC-Information.c M src/ranap/RANAP_SRVCC-Operation-Possible.c M src/ranap/RANAP_SecurityModeCommand.c M src/ranap/RANAP_SecurityModeComplete.c M src/ranap/RANAP_SecurityModeReject.c M src/ranap/RANAP_Service-Handover.c M src/ranap/RANAP_Session-Re-establishment-Indicator.c M src/ranap/RANAP_SessionUpdateID.c M src/ranap/RANAP_Shared-Network-Information.c M src/ranap/RANAP_SignallingIndication.c M src/ranap/RANAP_Source-ToTarget-TransparentContainer.c M src/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.c M src/ranap/RANAP_SourceCellID.c M src/ranap/RANAP_SourceID.c M src/ranap/RANAP_SourceRNC-ID.c M src/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.c M src/ranap/RANAP_SourceStatisticsDescriptor.c M src/ranap/RANAP_SourceUTRANCellID.c M src/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.c M src/ranap/RANAP_SubflowSDU-Size.c M src/ranap/RANAP_SubscriberProfileIDforRFP.c M src/ranap/RANAP_SuccessfulOutcome.c M src/ranap/RANAP_SupportedBitrate.c M src/ranap/RANAP_SupportedRAB-ParameterBitrateList.c M src/ranap/RANAP_TAC.c M src/ranap/RANAP_TAI.c M src/ranap/RANAP_TBCD-STRING.c M src/ranap/RANAP_TMGI.c M src/ranap/RANAP_TMSI.c M src/ranap/RANAP_TNLInformationEnhRelInfoReq.c M src/ranap/RANAP_TNLInformationEnhRelInfoRes.c M src/ranap/RANAP_Target-ToSource-TransparentContainer.c M src/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.c M src/ranap/RANAP_TargetCellId.c M src/ranap/RANAP_TargetENB-ID.c M src/ranap/RANAP_TargetID.c M src/ranap/RANAP_TargetRNC-ID.c M src/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.c M src/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.c M src/ranap/RANAP_TemporaryUE-ID.c M src/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.c M src/ranap/RANAP_Time-UE-StayedInCell.c M src/ranap/RANAP_TimeToMBMSDataTransfer.c M src/ranap/RANAP_TimingDifferenceULDL.c M src/ranap/RANAP_TrCH-ID-List.c M src/ranap/RANAP_TrCH-ID.c M src/ranap/RANAP_TraceDepth.c M src/ranap/RANAP_TraceInformation.c M src/ranap/RANAP_TracePropagationParameters.c M src/ranap/RANAP_TraceRecordingSessionInformation.c M src/ranap/RANAP_TraceRecordingSessionReference.c M src/ranap/RANAP_TraceReference.c M src/ranap/RANAP_TraceType.c M src/ranap/RANAP_TrafficClass.c M src/ranap/RANAP_TrafficHandlingPriority.c M src/ranap/RANAP_TransferDelay.c M src/ranap/RANAP_TransportLayerAddress.c M src/ranap/RANAP_TransportLayerInformation.c M src/ranap/RANAP_TriggerID.c M src/ranap/RANAP_TriggeringMessage.c M src/ranap/RANAP_TunnelInformation.c M src/ranap/RANAP_TypeOfError.c M src/ranap/RANAP_UE-AggregateMaximumBitRate.c M src/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.c M src/ranap/RANAP_UE-AggregateMaximumBitRateUplink.c M src/ranap/RANAP_UE-History-Information.c M src/ranap/RANAP_UE-ID.c M src/ranap/RANAP_UESBI-Iu.c M src/ranap/RANAP_UESBI-IuA.c M src/ranap/RANAP_UESBI-IuB.c M src/ranap/RANAP_UESpecificInformationIndication.c M src/ranap/RANAP_UL-GTP-PDU-SequenceNumber.c M src/ranap/RANAP_UL-N-PDU-SequenceNumber.c M src/ranap/RANAP_UP-ModeVersions.c M src/ranap/RANAP_UPInformation.c M src/ranap/RANAP_UPInitialisationFrame.c M src/ranap/RANAP_USCH-ID.c M src/ranap/RANAP_UTRAN-CellID.c M src/ranap/RANAP_UeRadioCapabilityMatchRequest.c M src/ranap/RANAP_UeRadioCapabilityMatchResponse.c M src/ranap/RANAP_UnsuccessfulLinking-IEs.c M src/ranap/RANAP_UnsuccessfulOutcome.c M src/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.c M src/ranap/RANAP_UplinkInformationExchangeFailure.c M src/ranap/RANAP_UplinkInformationExchangeRequest.c M src/ranap/RANAP_UplinkInformationExchangeResponse.c M src/ranap/RANAP_UserPlaneInformation.c M src/ranap/RANAP_UserPlaneMode.c M src/ranap/RANAP_VelocityEstimate.c M src/ranap/RANAP_VerticalAccuracyCode.c M src/ranap/RANAP_VerticalSpeedDirection.c M src/ranap/RANAP_VerticalVelocity.c M src/ranap/RANAP_VoiceSupportMatchIndicator.c 1,159 files changed, 1,798 insertions(+), 1,811 deletions(-) Approvals: pespin: Verified laforge: Looks good to me, approved -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/25994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Iba106dcc18e3d429b4b9808610a44ac29b798172 Gerrit-Change-Number: 25994 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:44:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:44:21 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Route STATUS in PtP-BVC by TLLI/TMSI as well In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/26036 ) Change subject: gbproxy: Route STATUS in PtP-BVC by TLLI/TMSI as well ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/26036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib31c60ba840522719f307df089efeb8f4da1d9ae Gerrit-Change-Number: 26036 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 31 Oct 2021 07:44:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:45:09 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:45:09 +0000 Subject: Change in osmo-gbproxy[master]: gbproxy: Route STATUS in PtP-BVC by TLLI/TMSI as well In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/26036 ) Change subject: gbproxy: Route STATUS in PtP-BVC by TLLI/TMSI as well ...................................................................... gbproxy: Route STATUS in PtP-BVC by TLLI/TMSI as well Related: SYS#5235, OS#4892 Change-Id: Ib31c60ba840522719f307df089efeb8f4da1d9ae --- M src/gb_proxy.c 1 file changed, 21 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/gb_proxy.c b/src/gb_proxy.c index 18e0efb..7333e80 100644 --- a/src/gb_proxy.c +++ b/src/gb_proxy.c @@ -380,6 +380,8 @@ return gbprox_relay2peer(msg, sgsn_bvc, sig_bvci ? 0 : sgsn_bvc->bvci); } +static int gbproxy_tlli_from_status_pdu(struct tlv_parsed *tp, uint32_t *tlli, char *log_pfx); + /* Receive an incoming PTP message from a BSS-side NS-VC */ static int gbprox_rx_ptp_from_bss(struct gbproxy_nse *nse, struct msgb *msg, uint16_t ns_bvci) { @@ -496,12 +498,28 @@ osmo_fsm_inst_dispatch(bss_bvc->fi, BSSGP_BVCFSM_E_RX_FC_BVC, msg); break; case BSSGP_PDUT_STATUS: - /* TODO: Implement by inspecting the contained PDU */ - if (!TLVP_PRESENT(&tp, BSSGP_IE_PDU_IN_ERROR)) + { + struct gbproxy_sgsn *sgsn; + /* Check if the status needs to be terminated locally */ + uint8_t cause = *TLVP_VAL(&tp, BSSGP_IE_CAUSE); + + LOGPNSE(nse, LOGL_NOTICE, "Rx STATUS cause=0x%02x(%s)\n", cause, + bssgp_cause_str(cause)); + + if (gbproxy_tlli_from_status_pdu(&tp, &tlli, log_pfx) == 0) + sgsn = gbproxy_select_sgsn(nse->cfg, &tlli); + else + sgsn = gbproxy_select_sgsn(nse->cfg, NULL); + + if (!sgsn) { + rc = -EINVAL; break; - LOGPBVC(bss_bvc, LOGL_ERROR, "Rx %s: Implementation missing\n", pdut_name); + } + + rc = gbprox_relay2nse(msg, sgsn->nse, ns_bvci); break; } + } return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/26036 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: Ib31c60ba840522719f307df089efeb8f4da1d9ae Gerrit-Change-Number: 26036 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:46:07 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:46:07 +0000 Subject: Change in osmo-ci[master]: scripts: add a script for checking presence of In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/26045 ) Change subject: scripts: add a script for checking presence of ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6a1e7fc2e96f42fc596f47b4d7f1ac6c61d834b6 Gerrit-Change-Number: 26045 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:46:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:46:19 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:46:19 +0000 Subject: Change in libosmocore[master]: gsm/protocol/gsm_44_004.h: fix missing include of 'endian.h' In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26044 ) Change subject: gsm/protocol/gsm_44_004.h: fix missing include of 'endian.h' ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c14a1b898fdb743191dab0e6be157ce916e8161 Gerrit-Change-Number: 26044 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 31 Oct 2021 07:46:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:46:35 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:46:35 +0000 Subject: Change in libosmocore[master]: gsm/protocol/gsm_44_004.h: fix missing include of 'endian.h' In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/26044 ) Change subject: gsm/protocol/gsm_44_004.h: fix missing include of 'endian.h' ...................................................................... gsm/protocol/gsm_44_004.h: fix missing include of 'endian.h' Without this header, both OSMO_IS_{BIG,LITTLE}_ENDIAN macros are not defined, and thus the 'struct gsm_sacch_l1_hdr' is empty. Change-Id: I2c14a1b898fdb743191dab0e6be157ce916e8161 --- M include/osmocom/gsm/protocol/gsm_44_004.h 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/gsm/protocol/gsm_44_004.h b/include/osmocom/gsm/protocol/gsm_44_004.h index 83be9bf..32ef24e 100644 --- a/include/osmocom/gsm/protocol/gsm_44_004.h +++ b/include/osmocom/gsm/protocol/gsm_44_004.h @@ -1,5 +1,7 @@ #pragma once +#include + /* TS 44.004 Section 7.1 */ struct gsm_sacch_l1_hdr { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/26044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2c14a1b898fdb743191dab0e6be157ce916e8161 Gerrit-Change-Number: 26044 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:47:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:47:54 +0000 Subject: Change in osmo-bts[master]: lchan_meas_handle_sacch(): check if Measurement Result is valid In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26047 ) Change subject: lchan_meas_handle_sacch(): check if Measurement Result is valid ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/26047/2/src/common/measurement.c File src/common/measurement.c: https://gerrit.osmocom.org/c/osmo-bts/+/26047/2/src/common/measurement.c at 954 PS2, Line 954: i isn't the logic exactly wrong then? You are using mr->dtx_used if meas_valid == 1. While at the same time your coment states "0 =[=] valid" -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4aaac742674ce3ac15e9a4a32fe7c72db81d32d2 Gerrit-Change-Number: 26047 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:47:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:48:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:48:15 +0000 Subject: Change in osmo-bts[master]: measurement: pass *mr to repeated_dl_facch_active_decision() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26048 ) Change subject: measurement: pass *mr to repeated_dl_facch_active_decision() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idbf5f95d632aa2270c49b351ad5561ca2182bf9a Gerrit-Change-Number: 26048 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:48:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:48:49 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:48:49 +0000 Subject: Change in osmo-bts[master]: measurement: pass *mr to lchan_bs_pwr_ctrl() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26049 ) Change subject: measurement: pass *mr to lchan_bs_pwr_ctrl() ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/26049/2/tests/power/bs_power_loop_test.ok File tests/power/bs_power_loop_test.ok: https://gerrit.osmocom.org/c/osmo-bts/+/26049/2/tests/power/bs_power_loop_test.ok at a266 PS2, Line 266: #07 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(30), RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0) is this expected? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I937117cf26fb718d57920382f6972390ad498c51 Gerrit-Change-Number: 26049 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:48:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:49:17 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 07:49:17 +0000 Subject: Change in osmo-bts[master]: measurement: call lchan_bs_pwr_ctrl() iff *mr is valid In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26050 ) Change subject: measurement: call lchan_bs_pwr_ctrl() iff *mr is valid ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I125aab5224e25585cbfbe1550d2d52d62ba198bb Gerrit-Change-Number: 26050 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:49:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:54:27 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 07:54:27 +0000 Subject: Change in osmo-ci[master]: scripts: add a script for checking presence of In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/26045 ) Change subject: scripts: add a script for checking presence of ...................................................................... scripts: add a script for checking presence of Change-Id: I6a1e7fc2e96f42fc596f47b4d7f1ac6c61d834b6 --- A scripts/verify_endian_header.sh 1 file changed, 23 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/scripts/verify_endian_header.sh b/scripts/verify_endian_header.sh new file mode 100755 index 0000000..9dcbc0e --- /dev/null +++ b/scripts/verify_endian_header.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +# Usage: ./verify_endian_header.sh $(find . -name "*.[hc]") + +HEADER="osmocom/core/endian.h" +COUNT=0 + +for f in $*; do + # Obviously, ignore the header file defining the macros + if [ $(basename $f) = $(basename $HEADER) ]; then + continue + fi + # Match files using either of OSMO_IS_{LITTLE,BIG}_ENDIAN + if grep -q "OSMO_IS_\(LITTLE\|BIG\)_ENDIAN" $f; then + # The header file must be included + if ! grep -q "#include <$HEADER>" $f; then + echo "File '$f' does not #include <$HEADER>" + COUNT=$((COUNT + 1)) + fi + fi +done + +exit $COUNT -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/26045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6a1e7fc2e96f42fc596f47b4d7f1ac6c61d834b6 Gerrit-Change-Number: 26045 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 07:57:49 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 07:57:49 +0000 Subject: Change in osmo-bts[master]: lchan_meas_handle_sacch(): check if Measurement Result is valid In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26047 ) Change subject: lchan_meas_handle_sacch(): check if Measurement Result is valid ...................................................................... Patch Set 2: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/26047/2/src/common/measurement.c File src/common/measurement.c: https://gerrit.osmocom.org/c/osmo-bts/+/26047/2/src/common/measurement.c at 954 PS2, Line 954: i > isn't the logic exactly wrong then? You are using mr->dtx_used if meas_valid == 1. [?] Oh, you're right, thanks! I just copy-pasted an early return statement, but forgot to inverse the logic. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4aaac742674ce3ac15e9a4a32fe7c72db81d32d2 Gerrit-Change-Number: 26047 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 07:57:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 08:00:01 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 08:00:01 +0000 Subject: Change in osmo-bsc[master]: add time_cc API: cumlative counter for time, reported as rate_ctr In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25973 ) Change subject: add time_cc API: cumlative counter for time, reported as rate_ctr ...................................................................... Patch Set 1: > Well maybe then the question is why are you using rate_ctr and not stat_items here, it really confuses me. At least at first sight, I agree. The resulting metric computed by this new code base renders a single value which matches better a state_item than a rate_ctr. Any particular argument to go for rate_ctr, Neels? > But my understanding here is that allAvailableSDCCHAllocated fits with a stat_item, which is simply a counter value changing over time. So I'm not really following on why you need all this infrastructure sorry, this all looks super complicated for no reason (I'm able to see). Maybe someone else can also shed some light on it. I guess the point is the definition of allAvailableSDCCHAllocated in TS 52.402: "This measurement provides the accumulated time during the granularity period when all available SDCCHs are in use or otherwise unavailable to be allocated." So it is not an instantaneous value of how many SDCCH are currently allocated, but actually accumulated time, as (I presume) neels' patch implements. So the question remains: Should the result be exposed as rate_ctr or as stat_item? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icdd36f27cb54b2e1b940c9e6404ba9dd3692a310 Gerrit-Change-Number: 25973 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-CC: pespin Gerrit-Comment-Date: Sun, 31 Oct 2021 08:00:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 08:04:56 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 08:04:56 +0000 Subject: Change in osmo-bsc[master]: heighbor_ident: add/del neighbor cells via ctrl interface In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25976 ) Change subject: heighbor_ident: add/del neighbor cells via ctrl interface ...................................................................... Patch Set 5: (2 comments) https://gerrit.osmocom.org/c/osmo-bsc/+/25976/5/doc/manuals/chapters/control.adoc File doc/manuals/chapters/control.adoc: https://gerrit.osmocom.org/c/osmo-bsc/+/25976/5/doc/manuals/chapters/control.adoc at 148 PS5, Line 148: FIXME: add variables defined in src/ctrl/control_if.c? > I would comment this line out: [?] that line already existed before hand. So if you want to change that, it is a separate change and shouldn't be considered as part of the review of this patch. https://gerrit.osmocom.org/c/osmo-bsc/+/25976/5/src/osmo-bsc/neighbor_ident_ctrl.c File src/osmo-bsc/neighbor_ident_ctrl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/25976/5/src/osmo-bsc/neighbor_ident_ctrl.c at 48 PS5, Line 48: return 1; it is unusual in osmocom code to return positive integers in error case. In general, we use negative values for errors, zero for success, and positive values if there is anything to count. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25976 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I343a40e18fa9b91e6c381912c0426a002841e079 Gerrit-Change-Number: 25976 Gerrit-PatchSet: 5 Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: fixeria Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 08:04:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 09:34:40 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 09:34:40 +0000 Subject: Change in osmo-bts[master]: lchan_meas_handle_sacch(): check if Measurement Result is valid In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/26047 to look at the new patch set (#3). Change subject: lchan_meas_handle_sacch(): check if Measurement Result is valid ...................................................................... lchan_meas_handle_sacch(): check if Measurement Result is valid We should not rely on measurement data marked as invalid. Change-Id: I4aaac742674ce3ac15e9a4a32fe7c72db81d32d2 --- M src/common/measurement.c 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/26047/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4aaac742674ce3ac15e9a4a32fe7c72db81d32d2 Gerrit-Change-Number: 26047 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 09:34:40 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 09:34:40 +0000 Subject: Change in osmo-bts[master]: measurement: pass *mr to lchan_bs_pwr_ctrl() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/26049 to look at the new patch set (#3). Change subject: measurement: pass *mr to lchan_bs_pwr_ctrl() ...................................................................... measurement: pass *mr to lchan_bs_pwr_ctrl() As a side effect, we have to sacrifice a unit test (TC_inval_dummy) because it becomes impossible to pass a dummy or invalid SACCH block to lchan_bs_pwr_ctrl(). Change-Id: I937117cf26fb718d57920382f6972390ad498c51 Related: SYS#4918 --- M include/osmo-bts/power_control.h M src/common/measurement.c M src/common/power_control.c M tests/power/bs_power_loop_test.c M tests/power/bs_power_loop_test.err M tests/power/bs_power_loop_test.ok 6 files changed, 19 insertions(+), 112 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/49/26049/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I937117cf26fb718d57920382f6972390ad498c51 Gerrit-Change-Number: 26049 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 09:34:42 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 09:34:42 +0000 Subject: Change in osmo-bts[master]: measurement: get rid of *le in lchan_meas_handle_sacch() References: Message-ID: fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/26051 ) Change subject: measurement: get rid of *le in lchan_meas_handle_sacch() ...................................................................... measurement: get rid of *le in lchan_meas_handle_sacch() The current Timing Advance value can be obtained either from the L1 SACCH header (if received) or from lchan->ta_ctrl.current. Change-Id: I2b3693a0e49f03f2b4496c9dbd30cf47e9bc86b5 --- M src/common/measurement.c 1 file changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/51/26051/1 diff --git a/src/common/measurement.c b/src/common/measurement.c index e4d950e..94df965 100644 --- a/src/common/measurement.c +++ b/src/common/measurement.c @@ -782,9 +782,9 @@ lchan->meas.last_fn = LCHAN_FN_DUMMY; } -static inline uint8_t ms_to2rsl(const struct gsm_lchan *lchan, const struct lapdm_entity *le) +static inline uint8_t ms_to2rsl(const struct gsm_lchan *lchan, uint8_t ta) { - return (lchan->ms_t_offs >= 0) ? lchan->ms_t_offs : (lchan->p_offs - le->ta); + return (lchan->ms_t_offs >= 0) ? lchan->ms_t_offs : (lchan->p_offs - ta); } static inline bool ms_to_valid(const struct gsm_lchan *lchan) @@ -898,7 +898,6 @@ const struct gsm48_meas_res *mr = NULL; const struct gsm48_hdr *gh = NULL; int timing_offset, rc; - struct lapdm_entity *le; bool dtxu_used; uint8_t ms_pwr; uint8_t ms_ta; @@ -932,9 +931,7 @@ ms_ta = lchan->ta_ctrl.current; } - le = &lchan->lapdm_ch.lapdm_acch; - - timing_offset = ms_to_valid(lchan) ? ms_to2rsl(lchan, le) : -1; + timing_offset = ms_to_valid(lchan) ? ms_to2rsl(lchan, ms_ta) : -1; rc = rsl_tx_meas_res(lchan, msgb_l3(msg), msgb_l3len(msg), timing_offset); if (rc == 0) /* Count successful transmissions */ lchan->meas.res_nr++; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2b3693a0e49f03f2b4496c9dbd30cf47e9bc86b5 Gerrit-Change-Number: 26051 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 09:35:13 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 09:35:13 +0000 Subject: Change in osmo-bts[master]: l1sap: rework handling of DATA.ind on SACCH In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26046 ) Change subject: l1sap: rework handling of DATA.ind on SACCH ...................................................................... Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifed91f87fd653debc87a09da3fd31ad64a13f330 Gerrit-Change-Number: 26046 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 31 Oct 2021 09:35:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 09:36:41 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 09:36:41 +0000 Subject: Change in osmo-bts[master]: measurement: pass *mr to repeated_dl_facch_active_decision() In-Reply-To: References: Message-ID: Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/26048 to look at the new patch set (#4). Change subject: measurement: pass *mr to repeated_dl_facch_active_decision() ...................................................................... measurement: pass *mr to repeated_dl_facch_active_decision() Change-Id: Idbf5f95d632aa2270c49b351ad5561ca2182bf9a Related: SYS#5114 --- M src/common/measurement.c 1 file changed, 3 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/26048/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idbf5f95d632aa2270c49b351ad5561ca2182bf9a Gerrit-Change-Number: 26048 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 09:36:41 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 09:36:41 +0000 Subject: Change in osmo-bts[master]: measurement: pass *mr to lchan_bs_pwr_ctrl() In-Reply-To: References: Message-ID: Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/26049 to look at the new patch set (#4). Change subject: measurement: pass *mr to lchan_bs_pwr_ctrl() ...................................................................... measurement: pass *mr to lchan_bs_pwr_ctrl() As a side effect, we have to sacrifice a unit test (TC_inval_dummy) because it becomes impossible to pass a dummy or invalid SACCH block to lchan_bs_pwr_ctrl(). Change-Id: I937117cf26fb718d57920382f6972390ad498c51 Related: SYS#4918 --- M include/osmo-bts/power_control.h M src/common/measurement.c M src/common/power_control.c M tests/power/bs_power_loop_test.c M tests/power/bs_power_loop_test.err M tests/power/bs_power_loop_test.ok 6 files changed, 19 insertions(+), 112 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/49/26049/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I937117cf26fb718d57920382f6972390ad498c51 Gerrit-Change-Number: 26049 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-MessageType: newpatchset -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 09:37:18 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 09:37:18 +0000 Subject: Change in osmo-bts[master]: measurement: call lchan_bs_pwr_ctrl() iff *mr is valid In-Reply-To: References: Message-ID: fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26050 ) Change subject: measurement: call lchan_bs_pwr_ctrl() iff *mr is valid ...................................................................... Abandoned Merged into I937117cf26fb718d57920382f6972390ad498c51. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26050 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I125aab5224e25585cbfbe1550d2d52d62ba198bb Gerrit-Change-Number: 26050 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: abandon -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 10:08:21 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 10:08:21 +0000 Subject: Change in osmo-bts[master]: measurement: pass *mr to lchan_bs_pwr_ctrl() In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26049 ) Change subject: measurement: pass *mr to lchan_bs_pwr_ctrl() ...................................................................... Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/26049/2/tests/power/bs_power_loop_test.ok File tests/power/bs_power_loop_test.ok: https://gerrit.osmocom.org/c/osmo-bts/+/26049/2/tests/power/bs_power_loop_test.ok at a266 PS2, Line 266: #07 enc_meas_rep() -> Measurement Results (valid): RXLEV-FULL(30), RXQUAL-FULL(0), RXLEV-SUB(30), RXQUAL-SUB(0) > is this expected? This is an artifact of Gerrit's diff viewer: these lines moved above. In any case, I merged a subsequent patch into this one, where this test case is removed completely. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I937117cf26fb718d57920382f6972390ad498c51 Gerrit-Change-Number: 26049 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 10:08:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 12:27:12 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 12:27:12 +0000 Subject: Change in osmo-hnodeb[master]: More work on main.c to add osmocom functionalitites In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013 ) Change subject: More work on main.c to add osmocom functionalitites ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26013 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I61a5ee2e100f79cef7e42dbd981e308597c30900 Gerrit-Change-Number: 26013 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 12:27:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 12:28:04 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 12:28:04 +0000 Subject: Change in osmo-hnodeb[master]: Set up Iuh conn params through VTY In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26014 ) Change subject: Set up Iuh conn params through VTY ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26014 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Id5a17742643e8f02c22228e3055bcc213423a416 Gerrit-Change-Number: 26014 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 12:28:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 12:28:28 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 12:28:28 +0000 Subject: Change in osmo-hnodeb[master]: Drop unused fields in struct hnb In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 ) Change subject: Drop unused fields in struct hnb ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ia981d99bf521eb8b79bdf8d7f81ca50f6cdeba8c Gerrit-Change-Number: 26015 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 12:28:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 12:30:01 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 12:30:01 +0000 Subject: Change in osmo-hnodeb[master]: Use osmocom logging in non-main files In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017 ) Change subject: Use osmocom logging in non-main files ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I649b17803aeffd20354aa76dde61094959f08e43 Gerrit-Change-Number: 26017 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 12:30:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 12:31:01 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 12:31:01 +0000 Subject: Change in osmo-hnodeb[master]: Generate proper rnc_id and plmn in LuRequest In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26023 ) Change subject: Generate proper rnc_id and plmn in LuRequest ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26023 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: Ib40b5eb96b7cc13c424076a4ca725019514d52af Gerrit-Change-Number: 26023 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 12:31:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 12:34:48 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 12:34:48 +0000 Subject: Change in osmo-hnodeb[master]: ranap: Fix compiler warnings passing func callback In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26034 ) Change subject: ranap: Fix compiler warnings passing func callback ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: If80b57a8d36c28dee7db28cb36a88ed41e0a7328 Gerrit-Change-Number: 26034 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 12:34:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 12:35:10 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 12:35:10 +0000 Subject: Change in osmo-hnodeb[master]: configure: link against libsctp In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/26035 ) Change subject: configure: link against libsctp ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/26035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I793d6fe8601cf9a8dd72bf6884b469204b513c11 Gerrit-Change-Number: 26035 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 12:35:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 16:33:54 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 16:33:54 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 ) Change subject: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8df3db36f35190241735629a961f09d73bd0e5f5 Gerrit-Change-Number: 25907 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Sun, 31 Oct 2021 16:33:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 16:33:59 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 16:33:59 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() In-Reply-To: References: Message-ID: laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 ) Change subject: BTS_Tests: separate RACH / IMM ASS from f_est_dchan() ...................................................................... BTS_Tests: separate RACH / IMM ASS from f_est_dchan() Given that the test suite acts as the BSC, it's known in advance which exact logical channel is going to be activated. Therefore, it's not necessary to send an Immediate Assignment with the known Channel Description IE over the Um interface (via L1CTL). On the other hand, we may still want to validate the process of dedicated channel establishment, involving the use of Immediate Assignment procedure. So instead of doing this every time when a ConnHdlr component needs to activate a logical channel, let's split the existing logic into a separate test case - TC_est_dchan. This change facilitates the goal of running test cases against additional transceivers (not only against C0). Currently this is not possible, because a ConnHdlr component has no access to C0/AGCH when executed on Cx > 0. Change-Id: I8df3db36f35190241735629a961f09d73bd0e5f5 --- M bts/BTS_Tests.ttcn 1 file changed, 62 insertions(+), 20 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index d7419a9..5757e35 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2232,13 +2232,7 @@ /* Establish dedicated channel: L1CTL + RSL side */ private function f_est_dchan(boolean encr_enable := false, RSL_IE_List more_ies := {}) runs on ConnHdlr { - var GsmFrameNumber fn; - var ImmediateAssignment imm_ass; var ChannelDescription ch_desc; - var integer ra := 23; - - /* Send RACH request and wait for ChanReq */ - fn := f_rach_req_wait_chan_rqd(ra); /* Activate channel on BTS side */ f_rsl_chan_act(g_pars.chan_mode, encr_enable, more_ies); @@ -2250,21 +2244,9 @@ ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx_pars[0].arfcn, g_pars.tsc)); } - /* Send IMM.ASS via CCHAN */ - var GsmRrMessage rr_msg := valueof(ts_IMM_ASS(ra, fn, 0, ch_desc, g_pars.fhp.ma_map)); - RSL.send(ts_RSL_IMM_ASSIGN(enc_GsmRrMessage(rr_msg))); - - /* receive IMM.ASS on MS side */ - var ImmediateAssignment ia_um; - ia_um := f_L1CTL_WAIT_IMM_ASS(L1CTL, ra, fn); - - /* Make sure that IMM.ASS contains hopping parameters (if enabled) */ - if (ch_desc.h != ia_um.chan_desc.h) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Hopping parameters mismatch"); - } - /* enable dedicated mode */ - f_L1CTL_DM_EST_REQ_IA(L1CTL, ia_um, ma := g_pars.fhp.ma); + f_l1ctl_est_dchan(L1CTL, g_pars); + /* enable encryption, if requested */ if (encr_enable) { var uint8_t alg_id := f_alg_id_to_l1ctl(g_pars.encr.alg_id); @@ -7909,6 +7891,65 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__); } +private function f_TC_est_dchan(charstring id) runs on ConnHdlr { + var integer ra := oct2int(f_rnd_ra_cs()); + var ChannelDescription ch_desc; + + /* Tune the MS to BCCH */ + f_l1_tune(L1CTL); + + /* Send RACH request and wait for ChanReq */ + var GsmFrameNumber fn := f_rach_req_wait_chan_rqd(ra); + + /* Activate channel on the BTS side */ + f_rsl_chan_act(g_pars.chan_mode); + + /* Craft channel description (with or without frequency hopping parameters) */ + if (g_pars.fhp.enabled) { + ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.fhp.maio_hsn, g_pars.tsc)); + } else { + ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx_pars[0].arfcn, g_pars.tsc)); + } + + /* Send IMM.ASS via CCHAN */ + var GsmRrMessage rr_msg := valueof(ts_IMM_ASS(ra, fn, 0, ch_desc, g_pars.fhp.ma_map)); + RSL.send(ts_RSL_IMM_ASSIGN(enc_GsmRrMessage(rr_msg))); + + /* Receive IMM.ASS on the MS side */ + var ImmediateAssignment imm_ass := f_L1CTL_WAIT_IMM_ASS(L1CTL, ra, fn); + + /* Match the Channel Description IE in received IMM.ASS */ + if (not match(imm_ass.chan_desc, ch_desc)) { + setverdict(fail, "Channel Description IE does not match"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } + + /* Tune the MS to a dedicated channel indicated in the IMM.ASS */ + f_L1CTL_DM_EST_REQ_IA(L1CTL, imm_ass, g_pars.fhp.ma); + + /* Expect SACCH frames on Downlink */ + L1CTL.clear; + f_exp_sacch(true); + + /* We're done, deactivate and release */ + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rsl_chan_deact(); +} +testcase TC_est_dchan() runs on test_CT { + var ConnHdlr vc_conn; + var ConnHdlrPars pars; + + f_init(); + + for (var integer i := 0; i < sizeof(g_AllChannels); i := i + 1) { + pars := valueof(t_Pars(g_AllChannels[i], ts_RSL_ChanMode_SIGN)); + vc_conn := f_start_handler(refers(f_TC_est_dchan), pars); + vc_conn.done; + } + + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); +} + /* test generation of RLL ERR IND based on Um errors (TS 48.058 3.9) */ /* protocol error as per 44.006 */ /* link layer failure (repetition of I-frame N200 times without ACK */ @@ -7940,6 +7981,7 @@ */ control { + execute( TC_est_dchan() ); execute( TC_chan_act_stress() ); execute( TC_chan_act_react() ); execute( TC_chan_deact_not_active() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25907 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8df3db36f35190241735629a961f09d73bd0e5f5 Gerrit-Change-Number: 25907 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 16:36:47 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 16:36:47 +0000 Subject: Change in osmo-bts[master]: l1sap: rework handling of DATA.ind on SACCH In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26046 ) Change subject: l1sap: rework handling of DATA.ind on SACCH ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26046 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ifed91f87fd653debc87a09da3fd31ad64a13f330 Gerrit-Change-Number: 26046 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 16:36:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 16:37:21 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 16:37:21 +0000 Subject: Change in osmo-bts[master]: lchan_meas_handle_sacch(): check if Measurement Result is valid In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26047 ) Change subject: lchan_meas_handle_sacch(): check if Measurement Result is valid ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26047 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4aaac742674ce3ac15e9a4a32fe7c72db81d32d2 Gerrit-Change-Number: 26047 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 16:37:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 16:38:41 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 16:38:41 +0000 Subject: Change in osmo-bts[master]: measurement: get rid of *le in lchan_meas_handle_sacch() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26051 ) Change subject: measurement: get rid of *le in lchan_meas_handle_sacch() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26051 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2b3693a0e49f03f2b4496c9dbd30cf47e9bc86b5 Gerrit-Change-Number: 26051 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 16:38:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 16:39:15 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 16:39:15 +0000 Subject: Change in osmo-bts[master]: measurement: pass *mr to repeated_dl_facch_active_decision() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26048 ) Change subject: measurement: pass *mr to repeated_dl_facch_active_decision() ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26048 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Idbf5f95d632aa2270c49b351ad5561ca2182bf9a Gerrit-Change-Number: 26048 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 16:39:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 16:40:18 2021 From: gerrit-no-reply at lists.osmocom.org (laforge) Date: Sun, 31 Oct 2021 16:40:18 +0000 Subject: Change in osmo-bts[master]: measurement: pass *mr to lchan_bs_pwr_ctrl() In-Reply-To: References: Message-ID: laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/26049 ) Change subject: measurement: pass *mr to lchan_bs_pwr_ctrl() ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/26049 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I937117cf26fb718d57920382f6972390ad498c51 Gerrit-Change-Number: 26049 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sun, 31 Oct 2021 16:40:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From noreply at opensuse.org Sun Oct 31 16:40:32 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:40:32 +0000 Subject: Build failure of network:osmocom:nightly/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ec7167c338_11002ae3d3bb26007959d5@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:nightly/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly osmo-gsm-manuals Last lines of build log: [ 200s] # we create a symlink at ./srcfile.adoc pointing at [ 200s] # ./srcfile.adoc. test-usermanual.adoc is the ./srcfile.adoc, [ 200s] # is like basename from coreutils, and . is WD. [ 200s] if ! [ -f test-usermanual.adoc ]; then \ [ 200s] ln -s test-usermanual.adoc test-usermanual.adoc; \ [ 200s] fi [ 200s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 200s] # in ... [ 200s] TEXINPUTS=".." \ [ 200s] a2x -vv -L --asciidoc-opts="-f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/tests' -a commondir='../common'" --dblatex-opts="-s ../build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" test-usermanual.adoc [ 200s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/tests' -a commondir='../common'", '--dblatex-opts=-s ../build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'test-usermanual.adoc'] [ 200s] a2x: resource files: [] [ 200s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 200s] make[3]: *** [../build/Makefile.asciidoc.inc:70: test-usermanual.pdf] Error 1 [ 200s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 200s] make[2]: *** [Makefile:439: all-recursive] Error 1 [ 200s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 200s] make[1]: *** [Makefile:363: all] Error 2 [ 200s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 200s] dh_auto_build: error: make -j1 returned exit code 2 [ 200s] make: *** [debian/rules:5: binary] Error 25 [ 200s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 200s] ### VM INTERACTION START ### [ 201s] Powering off. [ 201s] [ 189.558603] reboot: Power down [ 201s] ### VM INTERACTION END ### [ 201s] [ 201s] goat07 failed "build osmo-gsm-manuals-dev_1.1.0.17.b92c.202110310026.dsc" at Sun Oct 31 16:40:20 UTC 2021. [ 201s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:40:32 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:40:32 +0000 Subject: Build failure of network:osmocom:latest/osmo-gsm-manuals in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ec7161850_11002ae3d3bb26007957eb@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gsm-manuals/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-gsm-manuals failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gsm-manuals Last lines of build log: [ 198s] # we create a symlink at ./srcfile.adoc pointing at [ 198s] # ./srcfile.adoc. test-usermanual.adoc is the ./srcfile.adoc, [ 198s] # is like basename from coreutils, and . is WD. [ 198s] if ! [ -f test-usermanual.adoc ]; then \ [ 198s] ln -s test-usermanual.adoc test-usermanual.adoc; \ [ 198s] fi [ 198s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 198s] # in ... [ 198s] TEXINPUTS=".." \ [ 198s] a2x -vv -L --asciidoc-opts="-f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/tests' -a commondir='../common'" --dblatex-opts="-s ../build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" test-usermanual.adoc [ 198s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f ../build/mscgen-filter.conf -f ../build/diag-filter.conf -f ../build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/tests' -a commondir='../common'", '--dblatex-opts=-s ../build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'test-usermanual.adoc'] [ 198s] a2x: resource files: [] [ 198s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 198s] make[3]: *** [../build/Makefile.asciidoc.inc:70: test-usermanual.pdf] Error 1 [ 198s] make[3]: Leaving directory '/usr/src/packages/BUILD/tests' [ 198s] make[2]: *** [Makefile:439: all-recursive] Error 1 [ 198s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 198s] make[1]: *** [Makefile:363: all] Error 2 [ 198s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 198s] dh_auto_build: error: make -j1 returned exit code 2 [ 198s] make: *** [debian/rules:5: binary] Error 25 [ 198s] dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 [ 198s] ### VM INTERACTION START ### [ 199s] Powering off. [ 199s] [ 188.745332] reboot: Power down [ 199s] ### VM INTERACTION END ### [ 199s] [ 199s] goat19 failed "build osmo-gsm-manuals-dev_1.1.0.dsc" at Sun Oct 31 16:40:19 UTC 2021. [ 199s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:44:47 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:44:47 +0000 Subject: Build failure of network:osmocom:latest/osmo-cbc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ec80583a73_11002ae3d3bb26007976c8@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-cbc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-cbc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-cbc Last lines of build log: [ 208s] # is like basename from coreutils, and . is WD. [ 208s] if ! [ -f osmocbc-usermanual.adoc ]; then \ [ 208s] ln -s osmocbc-usermanual.adoc osmocbc-usermanual.adoc; \ [ 208s] fi [ 208s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 208s] # in /usr/share/osmo-gsm-manuals. [ 208s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 209s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmocbc-usermanual.adoc [ 209s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmocbc-usermanual.adoc'] [ 209s] a2x: resource files: [] [ 209s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 209s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmocbc-usermanual.pdf] Error 1 [ 209s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 209s] make[3]: *** [Makefile:381: all-recursive] Error 1 [ 209s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 209s] make[2]: *** [Makefile:421: all-recursive] Error 1 [ 209s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 209s] make[1]: *** [Makefile:368: all] Error 2 [ 209s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 209s] dh_auto_build: error: make -j1 returned exit code 2 [ 209s] make: *** [debian/rules:45: build] Error 25 [ 209s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 209s] ### VM INTERACTION START ### [ 210s] Powering off. [ 210s] [ 199.870211] reboot: Power down [ 210s] ### VM INTERACTION END ### [ 210s] [ 210s] goat01 failed "build osmo-cbc_0.2.2.dsc" at Sun Oct 31 16:44:39 UTC 2021. [ 210s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:45:04 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:45:04 +0000 Subject: Build failure of network:osmocom:latest/osmo-bts in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ec81f327a2_11002ae3d3bb26007978c6@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bts/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bts failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bts Last lines of build log: [ 227s] # is like basename from coreutils, and . is WD. [ 227s] if ! [ -f osmobts-usermanual.adoc ]; then \ [ 227s] ln -s osmobts-usermanual.adoc osmobts-usermanual.adoc; \ [ 227s] fi [ 227s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 227s] # in /usr/share/osmo-gsm-manuals. [ 227s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 227s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmobts-usermanual.adoc [ 227s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmobts-usermanual.adoc'] [ 227s] a2x: resource files: [] [ 227s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 227s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmobts-usermanual.pdf] Error 1 [ 227s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 227s] make[3]: *** [Makefile:380: all-recursive] Error 1 [ 227s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 227s] make[2]: *** [Makefile:439: all-recursive] Error 1 [ 227s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 227s] make[1]: *** [Makefile:371: all] Error 2 [ 227s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 227s] dh_auto_build: error: make -j1 returned exit code 2 [ 227s] make: *** [debian/rules:12: build] Error 25 [ 227s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 227s] ### VM INTERACTION START ### [ 228s] Powering off. [ 228s] [ 217.498792] reboot: Power down [ 228s] ### VM INTERACTION END ### [ 228s] [ 228s] goat05 failed "build osmo-bts_1.3.3.dsc" at Sun Oct 31 16:44:58 UTC 2021. [ 228s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:46:46 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:46:46 +0000 Subject: Build failure of network:osmocom:latest/osmo-pcu in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ec87a18e34_11002ae3d3bb26007992ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-pcu/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-pcu failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-pcu Last lines of build log: [ 316s] # we create a symlink at ./srcfile.adoc pointing at [ 316s] # ./srcfile.adoc. osmopcu-usermanual.adoc is the ./srcfile.adoc, [ 316s] # is like basename from coreutils, and . is WD. [ 316s] if ! [ -f osmopcu-usermanual.adoc ]; then \ [ 316s] ln -s osmopcu-usermanual.adoc osmopcu-usermanual.adoc; \ [ 316s] fi [ 316s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 316s] # in /usr/share/osmo-gsm-manuals. [ 316s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 316s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmopcu-usermanual.adoc [ 317s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmopcu-usermanual.adoc'] [ 317s] a2x: resource files: [] [ 317s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 317s] make[3]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmopcu-usermanual.pdf] Error 1 [ 317s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 317s] make[2]: *** [Makefile:384: all-recursive] Error 1 [ 317s] make[2]: Leaving directory '/usr/src/packages/BUILD/doc' [ 317s] make[1]: *** [Makefile:420: all-recursive] Error 1 [ 317s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 317s] dh_auto_build: error: make -j1 returned exit code 2 [ 317s] make: *** [debian/rules:12: build] Error 25 [ 317s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 317s] ### VM INTERACTION START ### [ 318s] Powering off. [ 318s] [ 303.948554] reboot: Power down [ 318s] ### VM INTERACTION END ### [ 318s] [ 318s] sheep86 failed "build osmo-pcu_0.9.1.dsc" at Sun Oct 31 16:46:39 UTC 2021. [ 318s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:47:37 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:47:37 +0000 Subject: Build failure of network:osmocom:latest/osmo-gbproxy in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ec8b925041_11002ae3d3bb26008007ad@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-gbproxy/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-gbproxy failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-gbproxy Last lines of build log: [ 369s] # is like basename from coreutils, and . is WD. [ 369s] if ! [ -f osmogbproxy-usermanual.adoc ]; then \ [ 369s] ln -s osmogbproxy-usermanual.adoc osmogbproxy-usermanual.adoc; \ [ 369s] fi [ 369s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 369s] # in /usr/share/osmo-gsm-manuals. [ 369s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 369s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmogbproxy-usermanual.adoc [ 369s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmogbproxy-usermanual.adoc'] [ 369s] a2x: resource files: [] [ 369s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 369s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmogbproxy-usermanual.pdf] Error 1 [ 369s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 369s] make[3]: *** [Makefile:376: all-recursive] Error 1 [ 369s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 369s] make[2]: *** [Makefile:445: all-recursive] Error 1 [ 369s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 369s] make[1]: *** [Makefile:377: all] Error 2 [ 369s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 369s] dh_auto_build: error: make -j1 returned exit code 2 [ 369s] make: *** [debian/rules:45: build] Error 25 [ 369s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 369s] ### VM INTERACTION START ### [ 370s] Powering off. [ 370s] [ 352.497887] reboot: Power down [ 370s] ### VM INTERACTION END ### [ 370s] [ 370s] old-cirrus2 failed "build osmo-gbproxy_0.1.2.dsc" at Sun Oct 31 16:47:32 UTC 2021. [ 370s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:47:54 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:47:54 +0000 Subject: Build failure of network:osmocom:latest/osmo-sip-connector in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ec8d2b066b_11002ae3d3bb2600800965@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sip-connector/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sip-connector failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sip-connector Last lines of build log: [ 378s] # is like basename from coreutils, and . is WD. [ 378s] if ! [ -f osmosipconnector-usermanual.adoc ]; then \ [ 378s] ln -s osmosipconnector-usermanual.adoc osmosipconnector-usermanual.adoc; \ [ 378s] fi [ 378s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 378s] # in /usr/share/osmo-gsm-manuals. [ 378s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 378s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmosipconnector-usermanual.adoc [ 378s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmosipconnector-usermanual.adoc'] [ 378s] a2x: resource files: [] [ 378s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 378s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmosipconnector-usermanual.pdf] Error 1 [ 378s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 378s] make[3]: *** [Makefile:335: all-recursive] Error 1 [ 378s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 378s] make[2]: *** [Makefile:371: all-recursive] Error 1 [ 378s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 378s] make[1]: *** [Makefile:327: all] Error 2 [ 378s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 378s] dh_auto_build: error: make -j1 returned exit code 2 [ 378s] make: *** [debian/rules:12: build] Error 25 [ 378s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 378s] ### VM INTERACTION START ### [ 379s] Powering off. [ 379s] [ 360.134616] reboot: Power down [ 379s] ### VM INTERACTION END ### [ 379s] [ 379s] old-cirrus4 failed "build osmo-sip-connector_1.5.1.dsc" at Sun Oct 31 16:47:43 UTC 2021. [ 379s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:48:11 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:48:11 +0000 Subject: Build failure of network:osmocom:latest/osmo-ggsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ec8d3c4538_11002ae3d3bb260080157b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-ggsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-ggsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-ggsn Last lines of build log: [ 391s] # is like basename from coreutils, and . is WD. [ 391s] if ! [ -f osmoggsn-usermanual.adoc ]; then \ [ 391s] ln -s osmoggsn-usermanual.adoc osmoggsn-usermanual.adoc; \ [ 391s] fi [ 391s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 391s] # in /usr/share/osmo-gsm-manuals. [ 391s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 391s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmoggsn-usermanual.adoc [ 391s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmoggsn-usermanual.adoc'] [ 391s] a2x: resource files: [] [ 391s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 391s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmoggsn-usermanual.pdf] Error 1 [ 391s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 391s] make[3]: *** [Makefile:447: all-recursive] Error 1 [ 391s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 391s] make[2]: *** [Makefile:487: all-recursive] Error 1 [ 391s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 391s] make[1]: *** [Makefile:392: all] Error 2 [ 391s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 391s] dh_auto_build: error: make -j1 returned exit code 2 [ 391s] make: *** [debian/rules:15: build] Error 25 [ 391s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 391s] ### VM INTERACTION START ### [ 392s] Powering off. [ 392s] [ 374.324569] reboot: Power down [ 392s] ### VM INTERACTION END ### [ 392s] [ 392s] lamb09 failed "build osmo-ggsn_1.7.1.dsc" at Sun Oct 31 16:47:55 UTC 2021. [ 392s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:47:54 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:47:54 +0000 Subject: Build failure of network:osmocom:latest/osmo-mgw in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ec8d2df5c8_11002ae3d3bb26008010e0@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-mgw/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-mgw failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-mgw Last lines of build log: [ 390s] # is like basename from coreutils, and . is WD. [ 390s] if ! [ -f osmomgw-usermanual.adoc ]; then \ [ 390s] ln -s osmomgw-usermanual.adoc osmomgw-usermanual.adoc; \ [ 390s] fi [ 390s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 390s] # in /usr/share/osmo-gsm-manuals. [ 390s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 390s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmomgw-usermanual.adoc [ 390s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmomgw-usermanual.adoc'] [ 390s] a2x: resource files: [] [ 390s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 390s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmomgw-usermanual.pdf] Error 1 [ 390s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 390s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 390s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 390s] make[2]: *** [Makefile:514: all-recursive] Error 1 [ 390s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 390s] make[1]: *** [Makefile:423: all] Error 2 [ 390s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 390s] dh_auto_build: error: make -j1 returned exit code 2 [ 390s] make: *** [debian/rules:17: build] Error 25 [ 390s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 390s] ### VM INTERACTION START ### [ 391s] Powering off. [ 391s] [ 372.565343] reboot: Power down [ 392s] ### VM INTERACTION END ### [ 392s] [ 392s] lamb58 failed "build osmo-mgw_1.8.1.dsc" at Sun Oct 31 16:47:51 UTC 2021. [ 392s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:48:11 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:48:11 +0000 Subject: Build failure of network:osmocom:latest/libosmo-sccp in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ec8d3f2671_11002ae3d3bb26008016c9@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/libosmo-sccp/Debian_Unstable/x86_64 Package network:osmocom:latest/libosmo-sccp failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest libosmo-sccp Last lines of build log: [ 399s] # is like basename from coreutils, and . is WD. [ 399s] if ! [ -f osmostp-usermanual.adoc ]; then \ [ 399s] ln -s osmostp-usermanual.adoc osmostp-usermanual.adoc; \ [ 399s] fi [ 399s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 399s] # in /usr/share/osmo-gsm-manuals. [ 399s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 399s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmostp-usermanual.adoc [ 399s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmostp-usermanual.adoc'] [ 399s] a2x: resource files: [] [ 399s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 399s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmostp-usermanual.pdf] Error 1 [ 399s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 399s] make[3]: *** [Makefile:377: all-recursive] Error 1 [ 399s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 399s] make[2]: *** [Makefile:508: all-recursive] Error 1 [ 399s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 399s] make[1]: *** [Makefile:403: all] Error 2 [ 399s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 399s] dh_auto_build: error: make -j1 returned exit code 2 [ 399s] make: *** [debian/rules:12: build] Error 25 [ 399s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 399s] ### VM INTERACTION START ### [ 400s] Powering off. [ 400s] [ 382.579233] reboot: Power down [ 400s] ### VM INTERACTION END ### [ 400s] [ 400s] lamb06 failed "build libosmo-sccp_1.4.0.dsc" at Sun Oct 31 16:47:57 UTC 2021. [ 400s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:48:28 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:48:28 +0000 Subject: Build failure of network:osmocom:latest/osmo-remsim in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ec8f26e2d1_11002ae3d3bb2600801843@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-remsim/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-remsim failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-remsim Last lines of build log: [ 420s] # is like basename from coreutils, and . is WD. [ 420s] if ! [ -f osmo-remsim-usermanual.adoc ]; then \ [ 420s] ln -s osmo-remsim-usermanual.adoc osmo-remsim-usermanual.adoc; \ [ 420s] fi [ 420s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 420s] # in /usr/share/osmo-gsm-manuals. [ 420s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 420s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmo-remsim-usermanual.adoc [ 421s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmo-remsim-usermanual.adoc'] [ 421s] a2x: resource files: [] [ 421s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 421s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmo-remsim-usermanual.pdf] Error 1 [ 421s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 421s] make[3]: *** [Makefile:377: all-recursive] Error 1 [ 421s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 421s] make[2]: *** [Makefile:463: all-recursive] Error 1 [ 421s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 421s] make[1]: *** [Makefile:387: all] Error 2 [ 421s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 421s] dh_auto_build: error: make -j1 returned exit code 2 [ 421s] make: *** [debian/rules:12: build] Error 25 [ 421s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 421s] ### VM INTERACTION START ### [ 422s] Powering off. [ 422s] [ 403.711303] reboot: Power down [ 422s] ### VM INTERACTION END ### [ 422s] [ 422s] lamb15 failed "build osmo-remsim_0.2.4.dsc" at Sun Oct 31 16:48:26 UTC 2021. [ 422s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:48:28 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:48:28 +0000 Subject: Build failure of network:osmocom:latest/osmo-hlr in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ec8f338f48_11002ae3d3bb26008021ee@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-hlr/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-hlr failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-hlr Last lines of build log: [ 419s] # is like basename from coreutils, and . is WD. [ 419s] if ! [ -f osmohlr-usermanual.adoc ]; then \ [ 419s] ln -s osmohlr-usermanual.adoc osmohlr-usermanual.adoc; \ [ 419s] fi [ 419s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 419s] # in /usr/share/osmo-gsm-manuals. [ 419s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 419s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmohlr-usermanual.adoc [ 419s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmohlr-usermanual.adoc'] [ 419s] a2x: resource files: [] [ 419s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 419s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmohlr-usermanual.pdf] Error 1 [ 419s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 419s] make[3]: *** [Makefile:382: all-recursive] Error 1 [ 419s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 419s] make[2]: *** [Makefile:488: all-recursive] Error 1 [ 419s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 419s] make[1]: *** [Makefile:410: all] Error 2 [ 419s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 419s] dh_auto_build: error: make -j1 returned exit code 2 [ 419s] make: *** [debian/rules:7: build] Error 25 [ 419s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 419s] ### VM INTERACTION START ### [ 421s] Powering off. [ 421s] [ 385.893835] reboot: Power down [ 421s] ### VM INTERACTION END ### [ 421s] [ 421s] cloud127 failed "build osmo-hlr_1.3.1.dsc" at Sun Oct 31 16:48:25 UTC 2021. [ 421s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:51:52 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:51:52 +0000 Subject: Build failure of network:osmocom:latest/osmo-trx in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ec9c5cfdc3_11002ae3d3bb260080423b@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-trx/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-trx failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-trx Last lines of build log: [ 616s] # is like basename from coreutils, and . is WD. [ 616s] if ! [ -f osmotrx-usermanual.adoc ]; then \ [ 616s] ln -s osmotrx-usermanual.adoc osmotrx-usermanual.adoc; \ [ 616s] fi [ 616s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 616s] # in /usr/share/osmo-gsm-manuals. [ 616s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 616s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmotrx-usermanual.adoc [ 617s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmotrx-usermanual.adoc'] [ 617s] a2x: resource files: [] [ 617s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 617s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmotrx-usermanual.pdf] Error 1 [ 617s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 617s] make[3]: *** [Makefile:398: all-recursive] Error 1 [ 617s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 617s] make[2]: *** [Makefile:521: all-recursive] Error 1 [ 617s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 617s] make[1]: *** [Makefile:452: all] Error 2 [ 617s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 617s] dh_auto_build: error: make -j1 returned exit code 2 [ 617s] make: *** [debian/rules:6: build] Error 25 [ 617s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 617s] ### VM INTERACTION START ### [ 618s] Powering off. [ 618s] [ 595.981057] reboot: Power down [ 618s] ### VM INTERACTION END ### [ 618s] [ 618s] lamb24 failed "build osmo-trx_1.3.1.dsc" at Sun Oct 31 16:51:47 UTC 2021. [ 618s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:54:25 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:54:25 +0000 Subject: Build failure of network:osmocom:latest/osmo-iuh in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617eca5a526e2_11002ae3d3bb2600805343@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-iuh/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-iuh failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-iuh Last lines of build log: [ 371s] # is like basename from coreutils, and . is WD. [ 371s] if ! [ -f osmohnbgw-usermanual.adoc ]; then \ [ 371s] ln -s osmohnbgw-usermanual.adoc osmohnbgw-usermanual.adoc; \ [ 371s] fi [ 371s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 371s] # in /usr/share/osmo-gsm-manuals. [ 371s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 371s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmohnbgw-usermanual.adoc [ 371s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmohnbgw-usermanual.adoc'] [ 371s] a2x: resource files: [] [ 371s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 371s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmohnbgw-usermanual.pdf] Error 1 [ 371s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 371s] make[3]: *** [Makefile:383: all-recursive] Error 1 [ 371s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 371s] make[2]: *** [Makefile:469: all-recursive] Error 1 [ 371s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 371s] make[1]: *** [Makefile:391: all] Error 2 [ 371s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 371s] dh_auto_build: error: make -j1 returned exit code 2 [ 371s] make: *** [debian/rules:9: build] Error 25 [ 371s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 371s] ### VM INTERACTION START ### [ 372s] Powering off. [ 372s] [ 362.013025] reboot: Power down [ 373s] ### VM INTERACTION END ### [ 373s] [ 373s] goat01 failed "build osmo-iuh_1.0.0.dsc" at Sun Oct 31 16:54:22 UTC 2021. [ 373s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:55:16 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:55:16 +0000 Subject: Build failure of network:osmocom:latest/osmo-smlc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617eca7a8f30c_11002ae3d3bb260080568a@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-smlc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-smlc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-smlc Last lines of build log: [ 405s] # is like basename from coreutils, and . is WD. [ 405s] if ! [ -f osmosmlc-usermanual.adoc ]; then \ [ 405s] ln -s osmosmlc-usermanual.adoc osmosmlc-usermanual.adoc; \ [ 405s] fi [ 405s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 405s] # in /usr/share/osmo-gsm-manuals. [ 405s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 405s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmosmlc-usermanual.adoc [ 405s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmosmlc-usermanual.adoc'] [ 405s] a2x: resource files: [] [ 405s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 405s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmosmlc-usermanual.pdf] Error 1 [ 405s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 405s] make[3]: *** [Makefile:376: all-recursive] Error 1 [ 405s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 405s] make[2]: *** [Makefile:445: all-recursive] Error 1 [ 405s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 405s] make[1]: *** [Makefile:377: all] Error 2 [ 405s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 405s] dh_auto_build: error: make -j1 returned exit code 2 [ 405s] make: *** [debian/rules:45: build] Error 25 [ 405s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 405s] ### VM INTERACTION START ### [ 406s] Powering off. [ 406s] [ 370.571073] reboot: Power down [ 406s] ### VM INTERACTION END ### [ 406s] [ 406s] cloud109 failed "build osmo-smlc_0.2.0.dsc" at Sun Oct 31 16:55:10 UTC 2021. [ 406s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:56:07 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:56:07 +0000 Subject: Build failure of network:osmocom:latest/osmo-bsc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ecab46d6e2_11002ae3d3bb26008061f1@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-bsc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-bsc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-bsc Last lines of build log: [ 449s] # is like basename from coreutils, and . is WD. [ 449s] if ! [ -f osmobsc-usermanual.adoc ]; then \ [ 449s] ln -s osmobsc-usermanual.adoc osmobsc-usermanual.adoc; \ [ 449s] fi [ 449s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 449s] # in /usr/share/osmo-gsm-manuals. [ 449s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 449s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmobsc-usermanual.adoc [ 449s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmobsc-usermanual.adoc'] [ 449s] a2x: resource files: [] [ 449s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 449s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmobsc-usermanual.pdf] Error 1 [ 449s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 449s] make[3]: *** [Makefile:387: all-recursive] Error 1 [ 449s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 449s] make[2]: *** [Makefile:456: all-recursive] Error 1 [ 449s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 449s] make[1]: *** [Makefile:388: all] Error 2 [ 449s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 449s] dh_auto_build: error: make -j1 returned exit code 2 [ 449s] make: *** [debian/rules:45: build] Error 25 [ 449s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 449s] ### VM INTERACTION START ### [ 450s] Powering off. [ 450s] [ 431.777085] reboot: Power down [ 450s] ### VM INTERACTION END ### [ 450s] [ 450s] lamb56 failed "build osmo-bsc_1.7.2.dsc" at Sun Oct 31 16:55:50 UTC 2021. [ 450s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 16:58:23 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 16:58:23 +0000 Subject: Build failure of network:osmocom:latest/osmo-sgsn in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ecb4ce2d43_11002ae3d3bb2600806228@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-sgsn/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-sgsn failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-sgsn Last lines of build log: [ 213s] # is like basename from coreutils, and . is WD. [ 213s] if ! [ -f osmosgsn-usermanual.adoc ]; then \ [ 213s] ln -s osmosgsn-usermanual.adoc osmosgsn-usermanual.adoc; \ [ 213s] fi [ 213s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 213s] # in /usr/share/osmo-gsm-manuals. [ 213s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 213s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmosgsn-usermanual.adoc [ 213s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmosgsn-usermanual.adoc'] [ 213s] a2x: resource files: [] [ 213s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 213s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmosgsn-usermanual.pdf] Error 1 [ 213s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 213s] make[3]: *** [Makefile:393: all-recursive] Error 1 [ 213s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 213s] make[2]: *** [Makefile:462: all-recursive] Error 1 [ 213s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 213s] make[1]: *** [Makefile:394: all] Error 2 [ 213s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 213s] dh_auto_build: error: make -j1 returned exit code 2 [ 213s] make: *** [debian/rules:45: build] Error 25 [ 213s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 213s] ### VM INTERACTION START ### [ 214s] Powering off. [ 214s] [ 202.891578] reboot: Power down [ 214s] ### VM INTERACTION END ### [ 214s] [ 214s] goat11 failed "build osmo-sgsn_1.7.1.dsc" at Sun Oct 31 16:58:07 UTC 2021. [ 214s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From noreply at opensuse.org Sun Oct 31 17:02:38 2021 From: noreply at opensuse.org (OBS Notification) Date: Sun, 31 Oct 2021 17:02:38 +0000 Subject: Build failure of network:osmocom:latest/osmo-msc in Debian_Unstable/x86_64 In-Reply-To: References: Message-ID: <617ecc397b7c8_11002ae3d3bb26008068be@build.opensuse.org> Visit https://build.opensuse.org/package/live_build_log/network:osmocom:latest/osmo-msc/Debian_Unstable/x86_64 Package network:osmocom:latest/osmo-msc failed to build in Debian_Unstable/x86_64 Check out the package for editing: osc checkout network:osmocom:latest osmo-msc Last lines of build log: [ 452s] # is like basename from coreutils, and . is WD. [ 452s] if ! [ -f osmomsc-usermanual.adoc ]; then \ [ 452s] ln -s osmomsc-usermanual.adoc osmomsc-usermanual.adoc; \ [ 452s] fi [ 452s] # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} [ 452s] # in /usr/share/osmo-gsm-manuals. [ 452s] TEXINPUTS="/usr/share/osmo-gsm-manuals" \ [ 452s] a2x -vv -L --asciidoc-opts="-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'" --dblatex-opts="-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0" -a docinfo -a revnumber="DRAFT " -a revdate="unknown" osmomsc-usermanual.adoc [ 452s] a2x: args: ['-vv', '-L', "--asciidoc-opts=-f /usr/share/osmo-gsm-manuals/build/mscgen-filter.conf -f /usr/share/osmo-gsm-manuals/build/diag-filter.conf -f /usr/share/osmo-gsm-manuals/build/docinfo-releaseinfo.conf -a srcdir='/usr/src/packages/BUILD/doc/manuals' -a commondir='/usr/share/osmo-gsm-manuals/common'", '--dblatex-opts=-s /usr/share/osmo-gsm-manuals/build/custom-dblatex.sty -P draft.mode=yes -P draft.watermark=0', '-a', 'docinfo', '-a', 'revnumber=DRAFT ', '-a', 'revdate=unknown', 'osmomsc-usermanual.adoc'] [ 452s] a2x: resource files: [] [ 452s] a2x: resource directories: ['/etc/asciidoc/stylesheets'] [ 452s] make[4]: *** [/usr/share/osmo-gsm-manuals/build/Makefile.asciidoc.inc:70: osmomsc-usermanual.pdf] Error 1 [ 452s] make[4]: Leaving directory '/usr/src/packages/BUILD/doc/manuals' [ 452s] make[3]: *** [Makefile:402: all-recursive] Error 1 [ 452s] make[3]: Leaving directory '/usr/src/packages/BUILD/doc' [ 452s] make[2]: *** [Makefile:470: all-recursive] Error 1 [ 452s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 452s] make[1]: *** [Makefile:402: all] Error 2 [ 452s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 452s] dh_auto_build: error: make -j1 returned exit code 2 [ 452s] make: *** [debian/rules:45: build] Error 25 [ 452s] dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2 [ 452s] ### VM INTERACTION START ### [ 454s] Powering off. [ 454s] [ 393.188767] reboot: Power down [ 454s] ### VM INTERACTION END ### [ 454s] [ 454s] cloud101 failed "build osmo-msc_1.7.1.dsc" at Sun Oct 31 17:02:27 UTC 2021. [ 454s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/) From gerrit-no-reply at lists.osmocom.org Sun Oct 31 18:47:43 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 18:47:43 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: execute test cases for BS power control on TRX1 In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25908 ) Change subject: BTS_Tests: execute test cases for BS power control on TRX1 ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25908 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ied3e38986690850f0323d4db072cf59b6975587e Gerrit-Change-Number: 25908 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 31 Oct 2021 18:47:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 22:51:37 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 22:51:37 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: make TRX number configurable for ConnHdlr In-Reply-To: References: Message-ID: fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21317 ) Change subject: BTS_Tests: make TRX number configurable for ConnHdlr ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifed3891658501e0a04ff89563d0a02f08211eed3 Gerrit-Change-Number: 21317 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Comment-Date: Sun, 31 Oct 2021 22:51:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment -------------- next part -------------- An HTML attachment was scrubbed... URL: From gerrit-no-reply at lists.osmocom.org Sun Oct 31 22:51:45 2021 From: gerrit-no-reply at lists.osmocom.org (fixeria) Date: Sun, 31 Oct 2021 22:51:45 +0000 Subject: Change in osmo-ttcn3-hacks[master]: BTS_Tests: make TRX number configurable for ConnHdlr In-Reply-To: References: Message-ID: fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21317 ) Change subject: BTS_Tests: make TRX number configurable for ConnHdlr ...................................................................... BTS_Tests: make TRX number configurable for ConnHdlr This change allows running test cases against additional transceivers. Change-Id: Ifed3891658501e0a04ff89563d0a02f08211eed3 Related: SYS#4918 --- M bts/BTS_Tests.ttcn M bts/BTS_Tests_LAPDm.ttcn 2 files changed, 11 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 5757e35..2e35ce9 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -300,6 +300,7 @@ }; type record ConnHdlrPars { + uint8_t trx_nr, RslChannelNr chan_nr, RSL_IE_ChannelMode chan_mode, float t_guard, @@ -733,7 +734,7 @@ g_Tguard.start(pars.t_guard); activate(as_Tguard()); - f_rslem_register(0, pars.chan_nr); + f_rslem_register(pars.trx_nr, pars.chan_nr); /* call the user-supplied test case function */ fn.apply(id); @@ -797,7 +798,8 @@ friend template ConnHdlrPars t_Pars(template RslChannelNr chan_nr, template RSL_IE_ChannelMode chan_mode, template (omit) TestSpecUnion spec := omit, - float t_guard := 20.0) := { + uint8_t trx_nr := 0, float t_guard := 20.0) := { + trx_nr := trx_nr, chan_nr := valueof(chan_nr), chan_mode := valueof(chan_mode), t_guard := t_guard, @@ -2220,8 +2222,9 @@ /* Tune to a dedicated channel: L1CTL only */ private function f_l1ctl_est_dchan(L1CTL_PT pt, ConnHdlrPars pars) { if (not pars.fhp.enabled) { + var TrxParsItem trx_pars := mp_trx_pars[pars.trx_nr]; pt.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr, pars.tsc, - mp_trx_pars[0].arfcn)); + trx_pars.arfcn)); } else { pt.send(ts_L1CTL_DM_EST_REQ_H1(pars.chan_nr, pars.tsc, pars.fhp.maio_hsn.hsn, @@ -2241,7 +2244,8 @@ if (g_pars.fhp.enabled) { ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.fhp.maio_hsn, g_pars.tsc)); } else { - ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx_pars[0].arfcn, g_pars.tsc)); + var TrxParsItem trx_pars := mp_trx_pars[g_pars.trx_nr]; + ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, trx_pars.arfcn, g_pars.tsc)); } /* enable dedicated mode */ diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn index 6d252e0..edd974b 100644 --- a/bts/BTS_Tests_LAPDm.ttcn +++ b/bts/BTS_Tests_LAPDm.ttcn @@ -43,7 +43,8 @@ /* master function switching to a dedicated radio channel */ function f_switch_dcch() runs on ConnHdlr { - var GsmBandArfcn arfcn := valueof(ts_GsmBandArfcn(mp_trx_pars[0].arfcn)); + var TrxParsItem trx_pars := mp_trx_pars[g_pars.trx_nr]; + var GsmBandArfcn arfcn := valueof(ts_GsmBandArfcn(trx_pars.arfcn)); var BCCH_tune_req tune_req := { arfcn := arfcn, combined_ccch := true }; var DCCH_switch_req sw_req; @@ -55,7 +56,7 @@ sw_req.ma := g_pars.fhp.ma; } else { sw_req.chan_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, - mp_trx_pars[0].arfcn, + trx_pars.arfcn, g_pars.tsc)); sw_req.ma := omit; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21317 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ifed3891658501e0a04ff89563d0a02f08211eed3 Gerrit-Change-Number: 21317 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: